diff --git a/bin/impl/run/accumulo.sh b/bin/impl/run/accumulo.sh index 7910662..2cecccd 100755 --- a/bin/impl/run/accumulo.sh +++ b/bin/impl/run/accumulo.sh @@ -27,12 +27,14 @@ trap 'echo "[ERROR] Error occurred at $BASH_SOURCE:$LINENO command: $BASH_COMMAN [[ $1 != '--no-deps' ]] && run_component hadoop && run_component zookeeper "$HADOOP_HOME"/bin/hadoop fs -rm -r /accumulo 2>/dev/null || true -"$ACCUMULO_HOME"/bin/accumulo init --clear-instance-name --instance-name "$ACCUMULO_INSTANCE" --password "$ACCUMULO_PASSWORD" if [[ $ACCUMULO_VERSION =~ ^1\..*$ ]]; then - "$ACCUMULO_HOME"/bin/start-all.sh + print_to_console "Accumulo 1 is not supported; use an earlier uno or a newer accumulo" + exit 1 elif [[ $ACCUMULO_VERSION =~ ^2\.[0-1]\.[0-3]$ ]]; then + "$ACCUMULO_HOME"/bin/accumulo init --clear-instance-name --instance-name "$ACCUMULO_INSTANCE" --password "$ACCUMULO_PASSWORD" "$ACCUMULO_HOME"/bin/accumulo-cluster start else + "$ACCUMULO_HOME"/bin/accumulo inst init --clear-instance-name --instance-name "$ACCUMULO_INSTANCE" --password "$ACCUMULO_PASSWORD" "$ACCUMULO_HOME"/bin/accumulo-cluster start --local fi