[fluo-uno] branch main updated: Adapt accumulo.sh to use new cluster.yaml file (#272)

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller 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 0de4713  Adapt accumulo.sh to use new cluster.yaml file (#272)
0de4713 is described below

commit 0de4713301d594f0bf4b88e2cf985033db2ad447
Author: Jeffrey Manno <jeffreymann...@gmail.com>
AuthorDate: Fri Oct 1 15:16:50 2021 -0400

    Adapt accumulo.sh to use new cluster.yaml file (#272)
---
 bin/impl/install/accumulo.sh | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/bin/impl/install/accumulo.sh b/bin/impl/install/accumulo.sh
index 86dfbf1..bb490f7 100755
--- a/bin/impl/install/accumulo.sh
+++ b/bin/impl/install/accumulo.sh
@@ -50,7 +50,9 @@ else
   accumulo_conf=$conf/accumulo.properties
   cp "$UNO_HOME"/conf/accumulo/2/* "$conf"
   "$ACCUMULO_HOME"/bin/accumulo-cluster create-config
-  $SED "s#localhost#$UNO_HOST#" "$conf/tservers"
+  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#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
@@ -63,11 +65,16 @@ else
   fi
 fi
 
-managers_file="$conf/managers"
-if [[ -f "$conf/masters" ]]; then
-  managers_file="$conf/masters"
+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#" "$managers_file" "$conf/monitor" "$conf/gc"
+
 $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