monmaptool: fix clitests

Initial map is epoch 0.  Modifications still bump epoch by one.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>

diff --git a/src/test/cli/monmaptool/add-exists.t b/src/test/cli/monmaptool/add-exists.t
index c229415b01b31cb3c4fa1156569b358972b837ec..094ce85fc945af2d95e6492bca21e686e160444a 100644 (file)
--- a/src/test/cli/monmaptool/add-exists.t
+++ b/src/test/cli/monmaptool/add-exists.t
@@ -1,13 +1,13 @@
   $ monmaptool --create mymonmap
   monmaptool: monmap file mymonmap
   monmaptool: generated fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
-  monmaptool: writing epoch 1 to mymonmap (0 monitors)
+  monmaptool: writing epoch 0 to mymonmap (0 monitors)
 
   $ ORIG_FSID="$(monmaptool --print mymonmap|grep ^fsid)"
 
   $ monmaptool --add foo 2.3.4.5:6789 mymonmap
   monmaptool: monmap file mymonmap
-  monmaptool: writing epoch 2 to mymonmap (1 monitors)
+  monmaptool: writing epoch 1 to mymonmap (1 monitors)
   $ monmaptool --add foo 3.4.5.6:7890 mymonmap
   monmaptool: monmap file mymonmap
   monmaptool: map already contains mon.foo
@@ -16,7 +16,7 @@
 
   $ monmaptool --print mymonmap
   monmaptool: monmap file mymonmap
-  epoch 2
+  epoch 1
   fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
   last_changed \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ (re)
   created \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ (re)

diff --git a/src/test/cli/monmaptool/add-many.t b/src/test/cli/monmaptool/add-many.t
index 0417bc14af6baeeb994870d98f5fdc3570bea9f2..29d95b3bf10f77aa5a01c414c43fae260838a7f2 100644 (file)
--- a/src/test/cli/monmaptool/add-many.t
+++ b/src/test/cli/monmaptool/add-many.t
@@ -1,23 +1,23 @@
   $ monmaptool --create mymonmap
   monmaptool: monmap file mymonmap
   monmaptool: generated fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
-  monmaptool: writing epoch 1 to mymonmap (0 monitors)
+  monmaptool: writing epoch 0 to mymonmap (0 monitors)
 
   $ ORIG_FSID="$(monmaptool --print mymonmap|grep ^fsid)"
 
   $ monmaptool --add foo 2.3.4.5:6789 mymonmap
   monmaptool: monmap file mymonmap
-  monmaptool: writing epoch 2 to mymonmap (1 monitors)
+  monmaptool: writing epoch 1 to mymonmap (1 monitors)
   $ monmaptool --add bar 3.4.5.6:7890 mymonmap
   monmaptool: monmap file mymonmap
-  monmaptool: writing epoch 3 to mymonmap (2 monitors)
+  monmaptool: writing epoch 2 to mymonmap (2 monitors)
   $ monmaptool --add baz 4.5.6.7:8901 mymonmap
   monmaptool: monmap file mymonmap
-  monmaptool: writing epoch 4 to mymonmap (3 monitors)
+  monmaptool: writing epoch 3 to mymonmap (3 monitors)
 
   $ monmaptool --print mymonmap
   monmaptool: monmap file mymonmap
-  epoch 4
+  epoch 3
   fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
   last_changed \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ (re)
   created \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ (re)

diff --git a/src/test/cli/monmaptool/clobber.t b/src/test/cli/monmaptool/clobber.t
index 9de5471d114bca06fcf2be10bafdd76900ea34b3..9f038abfe074d3dbdc3887018f46c7587faf923c 100644 (file)
--- a/src/test/cli/monmaptool/clobber.t
+++ b/src/test/cli/monmaptool/clobber.t
@@ -1,7 +1,7 @@
   $ monmaptool --create --add foo 2.3.4.5:6789 mymonmap
   monmaptool: monmap file mymonmap
   monmaptool: generated fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
-  monmaptool: writing epoch 1 to mymonmap (1 monitors)
+  monmaptool: writing epoch 0 to mymonmap (1 monitors)
 
   $ ORIG_FSID="$(monmaptool --print mymonmap|grep ^fsid)"
 
@@ -13,7 +13,7 @@
 # hasn't changed yet
   $ monmaptool --print mymonmap
   monmaptool: monmap file mymonmap
-  epoch 1
+  epoch 0
   fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
   last_changed \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ (re)
   created \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ (re)
@@ -25,14 +25,14 @@
   $ monmaptool --create --clobber mymonmap
   monmaptool: monmap file mymonmap
   monmaptool: generated fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
-  monmaptool: writing epoch 1 to mymonmap (0 monitors)
+  monmaptool: writing epoch 0 to mymonmap (0 monitors)
 
   $ NEW_FSID="$(monmaptool --print mymonmap|grep ^fsid)"
   $ [ "$ORIG_FSID" != "$NEW_FSID" ]
 
   $ monmaptool --print mymonmap
   monmaptool: monmap file mymonmap
-  epoch 1
+  epoch 0
   fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
   last_changed \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ (re)
   created \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ (re)

diff --git a/src/test/cli/monmaptool/create-print.t b/src/test/cli/monmaptool/create-print.t
index ef7104eeadf7c93378d1cd24cb1834209d108407..3059b79183159a21d249800851dffb06a9a12777 100644 (file)
--- a/src/test/cli/monmaptool/create-print.t
+++ b/src/test/cli/monmaptool/create-print.t
@@ -1,18 +1,18 @@
   $ monmaptool --create mymonmap
   monmaptool: monmap file mymonmap
   monmaptool: generated fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
-  monmaptool: writing epoch 1 to mymonmap (0 monitors)
+  monmaptool: writing epoch 0 to mymonmap (0 monitors)
 
   $ monmaptool --print mymonmap
   monmaptool: monmap file mymonmap
-  epoch 1
+  epoch 0
   fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
   last_changed \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ (re)
   created \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ (re)
 
   $ monmaptool --print -- mymonmap
   monmaptool: monmap file mymonmap
-  epoch 1
+  epoch 0
   fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
   last_changed \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ (re)
   created \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ (re)

diff --git a/src/test/cli/monmaptool/create-with-add.t b/src/test/cli/monmaptool/create-with-add.t
index 2065cff92847c427db6653a999e2b9769c51bf81..783642a1a697012f8313afbda96d5e92e19e8079 100644 (file)
--- a/src/test/cli/monmaptool/create-with-add.t
+++ b/src/test/cli/monmaptool/create-with-add.t
@@ -1,11 +1,11 @@
   $ monmaptool --create --add foo 2.3.4.5:6789 mymonmap
   monmaptool: monmap file mymonmap
   monmaptool: generated fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
-  monmaptool: writing epoch 1 to mymonmap (1 monitors)
+  monmaptool: writing epoch 0 to mymonmap (1 monitors)
 
   $ monmaptool --print mymonmap
   monmaptool: monmap file mymonmap
-  epoch 1
+  epoch 0
   fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
   last_changed \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ (re)
   created \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ (re)

diff --git a/src/test/cli/monmaptool/rm-nonexistent.t b/src/test/cli/monmaptool/rm-nonexistent.t
index 3e97b85d69b775f9f1ce75759060f255e47dc66b..81ad9f9a332402e80c0202c26924477be4dd82a3 100644 (file)
--- a/src/test/cli/monmaptool/rm-nonexistent.t
+++ b/src/test/cli/monmaptool/rm-nonexistent.t
@@ -1,7 +1,7 @@
   $ monmaptool --create --add foo 2.3.4.5:6789 mymonmap
   monmaptool: monmap file mymonmap
   monmaptool: generated fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
-  monmaptool: writing epoch 1 to mymonmap (1 monitors)
+  monmaptool: writing epoch 0 to mymonmap (1 monitors)
 
   $ ORIG_FSID="$(monmaptool --print mymonmap|grep ^fsid)"
 
@@ -14,7 +14,7 @@
 
   $ monmaptool --print mymonmap
   monmaptool: monmap file mymonmap
-  epoch 1
+  epoch 0
   fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
   last_changed \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ (re)
   created \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ (re)

diff --git a/src/test/cli/monmaptool/rm.t b/src/test/cli/monmaptool/rm.t
index 981f4fb9d21f889dfc24d0ffbf0e27c931ba9240..cfac7f57e074dce78b099a90ec9c168b02b73039 100644 (file)
--- a/src/test/cli/monmaptool/rm.t
+++ b/src/test/cli/monmaptool/rm.t
@@ -1,18 +1,18 @@
   $ monmaptool --create --add foo 2.3.4.5:6789 mymonmap
   monmaptool: monmap file mymonmap
   monmaptool: generated fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
-  monmaptool: writing epoch 1 to mymonmap (1 monitors)
+  monmaptool: writing epoch 0 to mymonmap (1 monitors)
 
   $ ORIG_FSID="$(monmaptool --print mymonmap|grep ^fsid)"
 
   $ monmaptool --rm foo mymonmap
   monmaptool: monmap file mymonmap
   monmaptool: removing foo
-  monmaptool: writing epoch 2 to mymonmap (0 monitors)
+  monmaptool: writing epoch 1 to mymonmap (0 monitors)
 
   $ monmaptool --print mymonmap
   monmaptool: monmap file mymonmap
-  epoch 2
+  epoch 1
   fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
   last_changed \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ (re)
   created \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ (re)