Merge PR ceph#52623 into main

vshankar · vshankar · commit 2d93ad5a87a7 · 2024-09-30T12:28:05.000+05:30
* refs/pull/52623/head:
	ceph-dencoder: MDS - Add missing types

Reviewed-by: Venky Shankar &lt;vshankar@redhat.com&gt;
diff --git a/src/include/cephfs/metrics/Types.h b/src/include/cephfs/metrics/Types.h
@@ -688,6 +688,10 @@ struct ClientMetricMessage {
     apply_visitor(DumpPayloadVisitor(f), payload);
   }
 
+  static void generate_test_instances(std::list<ClientMetricMessage*>& ls) {
+    ls.push_back(new ClientMetricMessage(CapInfoPayload(1, 2, 3)));
+  }
+
   void print(std::ostream *out) const {
     apply_visitor(PrintPayloadVisitor(out), payload);
   }
diff --git a/src/include/cephfs/types.h b/src/include/cephfs/types.h
@@ -226,7 +226,6 @@ struct vinodeno_t {
     ls.push_back(new vinodeno_t);
     ls.push_back(new vinodeno_t(1, 2));
   }
-
   inodeno_t ino;
   snapid_t snapid;
 };
@@ -371,7 +370,6 @@ struct inline_data_t {
   void decode(ceph::buffer::list::const_iterator& bl);
   void dump(ceph::Formatter *f) const;
   static void generate_test_instances(std::list<inline_data_t*>& ls);
-
   version_t version = 1;
 
 private:
diff --git a/src/mds/Capability.cc b/src/mds/Capability.cc
@@ -73,14 +73,8 @@ void Capability::Export::dump(ceph::Formatter *f) const
 
 void Capability::Export::generate_test_instances(std::list<Capability::Export*>& ls)
 {
-  ls.push_back(new Export);
-  ls.push_back(new Export);
-  ls.back()->wanted = 1;
-  ls.back()->issued = 2;
-  ls.back()->pending = 3;
-  ls.back()->client_follows = 4;
-  ls.back()->mseq = 5;
-  ls.back()->last_issue_stamp = utime_t(6, 7);
+  ls.push_back(new Export());
+  ls.push_back(new Export(1, 2, 3, 4, 5, 6, 7, utime_t(8, 9), 10));
 }
 
 void Capability::Import::encode(ceph::buffer::list &bl) const
@@ -108,6 +102,11 @@ void Capability::Import::dump(ceph::Formatter *f) const
   f->dump_unsigned("migrate_seq", mseq);
 }
 
+void Capability::Import::generate_test_instances(std::list<Capability::Import*>& ls)
+{
+  ls.push_back(new Import());
+  ls.push_back(new Import(1, 2, 3));
+}
 /*
  * Capability::revoke_info
  */
diff --git a/src/mds/Capability.h b/src/mds/Capability.h
@@ -100,6 +100,7 @@ class Capability : public Counter<Capability> {
     void encode(ceph::buffer::list &bl) const;
     void decode(ceph::buffer::list::const_iterator &p);
     void dump(ceph::Formatter *f) const;
+    static void generate_test_instances(std::list<Import*>& ls);
 
     int64_t cap_id = 0;
     ceph_seq_t issue_seq = 0;
diff --git a/src/mds/FSMap.cc b/src/mds/FSMap.cc
@@ -115,6 +115,14 @@ void MirrorInfo::dump(ceph::Formatter *f) const {
   f->close_section(); // peers
 }
 
+void MirrorInfo::generate_test_instances(std::list<MirrorInfo*>& ls) {
+  ls.push_back(new MirrorInfo());
+  ls.push_back(new MirrorInfo());
+  ls.back()->mirrored = true;
+  ls.back()->peers.insert(Peer());
+  ls.back()->peers.insert(Peer());
+}
+
 void MirrorInfo::print(std::ostream& out) const {
   out << "[peers=" << peers << "]" << std::endl;
 }
diff --git a/src/mds/FSMap.h b/src/mds/FSMap.h
@@ -169,6 +169,7 @@ struct MirrorInfo {
   Peers peers;
 
   void dump(ceph::Formatter *f) const;
+  static void generate_test_instances(std::list<MirrorInfo*>& ls);
   void print(std::ostream& out) const;
 
   void encode(ceph::buffer::list &bl) const;
diff --git a/src/mds/PurgeQueue.cc b/src/mds/PurgeQueue.cc
@@ -99,6 +99,17 @@ void PurgeItem::decode(bufferlist::const_iterator &p)
   DECODE_FINISH(p);
 }
 
+void PurgeItem::generate_test_instances(std::list<PurgeItem*>& ls) {
+  ls.push_back(new PurgeItem());
+  ls.push_back(new PurgeItem());
+  ls.back()->action = PurgeItem::PURGE_FILE;
+  ls.back()->ino = 1;
+  ls.back()->size = 2;
+  ls.back()->layout = file_layout_t();
+  ls.back()->old_pools = {1, 2};
+  ls.back()->snapc = SnapContext();
+  ls.back()->stamp = utime_t(3, 4);
+}
 // if Objecter has any slow requests, take that as a hint and
 // slow down our rate of purging
 PurgeQueue::PurgeQueue(
diff --git a/src/mds/PurgeQueue.h b/src/mds/PurgeQueue.h
@@ -61,6 +61,7 @@ class PurgeItem
     fragtree.dump(f);
     f->close_section();
   }
+  static void generate_test_instances(std::list<PurgeItem*>& ls);
 
   std::string_view get_type_str() const;
 
diff --git a/src/mds/SessionMap.h b/src/mds/SessionMap.h
@@ -574,7 +574,6 @@ class SessionMapStore {
   }
 
   static void generate_test_instances(std::list<SessionMapStore*>& ls);
-
   void reset_state()
   {
     session_map.clear();
diff --git a/src/mds/SimpleLock.cc b/src/mds/SimpleLock.cc
@@ -43,6 +43,13 @@ void SimpleLock::dump(ceph::Formatter *f) const {
   f->close_section();
 }
 
+void SimpleLock::generate_test_instances(std::list<SimpleLock*>& ls) {
+  ls.push_back(new SimpleLock);
+  ls.push_back(new SimpleLock);
+  ls.back()->set_state(LOCK_SYNC);
+}
+
+
 int SimpleLock::get_wait_shift() const {
   switch (get_type()) {
     case CEPH_LOCK_DN:       return 0;
diff --git a/src/mds/SimpleLock.h b/src/mds/SimpleLock.h
@@ -175,6 +175,12 @@ class SimpleLock {
     }
   }
 
+  //for dencoder only
+  SimpleLock() :
+    type(nullptr),
+    parent(nullptr)
+  {}
+
   SimpleLock(MDSCacheObject *o, const LockType *lt) :
     type(lt),
     parent(o)
@@ -199,8 +205,8 @@ class SimpleLock {
 
   // parent
   MDSCacheObject *get_parent() { return parent; }
-  int get_type() const { return type->type; }
-  const sm_t* get_sm() const { return type->sm; }
+  int get_type() const { return (type != nullptr) ? type->type : 0; }
+  const sm_t* get_sm() const { return (type != nullptr) ? type->sm : nullptr; }
 
   int get_cap_shift() const;
   int get_cap_mask() const;
@@ -493,6 +499,7 @@ class SimpleLock {
       encode(empty_gather_set, bl);
     ENCODE_FINISH(bl);
   }
+  
   void decode(ceph::buffer::list::const_iterator& p) {
     DECODE_START(2, p);
     decode(state, p);
@@ -588,6 +595,7 @@ class SimpleLock {
    * to formatter, or nothing if is_sync_and_unlocked.
    */
   void dump(ceph::Formatter *f) const;
+  static void generate_test_instances(std::list<SimpleLock*>& ls);
 
   virtual void print(std::ostream& out) const {
     out << "(";
diff --git a/src/mds/flock.cc b/src/mds/flock.cc
@@ -37,6 +37,50 @@ ceph_lock_state_t::~ceph_lock_state_t()
   }
 }
 
+void ceph_lock_state_t::dump(ceph::Formatter *f) const {
+  f->dump_int("type", type);
+  f->dump_int("held_locks", held_locks.size());
+  for (auto &p : held_locks) {
+    f->open_object_section("lock");
+    f->dump_int("start", p.second.start);
+    f->dump_int("length", p.second.length);
+    f->dump_int("client", p.second.client);
+    f->dump_int("owner", p.second.owner);
+    f->dump_int("pid", p.second.pid);
+    f->dump_int("type", p.second.type);
+    f->close_section();
+  }
+  f->dump_int("waiting_locks", waiting_locks.size());
+  for (auto &p : waiting_locks) {
+    f->open_object_section("lock");
+    f->dump_int("start", p.second.start);
+    f->dump_int("length", p.second.length);
+    f->dump_int("client", p.second.client);
+    f->dump_int("owner", p.second.owner);
+    f->dump_int("pid", p.second.pid);
+    f->dump_int("type", p.second.type);
+    f->close_section();
+  }
+  f->dump_int("client_held_lock_counts", client_held_lock_counts.size());
+  for (auto &p : client_held_lock_counts) {
+    f->open_object_section("client");
+    f->dump_int("client_id", p.first.v);
+    f->dump_int("count", p.second);
+    f->close_section();
+  }
+  f->dump_int("client_waiting_lock_counts", client_waiting_lock_counts.size());
+}
+
+
+void ceph_lock_state_t::generate_test_instances(std::list<ceph_lock_state_t*>& ls) {
+  ls.push_back(new ceph_lock_state_t(NULL, 0));
+  ls.push_back(new ceph_lock_state_t(NULL, 1));
+  ls.back()->held_locks.insert(std::make_pair(1, ceph_filelock()));
+  ls.back()->waiting_locks.insert(std::make_pair(1, ceph_filelock()));
+  ls.back()->client_held_lock_counts.insert(std::make_pair(1, 1));
+  ls.back()->client_waiting_lock_counts.insert(std::make_pair(1, 1));
+}
+
 bool ceph_lock_state_t::is_waiting(const ceph_filelock &fl) const
 {
   auto p = waiting_locks.find(fl.start);
diff --git a/src/mds/flock.h b/src/mds/flock.h
@@ -71,6 +71,7 @@ inline bool operator!=(const ceph_filelock& l, const ceph_filelock& r) {
 class ceph_lock_state_t {
 public:
   explicit ceph_lock_state_t(CephContext *cct_, int type_) : cct(cct_), type(type_) {}
+  ceph_lock_state_t() : cct(NULL), type(0) {}
   ~ceph_lock_state_t();
   /**
    * Check if a lock is on the waiting_locks list.
@@ -132,6 +133,8 @@ class ceph_lock_state_t {
     decode(held_locks, bl);
     decode(client_held_lock_counts, bl);
   }
+  void dump(ceph::Formatter *f) const;
+  static void generate_test_instances(std::list<ceph_lock_state_t*>& ls);
   bool empty() const {
     return held_locks.empty() && waiting_locks.empty() &&
 	   client_held_lock_counts.empty() &&
diff --git a/src/mds/mdstypes.cc b/src/mds/mdstypes.cc
@@ -528,6 +528,15 @@ void feature_bitset_t::dump(Formatter *f) const {
   f->dump_string("feature_bits", css->strv());
 }
 
+void feature_bitset_t::generate_test_instances(std::list<feature_bitset_t*>& ls)
+{
+  ls.push_back(new feature_bitset_t());
+  ls.push_back(new feature_bitset_t());
+  ls.back()->_vec.push_back(1);
+  ls.back()->_vec.push_back(2);
+  ls.back()->_vec.push_back(3);
+}
+
 void feature_bitset_t::print(ostream& out) const
 {
   std::ios_base::fmtflags f(out.flags());
@@ -564,6 +573,13 @@ void metric_spec_t::dump(Formatter *f) const {
   f->dump_object("metric_flags", metric_flags);
 }
 
+void metric_spec_t::generate_test_instances(std::list<metric_spec_t*>& ls)
+{
+  ls.push_back(new metric_spec_t());
+  ls.push_back(new metric_spec_t());
+  ls.back()->metric_flags = 1;
+}
+
 void metric_spec_t::print(ostream& out) const
 {
   out << "{metric_flags: '" << metric_flags << "'}";
@@ -601,6 +617,16 @@ void client_metadata_t::dump(Formatter *f) const
     f->dump_string(name.c_str(), val);
 }
 
+void client_metadata_t::generate_test_instances(std::list<client_metadata_t*>& ls)
+{
+  ls.push_back(new client_metadata_t());
+  ls.push_back(new client_metadata_t());
+  ls.back()->kv_map["key1"] = "val1";
+  ls.back()->kv_map["key2"] = "val2";
+  ls.back()->features = 0x12345678;
+  ls.back()->metric_spec.metric_flags = 0x12345678;
+}
+
 /*
  * session_info_t
  */
diff --git a/src/mds/mdstypes.h b/src/mds/mdstypes.h
@@ -349,6 +349,7 @@ class feature_bitset_t {
   void decode(ceph::buffer::list::const_iterator &p);
   void dump(ceph::Formatter *f) const;
   void print(std::ostream& out) const;
+  static void generate_test_instances(std::list<feature_bitset_t*>& ls);
 private:
   void init_array(const std::vector<size_t>& v);
 
@@ -387,6 +388,7 @@ struct metric_spec_t {
   void encode(ceph::buffer::list& bl) const;
   void decode(ceph::buffer::list::const_iterator& p);
   void dump(ceph::Formatter *f) const;
+  static void generate_test_instances(std::list<metric_spec_t*>& ls);
   void print(std::ostream& out) const;
 
   // set of metrics that a client is capable of forwarding
@@ -433,6 +435,7 @@ struct client_metadata_t {
   void encode(ceph::buffer::list& bl) const;
   void decode(ceph::buffer::list::const_iterator& p);
   void dump(ceph::Formatter *f) const;
+  static void generate_test_instances(std::list<client_metadata_t*>& ls);
 
   kv_map_t kv_map;
   feature_bitset_t features;
@@ -634,7 +637,10 @@ struct metareqid_t {
   void print(std::ostream& out) const {
     out << name << ":" << tid;
   }
-
+  static void generate_test_instances(std::list<metareqid_t*>& ls) {
+    ls.push_back(new metareqid_t);
+    ls.push_back(new metareqid_t(entity_name_t::CLIENT(123), 456));
+  }
   entity_name_t name;
   uint64_t tid = 0;
 };
@@ -786,6 +792,15 @@ struct dirfrag_t {
     decode(ino, bl);
     decode(frag, bl);
   }
+  void dump(ceph::Formatter *f) const {
+    f->dump_unsigned("ino", ino);
+    f->dump_unsigned("frag", frag);
+  }
+  static void generate_test_instances(std::list<dirfrag_t*>& ls) {
+    ls.push_back(new dirfrag_t);
+    ls.push_back(new dirfrag_t(1, frag_t()));
+    ls.push_back(new dirfrag_t(2, frag_t(3)));
+  }
 
   inodeno_t ino = 0;
   frag_t frag;
diff --git a/src/messages/MMDSBeacon.h b/src/messages/MMDSBeacon.h
@@ -155,6 +155,25 @@ struct MDSHealthMetric
     DECODE_FINISH(bl);
   }
 
+  void dump(ceph::Formatter *f) const {
+    f->dump_string("type", mds_metric_name(type));
+    f->dump_stream("sev") << sev;
+    f->dump_string("message", message);
+    f->open_object_section("metadata");
+    for (auto& i : metadata) {
+      f->dump_string(i.first.c_str(), i.second);
+    }
+    f->close_section();
+  }
+
+  static void generate_test_instances(std::list<MDSHealthMetric*>& ls) {
+    ls.push_back(new MDSHealthMetric());
+    ls.back()->type = MDS_HEALTH_CACHE_OVERSIZED;
+    ls.push_back(new MDSHealthMetric(MDS_HEALTH_TRIM, HEALTH_WARN, "MDS is behind on trimming"));
+    ls.back()->metadata["mds"] = "a";
+    ls.back()->metadata["num"] = "1";
+  }
+
   bool operator==(MDSHealthMetric const &other) const
   {
     return (type == other.type && sev == other.sev && message == other.message);
@@ -187,6 +206,23 @@ struct MDSHealth
     DECODE_FINISH(bl);
   }
 
+  void dump(ceph::Formatter *f) const {
+    f->open_array_section("metrics");
+    for (auto& i : metrics) {
+      f->open_object_section("metric");
+      i.dump(f);
+      f->close_section();
+    }
+    f->close_section();
+  }
+
+  static void generate_test_instances(std::list<MDSHealth*>& ls) {
+    ls.push_back(new MDSHealth);
+    ls.push_back(new MDSHealth);
+    ls.back()->metrics.push_back(MDSHealthMetric(MDS_HEALTH_TRIM, HEALTH_WARN,
+             "MDS is behind on trimming"));
+  }
+
   bool operator==(MDSHealth const &other) const
   {
     return metrics == other.metrics;
diff --git a/src/mgr/DaemonHealthMetric.h b/src/mgr/DaemonHealthMetric.h
@@ -7,6 +7,7 @@
 #include <ostream>
 #include "common/Formatter.h"
 #include "include/denc.h"
+#include "common/Formatter.h"
 
 enum class daemon_metric : uint8_t {
   SLOW_OPS,
diff --git a/src/mgr/MDSPerfMetricTypes.h b/src/mgr/MDSPerfMetricTypes.h
diff --git a/src/mgr/MetricTypes.h b/src/mgr/MetricTypes.h
diff --git a/src/mgr/OSDPerfMetricTypes.h b/src/mgr/OSDPerfMetricTypes.h
diff --git a/src/tools/ceph-dencoder/mds_types.h b/src/tools/ceph-dencoder/mds_types.h

Original file line number	Diff line number	Diff line change
`@@ -688,6 +688,10 @@ struct ClientMetricMessage {`
`688`	`688`	`apply_visitor(DumpPayloadVisitor(f), payload);`
`689`	`689`	`}`
`690`	`690`
	`691`	`+ static void generate_test_instances(std::list<ClientMetricMessage*>& ls) {`
	`692`	`+ ls.push_back(new ClientMetricMessage(CapInfoPayload(1, 2, 3)));`
	`693`	`+ }`
	`694`	`+`
`691`	`695`	`void print(std::ostream *out) const {`
`692`	`696`	`apply_visitor(PrintPayloadVisitor(out), payload);`
`693`	`697`	`}`
Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,14 @@ void MirrorInfo::dump(ceph::Formatter *f) const {`
`115`	`115`	`f->close_section(); // peers`
`116`	`116`	`}`
`117`	`117`
	`118`	`+void MirrorInfo::generate_test_instances(std::list<MirrorInfo*>& ls) {`
	`119`	`+ ls.push_back(new MirrorInfo());`
	`120`	`+ ls.push_back(new MirrorInfo());`
	`121`	`+ ls.back()->mirrored = true;`
	`122`	`+ ls.back()->peers.insert(Peer());`
	`123`	`+ ls.back()->peers.insert(Peer());`
	`124`	`+}`
	`125`	`+`
`118`	`126`	`void MirrorInfo::print(std::ostream& out) const {`
`119`	`127`	`out << "[peers=" << peers << "]" << std::endl;`
`120`	`128`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,7 @@ class PurgeItem`
`61`	`61`	`fragtree.dump(f);`
`62`	`62`	`f->close_section();`
`63`	`63`	`}`
	`64`	`+ static void generate_test_instances(std::list<PurgeItem*>& ls);`
`64`	`65`
`65`	`66`	`std::string_view get_type_str() const;`
`66`	`67`
Original file line number	Diff line number	Diff line change
`@@ -574,7 +574,6 @@ class SessionMapStore {`
`574`	`574`	`}`
`575`	`575`
`576`	`576`	`static void generate_test_instances(std::list<SessionMapStore*>& ls);`
`577`		`-`
`578`	`577`	`void reset_state()`
`579`	`578`	`{`
`580`	`579`	`session_map.clear();`