osd: bypass split code

Until it is fully implemented.  It's also disabled in the monitor
currently, but just in case it gets into the OSDMap, do nothing for now.

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 5c83122016fc713577694d08f5898a8c00d37f4f..b1f4dabab43c65b55e166487f1bfe375e40201b4 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -3646,14 +3646,17 @@ void OSD::advance_map(ObjectStore::Transaction& t, C_Contexts *tfin)
   // do splits?
   for (map<int64_t,int>::iterator p = pool_resize.begin(); p != pool_resize.end(); p++) {
     dout(10) << " processing pool " << p->first << " resize" << dendl;
-    for (hash_map<pg_t,PG*>::iterator it = pg_map.begin();
-        it != pg_map.end();
-        it++) {
-      pg_t pgid = it->first;
-      PG *pg = it->second;
-      set<pg_t> children;
-      if (pgid.is_split(p->second, pg->pool->info.pg_num, children)) {
-       do_split(pg, children, t, tfin);
+    clog.error() << "ignoring pool " << p->first << " resize; not fully implemented\n";
+    if (false) {
+      for (hash_map<pg_t,PG*>::iterator it = pg_map.begin();
+          it != pg_map.end();
+          it++) {
+       pg_t pgid = it->first;
+       PG *pg = it->second;
+       set<pg_t> children;
+       if (pgid.is_split(p->second, pg->pool->info.pg_num, children)) {
+         do_split(pg, children, t, tfin);
+       }
       }
     }
   }