You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by nd...@apache.org on 2023/05/09 13:09:54 UTC
[hbase-operator-tools] 04/06: address shellcheck complaints
This is an automated email from the ASF dual-hosted git repository.
ndimiduk pushed a commit to branch 27834-introduce-ha-hdfs-overlay
in repository https://gitbox.apache.org/repos/asf/hbase-operator-tools.git
commit 5b0d259131a4bc83a64918bab17b900253db60ac
Author: Nick Dimiduk <nd...@apache.org>
AuthorDate: Tue May 9 13:49:07 2023 +0200
address shellcheck complaints
---
.../components/zookeeper/single-instance/start.sh | 114 +++++++++++----------
1 file changed, 60 insertions(+), 54 deletions(-)
diff --git a/hbase-kubernetes-deployment/components/zookeeper/single-instance/start.sh b/hbase-kubernetes-deployment/components/zookeeper/single-instance/start.sh
index d35e6d8..48b3d91 100755
--- a/hbase-kubernetes-deployment/components/zookeeper/single-instance/start.sh
+++ b/hbase-kubernetes-deployment/components/zookeeper/single-instance/start.sh
@@ -89,9 +89,9 @@
set -x
ZOOKEEPER_HOME="$( ls -d /apache-zookeeper* )"
-USER=`whoami`
-HOST=`hostname -s`
-DOMAIN=`hostname -d`
+USER="$(whoami)"
+HOST="$(hostname -s)"
+DOMAIN="$(hostname -d)"
LOG_LEVEL=INFO
DATA_DIR="/var/lib/zookeeper/data"
DATA_LOG_DIR="/var/lib/zookeeper/log"
@@ -173,75 +173,81 @@ Starts a ZooKeeper server based on the supplied options.
}
function create_data_dirs() {
- if [ ! -d $DATA_DIR ]; then
- mkdir -p $DATA_DIR
- chown -R $USER:$USER $DATA_DIR
+ if [ ! -d "$DATA_DIR" ]; then
+ mkdir -p "$DATA_DIR"
+ chown -R "$USER":"$USER" "$DATA_DIR"
fi
- if [ ! -d $DATA_LOG_DIR ]; then
- mkdir -p $DATA_LOG_DIR
- chown -R $USER:USER $DATA_LOG_DIR
+ if [ ! -d "$DATA_LOG_DIR" ]; then
+ mkdir -p "$DATA_LOG_DIR"
+ chown -R "$USER":"$USER" "$DATA_LOG_DIR"
fi
- if [ ! -d $LOG_DIR ]; then
- mkdir -p $LOG_DIR
- chown -R $USER:$USER $LOG_DIR
+ if [ ! -d "$LOG_DIR" ]; then
+ mkdir -p "$LOG_DIR"
+ chown -R "$USER":"$USER" "$LOG_DIR"
fi
- if [ ! -f $ID_FILE ] && [ $SERVERS -gt 1 ]; then
- echo $MY_ID >> $ID_FILE
+ if [ ! -f "$ID_FILE" ] && [ "$SERVERS" -gt 1 ]; then
+ echo "$MY_ID" >> "$ID_FILE"
fi
}
function print_servers() {
- for (( i=1; i<=$SERVERS; i++ ))
+ for (( i=1; i<=SERVERS; i++ ))
do
echo "server.$i=$NAME-$((i-1)).$DOMAIN:$SERVER_PORT:$ELECTION_PORT"
done
}
function create_config() {
- rm -f $CONFIG_FILE
- echo "#This file was autogenerated DO NOT EDIT" >> $CONFIG_FILE
- echo "clientPort=$CLIENT_PORT" >> $CONFIG_FILE
- echo "dataDir=$DATA_DIR" >> $CONFIG_FILE
- echo "dataLogDir=$DATA_LOG_DIR" >> $CONFIG_FILE
- echo "tickTime=$TICK_TIME" >> $CONFIG_FILE
- echo "initLimit=$INIT_LIMIT" >> $CONFIG_FILE
- echo "syncLimit=$SYNC_LIMIT" >> $CONFIG_FILE
- echo "maxClientCnxns=$MAX_CLIENT_CNXNS" >> $CONFIG_FILE
- echo "minSessionTimeout=$MIN_SESSION_TIMEOUT" >> $CONFIG_FILE
- echo "maxSessionTimeout=$MAX_SESSION_TIMEOUT" >> $CONFIG_FILE
- echo "autopurge.snapRetainCount=$SNAP_RETAIN_COUNT" >> $CONFIG_FILE
- echo "autopurge.purgeInteval=$PURGE_INTERVAL" >> $CONFIG_FILE
- echo "quorumListenOnAllIPs=$QUORUM_LISTEN_ON_ALL_IPS" >> $CONFIG_FILE
- # Allow running all zk commands.
- echo "4lw.commands.whitelist=*" >> $CONFIG_FILE
- if [ $SERVERS -gt 1 ]; then
- print_servers >> $CONFIG_FILE
- fi
- echo "metricsProvider.className=org.apache.zookeeper.metrics.prometheus.PrometheusMetricsProvider" >> $CONFIG_FILE
- echo "metricsProvider.httpPort=$PROM_PORT" >> $CONFIG_FILE
- cat $CONFIG_FILE >&2
+ rm -f "$CONFIG_FILE"
+ {
+ echo "#This file was autogenerated DO NOT EDIT"
+ echo "clientPort=$CLIENT_PORT"
+ echo "dataDir=$DATA_DIR"
+ echo "dataLogDir=$DATA_LOG_DIR"
+ echo "tickTime=$TICK_TIME"
+ echo "initLimit=$INIT_LIMIT"
+ echo "syncLimit=$SYNC_LIMIT"
+ echo "maxClientCnxns=$MAX_CLIENT_CNXNS"
+ echo "minSessionTimeout=$MIN_SESSION_TIMEOUT"
+ echo "maxSessionTimeout=$MAX_SESSION_TIMEOUT"
+ echo "autopurge.snapRetainCount=$SNAP_RETAIN_COUNT"
+ echo "autopurge.purgeInteval=$PURGE_INTERVAL"
+ echo "quorumListenOnAllIPs=$QUORUM_LISTEN_ON_ALL_IPS"
+ # Allow running all zk commands.
+ echo "4lw.commands.whitelist=*"
+ if [ "$SERVERS" -gt 1 ]; then
+ print_servers
+ fi
+ echo "metricsProvider.className=org.apache.zookeeper.metrics.prometheus.PrometheusMetricsProvider"
+ echo "metricsProvider.httpPort=$PROM_PORT"
+ } >> "$CONFIG_FILE"
+ cat "$CONFIG_FILE" >&2
}
function create_jvm_props() {
- rm -f $JAVA_ENV_FILE
- echo "SERVER_JVMFLAGS=\"-XX:MaxRAMPercentage=${JVM_HEAP_PERCENTAGE_OF_RESOURCE_LIMIT} \
- -XX:InitialRAMPercentage=${JVM_HEAP_PERCENTAGE_OF_RESOURCE_LIMIT}\"" >> $JAVA_ENV_FILE
- echo "ZOO_LOG_DIR=$LOG_DIR" >> $JAVA_ENV_FILE
- echo "JVMFLAGS=" >> $JAVA_ENV_FILE
+ rm -f "$JAVA_ENV_FILE"
+ {
+ echo "SERVER_JVMFLAGS=\"-XX:MaxRAMPercentage=${JVM_HEAP_PERCENTAGE_OF_RESOURCE_LIMIT} \
+ -XX:InitialRAMPercentage=${JVM_HEAP_PERCENTAGE_OF_RESOURCE_LIMIT}\""
+ echo "ZOO_LOG_DIR=$LOG_DIR"
+ echo "JVMFLAGS="
+ } >> "$JAVA_ENV_FILE"
}
function create_log_props() {
- rm -f $LOGGER_PROPS_FILE
+ rm -f "$LOGGER_PROPS_FILE"
echo "Creating ZooKeeper log4j configuration"
- echo "zookeeper.root.logger=CONSOLE" >> $LOGGER_PROPS_FILE
- echo "zookeeper.console.threshold="$LOG_LEVEL >> $LOGGER_PROPS_FILE
- echo "log4j.rootLogger=\${zookeeper.root.logger}" >> $LOGGER_PROPS_FILE
- echo "log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender" >> $LOGGER_PROPS_FILE
- echo "log4j.appender.CONSOLE.Threshold=\${zookeeper.console.threshold}" >> $LOGGER_PROPS_FILE
- echo "log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout" >> $LOGGER_PROPS_FILE
- echo "log4j.appender.CONSOLE.layout.ConversionPattern=%d{ISO8601} [myid:%X{myid}] - %-5p [%t:%C{1}@%L] - %m%n" >> $LOGGER_PROPS_FILE
+ {
+ echo "zookeeper.root.logger=CONSOLE"
+ echo "zookeeper.console.threshold=$LOG_LEVEL"
+ echo "log4j.rootLogger=\${zookeeper.root.logger}"
+ echo "log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender"
+ echo "log4j.appender.CONSOLE.Threshold=\${zookeeper.console.threshold}"
+ echo "log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout"
+ echo "log4j.appender.CONSOLE.layout.ConversionPattern=%d{ISO8601} [myid:%X{myid}] - %-5p [%t:%C{1}@%L] - %m%n"
+ } >> "$LOGGER_PROPS_FILE"
}
optspec=":hv-:"
@@ -330,9 +336,9 @@ done
MIN_SESSION_TIMEOUT=${MIN_SESSION_TIMEOUT:- $((TICK_TIME*2))}
MAX_SESSION_TIMEOUT=${MAX_SESSION_TIMEOUT:- $((TICK_TIME*20))}
ID_FILE="$DATA_DIR/myid"
-if [ ! -d $CONF_DIR ]; then
- mkdir -p $CONF_DIR
- chown -R $USER:$USER $CONF_DIR
+if [ ! -d "$CONF_DIR" ]; then
+ mkdir -p "$CONF_DIR"
+ chown -R "$USER":"$USER" "$CONF_DIR"
fi
CONFIG_FILE="$CONF_DIR/zoo.cfg"
LOGGER_PROPS_FILE="$CONF_DIR/log4j.properties"
@@ -349,4 +355,4 @@ fi
MY_ID=$((ORD+1))
export ZOOCFGDIR=${CONF_DIR}
-create_config && create_jvm_props && create_log_props && create_data_dirs && exec ${ZOOKEEPER_HOME}/bin/zkServer.sh start-foreground
+create_config && create_jvm_props && create_log_props && create_data_dirs && exec "${ZOOKEEPER_HOME}/bin/zkServer.sh" start-foreground