Skip to content

Commit

Permalink
Drop EOL accumulo versions (#303)
Browse files Browse the repository at this point in the history
Simplify the handling of different Accumulo versions by dropping support
for EOL versions of Accumulo
  • Loading branch information
ctubbsii authored Sep 23, 2024
1 parent 781ab5a commit 3ca2b6c
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 140 deletions.
24 changes: 5 additions & 19 deletions bin/impl/install/accumulo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,8 @@ sed -i'' -e 's!paste -sd:)!paste -sd: -)!' "$conf/accumulo-env.sh"

cp "$UNO_HOME"/conf/accumulo/common/* "$conf"
if [[ $ACCUMULO_VERSION =~ ^1\..*$ ]]; then
accumulo_conf=$conf/accumulo-site.xml
cp "$conf"/examples/2GB/standalone/* "$conf"/
$SED "s#localhost#$UNO_HOST#" "$conf/slaves"
cp "$UNO_HOME"/conf/accumulo/1/* "$conf"
$SED "s#export HADOOP_PREFIX=[^ ]*#export HADOOP_PREFIX=$HADOOP_HOME#" "$conf"/accumulo-env.sh
$SED "s#ZOOKEEPER_HOME#ZOOKEEPER_HOME/lib#" "$accumulo_conf"
$SED "s#-maxdepth 1#-maxdepth 2#" "$ACCUMULO_HOME"/bin/start-all.sh
print_to_console "Accumulo 1 is not supported; use an earlier uno or a newer accumulo"
exit 1
else
accumulo_conf=$conf/accumulo.properties
cp "$UNO_HOME"/conf/accumulo/2/* "$conf"
Expand All @@ -73,21 +68,12 @@ else
$SED "s#auth[.]principal=#auth.principal=$ACCUMULO_USER#" "$conf"/accumulo-client.properties
$SED "s#auth[.]token=#auth.token=$ACCUMULO_PASSWORD#" "$conf"/accumulo-client.properties
if [[ $ACCUMULO_VERSION =~ ^2\.0\..*$ ]]; then
# Ignore false positive; we actually want the literal '${ZOOKEEPER_HOME}' and not its current value
# shellcheck disable=SC2016
$SED 's#:[$][{]ZOOKEEPER_HOME[}]/[*]:#:${ZOOKEEPER_HOME}/*:${ZOOKEEPER_HOME}/lib/*:#' "$conf"/accumulo-env.sh
print_to_console "Accumulo 2.0 is not supported; use an earlier uno or a newer accumulo"
exit 1
fi
fi

if [[ -f "$conf/cluster.yaml" ]]; then
$SED "s#localhost#$UNO_HOST#" "$conf/cluster.yaml"
else
managers_file="$conf/managers"
if [[ -f "$conf/masters" ]]; then
managers_file="$conf/masters"
fi
$SED "s#localhost#$UNO_HOST#" "$managers_file" "$conf/monitor" "$conf/gc"
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
Expand Down
6 changes: 1 addition & 5 deletions bin/impl/run/accumulo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,7 @@ trap 'echo "[ERROR] Error occurred at $BASH_SOURCE:$LINENO command: $BASH_COMMAN

"$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
else
"$ACCUMULO_HOME"/bin/accumulo-cluster start
fi
"$ACCUMULO_HOME"/bin/accumulo-cluster start

print_to_console "Apache Accumulo $ACCUMULO_VERSION is running"
print_to_console " * Accumulo Monitor: http://localhost:9995/"
Expand Down
114 changes: 0 additions & 114 deletions conf/accumulo/1/accumulo-site.xml

This file was deleted.

2 changes: 0 additions & 2 deletions conf/checksums
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
accumulo:2.1.3:1a27a144dc31f55ccc8e081b6c1bc6cc0362a8391838c53c166cb45291ff8f35867fd8e4729aa7b2c540f8b721f8c6953281bf589fc7fe320e4dc4d20b87abc4
accumulo:2.0.1:b443839443a9f5098b55bc5c54be10c11fedbaea554ee6cd42eaa9311068c70bd611d7fc67698c91ec73da0e85b9907aa72b98d5eb4d49ea3a5d51b0c6c5785f
accumulo:1.10.3:36e6795ad3720ba72fc9f4ddabf45f6d67cdc77658a181733fa2c47bfd3799f123b8840a79b538b8504a7b4bdc97fd0b52efab790395a5e022a897bc18405d0c
hadoop:3.4.0:6f653c0109f97430047bd3677c50da7c8a2809d153b231794cf980b3208a6b4beff8ff1a03a01094299d459a3a37a3fe16731629987165d71f328657dbf2f24c
hadoop:3.3.6:de3eaca2e0517e4b569a88b63c89fae19cb8ac6c01ff990f1ff8f0cc0f3128c8e8a23db01577ca562a0e0bb1b4a3889f8c74384e609cd55e537aada3dcaa9f8a
hadoop:3.2.3:46bfbbec3a80dec4d4775e807a981260cac8719964d45663eb8215adcd716b90ef3225d4fe781bcce02ea15e5d2155733bfe0f41f985f2b15297f61abbeb2979
Expand Down

0 comments on commit 3ca2b6c

Please sign in to comment.