From b5869fdd86ac8ebd5ed66f9e7cd76f9c8449679d Mon Sep 17 00:00:00 2001 From: Yongqiang YANG Date: Fri, 30 Aug 2024 14:42:29 +0800 Subject: [PATCH] format --- tools/fdb/fdb_ctrl.sh | 56 +++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/tools/fdb/fdb_ctrl.sh b/tools/fdb/fdb_ctrl.sh index 93e84579da01391..31def3b6ec99551 100755 --- a/tools/fdb/fdb_ctrl.sh +++ b/tools/fdb/fdb_ctrl.sh @@ -100,34 +100,34 @@ function download_fdb() { # Function to configure coordinators get_coordinators() { - local num_nodes=$(echo "$FDB_CLUSTER_IPS" | tr ',' '\n' | wc -l) + local num_nodes=$(echo "${FDB_CLUSTER_IPS}" | tr ',' '\n' | wc -l) local num_coordinators - if [[ $num_nodes -le 2 ]]; then + if [[ ${num_nodes} -le 2 ]]; then num_coordinators=1 - elif [[ $num_nodes -le 4 ]]; then + elif [[ ${num_nodes} -le 4 ]]; then num_coordinators=3 else num_coordinators=5 fi - echo $FDB_CLUSTER_IPS | cut -d',' -f1-$num_coordinators | tr ',' '\n' | sed "s/$/:$FDB_PORT/" | paste -sd ',' + echo ${FDB_CLUSTER_IPS} | cut -d',' -f1-${num_coordinators} | tr ',' '\n' | sed "s/$/:${FDB_PORT}/" | paste -sd ',' } get_fdb_mode() { # Initialize a new database - local num_nodes=$(echo "$FDB_CLUSTER_IPS" | tr ',' '\n' | wc -l) + local num_nodes=$(echo "${FDB_CLUSTER_IPS}" | tr ',' '\n' | wc -l) local fdb_mode - if [[ $num_nodes -eq 1 ]]; then + if [[ ${num_nodes} -eq 1 ]]; then fdb_mode="single" - elif [[ $num_nodes -le 4 ]]; then + elif [[ ${num_nodes} -le 4 ]]; then fdb_mode="double" else fdb_mode="triple" fi - echo $fdb_mode + echo ${fdb_mode} } # Function to calculate number of processes @@ -139,27 +139,27 @@ calculate_process_numbers() { local data_dir_count # Convert comma-separated DATA_DIRS into an array - IFS=',' read -r -a DATA_DIR_ARRAY <<< "$DATA_DIRS" + IFS=',' read -r -a DATA_DIR_ARRAY <<< "${DATA_DIRS}" data_dir_count=${#DATA_DIR_ARRAY[@]} # Stateless processes (at least 1, up to 1/4 of CPU cores) STATLESS_PROCESSES=$((cpu_cores / 4)) - [[ $STATLESS_PROCESSES -lt $min_processes ]] && STATLESS_PROCESSES=$min_processes + [[ ${STATLESS_PROCESSES} -lt ${min_processes} ]] && STATLESS_PROCESSES=${min_processes} # Storage processes (must be a multiple of the number of data directories) STORAGE_PROCESSES=$((cpu_cores / 4)) - [[ $STORAGE_PROCESSES -lt $data_dir_count ]] && STORAGE_PROCESSES=$data_dir_count + [[ ${STORAGE_PROCESSES} -lt ${data_dir_count} ]] && STORAGE_PROCESSES=${data_dir_count} STORAGE_PROCESSES=$(( (STORAGE_PROCESSES / data_dir_count) * data_dir_count )) # Transaction processes (must be a multiple of the number of data directories) TRANSACTION_PROCESSES=$((cpu_cores / 8)) - [[ $TRANSACTION_PROCESSES -lt $min_processes ]] && TRANSACTION_PROCESSES=$min_processes - [[ $TRANSACTION_PROCESSES -lt $data_dir_count ]] && TRANSACTION_PROCESSES=$data_dir_count + [[ ${TRANSACTION_PROCESSES} -lt ${min_processes} ]] && TRANSACTION_PROCESSES=${min_processes} + [[ ${TRANSACTION_PROCESSES} -lt ${data_dir_count} ]] && TRANSACTION_PROCESSES=${data_dir_count} TRANSACTION_PROCESSES=$(( (TRANSACTION_PROCESSES / data_dir_count) * data_dir_count )) - echo "Stateless Processes: $STATLESS_PROCESSES" - echo "Storage Processes: $STORAGE_PROCESSES" - echo "Transaction Processes: $TRANSACTION_PROCESSES" + echo "Stateless Processes: ${STATLESS_PROCESSES}" + echo "Storage Processes: ${STORAGE_PROCESSES}" + echo "Transaction Processes: ${TRANSACTION_PROCESSES}" } function deploy_fdb() { @@ -173,9 +173,9 @@ function deploy_fdb() { CLUSTER_DESC=${FDB_CLUSTER_DESC:-$FDB_CLUSTER_ID} # Convert comma-separated DATA_DIRS into an array - IFS=',' read -r -a DATA_DIR_ARRAY <<< "$DATA_DIRS" + IFS=',' read -r -a DATA_DIR_ARRAY <<< "${DATA_DIRS}" for DIR in "${DATA_DIR_ARRAY[@]}"; do - mkdir -p $DIR || handle_error "Failed to create data directory $DIR" + mkdir -p ${DIR} || handle_error "Failed to create data directory ${DIR}" done echo -e "\tCreate fdb.cluster, coordinator: $(get_coordinators)" @@ -208,7 +208,7 @@ EOF CPU_CORES_LIMIT=${CPU_CORES_LIMIT:-1} # Calculate number of processes based on resources and data directories - calculate_process_numbers $MEMORY_LIMIT_GB $CPU_CORES_LIMIT + calculate_process_numbers ${MEMORY_LIMIT_GB} ${CPU_CORES_LIMIT} # Add stateless processes for ((i = 0; i < STATLESS_PROCESSES; i++)); do @@ -224,9 +224,9 @@ class = stateless" | tee -a ${FDB_HOME}/conf/fdb.conf > /dev/null for ((i = 0; i < STORAGE_PROCESSES; i++)); do PORT=$((FDB_PORT + i)) DIR_INDEX=$((i % STORAGE_DIR_COUNT)) - echo "[fdbserver.$PORT] + echo "[fdbserver.${PORT}] class = storage -datadir = ${DATA_DIR_ARRAY[$DIR_INDEX]}/$PORT" | tee -a ${FDB_HOME}/conf/fdb.conf > /dev/null +datadir = ${DATA_DIR_ARRAY[${DIR_INDEX}]}/${PORT}" | tee -a ${FDB_HOME}/conf/fdb.conf > /dev/null done FDB_PORT=$((FDB_PORT + STORAGE_PROCESSES)) @@ -235,9 +235,9 @@ datadir = ${DATA_DIR_ARRAY[$DIR_INDEX]}/$PORT" | tee -a ${FDB_HOME}/conf/fdb.co for ((i = 0; i < TRANSACTION_PROCESSES; i++)); do PORT=$((FDB_PORT + i)) DIR_INDEX=$((i % STORAGE_DIR_COUNT)) - echo "[fdbserver.$PORT] + echo "[fdbserver.${PORT}] class = transaction -datadir = ${DATA_DIR_ARRAY[$DIR_INDEX]}/$PORT" | tee -a ${FDB_HOME}/conf/fdb.conf > /dev/null +datadir = ${DATA_DIR_ARRAY[${DIR_INDEX}]}/${PORT}" | tee -a ${FDB_HOME}/conf/fdb.conf > /dev/null done echo "[backup_agent] @@ -373,16 +373,16 @@ skip_config="false" case $cmd in deploy) - deploy "$job" $skip_pkg $skip_config + deploy "${job}" ${skip_pkg} ${skip_config} ;; start) - start "$job" "${init}" + start "${job}" "${init}" ;; stop) - stop "$job" + stop "${job}" ;; clean) - clean "$job" + clean "${job}" ;; fdbcli) ${FDB_HOME}/fdbcli -C ${FDB_HOME}/conf/fdb.cluster $@ @@ -391,7 +391,7 @@ case $cmd in generate_regression_config true ;; *) - unknown_cmd $cmd + unknown_cmd ${cmd} ;; esac