tools: remove RadosDump::debug in favour of dout

This attribute was a hangover from objectstore-tool

Signed-off-by: John Spray <john.spray@redhat.com>

diff --git a/src/tools/RadosDump.h b/src/tools/RadosDump.h
index 60086ffd4f71a245387b1ece09ebd8800ff1dee2..92c0eeb85b45ac2c84319d7b608c4fe0b2bcd0c4 100644 (file)
--- a/src/tools/RadosDump.h
+++ b/src/tools/RadosDump.h
@@ -347,12 +347,11 @@ class RadosDump
   protected:
     int file_fd;
     super_header sh;
-    bool debug;  // FIXME set this somewhere
     bool dry_run;
 
   public:
     RadosDump(int file_fd_, bool dry_run_)
-      : file_fd(file_fd_), debug(true), dry_run(dry_run_)
+      : file_fd(file_fd_), dry_run(dry_run_)
     {}
 
     int read_super();

diff --git a/src/tools/RadosImport.cc b/src/tools/RadosImport.cc
index 0b54ae91cb06c46ec86a8ebd5f6f1275d84e404f..fcb352604163b9a80614a826a18ab0cec52d85fb 100644 (file)
--- a/src/tools/RadosImport.cc
+++ b/src/tools/RadosImport.cc
@@ -61,9 +61,7 @@ int RadosImport::import(std::string pool, bool no_overwrite)
       cerr << "Importing Erasure Coded shard is not supported" << std::endl;
       return -EOPNOTSUPP;
     }
-    if (debug) {
-      cerr << "Exported features: " << pgb.superblock.compat_features << std::endl;
-    }
+    dout(10) << "Exported features: " << pgb.superblock.compat_features << dendl;
     cout << "Importing from pgid " << pgid << std::endl;
   } else {
     cerr << "Invalid initial section code " << type << std::endl;
@@ -128,8 +126,7 @@ int RadosImport::import(std::string pool, bool no_overwrite)
       }
       break;
     case TYPE_PG_METADATA:
-      if (debug)
-        cout << "Don't care about the old metadata" << std::endl;
+      dout(10) << "Don't care about the old metadata" << dendl;
       found_metadata = true;
       break;
     case TYPE_PG_END:
@@ -236,8 +233,9 @@ int RadosImport::get_object_rados(librados::IoCtx &ioctx, bufferlist &bl, bool n
       alignment = ioctx.pool_required_alignment();
   }
 
-  if (debug && need_align)
-    cerr << "alignment = " << alignment << std::endl;
+  if (need_align) {
+    dout(10) << "alignment = " << alignment << dendl;
+  }
 
   bufferlist ebl, databl;
   uint64_t in_offset = 0, out_offset = 0;
@@ -260,8 +258,7 @@ int RadosImport::get_object_rados(librados::IoCtx &ioctx, bufferlist &bl, bool n
     switch(type) {
     case TYPE_DATA:
       ds.decode(ebliter);
-      if (debug)
-        cerr << "\tdata: offset " << ds.offset << " len " << ds.len << std::endl;
+      dout(10) << "\tdata: offset " << ds.offset << " len " << ds.len << dendl;
       if (need_align) {
         if (ds.offset != in_offset) {
           cerr << "Discontiguous object data in export" << std::endl;
@@ -272,7 +269,7 @@ int RadosImport::get_object_rados(librados::IoCtx &ioctx, bufferlist &bl, bool n
         in_offset += ds.len;
         if (databl.length() >= alignment) {
           uint64_t rndlen = uint64_t(databl.length() / alignment) * alignment;
-          if (debug) cerr << "write offset=" << out_offset << " len=" << rndlen << std::endl;
+          dout(10) << "write offset=" << out_offset << " len=" << rndlen << dendl;
           if (!dry_run && !skipping) {
             ret = ioctx.write(ob.hoid.hobj.oid.name, databl, rndlen, out_offset);
             if (ret) {
@@ -301,11 +298,11 @@ int RadosImport::get_object_rados(librados::IoCtx &ioctx, bufferlist &bl, bool n
     case TYPE_ATTRS:
       as.decode(ebliter);
 
-      if (debug)
-        cerr << "\tattrs: len " << as.data.size() << std::endl;
+      dout(10) << "\tattrs: len " << as.data.size() << dendl;
       if (dry_run || skipping)
         break;
-      for (i = as.data.begin(); i != as.data.end(); ++i) {
+      for (std::map<string,bufferlist>::iterator i = as.data.begin();
+          i != as.data.end(); ++i) {
         if (i->first == "_" || i->first == "snapset")
           continue;
         ret = ioctx.setxattr(ob.hoid.hobj.oid.name, i->first.substr(1).c_str(), i->second);
@@ -319,9 +316,8 @@ int RadosImport::get_object_rados(librados::IoCtx &ioctx, bufferlist &bl, bool n
     case TYPE_OMAP_HDR:
       oh.decode(ebliter);
 
-      if (debug)
-        cerr << "\tomap header: " << string(oh.hdr.c_str(), oh.hdr.length())
-          << std::endl;
+      dout(10) << "\tomap header: " << string(oh.hdr.c_str(), oh.hdr.length())
+        << dendl;
       if (dry_run || skipping)
         break;
       ret = ioctx.omap_set_header(ob.hoid.hobj.oid.name, oh.hdr);
@@ -334,8 +330,7 @@ int RadosImport::get_object_rados(librados::IoCtx &ioctx, bufferlist &bl, bool n
     case TYPE_OMAP:
       os.decode(ebliter);
 
-      if (debug)
-        cerr << "\tomap: size " << os.omap.size() << std::endl;
+      dout(10) << "\tomap: size " << os.omap.size() << dendl;
       if (dry_run || skipping)
         break;
       ret = ioctx.omap_set(ob.hoid.hobj.oid.name, os.omap);
@@ -349,7 +344,7 @@ int RadosImport::get_object_rados(librados::IoCtx &ioctx, bufferlist &bl, bool n
       done = true;
       if (need_align && databl.length() > 0) {
         assert(databl.length() < alignment);
-        if (debug) cerr << "END write offset=" << out_offset << " len=" << databl.length() << std::endl;
+        dout(10) << "END write offset=" << out_offset << " len=" << databl.length() << dendl;
         if (dry_run || skipping)
           break;
         ret = ioctx.write(ob.hoid.hobj.oid.name, databl, databl.length(), out_offset);