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 <ldachary@redhat.com>

diff --git a/qa/workunits/ceph-helpers.sh b/qa/workunits/ceph-helpers.sh
index 5ee290962c30a582b592217d7916306514116f44..a526e09537edc959761053bd4c91ea6eceb2b291 100755 (executable)
--- 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 28405538fef016296550ce354a13b503f878e199..132876667c8f520fca06f5dd844887c702e13a98 100755 (executable)
--- 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 129d09b7ec81fb901b3ac1ad4f8354d4dbf329fd..32a6e171d6099a5900400eb8a46d55bfd37cb794 100755 (executable)
--- 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 df0a837a747b3aa1c15147a5ca7f1a5d7fa51e3c..ed0e89208b2647faefb276b8fba904e5a3946a6a 100755 (executable)
--- 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 d2e5dbd51c9ad5acc6c9f53cba3a90715df37559..c11c0eb0d5d586b4101ba834780de790c154b94d 100755 (executable)
--- 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 68208b202919b46d3469307f085a1283ca6d4e95..57a030197db959b931d5ffaca9b5cebb1adc61db 100755 (executable)
--- 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 e3f7395658aac7dd29fd911b0d6e01dd8a8b9aa9..c27dc7b9bd28751490f1b7c7673702f0576c3fdb 100755 (executable)
--- 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 eb33bbcc7f3056a1767d849cac113e77db593495..b8698393a70bebacf1f61569355e9df1c912ce02 100755 (executable)
--- 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 1c2adff6732d2bdc06637b956e95318547ef2ab7..b7dbd230cb755cdcd3ca49767b8f868a3e59c66f 100755 (executable)
--- 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 27be3464fe81982bdf51f637cee9fa64953b5585..bc4e30f63af12a94bd44fe59d1d343432fe47acb 100755 (executable)
--- 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 e7d1be6c124e9f8253b7b9af94c7b24d1fc3c48b..0d11a239b96c4c42ab6e5e0cc9042c25b995d3de 100755 (executable)
--- 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 fd466f8583797c4cafaf981b744c78cb6cd87a0a..0fb5ab8599c039c5536cec20d1e206005615fdf6 100755 (executable)
--- 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 1f7348550faad34af181e986895bf14bee10deb4..3cb7fa6c2380b8d9e79da8dbe5ea3b127340afab 100755 (executable)
--- 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 6f1e03717eab22011c37245ee3d90c256f92fcf6..375ad44e35c99a95e3d84763528777bc22f6ea63 100755 (executable)
--- 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 4690bec128e9cd36d1838bda986757092436722c..ca329975ac4187015ac2d0d23c2b968b309c2ea1 100755 (executable)
--- 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 "