ceph_objectstore_tool: For import get object_info_t available for each object

Add object_info_t to object_begin so we have at object create time
This will be useful for importing from multiple erasure coded exports

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 05d916ed12f361da48ef73953bcc0cef465fcc2a)

diff --git a/src/tools/ceph_objectstore_tool.cc b/src/tools/ceph_objectstore_tool.cc
index 32a060316b34d281623bbb1d06adb362e18fb758..ddab16ff12ccde9035bbf4cc9e94544862bd92c6 100644 (file)
--- a/src/tools/ceph_objectstore_tool.cc
+++ b/src/tools/ceph_objectstore_tool.cc
@@ -203,6 +203,11 @@ struct pg_begin {
 
 struct object_begin {
   ghobject_t hoid;
+
+  // Duplicate what is in the OI_ATTR so we have it at the start
+  // of object processing.
+  object_info_t oi;
+
   object_begin(const ghobject_t &hoid): hoid(hoid) { }
   object_begin() { }
 
@@ -210,14 +215,15 @@ struct object_begin {
   // generation will be NO_GEN, shard_id will be NO_SHARD for a replicated
   // pool.  This means we will allow the decode by struct_v 1.
   void encode(bufferlist& bl) const {
-    ENCODE_START(2, 1, bl);
+    ENCODE_START(3, 1, bl);
     ::encode(hoid.hobj, bl);
     ::encode(hoid.generation, bl);
     ::encode(hoid.shard_id, bl);
+    ::encode(oi, bl);
     ENCODE_FINISH(bl);
   }
   void decode(bufferlist::iterator& bl) {
-    DECODE_START(2, bl);
+    DECODE_START(3, bl);
     ::decode(hoid.hobj, bl);
     if (struct_v > 1) {
       ::decode(hoid.generation, bl);
@@ -226,6 +232,9 @@ struct object_begin {
       hoid.generation = ghobject_t::NO_GEN;
       hoid.shard_id = ghobject_t::NO_SHARD;
     }
+    if (struct_v > 2) {
+      ::decode(oi, bl);
+    }
     DECODE_FINISH(bl);
   }
 };
@@ -828,6 +837,23 @@ int export_file(ObjectStore *store, coll_t cid, ghobject_t &obj)
     cerr << "size=" << total << std::endl;
 
   object_begin objb(obj);
+
+  {
+    bufferptr bp;
+    bufferlist bl;
+    ret = store->getattr(cid, obj, OI_ATTR, bp);
+    if (ret < 0) {
+      cerr << "getattr failure object_info " << ret << std::endl;
+      return ret;
+    }
+    bl.push_back(bp);
+    decode(objb.oi, bl);
+    if (debug)
+      cerr << "object_info: " << objb.oi << std::endl;
+  }
+
+  // XXX: Should we be checking for WHITEOUT or LOST in objb.oi.flags and skip?
+
   ret = write_section(TYPE_OBJECT_BEGIN, objb, file_fd);
   if (ret < 0)
     return ret;
@@ -1094,6 +1120,8 @@ int get_attrs(ObjectStore *store, coll_t coll, ghobject_t hoid,
     cerr << "\tattrs: len " << as.data.size() << std::endl;
   t->setattrs(coll, hoid, as.data);
 
+  // This could have been handled in the caller if we didn't need to
+  // support exports that didn't include object_info_t in object_begin.
   if (hoid.hobj.snap < CEPH_MAXSNAP && hoid.generation == ghobject_t::NO_GEN) {
     map<string,bufferptr>::iterator mi = as.data.find(OI_ATTR);
     if (mi != as.data.end()) {