thebestvibedev/tromcho.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use just IMAGE_PREFIX, not IMAGE_PREFIX+"one"

Browse Source
This commit is contained in:
Vitaliy Filippov
2024-09-04 01:23:00 +03:00
parent ee3094c5e5
commit 9f25bb059b
10 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
opennebula/remotes/datastore/vitastor/clone
+2 -3
View File
@@ -43,7 +43,7 @@ unset i
BASE_PATH="${XPATH_ELEMENTS[i++]}" BASE_PATH="${XPATH_ELEMENTS[i++]}"
BRIDGE_LIST="${XPATH_ELEMENTS[i++]}" BRIDGE_LIST="${XPATH_ELEMENTS[i++]}"
POOL_NAME="${XPATH_ELEMENTS[i++]}" POOL_NAME="${XPATH_ELEMENTS[i++]}"
IMAGE_PREFIX="${XPATH_ELEMENTS[i++]}" IMAGE_PREFIX="${XPATH_ELEMENTS[i++]:-one}"
SRC="${XPATH_ELEMENTS[i++]}" SRC="${XPATH_ELEMENTS[i++]}"
SIZE="${XPATH_ELEMENTS[i++]}" SIZE="${XPATH_ELEMENTS[i++]}"
VITASTOR_CONF="${XPATH_ELEMENTS[i++]}" VITASTOR_CONF="${XPATH_ELEMENTS[i++]}"
@@ -65,12 +65,11 @@ fi
SAFE_DIRS="" SAFE_DIRS=""
DST="${IMAGE_PREFIX}one-${ID}" DST="${IMAGE_PREFIX}-${ID}"
ssh_exec_and_log "$DST_HOST" "$CLI create --parent $SRC $DST" \ ssh_exec_and_log "$DST_HOST" "$CLI create --parent $SRC $DST" \
"Error during $CLI create --parent $SRC $DST in $DST_HOST" "Error during $CLI create --parent $SRC $DST in $DST_HOST"
# FIXME: Is it really required?
ssh_exec_and_log "$DST_HOST" "$CLI flatten $DST" \ ssh_exec_and_log "$DST_HOST" "$CLI flatten $DST" \
"Error during $CLI create flatten $DST in $DST_HOST" "Error during $CLI create flatten $DST in $DST_HOST"
opennebula/remotes/datastore/vitastor/cp
+3 -3
View File
@@ -57,8 +57,8 @@ RESTRICTED_DIRS="${XPATH_ELEMENTS[i++]}"
SAFE_DIRS="${XPATH_ELEMENTS[i++]}" SAFE_DIRS="${XPATH_ELEMENTS[i++]}"
BRIDGE_LIST="${XPATH_ELEMENTS[i++]}" BRIDGE_LIST="${XPATH_ELEMENTS[i++]}"
POOL_NAME="${XPATH_ELEMENTS[i++]}" POOL_NAME="${XPATH_ELEMENTS[i++]}"
IMAGE_PREFIX="${XPATH_ELEMENTS[i++]}" IMAGE_PREFIX="${XPATH_ELEMENTS[i++]:-one}"
STAGING_DIR="${XPATH_ELEMENTS[i++]:-$STAGING_DIR}" STAGING_DIR="${XPATH_ELEMENTS[i++]:-/var/tmp}"
SRC="${XPATH_ELEMENTS[i++]}" SRC="${XPATH_ELEMENTS[i++]}"
SIZE="${XPATH_ELEMENTS[i++]}" SIZE="${XPATH_ELEMENTS[i++]}"
MD5="${XPATH_ELEMENTS[i++]}" MD5="${XPATH_ELEMENTS[i++]}"
@@ -89,7 +89,7 @@ set_up_datastore "$BASE_PATH" "$RESTRICTED_DIRS" "$SAFE_DIRS"
IMAGE_HASH=`generate_image_hash` IMAGE_HASH=`generate_image_hash`
TMP_DST="$STAGING_DIR/$IMAGE_HASH" TMP_DST="$STAGING_DIR/$IMAGE_HASH"
DST="${IMAGE_PREFIX}one-${ID}" DST="${IMAGE_PREFIX}-${ID}"
DOWNLOADER_ARGS=`set_downloader_args "$MD5" "$SHA1" "$NO_DECOMPRESS" "$LIMIT_TRANSFER_BW" "$SRC" -` DOWNLOADER_ARGS=`set_downloader_args "$MD5" "$SHA1" "$NO_DECOMPRESS" "$LIMIT_TRANSFER_BW" "$SRC" -`
opennebula/remotes/datastore/vitastor/mkfs
+2 -5
View File
@@ -38,7 +38,6 @@ done < <($XPATH \
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/BRIDGE_LIST \ /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/BRIDGE_LIST \
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/POOL_NAME \ /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/POOL_NAME \
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/IMAGE_PREFIX \ /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/IMAGE_PREFIX \
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/STAGING_DIR \
/DS_DRIVER_ACTION_DATA/IMAGE/FORMAT \ /DS_DRIVER_ACTION_DATA/IMAGE/FORMAT \
/DS_DRIVER_ACTION_DATA/IMAGE/SIZE \ /DS_DRIVER_ACTION_DATA/IMAGE/SIZE \
/DS_DRIVER_ACTION_DATA/IMAGE/FS \ /DS_DRIVER_ACTION_DATA/IMAGE/FS \
@@ -51,8 +50,7 @@ RESTRICTED_DIRS="${XPATH_ELEMENTS[i++]}"
SAFE_DIRS="${XPATH_ELEMENTS[i++]}" SAFE_DIRS="${XPATH_ELEMENTS[i++]}"
BRIDGE_LIST="${XPATH_ELEMENTS[i++]}" BRIDGE_LIST="${XPATH_ELEMENTS[i++]}"
POOL_NAME="${XPATH_ELEMENTS[i++]}" POOL_NAME="${XPATH_ELEMENTS[i++]}"
IMAGE_PREFIX="${XPATH_ELEMENTS[i++]}" IMAGE_PREFIX="${XPATH_ELEMENTS[i++]:-one}"
STAGING_DIR="${XPATH_ELEMENTS[i++]:-$STAGING_DIR}"
FORMAT="${XPATH_ELEMENTS[i++]}" FORMAT="${XPATH_ELEMENTS[i++]}"
SIZE="${XPATH_ELEMENTS[i++]}" SIZE="${XPATH_ELEMENTS[i++]}"
FS="${XPATH_ELEMENTS[i++]}" FS="${XPATH_ELEMENTS[i++]}"
@@ -75,7 +73,7 @@ fi
set_up_datastore "$BASE_PATH" "$RESTRICTED_DIRS" "$SAFE_DIRS" set_up_datastore "$BASE_PATH" "$RESTRICTED_DIRS" "$SAFE_DIRS"
IMAGE_NAME="${IMAGE_PREFIX}one-${ID}" IMAGE_NAME="${IMAGE_PREFIX}-${ID}"
# ------------ Image to save_as disk, no need to create a new image ------------ # ------------ Image to save_as disk, no need to create a new image ------------
@@ -109,7 +107,6 @@ if [ ! -z $FS ]; then
set -e -o pipefail set -e -o pipefail
IMAGE_HASH=`generate_image_hash` IMAGE_HASH=`generate_image_hash`
TMP_DST="$STAGING_DIR/$IMAGE_HASH"
FS_OPTS=$(eval $(echo "echo \$FS_OPTS_$FS")) FS_OPTS=$(eval $(echo "echo \$FS_OPTS_$FS"))
MKFS_CMD=`mkfs_command '$NBD' raw "$SIZE" "$SUPPORTED_FS" "$FS" "$FS_OPTS" | grep -v $QEMU_IMG` MKFS_CMD=`mkfs_command '$NBD' raw "$SIZE" "$SUPPORTED_FS" "$FS" "$FS_OPTS" | grep -v $QEMU_IMG`
opennebula/remotes/tm/vitastor/cpds
+1 -1
View File
@@ -52,7 +52,7 @@ unset i j XPATH_ELEMENTS
while IFS= read -r -d '' element; do while IFS= read -r -d '' element; do
XPATH_ELEMENTS[i++]="$element" XPATH_ELEMENTS[i++]="$element"
done < <(onevm show -x $VM_ID| $XPATH \ done < <(onevm show -x $VM_ID | $XPATH \
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/SOURCE \ /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/SOURCE \
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CLONE \ /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CLONE \
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/VITASTOR_CONF \ /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/VITASTOR_CONF \
opennebula/remotes/tm/vitastor/delete
+4 -4
View File
@@ -57,7 +57,7 @@ if [ `is_disk $DST_PATH` -eq 0 ]; then
SRC="${XPATH_ELEMENTS[j++]}" SRC="${XPATH_ELEMENTS[j++]}"
CLONE="${XPATH_ELEMENTS[j++]}" CLONE="${XPATH_ELEMENTS[j++]}"
VITASTOR_CONF="${XPATH_ELEMENTS[j++]}" VITASTOR_CONF="${XPATH_ELEMENTS[j++]}"
IMAGE_PREFIX="${XPATH_ELEMENTS[j++]}" IMAGE_PREFIX="${XPATH_ELEMENTS[j++]:-one}"
POOL_NAME="${XPATH_ELEMENTS[j++]}" POOL_NAME="${XPATH_ELEMENTS[j++]}"
CLI=vitastor-cli CLI=vitastor-cli
@@ -65,7 +65,7 @@ if [ `is_disk $DST_PATH` -eq 0 ]; then
CLI="$CLI --config_path ${VITASTOR_CONF}" CLI="$CLI --config_path ${VITASTOR_CONF}"
fi fi
SRC_CHECKPOINT="${IMAGE_PREFIX}one-sys-${VM_ID}-checkpoint" SRC_CHECKPOINT="${IMAGE_PREFIX}-sys-${VM_ID}-checkpoint"
ssh_exec_and_log "$DST_HOST" "$CLI rm $SRC_CHECKPOINT 2>/dev/null || exit 0" \ ssh_exec_and_log "$DST_HOST" "$CLI rm $SRC_CHECKPOINT 2>/dev/null || exit 0" \
"Error deleting $SRC_CHECKPOINT in $DST_HOST" "Error deleting $SRC_CHECKPOINT in $DST_HOST"
@@ -95,7 +95,7 @@ done < <(onevm show -x $VM_ID | $XPATH \
SRC="${XPATH_ELEMENTS[j++]}" SRC="${XPATH_ELEMENTS[j++]}"
CLONE="${XPATH_ELEMENTS[j++]}" CLONE="${XPATH_ELEMENTS[j++]}"
VITASTOR_CONF="${XPATH_ELEMENTS[j++]}" VITASTOR_CONF="${XPATH_ELEMENTS[j++]}"
IMAGE_PREFIX="${XPATH_ELEMENTS[j++]}" IMAGE_PREFIX="${XPATH_ELEMENTS[j++]:-one}"
POOL_NAME="${XPATH_ELEMENTS[j++]}" POOL_NAME="${XPATH_ELEMENTS[j++]}"
if is_undeployed "$VM_ID" "$DST_HOST"; then if is_undeployed "$VM_ID" "$DST_HOST"; then
@@ -124,7 +124,7 @@ if [ -n "$SRC" ]; then
SRC_IMAGE="${SRC}-${VM_ID}-${DISK_ID}" SRC_IMAGE="${SRC}-${VM_ID}-${DISK_ID}"
else else
# volatile # volatile
SRC_IMAGE="${IMAGE_PREFIX}one-sys-${VM_ID}-${DISK_ID}" SRC_IMAGE="${IMAGE_PREFIX}-sys-${VM_ID}-${DISK_ID}"
fi fi
# Delete the image # Delete the image
opennebula/remotes/tm/vitastor/mkimage
+2 -2
View File
@@ -64,7 +64,7 @@ done < <(onevm show -x $VMID | $XPATH \
VITASTOR_CONF="${XPATH_ELEMENTS[j++]}" VITASTOR_CONF="${XPATH_ELEMENTS[j++]}"
POOL_NAME="${XPATH_ELEMENTS[j++]}" POOL_NAME="${XPATH_ELEMENTS[j++]}"
IMAGE_PREFIX="${XPATH_ELEMENTS[j++]}" IMAGE_PREFIX="${XPATH_ELEMENTS[j++]:-one}"
FS="${XPATH_ELEMENTS[j++]}" FS="${XPATH_ELEMENTS[j++]}"
CLI= CLI=
@@ -74,7 +74,7 @@ if [ -n "$VITASTOR_CONF" ]; then
QEMU_ARG=":config_path=${VITASTOR_CONF}" QEMU_ARG=":config_path=${VITASTOR_CONF}"
fi fi
IMAGE_NAME="${IMAGE_PREFIX}one-sys-${VMID}-${DISK_ID}" IMAGE_NAME="${IMAGE_PREFIX}-sys-${VMID}-${DISK_ID}"
ssh_make_path $DST_HOST $DST_DIR ssh_make_path $DST_HOST $DST_DIR
opennebula/remotes/tm/vitastor/resize
+2 -2
View File
@@ -51,7 +51,7 @@ done < <(onevm show -x $VM_ID | $XPATH \
SRC_IMAGE="${XPATH_ELEMENTS[j++]}" SRC_IMAGE="${XPATH_ELEMENTS[j++]}"
VITASTOR_CONF="${XPATH_ELEMENTS[j++]}" VITASTOR_CONF="${XPATH_ELEMENTS[j++]}"
IMAGE_PREFIX="${XPATH_ELEMENTS[j++]}" IMAGE_PREFIX="${XPATH_ELEMENTS[j++]:-one}"
PERSISTENT="${XPATH_ELEMENTS[j++]}" PERSISTENT="${XPATH_ELEMENTS[j++]}"
if [ -n "${SRC_IMAGE}" ]; then if [ -n "${SRC_IMAGE}" ]; then
@@ -59,7 +59,7 @@ if [ -n "${SRC_IMAGE}" ]; then
SRC_IMAGE="${SRC_IMAGE}-${VM_ID}-${DISK_ID}" SRC_IMAGE="${SRC_IMAGE}-${VM_ID}-${DISK_ID}"
fi fi
else else
SRC_IMAGE="${IMAGE_PREFIX}one-sys-${VM_ID}-${DISK_ID}" SRC_IMAGE="${IMAGE_PREFIX}-sys-${VM_ID}-${DISK_ID}"
fi fi
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
opennebula/remotes/vmm/kvm/restore.vitastor
+2 -2
View File
@@ -24,14 +24,14 @@ done < <($XPATH \
/VMM_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/IMAGE_PREFIX) /VMM_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/IMAGE_PREFIX)
VITASTOR_CONF="${XPATH_ELEMENTS[j++]}" VITASTOR_CONF="${XPATH_ELEMENTS[j++]}"
IMAGE_PREFIX="${XPATH_ELEMENTS[j++]}" IMAGE_PREFIX="${XPATH_ELEMENTS[j++]:-one}"
CLI=vitastor-cli CLI=vitastor-cli
if [ -n "$VITASTOR_CONF" ]; then if [ -n "$VITASTOR_CONF" ]; then
CLI="$CLI --config_path $VITASTOR_CONF" CLI="$CLI --config_path $VITASTOR_CONF"
fi fi
SRC_IMAGE="${IMAGE_PREFIX}one-sys-${VM_ID}-checkpoint" SRC_IMAGE="${IMAGE_PREFIX}-sys-${VM_ID}-checkpoint"
exec_and_log "$CLI dd iimg=$SRC_IMAGE of=$FILE" "Error exporting checkpoint into from $SRC_IMAGE to $FILE" exec_and_log "$CLI dd iimg=$SRC_IMAGE of=$FILE" "Error exporting checkpoint into from $SRC_IMAGE to $FILE"
exec_and_log "$CLI rm $SRC_IMAGE" "Error removing checkpoint $SRC_IMAGE" exec_and_log "$CLI rm $SRC_IMAGE" "Error removing checkpoint $SRC_IMAGE"
opennebula/remotes/vmm/kvm/save.vitastor
+2 -2
View File
@@ -26,7 +26,7 @@ done < <($XPATH \
/VMM_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/POOL_NAME) /VMM_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/POOL_NAME)
VITASTOR_CONF="${XPATH_ELEMENTS[j++]}" VITASTOR_CONF="${XPATH_ELEMENTS[j++]}"
IMAGE_PREFIX="${XPATH_ELEMENTS[j++]}" IMAGE_PREFIX="${XPATH_ELEMENTS[j++]:-one}"
POOL_NAME="${XPATH_ELEMENTS[j++]}" POOL_NAME="${XPATH_ELEMENTS[j++]}"
CLI=vitastor-cli CLI=vitastor-cli
@@ -37,7 +37,7 @@ if [ -n "$POOL_NAME" ]; then
CLI="$CLI --pool ${POOL_NAME}" CLI="$CLI --pool ${POOL_NAME}"
fi fi
DST_IMAGE="${IMAGE_PREFIX}one-sys-${VM_ID}-checkpoint" DST_IMAGE="${IMAGE_PREFIX}-sys-${VM_ID}-checkpoint"
exec_and_log "$CLI dd if=$FILE oimg=$DST_IMAGE" "Error importing checkpoint into $DST_IMAGE" exec_and_log "$CLI dd if=$FILE oimg=$DST_IMAGE" "Error importing checkpoint into $DST_IMAGE"
exec_and_log "$RM -f $FILE" "Error removing checkpoint ($FILE)" exec_and_log "$RM -f $FILE" "Error removing checkpoint ($FILE)"
opennebula/vitastor-imageds.conf
+1 -1
View File
@@ -5,6 +5,6 @@ TYPE = "IMAGE_DS"
DISK_TYPE = "file" DISK_TYPE = "file"
BRIDGE_LIST = "opennebula1" BRIDGE_LIST = "opennebula1"
POOL_NAME = "test1" POOL_NAME = "test1"
IMAGE_PREFIX = "my" IMAGE_PREFIX = "one"
STAGING_DIR = "/var/tmp" STAGING_DIR = "/var/tmp"
VITASTOR_CONF = "/etc/vitastor/vitastor.conf" VITASTOR_CONF = "/etc/vitastor/vitastor.conf"