This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/fluo-uno.git
The following commit(s) were added to refs/heads/main by this push:
new 3ca2b6c Drop EOL accumulo versions (#303)
3ca2b6c is described below
commit 3ca2b6c03e75e141974e48f3619354c77f126ec7
Author: Christopher Tubbs <[email protected]>
AuthorDate: Mon Sep 23 16:14:15 2024 -0400
Drop EOL accumulo versions (#303)
Simplify the handling of different Accumulo versions by dropping support
for EOL versions of Accumulo
---
bin/impl/install/accumulo.sh | 24 ++------
bin/impl/run/accumulo.sh | 6 +-
conf/accumulo/1/accumulo-site.xml | 114 --------------------------------------
conf/checksums | 2 -
4 files changed, 6 insertions(+), 140 deletions(-)
diff --git a/bin/impl/install/accumulo.sh b/bin/impl/install/accumulo.sh
index 293f089..6ca06ed 100755
--- a/bin/impl/install/accumulo.sh
+++ b/bin/impl/install/accumulo.sh
@@ -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"
@@ -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
diff --git a/bin/impl/run/accumulo.sh b/bin/impl/run/accumulo.sh
index ddf0410..7564161 100755
--- a/bin/impl/run/accumulo.sh
+++ b/bin/impl/run/accumulo.sh
@@ -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/";
diff --git a/conf/accumulo/1/accumulo-site.xml
b/conf/accumulo/1/accumulo-site.xml
deleted file mode 100755
index f642186..0000000
--- a/conf/accumulo/1/accumulo-site.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-
-<configuration>
-
- <property>
- <!-- Work around for ACCUMULO-2388. See Accumulo 1.6.0 release notes -->
- <name>general.rpc.timeout</name>
- <value>240s</value>
- </property>
-
- <property>
- <name>instance.secret</name>
- <value>uno</value>
- </property>
-
- <property>
- <name>instance.volumes</name>
- <value>hdfs://UNO_HOST:8020/accumulo</value>
- </property>
-
- <property>
- <name>instance.zookeeper.host</name>
- <value>UNO_HOST:2181</value>
- </property>
-
- <property>
- <name>table.durability</name>
- <value>flush</value>
- </property>
-
- <property>
- <name>tserver.cache.data.size</name>
- <value>ACCUMULO_DCACHE_SIZE</value>
- </property>
-
- <property>
- <name>tserver.cache.index.size</name>
- <value>ACCUMULO_ICACHE_SIZE</value>
- </property>
-
- <property>
- <name>tserver.memory.maps.max</name>
- <value>ACCUMULO_IMAP_SIZE</value>
- </property>
-
- <property>
- <name>tserver.memory.maps.native.enabled</name>
- <value>ACCUMULO_USE_NATIVE_MAP</value>
- </property>
-
- <property>
- <name>tserver.readahead.concurrent.max</name>
- <value>64</value>
- </property>
-
- <property>
- <name>tserver.server.threads.minimum</name>
- <value>64</value>
- </property>
-
- <property>
- <name>tserver.sort.buffer.size</name>
- <value>50M</value>
- </property>
-
- <property>
- <name>tserver.wal.sync.method</name>
- <value>hflush</value>
- </property>
-
- <property>
- <name>tserver.walog.max.size</name>
- <value>512M</value>
- </property>
- <property>
- <name>replication.receipt.service.port</name>
- <value>0</value>
- </property>
- <property>
- <name>tserver.port.search</name>
- <value>true</value>
- </property>
- <property>
- <name>tserver.port.client</name>
- <value>11000</value>
- </property>
-
-
- <property>
- <name>general.classpaths</name>
- <value>
- <!-- Accumulo requirements -->
- $ACCUMULO_HOME/lib/accumulo-server.jar,
- $ACCUMULO_HOME/lib/accumulo-core.jar,
- $ACCUMULO_HOME/lib/accumulo-start.jar,
- $ACCUMULO_HOME/lib/accumulo-fate.jar,
- $ACCUMULO_HOME/lib/accumulo-proxy.jar,
- $ACCUMULO_HOME/lib/[^.].*.jar,
- <!-- ZooKeeper requirements -->
- $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
- <!-- Common Hadoop requirements -->
- $HADOOP_CONF_DIR,
- <!-- Hadoop 2 requirements -->
- $HADOOP_PREFIX/share/hadoop/common/[^.].*.jar,
- $HADOOP_PREFIX/share/hadoop/common/lib/(?!slf4j)[^.].*.jar,
- $HADOOP_PREFIX/share/hadoop/hdfs/[^.].*.jar,
- $HADOOP_PREFIX/share/hadoop/mapreduce/[^.].*.jar,
- $HADOOP_PREFIX/share/hadoop/yarn/[^.].*.jar,
- $HADOOP_PREFIX/share/hadoop/yarn/lib/jersey.*.jar,
- <!-- End Hadoop 2 requirements -->
- </value>
- </property>
-</configuration>
diff --git a/conf/checksums b/conf/checksums
index 52a6125..de36883 100644
--- a/conf/checksums
+++ b/conf/checksums
@@ -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
