FileStore: remove user_only options from getattrs through the ObjectStore stack

This sort of awareness belongs at a higher level in the stack -- as
evidenced by nobody using the option at this level. Remove it from the
implementations and the interface

Signed-off-by: Greg Farnum <greg@inktank.com>

diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index b8967a8b6609627dd6658ff1dd5694f6f286ef98..6561fe92a6bdf0275c64de428dd96cb93e0172f3 100644 (file)
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -3700,7 +3700,7 @@ int FileStore::getattr(coll_t cid, const ghobject_t& oid, const char *name, buff
   }
 }
 
-int FileStore::getattrs(coll_t cid, const ghobject_t& oid, map<string,bufferptr>& aset, bool user_only)
+int FileStore::getattrs(coll_t cid, const ghobject_t& oid, map<string,bufferptr>& aset)
 {
   set<string> omap_attrs;
   map<string, bufferlist> omap_aset;
@@ -3719,7 +3719,7 @@ int FileStore::getattrs(coll_t cid, const ghobject_t& oid, map<string,bufferptr>
   if (r >= 0 && !strncmp(buf, XATTR_NO_SPILL_OUT, sizeof(XATTR_NO_SPILL_OUT)))
     spill_out = false;
 
-  r = _fgetattrs(**fd, aset, user_only);
+  r = _fgetattrs(**fd, aset, false);
   if (r < 0) {
     goto out;
   }
@@ -3752,16 +3752,7 @@ int FileStore::getattrs(coll_t cid, const ghobject_t& oid, map<string,bufferptr>
   for (map<string, bufferlist>::iterator i = omap_aset.begin();
         i != omap_aset.end();
         ++i) {
-    string key;
-    if (user_only) {
-       if (i->first[0] != '_')
-         continue;
-       if (i->first == "_")
-         continue;
-       key = i->first.substr(1, i->first.size());
-    } else {
-       key = i->first;
-    }
+    string key(i->first);
     aset.insert(make_pair(key,
                            bufferptr(i->second.c_str(), i->second.length())));
   }

diff --git a/src/os/FileStore.h b/src/os/FileStore.h
index 941b8d240aeed4818e320266269132f99d5c532e..30d6dc90b93da8741388a260b6d9b12efb42a261 100644 (file)
--- a/src/os/FileStore.h
+++ b/src/os/FileStore.h
@@ -494,7 +494,7 @@ public:
 
   // attrs
   int getattr(coll_t cid, const ghobject_t& oid, const char *name, bufferptr &bp);
-  int getattrs(coll_t cid, const ghobject_t& oid, map<string,bufferptr>& aset, bool user_only = false);
+  int getattrs(coll_t cid, const ghobject_t& oid, map<string,bufferptr>& aset);
 
   int _setattrs(coll_t cid, const ghobject_t& oid, map<string,bufferptr>& aset,
                const SequencerPosition &spos);

diff --git a/src/os/KeyValueStore.cc b/src/os/KeyValueStore.cc
index 08af6391196d0393892848acfa8f21dada1ec2cb..598556acc3b65256532037fe678419fc45b4d305 100644 (file)
--- a/src/os/KeyValueStore.cc
+++ b/src/os/KeyValueStore.cc
@@ -2019,7 +2019,7 @@ int KeyValueStore::getattr(coll_t cid, const ghobject_t& oid, const char *name,
 }
 
 int KeyValueStore::getattrs(coll_t cid, const ghobject_t& oid,
-                           map<string,bufferptr>& aset, bool user_only)
+                           map<string,bufferptr>& aset)
 {
   int r;
   map<string, bufferlist> attr_aset;
@@ -2036,15 +2036,7 @@ int KeyValueStore::getattrs(coll_t cid, const ghobject_t& oid,
   for (map<string, bufferlist>::iterator i = attr_aset.begin();
        i != attr_aset.end(); ++i) {
     string key;
-    if (user_only) {
-      if (i->first[0] != '_')
-        continue;
-      if (i->first == "_")
-        continue;
-      key = i->first.substr(1, i->first.size());
-    } else {
-      key = i->first;
-    }
+    key = i->first;
     aset.insert(make_pair(key,
                 bufferptr(i->second.c_str(), i->second.length())));
   }

diff --git a/src/os/KeyValueStore.h b/src/os/KeyValueStore.h
index 02574596954a77bcba5bb300310dd10651058fbc..1c6981501e798792aa6397ac575d98fa83390a43 100644 (file)
--- a/src/os/KeyValueStore.h
+++ b/src/os/KeyValueStore.h
@@ -491,8 +491,7 @@ class KeyValueStore : public ObjectStore,
   // attrs
   int getattr(coll_t cid, const ghobject_t& oid, const char *name,
               bufferptr &bp);
-  int getattrs(coll_t cid, const ghobject_t& oid, map<string,bufferptr>& aset,
-               bool user_only = false);
+  int getattrs(coll_t cid, const ghobject_t& oid, map<string,bufferptr>& aset);
 
   int _setattrs(coll_t cid, const ghobject_t& oid,
                 map<string, bufferptr>& aset, BufferTransaction &t);

diff --git a/src/os/MemStore.cc b/src/os/MemStore.cc
index fa75542be425f33e28ab6ca24c86ccecc38fae32..cdef5b51d9c77b4ffc40b99051d169dc1734edad 100644 (file)
--- a/src/os/MemStore.cc
+++ b/src/os/MemStore.cc
@@ -358,7 +358,7 @@ int MemStore::getattr(coll_t cid, const ghobject_t& oid,
 }
 
 int MemStore::getattrs(coll_t cid, const ghobject_t& oid,
-                      map<string,bufferptr>& aset, bool user_only)
+                      map<string,bufferptr>& aset)
 {
   dout(10) << __func__ << " " << cid << " " << oid << dendl;
   CollectionRef c = get_collection(cid);
@@ -369,17 +369,7 @@ int MemStore::getattrs(coll_t cid, const ghobject_t& oid,
   ObjectRef o = c->get_object(oid);
   if (!o)
     return -ENOENT;
-  if (user_only) {
-    for (map<string,bufferptr>::iterator p = o->xattr.begin();
-        p != o->xattr.end();
-        ++p) {
-      if (p->first.length() > 1 && p->first[0] == '_') {
-       aset[p->first.substr(1)] = p->second;
-      }
-    }
-  } else {
-    aset = o->xattr;
-  }
+  aset = o->xattr;
   return 0;
 }
 

diff --git a/src/os/MemStore.h b/src/os/MemStore.h
index c33dd04ca9353e217c96b987a73be84585a0ac80..77170b82f69b5e9c6e2703bad4cd915bdd27fd05 100644 (file)
--- a/src/os/MemStore.h
+++ b/src/os/MemStore.h
@@ -281,7 +281,7 @@ public:
     bool allow_eio = false);
   int fiemap(coll_t cid, const ghobject_t& oid, uint64_t offset, size_t len, bufferlist& bl);
   int getattr(coll_t cid, const ghobject_t& oid, const char *name, bufferptr& value);
-  int getattrs(coll_t cid, const ghobject_t& oid, map<string,bufferptr>& aset, bool user_only = false);
+  int getattrs(coll_t cid, const ghobject_t& oid, map<string,bufferptr>& aset);
 
   int list_collections(vector<coll_t>& ls);
   bool collection_exists(coll_t c);

diff --git a/src/os/ObjectStore.h b/src/os/ObjectStore.h
index 6e9a122f589651fb5617f3e3942e3bbba2a5d628..1a7645938d6c6b0412a427a5afd366a59886fa46 100644 (file)
--- a/src/os/ObjectStore.h
+++ b/src/os/ObjectStore.h
@@ -1342,10 +1342,9 @@ public:
    * @param cid collection for object
    * @param oid oid of object
    * @param aset place to put output result.
-   * @param user_only true -> only user attributes are return else all attributes are returned
    * @returns 0 on success, negative error code on failure.
    */
-  virtual int getattrs(coll_t cid, const ghobject_t& oid, map<string,bufferptr>& aset, bool user_only = false) = 0;
+  virtual int getattrs(coll_t cid, const ghobject_t& oid, map<string,bufferptr>& aset) = 0;
 
   /**
    * getattrs -- get all of the xattrs of an object
@@ -1353,12 +1352,11 @@ public:
    * @param cid collection for object
    * @param oid oid of object
    * @param aset place to put output result.
-   * @param user_only true -> only user attributes are return else all attributes are returned
    * @returns 0 on success, negative error code on failure.
    */
-  int getattrs(coll_t cid, const ghobject_t& oid, map<string,bufferlist>& aset, bool user_only = false) {
+  int getattrs(coll_t cid, const ghobject_t& oid, map<string,bufferlist>& aset) {
     map<string,bufferptr> bmap;
-    int r = getattrs(cid, oid, bmap, user_only);
+    int r = getattrs(cid, oid, bmap);
     for (map<string,bufferptr>::iterator i = bmap.begin();
        i != bmap.end();
        ++i) {

diff --git a/src/tools/ceph_filestore_dump.cc b/src/tools/ceph_filestore_dump.cc
index 7ea6395b5d8f99309e223e8ae84a04b93cec283d..425dd68b39570008fb6ca268087fd9c135e88400 100644 (file)
--- a/src/tools/ceph_filestore_dump.cc
+++ b/src/tools/ceph_filestore_dump.cc
@@ -625,7 +625,7 @@ int export_file(ObjectStore *store, coll_t cid, ghobject_t &obj)
 
   //Handle attrs for this object
   map<string,bufferptr> aset;
-  ret = store->getattrs(cid, obj, aset, false);
+  ret = store->getattrs(cid, obj, aset);
   if (ret) return ret;
   attr_section as(aset);
   ret = write_section(TYPE_ATTRS, as, file_fd);