mon: no need for 'whoami' file in store

The monitor rank is provided during startup.  No need to verify it against
the monitor store, especially since the stores are otherwise identical.

This makes it simpler to restore/duplicate/wahtever a monitor.. just copy
the files.

diff --git a/src/cmon.cc b/src/cmon.cc
index 9bed3f0cf652ecea866070a08334c9015cf8bd62..7fafe41f193c89933b1c8b0d5960919553589ccd 100644 (file)
--- a/src/cmon.cc
+++ b/src/cmon.cc
@@ -83,17 +83,6 @@ int main(int argc, const char **argv)
     exit(1);
   }
 
-  // whoami?
-  if (!store.exists_bl_ss("whoami")) {
-    cerr << "mon fs missing 'whoami'.. did you run mkcephfs?" << std::endl;
-    exit(1);
-  }
-  int w = store.get_int("whoami");
-  if (w != whoami) {
-    cerr << "monitor data is for mon" << w << ", but you said i was mon" << whoami << std::endl;
-    exit(1);
-  }
-
   bufferlist magicbl;
   store.get_bl_ss(magicbl, "magic", 0);
   string magic(magicbl.c_str(), magicbl.length()-1);  // ignore trailing \n

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index f1b23ba96769b34e83e0a678afb8f33d9e54f37d..cf0b20bbe13853a72462f16450e5554455eaeb0f 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -944,8 +944,6 @@ int Monitor::mkfs(bufferlist& osdmapbl)
     exit(1);
   }
   
-  store->put_int(whoami, "whoami", 0);
-
   bufferlist magicbl;
   magicbl.append(CEPH_MON_ONDISK_MAGIC);
   magicbl.append("\n");