From f14144441bd2b78c5d71f41f26aae654743b1b12 Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Tue, 27 Oct 2015 12:48:23 +0900 Subject: [PATCH] tests: port uniqueness reminder When copy/pasting a tests, it is easy to forget (or not know) that the port used must be unique to allow for multiple tests to run in parallel (make -j8). Add a reminder next to each port. Signed-off-by: Loic Dachary --- qa/workunits/ceph-helpers.sh | 2 +- src/test/erasure-code/test-erasure-code.sh | 2 +- src/test/erasure-code/test-erasure-eio.sh | 2 +- src/test/libradosstriper/rados-striper.sh | 2 +- src/test/mon/misc.sh | 6 +++--- src/test/mon/mkfs.sh | 2 +- src/test/mon/mon-ping.sh | 2 +- src/test/mon/mon-scrub.sh | 2 +- src/test/mon/osd-crush.sh | 8 ++++---- src/test/mon/osd-erasure-code-profile.sh | 2 +- src/test/mon/osd-pool-create.sh | 2 +- src/test/osd/osd-bench.sh | 2 +- src/test/osd/osd-config.sh | 2 +- src/test/osd/osd-copy-from.sh | 2 +- src/test/osd/osd-scrub-repair.sh | 2 +- 15 files changed, 20 insertions(+), 20 deletions(-) diff --git a/qa/workunits/ceph-helpers.sh b/qa/workunits/ceph-helpers.sh index 5ee290962c30a..a526e09537edc 100755 --- a/qa/workunits/ceph-helpers.sh +++ b/qa/workunits/ceph-helpers.sh @@ -1184,7 +1184,7 @@ function run_tests() { PS4='${BASH_SOURCE[0]}:$LINENO: ${FUNCNAME[0]}: ' export PATH=":$PATH" - export CEPH_MON="127.0.0.1:7109" + export CEPH_MON="127.0.0.1:7109" # git grep '\<7109\>' : there must be only one export CEPH_ARGS CEPH_ARGS+="--fsid=$(uuidgen) --auth-supported=none " CEPH_ARGS+="--mon-host=$CEPH_MON " diff --git a/src/test/erasure-code/test-erasure-code.sh b/src/test/erasure-code/test-erasure-code.sh index 28405538fef01..132876667c8f5 100755 --- a/src/test/erasure-code/test-erasure-code.sh +++ b/src/test/erasure-code/test-erasure-code.sh @@ -22,7 +22,7 @@ function run() { local dir=$1 shift - export CEPH_MON="127.0.0.1:7101" + export CEPH_MON="127.0.0.1:7101" # git grep '\<7101\>' : there must be only one export CEPH_ARGS CEPH_ARGS+="--fsid=$(uuidgen) --auth-supported=none " CEPH_ARGS+="--mon-host=$CEPH_MON " diff --git a/src/test/erasure-code/test-erasure-eio.sh b/src/test/erasure-code/test-erasure-eio.sh index 129d09b7ec81f..32a6e171d6099 100755 --- a/src/test/erasure-code/test-erasure-eio.sh +++ b/src/test/erasure-code/test-erasure-eio.sh @@ -22,7 +22,7 @@ function run() { local dir=$1 shift - export CEPH_MON="127.0.0.1:7112" + export CEPH_MON="127.0.0.1:7112" # git grep '\<7112\>' : there must be only one export CEPH_ARGS CEPH_ARGS+="--fsid=$(uuidgen) --auth-supported=none " CEPH_ARGS+="--mon-host=$CEPH_MON " diff --git a/src/test/libradosstriper/rados-striper.sh b/src/test/libradosstriper/rados-striper.sh index df0a837a747b3..ed0e89208b264 100755 --- a/src/test/libradosstriper/rados-striper.sh +++ b/src/test/libradosstriper/rados-striper.sh @@ -20,7 +20,7 @@ function run() { local dir=$1 shift - export CEPH_MON="127.0.0.1:7116" + export CEPH_MON="127.0.0.1:7116" # git grep '\<7116\>' : there must be only one export CEPH_ARGS CEPH_ARGS+="--fsid=$(uuidgen) --auth-supported=none " CEPH_ARGS+="--mon-host=$CEPH_MON " diff --git a/src/test/mon/misc.sh b/src/test/mon/misc.sh index d2e5dbd51c9ad..c11c0eb0d5d58 100755 --- a/src/test/mon/misc.sh +++ b/src/test/mon/misc.sh @@ -21,7 +21,7 @@ function run() { local dir=$1 shift - export CEPH_MON="127.0.0.1:7102" + export CEPH_MON="127.0.0.1:7102" # git grep '\<7102\>' : there must be only one export CEPH_ARGS CEPH_ARGS+="--fsid=$(uuidgen) --auth-supported=none " CEPH_ARGS+="--mon-host=$CEPH_MON " @@ -89,8 +89,8 @@ function TEST_mon_add_to_single_mon() { local dir=$1 fsid=$(uuidgen) - MONA=127.0.0.1:7117 - MONB=127.0.0.1:7118 + MONA=127.0.0.1:7117 # git grep '\<7117\>' : there must be only one + MONB=127.0.0.1:7118 # git grep '\<7118\>' : there must be only one CEPH_ARGS_orig=$CEPH_ARGS CEPH_ARGS="--fsid=$fsid --auth-supported=none " CEPH_ARGS+="--mon-initial-members=a " diff --git a/src/test/mon/mkfs.sh b/src/test/mon/mkfs.sh index 68208b202919b..57a030197db95 100755 --- a/src/test/mon/mkfs.sh +++ b/src/test/mon/mkfs.sh @@ -23,7 +23,7 @@ export CEPH_CONF=/dev/null unset CEPH_ARGS MON_ID=a MON_DIR=$DIR/$MON_ID -CEPH_MON=127.0.0.1:7110 +CEPH_MON=127.0.0.1:7110 # git grep '\<7110\>' : there must be only one TIMEOUT=360 function setup() { diff --git a/src/test/mon/mon-ping.sh b/src/test/mon/mon-ping.sh index e3f7395658aac..c27dc7b9bd287 100755 --- a/src/test/mon/mon-ping.sh +++ b/src/test/mon/mon-ping.sh @@ -18,7 +18,7 @@ function run() { local dir=$1 shift - export CEPH_MON="127.0.0.1:7119" + export CEPH_MON="127.0.0.1:7119" # git grep '\<7119\>' : there must be only one export CEPH_ARGS CEPH_ARGS+="--fsid=$(uuidgen) --auth-supported=none " CEPH_ARGS+="--mon-host=$CEPH_MON " diff --git a/src/test/mon/mon-scrub.sh b/src/test/mon/mon-scrub.sh index eb33bbcc7f305..b8698393a70be 100755 --- a/src/test/mon/mon-scrub.sh +++ b/src/test/mon/mon-scrub.sh @@ -21,7 +21,7 @@ function run() { local dir=$1 shift - export CEPH_MON="127.0.0.1:7120" + export CEPH_MON="127.0.0.1:7120" # git grep '\<7120\>' : there must be only one export CEPH_ARGS CEPH_ARGS+="--fsid=$(uuidgen) --auth-supported=none " CEPH_ARGS+="--mon-host=$CEPH_MON " diff --git a/src/test/mon/osd-crush.sh b/src/test/mon/osd-crush.sh index 1c2adff6732d2..b7dbd230cb755 100755 --- a/src/test/mon/osd-crush.sh +++ b/src/test/mon/osd-crush.sh @@ -21,7 +21,7 @@ function run() { local dir=$1 shift - export CEPH_MON="127.0.0.1:7104" + export CEPH_MON="127.0.0.1:7104" # git grep '\<7104\>' : there must be only one export CEPH_ARGS CEPH_ARGS+="--fsid=$(uuidgen) --auth-supported=none " CEPH_ARGS+="--mon-host=$CEPH_MON " @@ -241,9 +241,9 @@ function TEST_crush_tree() { function TEST_crush_repair_faulty_crushmap() { local dir=$1 fsid=$(uuidgen) - MONA=127.0.0.1:7113 - MONB=127.0.0.1:7114 - MONC=127.0.0.1:7115 + MONA=127.0.0.1:7113 # git grep '\<7113\>' : there must be only one + MONB=127.0.0.1:7114 # git grep '\<7114\>' : there must be only one + MONC=127.0.0.1:7115 # git grep '\<7115\>' : there must be only one CEPH_ARGS_orig=$CEPH_ARGS CEPH_ARGS="--fsid=$fsid --auth-supported=none " CEPH_ARGS+="--mon-initial-members=a,b,c " diff --git a/src/test/mon/osd-erasure-code-profile.sh b/src/test/mon/osd-erasure-code-profile.sh index 27be3464fe819..bc4e30f63af12 100755 --- a/src/test/mon/osd-erasure-code-profile.sh +++ b/src/test/mon/osd-erasure-code-profile.sh @@ -21,7 +21,7 @@ function run() { local dir=$1 shift - export CEPH_MON="127.0.0.1:7108" + export CEPH_MON="127.0.0.1:7108" # git grep '\<7108\>' : there must be only one export CEPH_ARGS CEPH_ARGS+="--fsid=$(uuidgen) --auth-supported=none " CEPH_ARGS+="--mon-host=$CEPH_MON " diff --git a/src/test/mon/osd-pool-create.sh b/src/test/mon/osd-pool-create.sh index e7d1be6c124e9..0d11a239b96c4 100755 --- a/src/test/mon/osd-pool-create.sh +++ b/src/test/mon/osd-pool-create.sh @@ -21,7 +21,7 @@ function run() { local dir=$1 shift - export CEPH_MON="127.0.0.1:7105" + export CEPH_MON="127.0.0.1:7105" # git grep '\<7105\>' : there must be only one export CEPH_ARGS CEPH_ARGS+="--fsid=$(uuidgen) --auth-supported=none " CEPH_ARGS+="--mon-host=$CEPH_MON " diff --git a/src/test/osd/osd-bench.sh b/src/test/osd/osd-bench.sh index fd466f8583797..0fb5ab8599c03 100755 --- a/src/test/osd/osd-bench.sh +++ b/src/test/osd/osd-bench.sh @@ -22,7 +22,7 @@ function run() { local dir=$1 shift - export CEPH_MON="127.0.0.1:7106" + export CEPH_MON="127.0.0.1:7106" # git grep '\<7106\>' : there must be only one export CEPH_ARGS CEPH_ARGS+="--fsid=$(uuidgen) --auth-supported=none " CEPH_ARGS+="--mon-host=$CEPH_MON " diff --git a/src/test/osd/osd-config.sh b/src/test/osd/osd-config.sh index 1f7348550faad..3cb7fa6c2380b 100755 --- a/src/test/osd/osd-config.sh +++ b/src/test/osd/osd-config.sh @@ -22,7 +22,7 @@ function run() { local dir=$1 shift - export CEPH_MON="127.0.0.1:7100" + export CEPH_MON="127.0.0.1:7100" # git grep '\<7100\>' : there must be only one export CEPH_ARGS CEPH_ARGS+="--fsid=$(uuidgen) --auth-supported=none " CEPH_ARGS+="--mon-host=$CEPH_MON " diff --git a/src/test/osd/osd-copy-from.sh b/src/test/osd/osd-copy-from.sh index 6f1e03717eab2..375ad44e35c99 100755 --- a/src/test/osd/osd-copy-from.sh +++ b/src/test/osd/osd-copy-from.sh @@ -23,7 +23,7 @@ function run() { local dir=$1 shift - export CEPH_MON="127.0.0.1:7111" + export CEPH_MON="127.0.0.1:7111" # git grep '\<7111\>' : there must be only one export CEPH_ARGS CEPH_ARGS+="--fsid=$(uuidgen) --auth-supported=none " CEPH_ARGS+="--mon-host=$CEPH_MON " diff --git a/src/test/osd/osd-scrub-repair.sh b/src/test/osd/osd-scrub-repair.sh index 4690bec128e9c..ca329975ac418 100755 --- a/src/test/osd/osd-scrub-repair.sh +++ b/src/test/osd/osd-scrub-repair.sh @@ -20,7 +20,7 @@ function run() { local dir=$1 shift - export CEPH_MON="127.0.0.1:7107" + export CEPH_MON="127.0.0.1:7107" # git grep '\<7107\>' : there must be only one export CEPH_ARGS CEPH_ARGS+="--fsid=$(uuidgen) --auth-supported=none " CEPH_ARGS+="--mon-host=$CEPH_MON " -- 2.39.5