src/common/json: Modified JSON structures so they take advantage of ceph_json.h fully.

Also moved and renamed JSONStructures files so they structures are more easily identifiable and usable by others if desired.

Signed-off-by: Jon Bailey <jonathan.bailey1@ibm.com>

7 files changed, 460 insertions, 0 deletions

diff --git a/src/common/json/BalancerStructures.cc b/src/common/json/BalancerStructures.cc
new file mode 100644
index 00000000000..48dfb843761
--- /dev/null
+++ b/src/common/json/BalancerStructures.cc
@@ -0,0 +1,38 @@
+#include "BalancerStructures.h"
+
+#include "common/ceph_json.h"
+
+using namespace ceph::messaging::balancer;
+
+void BalancerOffRequest::dump(Formatter* f) const {
+  encode_json("prefix", "balancer off", f);
+}
+
+void BalancerOffRequest::decode_json(JSONObj* obj) {}
+
+void BalancerStatusRequest::dump(Formatter* f) const {
+  encode_json("prefix", "balancer status", f);
+}
+
+void BalancerStatusRequest::decode_json(JSONObj* obj) {}
+
+void BalancerStatusReply::dump(Formatter* f) const {
+  encode_json("active", active, f);
+  encode_json("last_optimization_duration", last_optimization_duration, f);
+  encode_json("last_optimization_started", last_optimization_started, f);
+  encode_json("mode", mode, f);
+  encode_json("no_optimization_needed", no_optimization_needed, f);
+  encode_json("optimize_result", optimize_result, f);
+}
+
+void BalancerStatusReply::decode_json(JSONObj* obj) {
+  JSONDecoder::decode_json("active", active, obj);
+  JSONDecoder::decode_json("last_optimization_duration",
+                           last_optimization_duration, obj);
+  JSONDecoder::decode_json("last_optimization_started",
+                           last_optimization_started, obj);
+  JSONDecoder::decode_json("mode", mode, obj);
+  JSONDecoder::decode_json("no_optimization_needed", no_optimization_needed,
+                           obj);
+  JSONDecoder::decode_json("optimize_result", optimize_result, obj);
+}
\ No newline at end of file
diff --git a/src/common/json/BalancerStructures.h b/src/common/json/BalancerStructures.h
new file mode 100644
index 00000000000..bbf5c748eb3
--- /dev/null
+++ b/src/common/json/BalancerStructures.h
@@ -0,0 +1,35 @@
+#pragma once
+
+#include <string>
+
+#include "include/types.h"
+
+class JSONObj;
+
+namespace ceph {
+namespace messaging {
+namespace balancer {
+struct BalancerOffRequest {
+  void dump(Formatter* f) const;
+  void decode_json(JSONObj* obj);
+};
+
+struct BalancerStatusRequest {
+  void dump(Formatter* f) const;
+  void decode_json(JSONObj* obj);
+};
+
+struct BalancerStatusReply {
+  bool active;
+  std::string last_optimization_duration;
+  std::string last_optimization_started;
+  std::string mode;
+  bool no_optimization_needed;
+  std::string optimize_result;
+
+  void dump(Formatter* f) const;
+  void decode_json(JSONObj* obj);
+};
+}  // namespace balancer
+}  // namespace messaging
+}  // namespace ceph
\ No newline at end of file
diff --git a/src/common/json/CMakeLists.txt b/src/common/json/CMakeLists.txt
new file mode 100644
index 00000000000..1497daf93db
--- /dev/null
+++ b/src/common/json/CMakeLists.txt
@@ -0,0 +1,4 @@
+add_library(json_structures STATIC
+                BalancerStructures.cc ConfigStructures.cc OSDStructures.cc)
+
+    target_link_libraries(json_structures global)
\ No newline at end of file
diff --git a/src/common/json/ConfigStructures.cc b/src/common/json/ConfigStructures.cc
new file mode 100644
index 00000000000..651278d002a
--- /dev/null
+++ b/src/common/json/ConfigStructures.cc
@@ -0,0 +1,20 @@
+#include "ConfigStructures.h"
+
+#include "common/ceph_json.h"
+
+using namespace ceph::messaging::config;
+
+void ConfigSetRequest::dump(Formatter* f) const {
+  encode_json("prefix", "config set", f);
+  encode_json("who", who, f);
+  encode_json("name", name, f);
+  encode_json("value", value, f);
+  encode_json("force", force, f);
+}
+
+void ConfigSetRequest::decode_json(JSONObj* obj) {
+  JSONDecoder::decode_json("who", who, obj);
+  JSONDecoder::decode_json("name", name, obj);
+  JSONDecoder::decode_json("value", value, obj);
+  JSONDecoder::decode_json("force", force, obj);
+}
\ No newline at end of file
diff --git a/src/common/json/ConfigStructures.h b/src/common/json/ConfigStructures.h
new file mode 100644
index 00000000000..554229d75f4
--- /dev/null
+++ b/src/common/json/ConfigStructures.h
@@ -0,0 +1,24 @@
+#pragma once
+
+#include <optional>
+#include <string>
+
+#include "include/types.h"
+
+class JSONObj;
+
+namespace ceph {
+namespace messaging {
+namespace config {
+struct ConfigSetRequest {
+  std::string who;
+  std::string name;
+  std::string value;
+  std::optional<bool> force;
+
+  void dump(Formatter* f) const;
+  void decode_json(JSONObj* obj);
+};
+}  // namespace config
+}  // namespace messaging
+}  // namespace ceph
\ No newline at end of file
diff --git a/src/common/json/OSDStructures.cc b/src/common/json/OSDStructures.cc
new file mode 100644
index 00000000000..aaac5f6e169
--- /dev/null
+++ b/src/common/json/OSDStructures.cc
@@ -0,0 +1,150 @@
+#include "OSDStructures.h"
+
+#include "common/ceph_json.h"
+#include "common/io_exerciser/OpType.h"
+
+using namespace ceph::messaging::osd;
+
+void OSDMapRequest::dump(Formatter* f) const {
+  encode_json("prefix", "osd map", f);
+  encode_json("pool", pool, f);
+  encode_json("object", object, f);
+  encode_json("nspace", nspace, f);
+  encode_json("format", format, f);
+}
+
+void OSDMapRequest::decode_json(JSONObj* obj) {
+  JSONDecoder::decode_json("pool", pool, obj);
+  JSONDecoder::decode_json("object", object, obj);
+  JSONDecoder::decode_json("nspace", nspace, obj);
+  JSONDecoder::decode_json("format", format, obj);
+}
+
+void OSDMapReply::dump(Formatter* f) const {
+  encode_json("epoch", epoch, f);
+  encode_json("pool", pool, f);
+  encode_json("pool_id", pool_id, f);
+  encode_json("objname", objname, f);
+  encode_json("raw_pgid", raw_pgid, f);
+  encode_json("pgid", pgid, f);
+  encode_json("up", up, f);
+  encode_json("up_primary", up_primary, f);
+  encode_json("acting", acting, f);
+  encode_json("acting_primary", acting_primary, f);
+}
+
+void OSDMapReply::decode_json(JSONObj* obj) {
+  JSONDecoder::decode_json("epoch", epoch, obj);
+  JSONDecoder::decode_json("pool", pool, obj);
+  JSONDecoder::decode_json("pool_id", pool_id, obj);
+  JSONDecoder::decode_json("objname", objname, obj);
+  JSONDecoder::decode_json("raw_pgid", raw_pgid, obj);
+  JSONDecoder::decode_json("pgid", pgid, obj);
+  JSONDecoder::decode_json("up", up, obj);
+  JSONDecoder::decode_json("up_primary", up_primary, obj);
+  JSONDecoder::decode_json("acting", acting, obj);
+  JSONDecoder::decode_json("acting_primary", acting_primary, obj);
+}
+
+void OSDPoolGetRequest::dump(Formatter* f) const {
+  encode_json("prefix", "osd pool get", f);
+  encode_json("pool", pool, f);
+  encode_json("var", var, f);
+  encode_json("format", format, f);
+}
+
+void OSDPoolGetRequest::decode_json(JSONObj* obj) {
+  JSONDecoder::decode_json("pool", pool, obj);
+  JSONDecoder::decode_json("var", var, obj);
+  JSONDecoder::decode_json("format", format, obj);
+}
+
+void OSDPoolGetReply::dump(Formatter* f) const {
+  encode_json("erasure_code_profile", erasure_code_profile, f);
+}
+
+void OSDPoolGetReply::decode_json(JSONObj* obj) {
+  JSONDecoder::decode_json("erasure_code_profile", erasure_code_profile, obj);
+}
+
+void OSDECProfileGetRequest::dump(Formatter* f) const {
+  encode_json("prefix", "osd pool get", f);
+  encode_json("name", name, f);
+  encode_json("format", format, f);
+}
+
+void OSDECProfileGetRequest::decode_json(JSONObj* obj) {
+  JSONDecoder::decode_json("name", name, obj);
+  JSONDecoder::decode_json("format", format, obj);
+}
+
+void OSDECProfileGetReply::dump(Formatter* f) const {
+  encode_json("crush-device-class", crush_device_class, f);
+  encode_json("crush-failure-domain", crush_failure_domain, f);
+  encode_json("crush-num-failure-domains", crush_num_failure_domains, f);
+  encode_json("crush-osds-per-failure-domain", crush_osds_per_failure_domain,
+              f);
+  encode_json("crush-root", crush_root, f);
+  encode_json("jerasure-per-chunk-alignment", jerasure_per_chunk_alignment, f);
+  encode_json("k", k, f);
+  encode_json("m", m, f);
+  encode_json("plugin", plugin, f);
+  encode_json("technique", technique, f);
+  encode_json("w", w, f);
+}
+
+void OSDECProfileGetReply::decode_json(JSONObj* obj) {
+  JSONDecoder::decode_json("crush-device-class", crush_device_class, obj);
+  JSONDecoder::decode_json("crush-failure-domain", crush_failure_domain, obj);
+  JSONDecoder::decode_json("crush-num-failure-domains",
+                           crush_num_failure_domains, obj);
+  JSONDecoder::decode_json("crush-osds-per-failure-domain",
+                           crush_osds_per_failure_domain, obj);
+  JSONDecoder::decode_json("crush-root", crush_root, obj);
+  JSONDecoder::decode_json("jerasure-per-chunk-alignment",
+                           jerasure_per_chunk_alignment, obj);
+  JSONDecoder::decode_json("k", k, obj);
+  JSONDecoder::decode_json("m", m, obj);
+  JSONDecoder::decode_json("plugin", plugin, obj);
+  JSONDecoder::decode_json("technique", technique, obj);
+  JSONDecoder::decode_json("w", w, obj);
+}
+
+void OSDECProfileSetRequest::dump(Formatter* f) const {
+  encode_json("prefix", "osd erasure-code-profile set", f);
+  encode_json("name", name, f);
+  encode_json("profile", profile, f);
+}
+
+void OSDECProfileSetRequest::decode_json(JSONObj* obj) {
+  JSONDecoder::decode_json("name", name, obj);
+  JSONDecoder::decode_json("profile", profile, obj);
+}
+
+void OSDECPoolCreateRequest::dump(Formatter* f) const {
+  encode_json("prefix", "osd pool create", f);
+  encode_json("pool", pool, f);
+  encode_json("pool_type", pool_type, f);
+  encode_json("pg_num", pg_num, f);
+  encode_json("pgp_num", pgp_num, f);
+  encode_json("erasure_code_profile", erasure_code_profile, f);
+}
+
+void OSDECPoolCreateRequest::decode_json(JSONObj* obj) {
+  JSONDecoder::decode_json("pool", pool, obj);
+  JSONDecoder::decode_json("pool_type", pool_type, obj);
+  JSONDecoder::decode_json("pg_num", pg_num, obj);
+  JSONDecoder::decode_json("pgp_num", pgp_num, obj);
+  JSONDecoder::decode_json("erasure_code_profile", erasure_code_profile, obj);
+}
+
+void OSDSetRequest::dump(Formatter* f) const {
+  encode_json("prefix", "osd set", f);
+  encode_json("key", key, f);
+  encode_json("yes_i_really_mean_it", yes_i_really_mean_it, f);
+}
+
+void OSDSetRequest::decode_json(JSONObj* obj) {
+  JSONDecoder::decode_json("key", key, obj);
+  JSONDecoder::decode_json("yes_i_really_mean_it", yes_i_really_mean_it, obj);
+}
\ No newline at end of file
diff --git a/src/common/json/OSDStructures.h b/src/common/json/OSDStructures.h
new file mode 100644
index 00000000000..3e4528a099f
--- /dev/null
+++ b/src/common/json/OSDStructures.h
@@ -0,0 +1,189 @@
+#pragma once
+
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "common/ceph_json.h"
+#include "common/io_exerciser/OpType.h"
+#include "include/types.h"
+
+class JSONObj;
+
+namespace ceph {
+namespace messaging {
+namespace osd {
+struct OSDMapRequest {
+  std::string pool;
+  std::string object;
+  std::string nspace;
+  std::string format = "json";
+
+  void dump(Formatter* f) const;
+  void decode_json(JSONObj* obj);
+};
+
+struct OSDMapReply {
+  epoch_t epoch;
+  std::string pool;
+  uint64_t pool_id;
+  std::string objname;
+  std::string raw_pgid;
+  std::string pgid;
+  std::vector<int> up;
+  int up_primary;
+  std::vector<int> acting;
+  int acting_primary;
+
+  void dump(Formatter* f) const;
+  void decode_json(JSONObj* obj);
+};
+
+struct OSDPoolGetRequest {
+  std::string pool;
+  std::string var = "erasure_code_profile";
+  std::string format = "json";
+
+  void dump(Formatter* f) const;
+  void decode_json(JSONObj* obj);
+};
+
+struct OSDPoolGetReply {
+  std::string erasure_code_profile;
+
+  void dump(Formatter* f) const;
+  void decode_json(JSONObj* obj);
+};
+
+struct OSDECProfileGetRequest {
+  std::string name;
+  std::string format = "json";
+
+  void dump(Formatter* f) const;
+  void decode_json(JSONObj* obj);
+};
+
+struct OSDECProfileGetReply {
+  std::string crush_device_class;
+  std::string crush_failure_domain;
+  int crush_num_failure_domains;
+  int crush_osds_per_failure_domain;
+  std::string crush_root;
+  bool jerasure_per_chunk_alignment;
+  int k;
+  int m;
+  std::string plugin;
+  std::string technique;
+  std::string w;
+
+  void dump(Formatter* f) const;
+  void decode_json(JSONObj* obj);
+};
+
+struct OSDECProfileSetRequest {
+  std::string name;
+  std::vector<std::string> profile;
+
+  void dump(Formatter* f) const;
+  void decode_json(JSONObj* obj);
+};
+
+struct OSDECPoolCreateRequest {
+  std::string pool;
+  std::string pool_type;
+  int pg_num;
+  int pgp_num;
+  std::string erasure_code_profile;
+
+  void dump(Formatter* f) const;
+  void decode_json(JSONObj* obj);
+};
+
+struct OSDSetRequest {
+  std::string key;
+  std::optional<bool> yes_i_really_mean_it = std::nullopt;
+
+  void dump(Formatter* f) const;
+  void decode_json(JSONObj* obj);
+};
+
+// These structures are sent directly to the relevant OSD
+// rather than the monitor
+template <io_exerciser::InjectOpType op_type>
+struct InjectECErrorRequest {
+  std::string pool;
+  std::string objname;
+  int shardid;
+  std::optional<uint64_t> type;
+  std::optional<uint64_t> when;
+  std::optional<uint64_t> duration;
+
+  void dump(Formatter* f) const {
+    switch (op_type) {
+      case io_exerciser::InjectOpType::ReadEIO:
+        [[fallthrough]];
+      case io_exerciser::InjectOpType::ReadMissingShard:
+        ::encode_json("prefix", "injectecreaderr", f);
+        break;
+      case io_exerciser::InjectOpType::WriteFailAndRollback:
+        [[fallthrough]];
+      case io_exerciser::InjectOpType::WriteOSDAbort:
+        ::encode_json("prefix", "injectecwriteerr", f);
+        break;
+      default:
+        ceph_abort_msg("Unsupported Inject Type");
+    }
+    ::encode_json("pool", pool, f);
+    ::encode_json("objname", objname, f);
+    ::encode_json("shardid", shardid, f);
+    ::encode_json("type", type, f);
+    ::encode_json("when", when, f);
+    ::encode_json("duration", duration, f);
+  }
+  void decode_json(JSONObj* obj) {
+    JSONDecoder::decode_json("pool", pool, obj);
+    JSONDecoder::decode_json("objname", objname, obj);
+    JSONDecoder::decode_json("shardid", shardid, obj);
+    JSONDecoder::decode_json("type", type, obj);
+    JSONDecoder::decode_json("when", when, obj);
+    JSONDecoder::decode_json("duration", duration, obj);
+  }
+};
+
+template <io_exerciser::InjectOpType op_type>
+struct InjectECClearErrorRequest {
+  std::string pool;
+  std::string objname;
+  int shardid;
+  std::optional<uint64_t> type;
+
+  void dump(Formatter* f) const {
+    switch (op_type) {
+      case io_exerciser::InjectOpType::ReadEIO:
+        [[fallthrough]];
+      case io_exerciser::InjectOpType::ReadMissingShard:
+        ::encode_json("prefix", "injectecclearreaderr", f);
+        break;
+      case io_exerciser::InjectOpType::WriteFailAndRollback:
+        [[fallthrough]];
+      case io_exerciser::InjectOpType::WriteOSDAbort:
+        ::encode_json("prefix", "injectecclearwriteerr", f);
+        break;
+      default:
+        ceph_abort_msg("Unsupported Inject Type");
+    }
+    ::encode_json("pool", pool, f);
+    ::encode_json("objname", objname, f);
+    ::encode_json("shardid", shardid, f);
+    ::encode_json("type", type, f);
+  }
+  void decode_json(JSONObj* obj) {
+    JSONDecoder::decode_json("pool", pool, obj);
+    JSONDecoder::decode_json("objname", objname, obj);
+    JSONDecoder::decode_json("shardid", shardid, obj);
+    JSONDecoder::decode_json("type", type, obj);
+  }
+};
+}  // namespace osd
+}  // namespace messaging
+}  // namespace ceph
\ No newline at end of file