mikewalch closed pull request #192: Several updates to Uno URL: https://github.com/apache/fluo-uno/pull/192
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/bin/impl/setup-accumulo.sh b/bin/impl/setup-accumulo.sh index a924eb2..9a49d4f 100755 --- a/bin/impl/setup-accumulo.sh +++ b/bin/impl/setup-accumulo.sh @@ -31,6 +31,8 @@ pkill -f accumulo.start set -e print_to_console "Setting up Apache Accumulo at $ACCUMULO_HOME" +print_to_console " * Accumulo Monitor: http://localhost:9995/"; +print_to_console " * view logs at $ACCUMULO_LOG_DIR" rm -rf "$INSTALL"/accumulo-* rm -f "$ACCUMULO_LOG_DIR"/* @@ -45,11 +47,13 @@ if [[ $ACCUMULO_VERSION =~ ^1\..*$ ]]; then cp "$conf"/examples/2GB/standalone/* "$conf"/ $SED "s#localhost#$UNO_HOST#" "$conf/slaves" cp "$UNO_HOME"/conf/accumulo/accumulo-site-1.0.xml "$accumulo_conf" + $SED "s#export HADOOP_PREFIX=[^ ]*#export HADOOP_PREFIX=$HADOOP_HOME#" "$conf"/accumulo-env.sh else accumulo_conf=$conf/accumulo.properties "$ACCUMULO_HOME"/bin/accumulo-cluster create-config $SED "s#localhost#$UNO_HOST#" "$conf/tservers" cp "$UNO_HOME"/conf/accumulo/accumulo-2.0.properties "$accumulo_conf" + $SED "s#export HADOOP_HOME=[^ ]*#export HADOOP_HOME=$HADOOP_HOME#" "$conf"/accumulo-env.sh $SED "s#instance[.]name=#instance.name=$ACCUMULO_INSTANCE#" "$conf"/accumulo-client.properties $SED "s#instance[.]zookeepers=localhost:2181#instance.zookeepers=$UNO_HOST:2181#" "$conf"/accumulo-client.properties $SED "s#auth[.]principal=#auth.principal=$ACCUMULO_USER#" "$conf"/accumulo-client.properties @@ -57,7 +61,6 @@ else fi $SED "s#localhost#$UNO_HOST#" "$conf/masters" "$conf/monitor" "$conf/gc" $SED "s#export ZOOKEEPER_HOME=[^ ]*#export ZOOKEEPER_HOME=$ZOOKEEPER_HOME#" "$conf"/accumulo-env.sh -$SED "s#export HADOOP_PREFIX=[^ ]*#export HADOOP_PREFIX=$HADOOP_HOME#" "$conf"/accumulo-env.sh $SED "s#export ACCUMULO_LOG_DIR=[^ ]*#export ACCUMULO_LOG_DIR=$ACCUMULO_LOG_DIR#" "$conf"/accumulo-env.sh if [[ $ACCUMULO_VERSION =~ ^1\..*$ ]]; then $SED "s#ACCUMULO_TSERVER_OPTS=.*#ACCUMULO_TSERVER_OPTS=\"-Xmx$ACCUMULO_TSERV_MEM -Xms$ACCUMULO_TSERV_MEM\"#" "$conf"/accumulo-env.sh diff --git a/bin/impl/setup-hadoop.sh b/bin/impl/setup-hadoop.sh index 2f8f6f8..622130f 100755 --- a/bin/impl/setup-hadoop.sh +++ b/bin/impl/setup-hadoop.sh @@ -24,8 +24,16 @@ pkill -f hadoop.yarn # stop if any command fails set -e +namenode_port=9870 +if [[ $HADOOP_VERSION =~ ^2\..*$ ]]; then + namenode_port=50070 + export HADOOP_PREFIX=$HADOOP_HOME +fi + print_to_console "Setting up Apache Hadoop at $HADOOP_HOME" -print_to_console "Apache Hadoop logs are at $HADOOP_LOG_DIR" +print_to_console " * NameNode status: http://localhost:$namenode_port/"; +print_to_console " * ResourceManager status: http://localhost:8088/"; +print_to_console " * view logs at $HADOOP_LOG_DIR" rm -rf "$INSTALL"/hadoop-* rm -f "$HADOOP_LOG_DIR"/* diff --git a/bin/impl/setup-zookeeper.sh b/bin/impl/setup-zookeeper.sh index c8526db..c7cc6c3 100755 --- a/bin/impl/setup-zookeeper.sh +++ b/bin/impl/setup-zookeeper.sh @@ -24,6 +24,8 @@ pkill -f QuorumPeerMain set -e print_to_console "Setting up Apache ZooKeeper at $ZOOKEEPER_HOME" +print_to_console " * view logs at $ZOO_LOG_DIR" + rm -rf "$INSTALL"/zookeeper-* rm -f "$ZOO_LOG_DIR"/* mkdir -p "$ZOO_LOG_DIR" diff --git a/conf/checksums b/conf/checksums index a7b1100..b088a55 100644 --- a/conf/checksums +++ b/conf/checksums @@ -13,6 +13,7 @@ hadoop:2.8.3:e8bf9a53337b1dca3b152b0a5b5e277dc734e76520543e525c301a050bb27eae hadoop:2.7.6:f2327ea93f4bc5a5d7150dee8e0ede196d3a77ff8526a7dd05a48a09aae25669 hadoop:2.7.5:0bfc4d9b04be919be2fdf36f67fa3b4526cdbd406c512a7a1f5f1b715661f831 hadoop:2.6.5:001ad18d4b6d0fe542b15ddadba2d092bc97df1c4d2d797381c8d12887691898 +zookeeper:3.4.13:3481bd19945d80848f81d9dc2896a682ae8b62269b8164ffbae532e55aa4219961403e0208c8e72cf784605eae436d70ddae2b26e0deba0f1f84c74188c32c0a zookeeper:3.4.12:c686f9319050565b58e642149cb9e4c9cc8c7207aacc2cb70c5c0672849594b9 zookeeper:3.4.11:f6bd68a1c8f7c13ea4c2c99f13082d0d71ac464ffaf3bf7a365879ab6ad10e84 zookeeper:3.4.10:7f7f5414e044ac11fee2a1e0bc225469f51fb0cdf821e67df762a43098223f27 diff --git a/conf/uno.conf b/conf/uno.conf index 8f4c4a4..788d29f 100644 --- a/conf/uno.conf +++ b/conf/uno.conf @@ -4,7 +4,7 @@ # Versions # -------- export HADOOP_VERSION=${HADOOP_VERSION:-2.8.4} -export ZOOKEEPER_VERSION=${ZOOKEEPER_VERSION:-3.4.12} +export ZOOKEEPER_VERSION=${ZOOKEEPER_VERSION:-3.4.13} export ACCUMULO_VERSION=${ACCUMULO_VERSION:-1.9.2} export SPARK_VERSION=${SPARK_VERSION:-1.6.3} export FLUO_VERSION=${FLUO_VERSION:-1.2.0} @@ -100,9 +100,6 @@ export DATA_DIR=$INSTALL/data # Home directories export ZOOKEEPER_HOME=$INSTALL/zookeeper-$ZOOKEEPER_VERSION export HADOOP_HOME=$INSTALL/hadoop-$HADOOP_VERSION -if [[ $HADOOP_VERSION =~ ^2\..*$ ]]; then - export HADOOP_PREFIX=$HADOOP_HOME -fi export ACCUMULO_HOME=$INSTALL/accumulo-$ACCUMULO_VERSION export SPARK_HOME=$INSTALL/spark-$SPARK_VERSION-bin-without-hadoop export FLUO_HOME=$INSTALL/fluo-$FLUO_VERSION ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services
