Uh oh!
There was an error while loading. Please reload this page.
NAS B&R Plugin enhancements#9666
Uh oh!
There was an error while loading. Please reload this page.
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
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
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
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
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
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
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
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
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 |
|---|---|---|
| @@ -31,6 +31,58 @@ NAS_ADDRESS="" | ||
| MOUNT_OPTS="" | ||
| BACKUP_DIR="" | ||
| DISK_PATHS="" | ||
| logFile="/var/log/cloudstack/agent/agent.log" | ||
| log() { | ||
| [[ "$verb" -eq 1 ]] && builtin echo "$@" | ||
| if [[ "$1" == "-ne" || "$1" == "-e" || "$1" == "-n" ]]; then | ||
| builtin echo -e "$(date '+%Y-%m-%d %H-%M-%S>')" "${@: 2}" >> "$logFile" | ||
| else | ||
| builtin echo "$(date '+%Y-%m-%d %H-%M-%S>')" "$@" >> "$logFile" | ||
| fi | ||
| } | ||
| vercomp() { | ||
| local IFS=. | ||
| local i ver1=($1) ver2=($3) | ||
| # Compare each segment of the version numbers | ||
| for ((i=0; i<${#ver1[@]}; i++)); do | ||
| if [[ -z ${ver2[i]} ]]; then | ||
| ver2[i]=0 | ||
| fi | ||
| if ((10#${ver1[i]} > 10#${ver2[i]})); then | ||
| return 0 # Version 1 is greater | ||
| elif ((10#${ver1[i]} < 10#${ver2[i]})); then | ||
| return 2 # Version 2 is greater | ||
| fi | ||
| done | ||
| return 0 # Versions are equal | ||
| } | ||
| sanity_checks() { | ||
| hvVersion=$(virsh version | grep hypervisor | awk '{print $(NF)}') | ||
| libvVersion=$(virsh version | grep libvirt | awk '{print $(NF)}' | tail -n 1) | ||
| apiVersion=$(virsh version | grep API | awk '{print $(NF)}') | ||
| # Compare qemu version (hvVersion >= 4.2.0) | ||
| vercomp "$hvVersion" ">=" "4.2.0" | ||
| hvStatus=$? | ||
| # Compare libvirt version (libvVersion >= 7.2.0) | ||
| vercomp "$libvVersion" ">=" "7.2.0" | ||
| libvStatus=$? | ||
| if [[ $hvStatus -eq 0 && $libvStatus -eq 0 ]]; then | ||
| log -ne "Success... [ QEMU: $hvVersion Libvirt: $libvVersion apiVersion: $apiVersion ]" | ||
| else | ||
| echo "Failure... Your QEMU version $hvVersion or libvirt version $libvVersion is unsupported. Consider upgrading to the required minimum version of QEMU: 4.2.0 and Libvirt: 7.2.0" | ||
| exit 1 | ||
| fi | ||
| log -ne "Environment Sanity Checks successfully passed" | ||
| } | ||
| ### Operation methods ### | ||
| @@ -79,7 +131,7 @@ backup_stopped_vm() { | ||
| name="root" | ||
| for disk in $DISK_PATHS; do | ||
| volUuid="${disk##*/}" | ||
| qemu-img convert -O qcow2 $disk $dest/$name.$volUuid.qcow2 | tee -a "$logFile" | ||
| name="datadisk" | ||
| done | ||
| sync | ||
| @@ -99,7 +151,16 @@ delete_backup() { | ||
| mount_operation() { | ||
| mount_point=$(mktemp -d -t csbackup.XXXXX) | ||
| dest="$mount_point/${BACKUP_DIR}" | ||
| if [ ${NAS_TYPE} == "cifs" ]; then | ||
| MOUNT_OPTS="${MOUNT_OPTS},nobrl" | ||
Contributor There was a problem hiding this comment. nobrl is added in mountBackupDirectory. Is it required here as well? ContributorAuthor There was a problem hiding this comment. I had faced the following issue while backing up the VM: As per https://unix.stackexchange.com/questions/622194/how-to-use-qemu-kvm-virtual-machine-disk-image-on-smb-cifs-network-share-permis adding nobrl solved it - so I used that fix. | ||
| fi | ||
| mount -t ${NAS_TYPE} ${NAS_ADDRESS} ${mount_point} $([[ ! -z "${MOUNT_OPTS}" ]] && echo -o ${MOUNT_OPTS}) | tee -a "$logFile" | ||
| if [ $? -eq 0 ]; then | ||
| log -ne "Successfully mounted ${NAS_TYPE} store" | ||
| else | ||
| echo "Failed to mount ${NAS_TYPE} store" | ||
| exit 1 | ||
| fi | ||
| } | ||
| function usage { | ||
| @@ -157,6 +218,9 @@ while [[ $# -gt 0 ]]; do | ||
| esac | ||
| done | ||
| # Perform Initial sanity checks | ||
| sanity_checks | ||
| if [ "$OP" = "backup" ]; then | ||
| STATE=$(virsh -c qemu:///system list | grep $VM | awk '{print $3}') | ||
| if [ "$STATE" = "running" ]; then | ||
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
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
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.
can these be null?
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 am not sure - but just added a defensive check