Use curl for ssh dumps #59
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -26,16 +26,15 @@ CORE_COLLECTOR="" | |
| DEFAULT_CORE_COLLECTOR="makedumpfile -l --message-level 7 -d 31" | ||
| DMESG_COLLECTOR="/sbin/vmcore-dmesg" | ||
| FAILURE_ACTION="systemctl reboot -f" | ||
| HOST_IP='127.0.0.1' | ||
| DUMP_INSTRUCTION="" | ||
| SSH_KEY=$DEFAULT_SSHKEY | ||
| DD_BLKSIZE=512 | ||
| FINAL_ACTION="systemctl reboot -f" | ||
| KDUMP_PRE="" | ||
| KDUMP_POST="" | ||
| NEWROOT="/sysroot" | ||
| OPALCORE="" | ||
| KDUMP_CONF_PARSED="/tmp/kdump.conf.$$" | ||
|
|
||
| # POSIX doesn't have pipefail, only apply when using bash | ||
|
|
@@ -58,7 +57,7 @@ get_kdump_confs() { | |
| ;; | ||
| sshkey) | ||
| if [ -f "$config_val" ]; then | ||
| SSH_KEY=$config_val | ||
| fi | ||
| ;; | ||
| kdump_pre) | ||
|
|
@@ -133,14 +132,13 @@ save_log() { | |
| eval "$KDUMP_LOG_OP" | ||
| } | ||
|
|
||
| dump_fs() { | ||
| ddebug "dump_fs _mp=$NEWROOT" | ||
|
|
||
| if ! is_mounted "$NEWROOT"; then | ||
| dinfo "dump path '$NEWROOT' is not mounted, trying to mount..." | ||
| if ! mount --target "$NEWROOT"; then | ||
| derror "failed to dump to '$NEWROOT', it's not a mount point!" | ||
| return 1 | ||
| fi | ||
| fi | ||
|
|
@@ -156,39 +154,33 @@ dump_fs() { | |
| ;; | ||
| esac | ||
|
|
||
| dinfo "saving to $KDUMP_PATH" | ||
|
|
||
| # Only remount to read-write mode if the dump target is mounted read-only. | ||
| _dump_mnt_op=$(get_mount_info OPTIONS target "$NEWROOT" -f) | ||
| case $_dump_mnt_op in | ||
| ro*) | ||
| dinfo "Remounting the dump target in rw mode." | ||
| mount -o remount,rw "$NEWROOT" || return 1 | ||
| ;; | ||
| esac | ||
|
|
||
| mkdir -p "$KDUMP_PATH" || return 1 | ||
|
|
||
| save_vmcore_dmesg_fs ${DMESG_COLLECTOR} "$KDUMP_PATH" | ||
| save_opalcore_fs "$KDUMP_PATH" | ||
|
|
||
| dinfo "saving vmcore" | ||
| KDUMP_LOG_DEST=$KDUMP_PATH/ | ||
| KDUMP_LOG_OP="mv '$KDUMP_LOG_FILE' '$KDUMP_LOG_DEST/'" | ||
|
|
||
| $CORE_COLLECTOR /proc/vmcore "$KDUMP_PATH/vmcore-incomplete" | ||
| _dump_exitcode=$? | ||
| if [ $_dump_exitcode -eq 0 ]; then | ||
| sync -f "$KDUMP_PATH/vmcore-incomplete" | ||
| _sync_exitcode=$? | ||
| if [ $_sync_exitcode -eq 0 ]; then | ||
| mv "$KDUMP_PATH/vmcore-incomplete" "$KDUMP_PATH/vmcore" | ||
| dinfo "saving vmcore complete" | ||
| else | ||
| derror "sync vmcore failed, exitcode:$_sync_exitcode" | ||
|
|
@@ -226,14 +218,7 @@ save_vmcore_dmesg_fs() { | |
|
|
||
| # $1: dump path | ||
| save_opalcore_fs() { | ||
| [ -n "$OPALCORE" ] || return 0 | ||
|
|
||
| dinfo "saving opalcore:$OPALCORE to $1/opalcore" | ||
| if ! cp $OPALCORE "$1/opalcore"; then | ||
|
|
@@ -269,8 +254,9 @@ dump_to_rootfs() { | |
| return | ||
| fi | ||
|
|
||
| KDUMP_PATH="$NEWROOT/$KDUMP_PATH/$HOST_IP-$(date +%Y-%m-%d-%T)" | ||
| ddebug "NEWROOT=$NEWROOT" | ||
| dump_fs | ||
| } | ||
|
|
||
| kdump_emergency_shell() { | ||
|
|
@@ -399,117 +385,61 @@ dump_raw() { | |
| return 0 | ||
| } | ||
|
|
||
| _curl() { | ||
| curl --silent \ | ||
| --fail-early \ | ||
| --create-file-mode 0600 \ | ||
| --ftp-create-dirs \ | ||
| -u "$SSH_USER:" \ | ||
| --key "$SSH_KEY" \ | ||
| "$@" | ||
| } | ||
|
|
||
| # copy a file to remote host using curl | ||
| # $1: file to be copied or - (dash) when read from stdin | ||
| # $2: destination path on remote host | ||
| copy_to_remote() { | ||
| _src="$1"; shift | ||
| _dst="$1"; shift | ||
|
|
||
| _url="sftp://$SSH_HOST" | ||
|
|
||
| dinfo "saving ${_dst##*/} to $SSH_HOST:${_dst%/*}" | ||
| _curl -T "$_src" -Q "-rename $_dst-incomplete $_dst" "$_url/$_dst-incomplete" | ||
| _ret=$? | ||
| if [ $_ret -ne 0 ]; then | ||
| derror "failed to save ${_dst##*/}, exitcode $_ret" | ||
| return $_ret | ||
| fi | ||
|
|
||
| dinfo "saving ${_dst##*/} complete" | ||
| } | ||
|
|
||
| dump_ssh() { | ||
| dinfo "saving to $SSH_HOST:$KDUMP_PATH" | ||
|
|
||
| cat /var/lib/random-seed > /dev/urandom | ||
|
|
||
| $DMESG_COLLECTOR /proc/vmcore | copy_to_remote "-" "$KDUMP_PATH/vmcore-dmesg.txt" | ||
|
|
||
| dinfo "saving vmcore" | ||
|
|
||
| KDUMP_LOG_DEST=$SSH_HOST:$KDUMP_PATH/ | ||
| KDUMP_LOG_OP="copy_to_remote '$KDUMP_LOG_FILE' '$KDUMP_PATH/kexec-dmesg.log'" | ||
|
|
||
| [ -n "$OPALCORE" ] && copy_to_remote "$OPALCORE" "$KDUMP_PATH/opalcore" | ||
|
|
||
| if [ "${CORE_COLLECTOR%%[[:blank:]]*}" = "scp" ]; then | ||
| copy_to_remote /proc/vmcore "$KDUMP_PATH/vmcore" | ||
| _ret=$? | ||
| else | ||
| $CORE_COLLECTOR /proc/vmcore | copy_to_remote "-" "$KDUMP_PATH/vmcore.flat" | ||
| _ret=$? | ||
| fi | ||
|
|
||
| return $_ret | ||
| } | ||
|
|
||
| wait_online_network() { | ||
| # In some cases, network may still not be ready because nm-online is called | ||
| # with "-s" which means to wait for NetworkManager startup to complete, rather | ||
|
|
@@ -575,19 +505,24 @@ read_kdump_confs() { | |
| dracut_args) | ||
| config_val=$(get_dracut_args_target "$config_val") | ||
| if [ -n "$config_val" ]; then | ||
| NEWROOT=$(get_mntpoint_from_target "$config_val") | ||
| DUMP_INSTRUCTION="dump_fs" | ||
| fi | ||
| ;; | ||
| ext[234] | xfs | btrfs | minix | nfs | virtiofs) | ||
| NEWROOT=$(get_mntpoint_from_target "$config_val") | ||
| DUMP_INSTRUCTION="dump_fs" | ||
| ;; | ||
| raw) | ||
| DUMP_INSTRUCTION="dump_raw $config_val" | ||
| ;; | ||
| ssh) | ||
| SSH_USER="${config_val%@*}" | ||
| SSH_HOST="${config_val#*@}" | ||
| if is_ipv6_address "$SSH_HOST"; then | ||
| SSH_HOST="[$SSH_HOST]" | ||
| fi | ||
| DUMP_INSTRUCTION="dump_ssh" | ||
| ;; | ||
| esac | ||
| done < "$KDUMP_CONF_PARSED" | ||
|
|
@@ -600,33 +535,16 @@ fence_kdump_notify() { | |
| fi | ||
| } | ||
|
|
||
| kdump_test_mark_success() { | ||
| [ -n "$KDUMP_TEST_STATUS" ] || return | ||
|
|
||
|
Member
There was a problem hiding this comment. Hi @liutgnu, does this commit looks good to you? I'm not sure if checking "Unknown test status" is necessary.
Collaborator
Author
There was a problem hiding this comment. Hi @coiby, |
||
| _status="success kdump_test_id=$KDUMP_TEST_ID" | ||
|
|
||
| if is_ssh_dump_target; then | ||
| echo "$_status" | _curl -T "-" "sftp://$SSH_HOST/$KDUMP_TEST_STATUS" | ||
| else | ||
| echo "$_status" > "$KDUMP_TEST_STATUS" | ||
| sync -f "$KDUMP_TEST_STATUS" | ||
| fi | ||
| } | ||
|
|
||
|
|
@@ -636,12 +554,17 @@ kdump_test_init() { | |
| KDUMP_TEST_ID=$(getarg kdump_test_id=) | ||
| [ -z "$KDUMP_TEST_ID" ] && return | ||
|
|
||
| KDUMP_PATH="${KDUMP_PATH%/*}" | ||
| KDUMP_PATH="$KDUMP_PATH/kdump-test-$KDUMP_TEST_ID" | ||
| KDUMP_TEST_STATUS="$KDUMP_PATH/vmcore-creation.status" | ||
| } | ||
|
|
||
| for _core in "/sys/firmware/opal/mpipl/core" "/sys/firmware/opal/core"; do | ||
| [ -f "$_core" ] || continue | ||
| OPALCORE="$_core" | ||
| break | ||
| done | ||
|
|
||
| if [ "$1" = "--error-handler" ]; then | ||
| get_kdump_confs | ||
| do_failure_action | ||
|
|
@@ -665,9 +588,13 @@ if ! get_host_ip; then | |
| fi | ||
|
|
||
| if [ -z "$DUMP_INSTRUCTION" ]; then | ||
| DUMP_INSTRUCTION="dump_fs" | ||
| fi | ||
|
|
||
| KDUMP_PATH="$KDUMP_PATH/$HOST_IP-$(date +%Y-%m-%d-%T)" | ||
| [ "$DUMP_INSTRUCTION" = "dump_fs" ] && KDUMP_PATH="$NEWROOT/$KDUMP_PATH" | ||
| KDUMP_PATH="$(echo "$KDUMP_PATH" | tr -s /)" | ||
|
|
||
| kdump_test_init | ||
| if ! do_kdump_pre; then | ||
| derror "kdump_pre script exited with non-zero status!" | ||
|
|
@@ -689,5 +616,5 @@ if [ $DUMP_RETVAL -ne 0 ]; then | |
| exit 1 | ||
| fi | ||
|
|
||
| kdump_test_mark_success | ||
| do_final_action | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't know why ssh/scp option -q was used before. But I think it's better to drop
--silentin case in some corners cases curl does fail.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @coiby,
yeah, what confused me most was the inconsistent use of
-q...You are right that
--silentshould be replaced here as it also masks error messages. But I don't think we should simply drop it. If we do so the scripts output will be quite cluttered as every file transferred will print it's progress. Which is quite annoying, when the progress printed by curl and makedumpfile are interleaved. That's why I think replacing--silentwith--no-progress-metermakes more sense here.