From: David Zafman <dzafman@redhat.com>
Date: Tue, 13 Oct 2015 22:33:26 +0000 (-0700)
Subject: tools/rados: Improve xattr import handling so future internal xattrs ignored
X-Git-Tag: v10.0.0~30^2~15
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9222f56403cf52ec161a38fc437a3f04c24d1625;p=ceph.git

tools/rados: Improve xattr import handling so future internal xattrs ignored

Signed-off-by: David Zafman <dzafman@redhat.com>
---

diff --git a/src/tools/rados/RadosImport.cc b/src/tools/rados/RadosImport.cc
index 1f74af2c86cd..b4b397b1d9c4 100644
--- a/src/tools/rados/RadosImport.cc
+++ b/src/tools/rados/RadosImport.cc
@@ -317,7 +317,9 @@ int RadosImport::get_object_rados(librados::IoCtx &ioctx, bufferlist &bl, bool n
         break;
       for (std::map<string,bufferlist>::iterator i = as.data.begin();
           i != as.data.end(); ++i) {
-        if (i->first == "_" || i->first == "snapset")
+	// The user xattrs that we want all begin with "_" with length > 1.
+        // Drop key "_" and all attributes that do not start with '_'
+        if (i->first == "_" || i->first[0] != '_')
           continue;
         ret = ioctx.setxattr(ob.hoid.hobj.oid.name, i->first.substr(1).c_str(), i->second);
         if (ret) {