From 85ed06e973bb7f75afe5b22ee9fc2746d8b77d44 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 27 Feb 2012 14:18:21 -0800 Subject: [PATCH] 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 --- src/osd/OSD.cc | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 5c83122016fc7..b1f4dabab43c6 100644 --- 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::iterator p = pool_resize.begin(); p != pool_resize.end(); p++) { dout(10) << " processing pool " << p->first << " resize" << dendl; - for (hash_map::iterator it = pg_map.begin(); - it != pg_map.end(); - it++) { - pg_t pgid = it->first; - PG *pg = it->second; - set 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::iterator it = pg_map.begin(); + it != pg_map.end(); + it++) { + pg_t pgid = it->first; + PG *pg = it->second; + set children; + if (pgid.is_split(p->second, pg->pool->info.pg_num, children)) { + do_split(pg, children, t, tfin); + } } } } -- 2.39.5