Skip to content

Fix execute_ceph_cmd function return code #55

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

Open
esilvade-wr wants to merge 1 commit into
base: stx/v14.2.22
Choose a base branch
from
Open

Fix execute_ceph_cmd function return code #55

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions src/ceph_common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@ execute_ceph_cmd() {
errcode=$?
set +o pipefail
if [ $errcode -eq 124 ]; then # 'timeout' returns 124 when timing out
wlog $name "WARN" "Ceph failed to respond in ${WAIT_FOR_CMD}s when running: $cmd"
wlog "$name" "WARN" "Ceph failed to respond in ${WAIT_FOR_CMD}s when running: $cmd"
CEPH_FAILURE="true"
echo ""; return 1
echo ""; return $errcode
fi
local output=$(cat $DATA_PATH/.ceph_cmd_out_$$)
rm -f $DATA_PATH/.ceph_cmd_out_$$
if [ -z "$output" ] || [ $errcode -ne 0 ]; then
wlog $name "WARN" "Error executing: $cmd errorcode: $errcode output: $output"
echo ""; return 1
wlog "$name" "WARN" "Error executing: $cmd errorcode: $errcode output: $output"
echo ""; return $errcode
fi
eval "$ret=\"$output\""; return $errcode
}
Expand Down