Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix getConf bugs when it comes across warning #18330

Closed
wants to merge 3 commits into from
Closed

Fix getConf bugs when it comes across warning #18330

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0ba79d
fix getConf bug
YichuanSun Oct 26, 2023
1c5dc01
Update bin/alluxio-monitor.sh
YichuanSun Oct 26, 2023
824c305
remove useless code
YichuanSun Oct 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion bin/alluxio-masters.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,22 @@ ALLUXIO_TASK_LOG="${ALLUXIO_LOGS_DIR}/task.log"

echo "Executing the following command on all master nodes and logging to ${ALLUXIO_TASK_LOG}: $@" | tee -a ${ALLUXIO_TASK_LOG}

check_true() {
local output=$1
if [[ $output == *"true"* ]]; then
result="true"
else
result="false"
fi
echo $result
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove echo

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually I don't think it can be removed. If we delete echo, the function will use a temporary parameter "result" to store the boolean value, after returning, the result will not exist.

}

N=0
HA_ENABLED=$(${BIN}/alluxio getConf ${ALLUXIO_MASTER_JAVA_OPTS} alluxio.zookeeper.enabled)

HA_ENABLED_GETCONF_RES=$(${BIN}/alluxio getConf ${ALLUXIO_MASTER_JAVA_OPTS} alluxio.zookeeper.enabled)
HA_ENABLED=$(check_true "$HA_ENABLED_GETCONF_RES")
echo "$HA_ENABLED"

JOURNAL_TYPE=$(${BIN}/alluxio getConf ${ALLUXIO_MASTER_JAVA_OPTS} alluxio.master.journal.type | awk '{print toupper($0)}')
if [[ ${JOURNAL_TYPE} == "EMBEDDED" ]]; then
HA_ENABLED="true"
Expand Down
13 changes: 12 additions & 1 deletion bin/alluxio-monitor.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,8 @@ run_monitors() {
# if there is an error, print the log tail for the remaining master nodes.
batch_run_on_nodes "$(echo ${nodes})" "${BIN}/alluxio-monitor.sh" -L "${node_type}"
else
HA_ENABLED=$(${BIN}/alluxio getConf ${ALLUXIO_MASTER_JAVA_OPTS} alluxio.zookeeper.enabled)
HA_ENABLED_GETCONF_RES=$(${BIN}/alluxio getConf alluxio.zookeeper.enabled)
YichuanSun marked this conversation as resolved.
Show resolved Hide resolved
HA_ENABLED=$(check_true "$HA_ENABLED_GETCONF_RES")
JOURNAL_TYPE=$(${BIN}/alluxio getConf ${ALLUXIO_MASTER_JAVA_OPTS} alluxio.master.journal.type | awk '{print toupper($0)}')
if [[ ${JOURNAL_TYPE} == "EMBEDDED" ]]; then
HA_ENABLED="true"
Expand All @@ -205,6 +206,16 @@ run_monitors() {
fi
}

check_true() {
local output=$1
if [[ $output == *"true"* ]]; then
result="true"
else
result="false"
fi
echo $result
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove echo

}

# Used to run a command on multiple hosts concurrently.
# By default it limits concurrent tasks to 100.
batch_run_on_nodes() {
Expand Down
Loading