shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

F #-: Fix use of --data-pool flag in Ceph's DS.cp

Browse Source 
Signed-off-by: Guillermo Ramos <gramos@opennebula.io>
(cherry picked from commit 788534b9b9b735c287b82e8b71f862d6d19736e8)
This commit is contained in:
Guillermo Ramos 2024-10-11 13:19:06 +02:00 committed by Ruben S. Montero
parent 9f92eabab1
commit 25a094155e
No known key found for this signature in database
GPG Key ID: A0CEA6FA880A1D87
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/datastore_mad/remotes/ceph/cp
View File

@ -105,8 +105,14 @@ if [ -n "$CEPH_CONF" ]; then
RBD="$RBD --conf ${CEPH_CONF}"
fi
# EC parameters (--data-pool) are only accepted in some `rbd` commands. It's not officially
# documented but at least the following ones require it:
# - create
# - import
RBDEC="$RBD"
if [ -n "$EC_POOL_NAME" ]; then
RBD="$RBD --data-pool ${EC_POOL_NAME}"
RBDEC="$RBDEC --data-pool ${EC_POOL_NAME}"
fi
set_up_datastore "$BASE_PATH" "$RESTRICTED_DIRS" "$SAFE_DIRS"
@ -158,7 +164,7 @@ REGISTER_CMD=$(cat <<EOF
tar zxf $TMP_DST
# Upload base image and snapshot
$RBD import --export-format 2 - $RBD_SOURCE < disk.*.rbd2
$RBDEC import --export-format 2 - $RBD_SOURCE < disk.*.rbd2
# Apply increments
for f in \$(ls disk.*.*.rbdiff | sort -k3 -t.); do
@ -179,7 +185,7 @@ REGISTER_CMD=$(cat <<EOF
mv $TMP_DST.raw $TMP_DST
fi
$RBD import $FORMAT_OPT $TMP_DST $RBD_SOURCE
$RBDEC import $FORMAT_OPT $TMP_DST $RBD_SOURCE
# remove original
$RM -f $TMP_DST