Skip to content

Commit 1c34945

Browse files
authored
Merge pull request ceph#56077 from idryomov/wip-rbd-mirror-bash
qa/workunits/rbd: switch rbd-mirror workunits to bash
2 parents 89b0f27 + 166a236 commit 1c34945

9 files changed

+21
-9
lines changed

qa/workunits/rbd/compare_mirror_image_alternate_primary.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22

33
set -ex
44

qa/workunits/rbd/compare_mirror_images.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22

33
set -ex
44

qa/workunits/rbd/rbd_mirror.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/sh -ex
1+
#!/usr/bin/env bash
22
#
33
# rbd_mirror.sh - test rbd-mirror daemon in snapshot or journal mirroring mode
44
#
@@ -13,6 +13,8 @@
1313
# socket, temporary files, and launches rbd-mirror daemon.
1414
#
1515

16+
set -ex
17+
1618
if [ "${#}" -gt 0 ]; then
1719
echo "unnecessary arguments: ${@}"
1820
exit 100

qa/workunits/rbd/rbd_mirror_bootstrap.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
#!/bin/sh -ex
1+
#!/usr/bin/env bash
22
#
33
# rbd_mirror_bootstrap.sh - test peer bootstrap create/import
44
#
55

6+
set -ex
7+
68
RBD_MIRROR_MANUAL_PEERS=1
79
RBD_MIRROR_INSTANCES=${RBD_MIRROR_INSTANCES:-1}
810
. $(dirname $0)/rbd_mirror_helpers.sh

qa/workunits/rbd/rbd_mirror_fsx_compare.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
#!/bin/sh -ex
1+
#!/usr/bin/env bash
22
#
33
# rbd_mirror_fsx_compare.sh - test rbd-mirror daemon under FSX workload
44
#
55
# The script is used to compare FSX-generated images between two clusters.
66
#
77

8+
set -ex
9+
810
. $(dirname $0)/rbd_mirror_helpers.sh
911

1012
trap 'cleanup $?' INT TERM EXIT
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
#!/bin/sh -ex
1+
#!/usr/bin/env bash
22
#
33
# rbd_mirror_fsx_prepare.sh - test rbd-mirror daemon under FSX workload
44
#
55
# The script is used to compare FSX-generated images between two clusters.
66
#
77

8+
set -ex
9+
810
. $(dirname $0)/rbd_mirror_helpers.sh
911

1012
setup

qa/workunits/rbd/rbd_mirror_ha.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
#!/bin/sh -ex
1+
#!/usr/bin/env bash
22
#
33
# rbd_mirror_ha.sh - test rbd-mirror daemons in HA mode
44
#
55

6+
set -ex
7+
68
RBD_MIRROR_INSTANCES=${RBD_MIRROR_INSTANCES:-7}
79

810
. $(dirname $0)/rbd_mirror_helpers.sh

qa/workunits/rbd/rbd_mirror_helpers.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/sh
1+
#!/usr/bin/env bash
22
#
33
# rbd_mirror_helpers.sh - shared rbd-mirror daemon helper functions
44
#

qa/workunits/rbd/rbd_mirror_stress.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/sh -ex
1+
#!/usr/bin/env bash
22
#
33
# rbd_mirror_stress.sh - stress test rbd-mirror daemon
44
#
@@ -8,6 +8,8 @@
88
# tool during the many image test
99
#
1010

11+
set -ex
12+
1113
IMAGE_COUNT=50
1214
export LOCKDEP=0
1315

0 commit comments

Comments
 (0)