os/bluestore: Add printing buffers to Blob

Now printing Blob can include buffers.
There are 2 variants:
- 'buf' same as original in dump_onode
- 'sbuf' only fundamental params, no ptr etc.

Signed-off-by: Adam Kupczyk <akupczyk@ibm.com>

diff --git a/src/os/bluestore/BlueStore.h b/src/os/bluestore/BlueStore.h
index 86cfdbebc0efec993938664ce38e0ae48cbc44f1..597aa5df133a54e630f3d00e9c62974f3d756096 100644 (file)
--- a/src/os/bluestore/BlueStore.h
+++ b/src/os/bluestore/BlueStore.h
@@ -275,14 +275,16 @@ public:
   };
 
   struct printer {
-    static constexpr uint8_t ptr = 1;   // pointer to Blob
-    static constexpr uint8_t nick = 2;  // a nickname of this Blob
-    static constexpr uint8_t disk = 4;  // disk allocations of Blob
-    static constexpr uint8_t sdisk = 8; // shortened version of disk allocaitons
-    static constexpr uint8_t use = 16;  // use tracker
-    static constexpr uint8_t suse = 32; // shortened use tracker
-    static constexpr uint8_t chk = 64;  // checksum, full dump
-    static constexpr uint8_t schk = 128; // only base checksum info
+    static constexpr uint16_t ptr = 1;   // pointer to Blob
+    static constexpr uint16_t nick = 2;  // a nickname of this Blob
+    static constexpr uint16_t disk = 4;  // disk allocations of Blob
+    static constexpr uint16_t sdisk = 8; // shortened version of disk allocaitons
+    static constexpr uint16_t use = 16;  // use tracker
+    static constexpr uint16_t suse = 32; // shortened use tracker
+    static constexpr uint16_t chk = 64;  // checksum, full dump
+    static constexpr uint16_t schk = 128; // only base checksum info
+    static constexpr uint16_t buf = 256;  // print Blob's buffers (takes cache lock)
+    static constexpr uint16_t sbuf = 512; // short print Blob's buffers (takes cache lock)
   };
 
   /// cached buffer
@@ -302,6 +304,16 @@ public:
       default: return "???";
       }
     }
+    // Short version of state name.
+    // Not print "clean", as it is most frequent.
+    static const char *get_state_name_short(int s) {
+      switch (s) {
+      case STATE_EMPTY: return "empty";
+      case STATE_CLEAN: return "";
+      case STATE_WRITING: return "writing";
+      default: return "???";
+      }
+    }
     enum {
       FLAG_NOCACHE = 1,  ///< trim when done WRITING (do not become CLEAN)
       // NOTE: fix operator<< when you define a second flag
@@ -650,12 +662,12 @@ public:
     friend std::ostream& operator<<(std::ostream& out, const Blob &b);
     struct printer : public BlueStore::printer {
       const Blob& blob;
-      uint8_t mode;
-      printer(const Blob& blob, uint8_t mode)
+      uint16_t mode;
+      printer(const Blob& blob, uint16_t mode)
       :blob(blob), mode(mode) {}
     };
     friend std::ostream& operator<<(std::ostream& out, const printer &p);
-    printer print(uint8_t mode) const {
+    printer print(uint16_t mode) const {
       return printer(*this, mode);
     }
     const bluestore_blob_use_tracker_t& get_blob_use_tracker() const {

diff --git a/src/os/bluestore/BlueStore_debug.cc b/src/os/bluestore/BlueStore_debug.cc
index add6dcf5128e15c95962262529a85f1109b43dc5..5ffef20a52bc33a7a2e950d1d775776410001b1b 100644 (file)
--- a/src/os/bluestore/BlueStore_debug.cc
+++ b/src/os/bluestore/BlueStore_debug.cc
@@ -80,6 +80,7 @@ std::ostream &operator<<(std::ostream &out, const maybe_K &k) {
   return out;
 }
 
+std::ostream& operator<<(std::ostream& out, const BlueStore::Buffer& b);
 std::ostream& operator<<(std::ostream& out, const BlueStore::Blob::printer &p)
 {
   using P = BlueStore::printer;
@@ -211,6 +212,29 @@ std::ostream& operator<<(std::ostream& out, const BlueStore::Blob::printer &p)
     out << " (shared_blob=NULL)";
   }
   out << ")";
+  // here printing Buffers
+  if (p.mode & (P::buf | P::sbuf)) {
+    std::lock_guard l(p.blob.shared_blob->get_cache()->lock);
+    if (p.mode & P::sbuf) {
+      // summary buf mode, only print what is mapped what options are, one liner
+      out << "bufs(";
+      for (auto& i : p.blob.get_bc().buffer_map) {
+        out << "0x" << std::hex << i.first << "~" << i.second->length << std::dec
+          << "," << BlueStore::Buffer::get_state_name_short(i.second->state);
+        if (i.second->flags) {
+          out << "," << BlueStore::Buffer::get_flag_name(i.second->flags);
+        }
+        out << " ";
+      }
+      out << ")";
+    } else {
+      for (auto& i : p.blob.get_bc().buffer_map) {
+        out << std::endl << "  0x" << std::hex << i.first
+          << "~" << i.second->length << std::dec
+          << " " << *(i.second);
+      }
+    }
+  }
   return out;
 }