mds: *_pg_pool -> *_pool

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/mds/CDir.cc b/src/mds/CDir.cc
index 4b1d3ef76bc07db21ab6f862c759dfcd207db8e1..b6ac1938f2659c6f262184b74b68b7bec9a116fb 100644 (file)
--- a/src/mds/CDir.cc
+++ b/src/mds/CDir.cc
@@ -1358,7 +1358,7 @@ void CDir::fetch(Context *c, const string& want_dn, bool ignore_authpinnability)
   // start by reading the first hunk of it
   C_Dir_Fetch *fin = new C_Dir_Fetch(this, want_dn);
   object_t oid = get_ondisk_object();
-  object_locator_t oloc(cache->mds->mdsmap->get_metadata_pg_pool());
+  object_locator_t oloc(cache->mds->mdsmap->get_metadata_pool());
   ObjectOperation rd;
   rd.tmap_get(&fin->bl, NULL);
   cache->mds->objecter->read(oid, oloc, rd, CEPH_NOSNAP, NULL, 0, fin);
@@ -1961,7 +1961,7 @@ void CDir::_commit(version_t want)
 
   SnapContext snapc;
   object_t oid = get_ondisk_object();
-  object_locator_t oloc(cache->mds->mdsmap->get_metadata_pg_pool());
+  object_locator_t oloc(cache->mds->mdsmap->get_metadata_pool());
 
   m.priority = CEPH_MSG_PRIO_LOW;  // set priority lower than journal!
 

diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc
index af70b681ffc750f3f74c395b5e80862beef63ca0..595892e1b98e7d0da4cee5af92dd0457d44bf2a6 100644 (file)
--- a/src/mds/CInode.cc
+++ b/src/mds/CInode.cc
@@ -904,7 +904,7 @@ void CInode::store(Context *fin)
   m.write_full(bl);
 
   object_t oid = CInode::get_object_name(ino(), frag_t(), ".inode");
-  object_locator_t oloc(mdcache->mds->mdsmap->get_metadata_pg_pool());
+  object_locator_t oloc(mdcache->mds->mdsmap->get_metadata_pool());
 
   mdcache->mds->objecter->mutate(oid, oloc, m, snapc, ceph_clock_now(g_ceph_context), 0,
                                 NULL, new C_Inode_Stored(this, get_version(), fin) );
@@ -938,7 +938,7 @@ void CInode::fetch(Context *fin)
   C_GatherBuilder gather(g_ceph_context, c);
 
   object_t oid = CInode::get_object_name(ino(), frag_t(), "");
-  object_locator_t oloc(mdcache->mds->mdsmap->get_metadata_pg_pool());
+  object_locator_t oloc(mdcache->mds->mdsmap->get_metadata_pool());
 
   ObjectOperation rd;
   rd.getxattr("inode", &c->bl, NULL);
@@ -1031,7 +1031,7 @@ void CInode::store_parent(Context *fin)
   SnapContext snapc;
 
   object_t oid = get_object_name(ino(), frag_t(), "");
-  object_locator_t oloc(mdcache->mds->mdsmap->get_metadata_pg_pool());
+  object_locator_t oloc(mdcache->mds->mdsmap->get_metadata_pool());
 
   mdcache->mds->objecter->mutate(oid, oloc, m, snapc, ceph_clock_now(g_ceph_context), 0,
                                 NULL, new C_Inode_StoredParent(this, inode.last_renamed_version, fin) );

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 58a8b8a2a3450707d1410dcb98722511e57444c2..c345b11e448e9ba6ff3f3f00b4b73fc08b2741e8 100644 (file)
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -266,10 +266,10 @@ void MDCache::remove_inode(CInode *o)
 void MDCache::init_layouts()
 {
   default_file_layout = g_default_file_layout;
-  default_file_layout.fl_pg_pool = mds->mdsmap->get_data_pg_pool();
+  default_file_layout.fl_pg_pool = mds->mdsmap->get_data_pool();
 
   default_log_layout = g_default_file_layout;
-  default_log_layout.fl_pg_pool = mds->mdsmap->get_metadata_pg_pool();
+  default_log_layout.fl_pg_pool = mds->mdsmap->get_metadata_pool();
 }
 
 CInode *MDCache::create_system_inode(inodeno_t ino, int mode)
@@ -314,7 +314,7 @@ CInode *MDCache::create_root_inode()
   CInode *i = create_system_inode(MDS_INO_ROOT, S_IFDIR|0755);
   i->default_layout = new struct default_file_layout;
   i->default_layout->layout = default_file_layout;
-  i->default_layout->layout.fl_pg_pool = mds->mdsmap->get_data_pg_pool();
+  i->default_layout->layout.fl_pg_pool = mds->mdsmap->get_data_pool();
   return i;
 }
 
@@ -5207,7 +5207,7 @@ void MDCache::_recovered(CInode *in, int r, uint64_t size, utime_t mtime)
 void MDCache::purge_prealloc_ino(inodeno_t ino, Context *fin)
 {
   object_t oid = CInode::get_object_name(ino, frag_t(), "");
-  object_locator_t oloc(mds->mdsmap->get_metadata_pg_pool());
+  object_locator_t oloc(mds->mdsmap->get_metadata_pool());
 
   dout(10) << "purge_prealloc_ino " << ino << " oid " << oid << dendl;
   SnapContext snapc;
@@ -7378,7 +7378,7 @@ void MDCache::find_ino_dir(inodeno_t ino, Context *fin)
 
   // get the backtrace from the dir
   object_t oid = CInode::get_object_name(ino, frag_t(), "");
-  object_locator_t oloc(mds->mdsmap->get_metadata_pg_pool());
+  object_locator_t oloc(mds->mdsmap->get_metadata_pool());
   
   C_MDS_FindInoDir *c = new C_MDS_FindInoDir(this, ino, fin);
   mds->objecter->getxattr(oid, oloc, "path", CEPH_NOSNAP, &c->bl, 0, c);

diff --git a/src/mds/MDLog.cc b/src/mds/MDLog.cc
index 4284b6dfdf1b928eaa28992ec0c53d7d610d1ade..0f79112400dfdfd5bff7382236f53414ba9c5309 100644 (file)
--- a/src/mds/MDLog.cc
+++ b/src/mds/MDLog.cc
@@ -81,7 +81,7 @@ void MDLog::init_journaler()
   
   // log streamer
   if (journaler) delete journaler;
-  journaler = new Journaler(ino, mds->mdsmap->get_metadata_pg_pool(), CEPH_FS_ONDISK_MAGIC, mds->objecter, 
+  journaler = new Journaler(ino, mds->mdsmap->get_metadata_pool(), CEPH_FS_ONDISK_MAGIC, mds->objecter,
                            logger, l_mdl_jlat,
                            &mds->timer);
   assert(journaler->is_readonly());

diff --git a/src/mds/MDSMap.cc b/src/mds/MDSMap.cc
index cb94d94f9752357fa8cf70d958212e54eca87acf..e6308fbc7f7ce4a21696fddfd98feee3594dd910 100644 (file)
--- a/src/mds/MDSMap.cc
+++ b/src/mds/MDSMap.cc
@@ -110,10 +110,10 @@ void MDSMap::dump(Formatter *f) const
   }
   f->close_section();
   f->open_array_section("data_pools");
-  for (vector<int64_t>::const_iterator p = data_pg_pools.begin(); p != data_pg_pools.end(); ++p)
+  for (vector<int64_t>::const_iterator p = data_pools.begin(); p != data_pools.end(); ++p)
     f->dump_int("pool", *p);
   f->close_section();
-  f->dump_int("metadata_pool", metadata_pg_pool);
+  f->dump_int("metadata_pool", metadata_pool);
 }
 
 void MDSMap::print(ostream& out) 
@@ -134,8 +134,8 @@ void MDSMap::print(ostream& out)
       << "up\t" << up << "\n"
       << "failed\t" << failed << "\n"
       << "stopped\t" << stopped << "\n";
-  out << "data_pools\t" << data_pg_pools << "\n";
-  out << "metadata_pool\t" << metadata_pg_pool << "\n";
+  out << "data_pools\t" << data_pools << "\n";
+  out << "metadata_pool\t" << metadata_pool << "\n";
 
   multimap< pair<unsigned,unsigned>, uint64_t > foo;
   for (map<uint64_t,mds_info_t>::iterator p = mds_info.begin();

diff --git a/src/mds/MDSMap.h b/src/mds/MDSMap.h
index 044449b291469cbb61c305a1d26d6e3fe21d7c18..ccf86a04612521dd446e7a99adf153762283e4fe 100644 (file)
--- a/src/mds/MDSMap.h
+++ b/src/mds/MDSMap.h
@@ -174,9 +174,9 @@ protected:
   __u32 session_autoclose;
   uint64_t max_file_size;
 
-  vector<int64_t> data_pg_pools;  // file data pg_pools available to clients (via an ioctl).  first is the default.
-  int64_t cas_pg_pool;            // where CAS objects go
-  int64_t metadata_pg_pool;       // where fs metadata objects go
+  vector<int64_t> data_pools;  // file data pools available to clients (via an ioctl).  first is the default.
+  int64_t cas_pool;            // where CAS objects go
+  int64_t metadata_pool;       // where fs metadata objects go
   
   /*
    * in: the set of logical mds #'s that define the cluster.  this is the set
@@ -207,8 +207,8 @@ public:
       session_timeout(0),
       session_autoclose(0),
       max_file_size(0),
-      cas_pg_pool(-1),
-      metadata_pg_pool(0),
+      cas_pool(-1),
+      metadata_pool(0),
       max_mds(0)
   { }
 
@@ -239,12 +239,12 @@ public:
   int get_tableserver() const { return tableserver; }
   int get_root() const { return root; }
 
-  const vector<int64_t> &get_data_pg_pools() const { return data_pg_pools; }
-  int64_t get_data_pg_pool() const { return data_pg_pools[0]; }
-  int64_t get_cas_pg_pool() const { return cas_pg_pool; }
-  int64_t get_metadata_pg_pool() const { return metadata_pg_pool; }
-  bool is_data_pg_pool(int64_t poolid) const {
-    return std::find(data_pg_pools.begin(), data_pg_pools.end(), poolid) != data_pg_pools.end();
+  const vector<int64_t> &get_data_pools() const { return data_pools; }
+  int64_t get_data_pool() const { return data_pools[0]; }
+  int64_t get_cas_pool() const { return cas_pool; }
+  int64_t get_metadata_pool() const { return metadata_pool; }
+  bool is_data_pool(int64_t poolid) const {
+    return std::find(data_pools.begin(), data_pools.end(), poolid) != data_pools.end();
   }
 
   const map<uint64_t,mds_info_t>& get_mds_info() { return mds_info; }
@@ -277,15 +277,15 @@ public:
   }
 
   // data pools
-  void add_data_pg_pool(int64_t poolid) {
-    data_pg_pools.push_back(poolid);
+  void add_data_pool(int64_t poolid) {
+    data_pools.push_back(poolid);
   }
-  int remove_data_pg_pool(int64_t poolid) {
-    for (vector<int64_t>::iterator p = data_pg_pools.begin();
-        p != data_pg_pools.end();
+  int remove_data_pool(int64_t poolid) {
+    for (vector<int64_t>::iterator p = data_pools.begin();
+        p != data_pools.end();
         ++p) {
       if (*p == poolid) {
-       data_pg_pools.erase(p);
+       data_pools.erase(p);
        return 0;
       }
     }
@@ -515,13 +515,13 @@ public:
     ::encode(max_file_size, bl);
     ::encode(max_mds, bl);
     ::encode(mds_info, bl);
-    __u32 n = data_pg_pools.size();
+    __u32 n = data_pools.size();
     ::encode(n, bl);
-    for (vector<int64_t>::const_iterator p = data_pg_pools.begin(); p != data_pg_pools.end(); ++p) {
+    for (vector<int64_t>::const_iterator p = data_pools.begin(); p != data_pools.end(); ++p) {
       n = *p;
       ::encode(n, bl);
     }
-    int32_t m = cas_pg_pool;
+    int32_t m = cas_pool;
     ::encode(m, bl);
   }
   void encode(bufferlist& bl) const {
@@ -536,14 +536,14 @@ public:
     ::encode(max_file_size, bl);
     ::encode(max_mds, bl);
     ::encode(mds_info, bl);
-    ::encode(data_pg_pools, bl);
-    ::encode(cas_pg_pool, bl);
+    ::encode(data_pools, bl);
+    ::encode(cas_pool, bl);
 
     // kclient ignores everything from here
     __u16 ev = 5;
     ::encode(ev, bl);
     ::encode(compat, bl);
-    ::encode(metadata_pg_pool, bl);
+    ::encode(metadata_pool, bl);
     ::encode(created, bl);
     ::encode(modified, bl);
     ::encode(tableserver, bl);
@@ -572,14 +572,14 @@ public:
       while (n--) {
        __u32 m;
        ::decode(m, p);
-       data_pg_pools.push_back(m);
+       data_pools.push_back(m);
       }
       __s32 s;
       ::decode(s, p);
-      cas_pg_pool = s;
+      cas_pool = s;
     } else {
-      ::decode(data_pg_pools, p);
-      ::decode(cas_pg_pool, p);
+      ::decode(data_pools, p);
+      ::decode(cas_pool, p);
     }
 
     // kclient ignores everything from here
@@ -593,9 +593,9 @@ public:
     if (ev < 5) {
       __u32 n;
       ::decode(n, p);
-      metadata_pg_pool = n;
+      metadata_pool = n;
     } else {
-      ::decode(metadata_pg_pool, p);
+      ::decode(metadata_pool, p);
     }
     ::decode(created, p);
     ::decode(modified, p);

diff --git a/src/mds/MDSTable.cc b/src/mds/MDSTable.cc
index ed08f25ac9493e1adc6bd3ecc653811730cf0162..6db2e9b071f8bfa5a7ece6ddd9164a7fd4f688c6 100644 (file)
--- a/src/mds/MDSTable.cc
+++ b/src/mds/MDSTable.cc
@@ -65,7 +65,7 @@ void MDSTable::save(Context *onfinish, version_t v)
   // write (async)
   SnapContext snapc;
   object_t oid = get_object_name();
-  object_locator_t oloc(mds->mdsmap->get_metadata_pg_pool());
+  object_locator_t oloc(mds->mdsmap->get_metadata_pool());
   mds->objecter->write_full(oid, oloc,
                            snapc,
                            bl, ceph_clock_now(g_ceph_context), 0,
@@ -128,7 +128,7 @@ void MDSTable::load(Context *onfinish)
 
   C_MT_Load *c = new C_MT_Load(this, onfinish);
   object_t oid = get_object_name();
-  object_locator_t oloc(mds->mdsmap->get_metadata_pg_pool());
+  object_locator_t oloc(mds->mdsmap->get_metadata_pool());
   mds->objecter->read_full(oid, oloc, CEPH_NOSNAP, &c->bl, 0, c);
 }
 

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index ec4fb01f01937c5ae3071b7b38291a89be18aa06..64e99a1e5a460ee802fefdbb401da56f1f76582c 100644 (file)
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -2624,7 +2624,7 @@ void Server::handle_client_openc(MDRequest *mdr)
     return;
   }
   if (!mds->osdmap->have_pg_pool(layout.fl_pg_pool) ||
-      !mds->mdsmap->is_data_pg_pool(layout.fl_pg_pool)) {
+      !mds->mdsmap->is_data_pool(layout.fl_pg_pool)) {
     dout(10) << " invalid data pool " << layout.fl_pg_pool << dendl;
     reply_request(mdr, -EINVAL);
     return;
@@ -3295,7 +3295,7 @@ void Server::handle_client_setlayout(MDRequest *mdr)
     return;
   }
   if (!mds->osdmap->have_pg_pool(layout.fl_pg_pool) ||
-      !mds->mdsmap->is_data_pg_pool(layout.fl_pg_pool)) {
+      !mds->mdsmap->is_data_pool(layout.fl_pg_pool)) {
     dout(10) << " invalid data pool " << layout.fl_pg_pool << dendl;
     reply_request(mdr, -EINVAL);
     return;
@@ -3372,7 +3372,7 @@ void Server::handle_client_setdirlayout(MDRequest *mdr)
     return;
   }
   if (!mds->osdmap->have_pg_pool(layout->layout.fl_pg_pool) ||
-      !mds->mdsmap->is_data_pg_pool(layout->layout.fl_pg_pool)) {
+      !mds->mdsmap->is_data_pool(layout->layout.fl_pg_pool)) {
     dout(10) << " invalid data pool " << layout->layout.fl_pg_pool << dendl;
     reply_request(mdr, -EINVAL);
     delete layout;

diff --git a/src/mds/SessionMap.cc b/src/mds/SessionMap.cc
index af150f1f6b939cb460a7defa5ff92b7b82922aba..aee47d11c4d387fd9cbba9e4bb556fe386b25406 100644 (file)
--- a/src/mds/SessionMap.cc
+++ b/src/mds/SessionMap.cc
@@ -70,7 +70,7 @@ void SessionMap::load(Context *onload)
   
   C_SM_Load *c = new C_SM_Load(this);
   object_t oid = get_object_name();
-  object_locator_t oloc(mds->mdsmap->get_metadata_pg_pool());
+  object_locator_t oloc(mds->mdsmap->get_metadata_pool());
   mds->objecter->read_full(oid, oloc, CEPH_NOSNAP, &c->bl, 0, c);
 }
 
@@ -120,7 +120,7 @@ void SessionMap::save(Context *onsave, version_t needv)
   committing = version;
   SnapContext snapc;
   object_t oid = get_object_name();
-  object_locator_t oloc(mds->mdsmap->get_metadata_pg_pool());
+  object_locator_t oloc(mds->mdsmap->get_metadata_pool());
 
   mds->objecter->write_full(oid, oloc,
                            snapc,

diff --git a/src/mds/SnapServer.cc b/src/mds/SnapServer.cc
index d15c6ad9dbf51745791c2bdd5b553873af2c0ad6..cca54e3eb845bc2f7ffdb5a9a948d242c3ff3440 100644 (file)
--- a/src/mds/SnapServer.cc
+++ b/src/mds/SnapServer.cc
@@ -115,8 +115,8 @@ void SnapServer::_commit(version_t tid)
     dout(7) << "commit " << tid << " destroy " << sn << " seq " << seq << dendl;
     snaps.erase(sn);
 
-    for (vector<int64_t>::const_iterator p = mds->mdsmap->get_data_pg_pools().begin();
-        p != mds->mdsmap->get_data_pg_pools().end();
+    for (vector<int64_t>::const_iterator p = mds->mdsmap->get_data_pools().begin();
+        p != mds->mdsmap->get_data_pools().end();
         p++) {
       need_to_purge[*p].insert(sn);
       need_to_purge[*p].insert(seq);

diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
index 72168ac963826c3abf5212029f232ccce5839599..f46e623ddeaf358adea6ee401690d672cfb550c7 100644 (file)
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@ -60,9 +60,9 @@ void MDSMonitor::create_new_fs(MDSMap &m, int metadata_pool, int data_pool)
 {
   m.max_mds = g_conf->max_mds;
   m.created = ceph_clock_now(g_ceph_context);
-  m.data_pg_pools.push_back(data_pool);
-  m.metadata_pg_pool = metadata_pool;
-  m.cas_pg_pool = -1;
+  m.data_pools.push_back(data_pool);
+  m.metadata_pool = metadata_pool;
+  m.cas_pool = -1;
   m.compat = get_mdsmap_compat_set();
 
   m.session_timeout = g_conf->mds_session_timeout;
@@ -915,14 +915,14 @@ bool MDSMonitor::prepare_command(MMonCommand *m)
       int64_t poolid = parse_pos_long(m->cmd[2].c_str(), &ss);
       if (poolid < 0)
        goto out;
-      pending_mdsmap.add_data_pg_pool(poolid);
+      pending_mdsmap.add_data_pool(poolid);
       ss << "added data pool " << poolid << " to mdsmap";
       r = 0;
     } else if (m->cmd[1] == "remove_data_pool" && m->cmd.size() == 3) {
       int64_t poolid = parse_pos_long(m->cmd[2].c_str(), &ss);
       if (poolid < 0)
        goto out;
-      r = pending_mdsmap.remove_data_pg_pool(poolid);
+      r = pending_mdsmap.remove_data_pool(poolid);
       if (r == 0)
        ss << "removed data pool " << poolid << " from mdsmap";
     } else if (m->cmd[1] == "newfs" && m->cmd.size() >= 4) {