osdmaptool: print osdmap

diff --git a/src/dstartnew.sh b/src/dstartnew.sh
index 10712e13574291b0a540160a486d9ce1eef88cea..a37947e5a9c956925aae57b08c16113b2cbfbce5 100755 (executable)
--- a/src/dstartnew.sh
+++ b/src/dstartnew.sh
@@ -30,7 +30,7 @@ fi
 ./cmon -d mondata/mon0 --debug_mon 20 --debug_ms 1
 
 # build and inject an initial osd map
-./osdmaptool --clobber --createsimple .ceph_monmap 16 --print .ceph_osdmap # --pgbits 2
+./osdmaptool --clobber --createsimple .ceph_monmap 16 .ceph_osdmap # --pgbits 2
 ./cmonctl osd setmap -i .ceph_osdmap
 
 #ARGS="-m $IP:12345"

diff --git a/src/osdmaptool.cc b/src/osdmaptool.cc
index fb9d1375b7652f48956ffac98136de99df65af7a..d111af3353ecd0645ac1290601396b2b2c152844 100644 (file)
--- a/src/osdmaptool.cc
+++ b/src/osdmaptool.cc
@@ -35,15 +35,40 @@ void usage(const char *me)
   exit(1);
 }
 
-void printmap(const char *me, OSDMap *m)
+void printmap(const char *me, OSDMap *m, ostream& out)
 {
-  cout << me << ": osdmap: epoch " << m->get_epoch() << std::endl
-       << me << ": osdmap: fsid " << m->get_fsid() << std::endl;
-  /*for (unsigned i=0; i<m->mon_inst.size(); i++)
-    cout << me << ": osdmap:  " //<< "mon" << i << " " 
-        << m->mon_inst[i] << std::endl;
-  */
-}
+  out << "epoch " << m->get_epoch() << "\n"
+      << "fsid " << m->get_fsid() << "\n"
+      << "ctime " << m->get_ctime() << "\n"
+      << "mtime " << m->get_mtime() << "\n"
+      << std::endl;
+  out << "pg_num " << m->get_pg_num() << "\n"
+      << "pgp_num " << m->get_pgp_num() << "\n"
+      << "lpg_num " << m->get_lpg_num() << "\n"
+      << "lpgp_num " << m->get_lpgp_num() << "\n"
+      << "last_pg_change " << m->get_last_pg_change() << "\n"
+      << std::endl;
+  out << "max_osd " << m->get_max_osd() << "\n";
+  for (int i=0; i<m->get_max_osd(); i++) {
+    if (m->exists(i)) {
+      out << "osd" << i
+         << (m->is_in(i) ? " in":" out")
+         << (m->is_up(i) ? " up":" down");
+      if (m->is_up(i))
+       out << " " << m->get_addr(i);
+      out << " up_from " << m->get_up_from(i)
+         << " up_thru " << m->get_up_thru(i)
+         << "\n";
+    }
+  }
+  out << std::endl;
+  
+  // ignore pg_swap_primary
+  
+  out << "max_snap " << m->get_max_snap() << "\n"
+      << "removed_snaps " << m->get_removed_snaps() << "\n"
+      << std::endl;
+ }
 
 
 int main(int argc, const char **argv)
@@ -170,7 +195,7 @@ int main(int argc, const char **argv)
     osdmap.inc_epoch();
 
   if (print) 
-    printmap(me, &osdmap);
+    printmap(me, &osdmap, cout);
 
   if (modified) {
     bl.clear();

diff --git a/src/startnew.sh b/src/startnew.sh
index 28a4a163e813dadf8bfba941cfe0e3c088d4f487..dd5af5d44f515c3ae8fffc722263f138a39b13bf 100755 (executable)
--- a/src/startnew.sh
+++ b/src/startnew.sh
@@ -38,7 +38,7 @@ $CEPH_BIN/cmon $ARGS mondata/mon0 --debug_mon 10 --debug_ms 1
 
 
 # build and inject an initial osd map
-$CEPH_BIN/osdmaptool --clobber --createsimple .ceph_monmap 4 --print .ceph_osdmap
+$CEPH_BIN/osdmaptool --clobber --createsimple .ceph_monmap 4 .ceph_osdmap
 $CEPH_BIN/cmonctl osd setmap -i .ceph_osdmap
 
 for osd in 0 #1 2 3 

diff --git a/src/vstartnew.sh b/src/vstartnew.sh
index 57c040bca264b9ec33a4bf296a527352cd071e5a..b78dde2b3e72f4ded592cd1cc069205ceb958f93 100755 (executable)
--- a/src/vstartnew.sh
+++ b/src/vstartnew.sh
@@ -35,7 +35,7 @@ do
 done
 
 # build and inject an initial osd map
-$CEPH_BIN/osdmaptool --clobber --createsimple .ceph_monmap 4 --print .ceph_osdmap # --pgbits 2
+$CEPH_BIN/osdmaptool --clobber --createsimple .ceph_monmap 4 .ceph_osdmap # --pgbits 2
 $CEPH_BIN/cmonctl osd setmap -i .ceph_osdmap
 
 for osd in 0 #1 #2 3 #4 5 6 7 8 9 10 11 12 13 14 15