mikewalch closed pull request #193: Uno improvements
URL: https://github.com/apache/fluo-uno/pull/193
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/load-env.sh b/bin/impl/load-env.sh
index df507eb..7d80223 100755
--- a/bin/impl/load-env.sh
+++ b/bin/impl/load-env.sh
@@ -51,31 +51,36 @@ else
exit 1
fi
+function env_error() {
+ echo 'Make your shell env match uno.conf by running: eval "$(./bin/uno env)"'
+ exit 1
+}
+
# Confirm that hadoop, accumulo, and zookeeper env variables are not set
if [[ ! "version env" =~ $1 ]]; then
if [[ -n "$HH" && "$HH" != "$HADOOP_HOME" ]]; then
echo "HADOOP_HOME in your shell env '$HH' needs to match your uno uno.conf
'$HADOOP_HOME'"
- exit 1
+ env_error
fi
if [[ -n "$HC" && "$HC" != "$HADOOP_CONF_DIR" ]]; then
echo "HADOOP_CONF_DIR in your shell env '$HC' needs to match your uno
uno.conf '$HADOOP_CONF_DIR'"
- exit 1
+ env_error
fi
if [[ -n "$ZH" && "$ZH" != "$ZOOKEEPER_HOME" ]]; then
echo "ZOOKEEPER_HOME in your shell env '$ZH' needs to match your uno
uno.conf '$ZOOKEEPER_HOME'"
- exit 1
+ env_error
fi
if [[ -n "$SH" && "$SH" != "$SPARK_HOME" ]]; then
echo "SPARK_HOME in your shell env '$SH' needs to match your uno uno.conf
'$SPARK_HOME'"
- exit 1
+ env_error
fi
if [[ -n "$AH" && "$AH" != "$ACCUMULO_HOME" ]]; then
echo "ACCUMULO_HOME in your shell env '$AH' needs to match your uno
uno.conf '$ACCUMULO_HOME'"
- exit 1
+ env_error
fi
if [[ -n "$FH" && "$FH" != "$FLUO_HOME" ]]; then
echo "FLUO_HOME in your shell env '$FH' needs to match your uno uno.conf
'$FLUO_HOME'"
- exit 1
+ env_error
fi
fi
@@ -125,6 +130,19 @@ fi
: "${HADOOP_LOG_DIR:?"HADOOP_LOG_DIR is not set in uno.conf"}"
: "${ZOO_LOG_DIR:?"ZOO_LOG_DIR is not set in uno.conf"}"
+if [[ -z "$HADOOP_HASH" ]]; then
+ echo "HADOOP_HASH is not set. Set it for your version in 'conf/checksums' or
uno.conf"
+ exit 1
+fi
+if [[ -z "$ZOOKEEPER_HASH" ]]; then
+ echo "ZOOKEEPER_HASH is not set. Set it for your version in 'conf/checksums'
or uno.conf"
+ exit 1
+fi
+if [[ -z "$ACCUMULO_HASH" ]]; then
+ echo "ACCUMULO_HASH is not set. Set it for your version in 'conf/checksums'
or uno.conf"
+ exit 1
+fi
+
hash shasum 2>/dev/null || { echo >&2 "shasum must be installed & on PATH.
Aborting."; exit 1; }
hash sed 2>/dev/null || { echo >&2 "sed must be installed & on PATH.
Aborting."; exit 1; }
diff --git a/bin/impl/print-env.sh b/bin/impl/print-env.sh
index 6cb1908..c576da4 100755
--- a/bin/impl/print-env.sh
+++ b/bin/impl/print-env.sh
@@ -15,10 +15,9 @@
# limitations under the License.
if [[ -z "$1" || "$1" == "--vars" ]]; then
+ echo "export HADOOP_HOME=\"$HADOOP_HOME\""
if [[ $HADOOP_VERSION =~ ^2\..*$ ]]; then
echo "export HADOOP_PREFIX=\"$HADOOP_HOME\""
- else
- echo "export HADOOP_HOME=\"$HADOOP_HOME\""
fi
echo "export HADOOP_CONF_DIR=\"$HADOOP_CONF_DIR\""
echo "export ZOOKEEPER_HOME=\"$ZOOKEEPER_HOME\""
diff --git a/bin/impl/setup-accumulo.sh b/bin/impl/setup-accumulo.sh
index 9a49d4f..2979c55 100755
--- a/bin/impl/setup-accumulo.sh
+++ b/bin/impl/setup-accumulo.sh
@@ -16,6 +16,11 @@
source "$UNO_HOME"/bin/impl/util.sh
+pkill -f accumulo.start
+
+# stop if any command fails
+set -e
+
if [[ -z "$ACCUMULO_REPO" ]]; then
verify_exist_hash "$ACCUMULO_TARBALL" "$ACCUMULO_HASH"
fi
@@ -25,12 +30,7 @@ if [[ $1 != "--no-deps" ]]; then
run_setup_script ZooKeeper
fi
-pkill -f accumulo.start
-
-# stop if any command fails
-set -e
-
-print_to_console "Setting up Apache Accumulo at $ACCUMULO_HOME"
+print_to_console "Setting up Apache Accumulo $ACCUMULO_VERSION at
$ACCUMULO_HOME"
print_to_console " * Accumulo Monitor: http://localhost:9995/";
print_to_console " * view logs at $ACCUMULO_LOG_DIR"
diff --git a/bin/impl/setup-hadoop.sh b/bin/impl/setup-hadoop.sh
index 622130f..8945ca9 100755
--- a/bin/impl/setup-hadoop.sh
+++ b/bin/impl/setup-hadoop.sh
@@ -16,21 +16,21 @@
source "$UNO_HOME"/bin/impl/util.sh
-verify_exist_hash "$HADOOP_TARBALL" "$HADOOP_HASH"
-
pkill -f hadoop.hdfs
pkill -f hadoop.yarn
# stop if any command fails
set -e
+verify_exist_hash "$HADOOP_TARBALL" "$HADOOP_HASH"
+
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 "Setting up Apache Hadoop $HADOOP_VERSION at $HADOOP_HOME"
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"
diff --git a/bin/impl/setup-zookeeper.sh b/bin/impl/setup-zookeeper.sh
index c7cc6c3..80254a2 100755
--- a/bin/impl/setup-zookeeper.sh
+++ b/bin/impl/setup-zookeeper.sh
@@ -16,14 +16,14 @@
source "$UNO_HOME"/bin/impl/util.sh
-verify_exist_hash "$ZOOKEEPER_TARBALL" "$ZOOKEEPER_HASH"
-
pkill -f QuorumPeerMain
# stop if any command fails
set -e
-print_to_console "Setting up Apache ZooKeeper at $ZOOKEEPER_HOME"
+verify_exist_hash "$ZOOKEEPER_TARBALL" "$ZOOKEEPER_HASH"
+
+print_to_console "Setting up Apache ZooKeeper $ZOOKEEPER_VERSION at
$ZOOKEEPER_HOME"
print_to_console " * view logs at $ZOO_LOG_DIR"
rm -rf "$INSTALL"/zookeeper-*
diff --git a/bin/uno b/bin/uno
index 5389b14..d856b29 100755
--- a/bin/uno
+++ b/bin/uno
@@ -104,6 +104,13 @@ env)
version)
"$bin"/impl/version.sh "${@:2}"
;;
+wipe)
+ "$bin"/impl/kill.sh
+ if [[ -d "$INSTALL" ]]; then
+ echo "removing $INSTALL"
+ rm -rf "$INSTALL"
+ fi
+ ;;
*)
echo -e "Usage: uno <command> (<argument>)\n"
echo -e "Possible commands:\n"
@@ -114,11 +121,12 @@ version)
echo " Run 'uno setup' for list of components."
echo " start <component> Start ZooKeeper, Hadoop, Accumulo, if not
running."
echo " stop <component> Stop Accumulo, Hadoop, ZooKeeper, if running."
- echo " kill Kills all software"
+ echo " kill Kills all processes"
echo " ashell Runs the Accumulo shell"
echo " env Prints out shell configuration for PATH and
common environment variables."
echo " Add '--paths' or '--vars' command to limit
what is printed."
echo " version <dep> Prints out configured version for dependency"
+ echo " wipe Kills all processes and clears install
directory"
echo " "
exit 1
esac
----------------------------------------------------------------
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
