mirror of https://github.com/ceph/go-ceph
entrypoint: quote various shell variables
Small and straightforward fixes for a bunch of items found by shellcheck. Signed-off-by: John Mulligan <jmulligan@redhat.com>
This commit is contained in:
parent
f04fac6159
commit
24f02ecb2f
|
@ -163,51 +163,51 @@ setup_mirroring() {
|
||||||
echo "Setting up mirroring..."
|
echo "Setting up mirroring..."
|
||||||
local CONF_A=${CEPH_CONF}
|
local CONF_A=${CEPH_CONF}
|
||||||
local CONF_B=${MIRROR_CONF}
|
local CONF_B=${MIRROR_CONF}
|
||||||
ceph -c $CONF_A osd pool create rbd 8
|
ceph -c "$CONF_A" osd pool create rbd 8
|
||||||
ceph -c $CONF_B osd pool create rbd 8
|
ceph -c "$CONF_B" osd pool create rbd 8
|
||||||
rbd -c $CONF_A pool init
|
rbd -c "$CONF_A" pool init
|
||||||
rbd -c $CONF_B pool init
|
rbd -c "$CONF_B" pool init
|
||||||
rbd -c $CONF_A mirror pool enable rbd image
|
rbd -c "$CONF_A" mirror pool enable rbd image
|
||||||
rbd -c $CONF_B mirror pool enable rbd image
|
rbd -c "$CONF_B" mirror pool enable rbd image
|
||||||
token=$(rbd -c $CONF_A mirror pool peer bootstrap create --site-name ceph_a rbd)
|
token=$(rbd -c "$CONF_A" mirror pool peer bootstrap create --site-name ceph_a rbd)
|
||||||
echo "bootstrap token: ${token}"
|
echo "bootstrap token: ${token}"
|
||||||
echo ${token} | rbd -c $CONF_B mirror pool peer bootstrap import --site-name ceph_b rbd -
|
echo "${token}" | rbd -c "$CONF_B" mirror pool peer bootstrap import --site-name ceph_b rbd -
|
||||||
|
|
||||||
echo "enabled" > "${MIRROR_STATE}"
|
echo "enabled" > "${MIRROR_STATE}"
|
||||||
rbd -c $CONF_A rm mirror_test 2>/dev/null || true
|
rbd -c "$CONF_A" rm mirror_test 2>/dev/null || true
|
||||||
rbd -c $CONF_B rm mirror_test 2>/dev/null || true
|
rbd -c "$CONF_B" rm mirror_test 2>/dev/null || true
|
||||||
(echo "Mirror Test"; dd if=/dev/zero bs=1 count=500K) | rbd -c $CONF_A import - mirror_test
|
(echo "Mirror Test"; dd if=/dev/zero bs=1 count=500K) | rbd -c "$CONF_A" import - mirror_test
|
||||||
|
|
||||||
if [[ ${CEPH_VERSION} != nautilus ]]; then
|
if [[ ${CEPH_VERSION} != nautilus ]]; then
|
||||||
rbd -c $CONF_A mirror image enable mirror_test snapshot
|
rbd -c "$CONF_A" mirror image enable mirror_test snapshot
|
||||||
echo -n "Waiting for mirroring activation..."
|
echo -n "Waiting for mirroring activation..."
|
||||||
while ! rbd -c $CONF_A mirror image status mirror_test \
|
while ! rbd -c "$CONF_A" mirror image status mirror_test \
|
||||||
| grep -q "state: \+up+replaying" ; do
|
| grep -q "state: \+up+replaying" ; do
|
||||||
sleep 1
|
sleep 1
|
||||||
done
|
done
|
||||||
echo "done"
|
echo "done"
|
||||||
rbd -c $CONF_A mirror image snapshot mirror_test
|
rbd -c "$CONF_A" mirror image snapshot mirror_test
|
||||||
else
|
else
|
||||||
rbd -c $CONF_A feature enable mirror_test journaling
|
rbd -c "$CONF_A" feature enable mirror_test journaling
|
||||||
rbd -c $CONF_A mirror image enable mirror_test
|
rbd -c "$CONF_A" mirror image enable mirror_test
|
||||||
echo -n "Waiting for mirroring activation..."
|
echo -n "Waiting for mirroring activation..."
|
||||||
while ! rbd -c $CONF_B mirror image status mirror_test \
|
while ! rbd -c "$CONF_B" mirror image status mirror_test \
|
||||||
| grep -q "state: \+up+replaying" ; do
|
| grep -q "state: \+up+replaying" ; do
|
||||||
sleep 1
|
sleep 1
|
||||||
done
|
done
|
||||||
echo "done"
|
echo "done"
|
||||||
rbd -c $CONF_A mirror image demote mirror_test
|
rbd -c "$CONF_A" mirror image demote mirror_test
|
||||||
while ! rbd -c $CONF_B mirror image status mirror_test \
|
while ! rbd -c "$CONF_B" mirror image status mirror_test \
|
||||||
| grep -q "state: \+up+stopped" ; do
|
| grep -q "state: \+up+stopped" ; do
|
||||||
sleep 1
|
sleep 1
|
||||||
done
|
done
|
||||||
rbd -c $CONF_B mirror image status mirror_test
|
rbd -c "$CONF_B" mirror image status mirror_test
|
||||||
rbd -c $CONF_B mirror image promote mirror_test
|
rbd -c "$CONF_B" mirror image promote mirror_test
|
||||||
rbd -c $CONF_B mirror image disable mirror_test
|
rbd -c "$CONF_B" mirror image disable mirror_test
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo -n "Waiting for mirror sync..."
|
echo -n "Waiting for mirror sync..."
|
||||||
while ! rbd -c $CONF_B export mirror_test - 2>/dev/null | grep -q "Mirror Test" ; do
|
while ! rbd -c "$CONF_B" export mirror_test - 2>/dev/null | grep -q "Mirror Test" ; do
|
||||||
sleep 1
|
sleep 1
|
||||||
done
|
done
|
||||||
echo "functional" > "${MIRROR_STATE}"
|
echo "functional" > "${MIRROR_STATE}"
|
||||||
|
@ -248,7 +248,7 @@ test_pkg() {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
show go test -v "${testargs[@]}" "./${pkg}"
|
show go test -v "${testargs[@]}" "./${pkg}"
|
||||||
ret=$(($?+${ret}))
|
ret=$(($?+ret))
|
||||||
grep -v "^mode: count" "${pkg}.cover.out" >> "cover.out"
|
grep -v "^mode: count" "${pkg}.cover.out" >> "cover.out"
|
||||||
return ${ret}
|
return ${ret}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue