From 8cd3f1cd2546a61bb5402fa374de7f37147dc3a0 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 20 Apr 2011 12:03:47 -0700 Subject: [PATCH] osd: drop 'casdata' bucket by default We don't use it for anything. It just means we create a bunch of useless PGs. Signed-off-by: Sage Weil --- src/client/SyntheticClient.cc | 12 ++++++------ src/mds/MDSMap.h | 6 +++--- src/mon/MDSMonitor.cc | 2 +- src/osd/OSDMap.cc | 1 - src/osd/osd_types.h | 1 - 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/client/SyntheticClient.cc b/src/client/SyntheticClient.cc index 4cd14b41e0ef2..d3975f816e8d7 100644 --- a/src/client/SyntheticClient.cc +++ b/src/client/SyntheticClient.cc @@ -1398,7 +1398,7 @@ int SyntheticClient::play_trace(Trace& t, string& prefix, bool metadata_only) int64_t ol = t.get_int(); object_t oid = file_object_t(oh, ol); lock.Lock(); - object_locator_t oloc(CEPH_CASDATA_RULE); + object_locator_t oloc(CEPH_DATA_RULE); uint64_t size; utime_t mtime; client->objecter->stat(oid, oloc, CEPH_NOSNAP, &size, &mtime, 0, new C_SafeCond(&lock, &cond, &ack)); @@ -1411,7 +1411,7 @@ int SyntheticClient::play_trace(Trace& t, string& prefix, bool metadata_only) int64_t off = t.get_int(); int64_t len = t.get_int(); object_t oid = file_object_t(oh, ol); - object_locator_t oloc(CEPH_CASDATA_RULE); + object_locator_t oloc(CEPH_DATA_RULE); lock.Lock(); bufferlist bl; client->objecter->read(oid, oloc, off, len, CEPH_NOSNAP, &bl, 0, new C_SafeCond(&lock, &cond, &ack)); @@ -1424,7 +1424,7 @@ int SyntheticClient::play_trace(Trace& t, string& prefix, bool metadata_only) int64_t off = t.get_int(); int64_t len = t.get_int(); object_t oid = file_object_t(oh, ol); - object_locator_t oloc(CEPH_CASDATA_RULE); + object_locator_t oloc(CEPH_DATA_RULE); lock.Lock(); bufferptr bp(len); bufferlist bl; @@ -1442,7 +1442,7 @@ int SyntheticClient::play_trace(Trace& t, string& prefix, bool metadata_only) int64_t off = t.get_int(); int64_t len = t.get_int(); object_t oid = file_object_t(oh, ol); - object_locator_t oloc(CEPH_CASDATA_RULE); + object_locator_t oloc(CEPH_DATA_RULE); lock.Lock(); SnapContext snapc; client->objecter->zero(oid, oloc, off, len, snapc, g_clock.now(), 0, @@ -2203,7 +2203,7 @@ int SyntheticClient::create_objects(int nobj, int osize, int inflight) if (time_to_stop()) break; object_t oid = file_object_t(999, i); - object_locator_t oloc(CEPH_CASDATA_RULE); + object_locator_t oloc(CEPH_DATA_RULE); SnapContext snapc; if (i % inflight == 0) { @@ -2304,7 +2304,7 @@ int SyntheticClient::object_rw(int nobj, int osize, int wrpc, o = (long)trunc(pow(r, rskew) * (double)nobj); // exponentially skew towards 0 } object_t oid = file_object_t(999, o); - object_locator_t oloc(CEPH_CASDATA_RULE); + object_locator_t oloc(CEPH_DATA_RULE); SnapContext snapc; client->client_lock.Lock(); diff --git a/src/mds/MDSMap.h b/src/mds/MDSMap.h index cb3e28cc33042..96e4363030708 100644 --- a/src/mds/MDSMap.h +++ b/src/mds/MDSMap.h @@ -169,7 +169,7 @@ protected: uint64_t max_file_size; vector<__u32> data_pg_pools; // file data pg_pools available to clients (via an ioctl). first is the default. - __u32 cas_pg_pool; // where CAS objects go + __s32 cas_pg_pool; // where CAS objects go __u32 metadata_pg_pool; // where fs metadata objects go /* @@ -197,7 +197,7 @@ public: public: MDSMap() : epoch(0), flags(0), last_failure(0), last_failure_osd_epoch(0), tableserver(0), root(0), - cas_pg_pool(0), metadata_pg_pool(0) { + cas_pg_pool(-1), metadata_pg_pool(0) { // hack.. this doesn't really belong here session_timeout = (int)g_conf.mds_session_timeout; session_autoclose = (int)g_conf.mds_session_autoclose; @@ -233,7 +233,7 @@ public: const vector<__u32> &get_data_pg_pools() const { return data_pg_pools; } __u32 get_data_pg_pool() const { return data_pg_pools[0]; } - __u32 get_cas_pg_pool() const { return cas_pg_pool; } + __s32 get_cas_pg_pool() const { return cas_pg_pool; } __u32 get_metadata_pg_pool() const { return metadata_pg_pool; } const map& get_mds_info() { return mds_info; } diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc index 96508f9971037..41f94887c87b0 100644 --- a/src/mon/MDSMonitor.cc +++ b/src/mon/MDSMonitor.cc @@ -59,7 +59,7 @@ void MDSMonitor::create_new_fs(MDSMap &m, int metadata_pool, int data_pool) m.created = g_clock.now(); m.data_pg_pools.push_back(data_pool); m.metadata_pg_pool = metadata_pool; - m.cas_pg_pool = CEPH_CASDATA_RULE; + m.cas_pg_pool = -1; m.compat = mdsmap_compat; print_map(m); } diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc index 95c342ed397f5..03d32d9c6e300 100644 --- a/src/osd/OSDMap.cc +++ b/src/osd/OSDMap.cc @@ -118,7 +118,6 @@ void OSDMap::build_simple(epoch_t e, ceph_fsid_t &fsid, map rulesets; rulesets[CEPH_DATA_RULE] = "data"; rulesets[CEPH_METADATA_RULE] = "metadata"; - rulesets[CEPH_CASDATA_RULE] = "casdata"; rulesets[CEPH_RBD_RULE] = "rbd"; for (map::iterator p = rulesets.begin(); p != rulesets.end(); p++) { diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h index ceb241db35574..0500e52d41e67 100644 --- a/src/osd/osd_types.h +++ b/src/osd/osd_types.h @@ -108,7 +108,6 @@ typedef uint16_t ps_t; enum { CEPH_DATA_RULE, CEPH_METADATA_RULE, - CEPH_CASDATA_RULE, CEPH_RBD_RULE, }; -- 2.39.5