Skip to content

Support Accumulo 2.1.4 command compatibility #314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DomGarguilo merged 2 commits into from
Jun 4, 2026
Merged

Support Accumulo 2.1.4 command compatibility #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1fbe8e2
Support Accumulo 2.1.4 command compatibility
DomGarguilo Jun 4, 2026
4688d30
Handle defaulted Accumulo env variables
DomGarguilo Jun 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bin/impl/commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ function uno_start_main() {
if [[ -z $tmp ]]; then
if [[ $ACCUMULO_VERSION =~ ^1\..*$ ]]; then
"$ACCUMULO_HOME"/bin/start-all.sh
elif [[ $ACCUMULO_VERSION =~ ^2\.[0-1]\.[0-3]$ ]]; then
elif [[ $ACCUMULO_VERSION =~ ^2\.[0-1]\..*$ ]]; then
"$ACCUMULO_HOME"/bin/accumulo-cluster start
else
"$ACCUMULO_HOME"/bin/accumulo-cluster start --local
Expand Down Expand Up @@ -230,7 +230,7 @@ function uno_stop_main() {
if pgrep -f accumulo\\.start >/dev/null; then
if [[ $ACCUMULO_VERSION =~ ^1\..*$ ]]; then
"$ACCUMULO_HOME"/bin/stop-all.sh
elif [[ $ACCUMULO_VERSION =~ ^2\.[0-1]\.[0-3]$ ]]; then
elif [[ $ACCUMULO_VERSION =~ ^2\.[0-1]\..*$ ]]; then
"$ACCUMULO_HOME"/bin/accumulo-cluster stop
else
"$ACCUMULO_HOME"/bin/accumulo-cluster stop --local
Expand Down
6 changes: 3 additions & 3 deletions bin/impl/install/accumulo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ else
if [[ -f "$conf/tservers" ]]; then
$SED "s#localhost#$UNO_HOST#" "$conf/tservers"
fi
$SED "s#export HADOOP_HOME=[^ ]*#export HADOOP_HOME=$HADOOP_HOME#" "$conf"/accumulo-env.sh
$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
Expand All @@ -75,8 +75,8 @@ fi

$SED "s#localhost#$UNO_HOST#" "$conf/cluster.yaml"

$SED "s#export ZOOKEEPER_HOME=[^ ]*#export ZOOKEEPER_HOME=$ZOOKEEPER_HOME#" "$conf"/accumulo-env.sh
$SED "s#export ACCUMULO_LOG_DIR=[^ ]*#export ACCUMULO_LOG_DIR=$ACCUMULO_LOG_DIR#" "$conf"/accumulo-env.sh
$SED "s#^\(export \)\?ZOOKEEPER_HOME=.*#export ZOOKEEPER_HOME=$ZOOKEEPER_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
else
Expand Down
2 changes: 1 addition & 1 deletion bin/impl/run/accumulo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ trap 'echo "[ERROR] Error occurred at $BASH_SOURCE:$LINENO command: $BASH_COMMAN
if [[ $ACCUMULO_VERSION =~ ^1\..*$ ]]; then
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
elif [[ $ACCUMULO_VERSION =~ ^2\.[0-1]\..*$ ]]; then
"$ACCUMULO_HOME"/bin/accumulo init --clear-instance-name --instance-name "$ACCUMULO_INSTANCE" --password "$ACCUMULO_PASSWORD"
"$ACCUMULO_HOME"/bin/accumulo-cluster start
else
Expand Down
Loading