Merge pull request #48516 from athanatos/sjust/wip-57801

crimson,mon: add guards to avoid accidental crimson deployment and to avoid usage of unsupported features with crimson

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>

diff --cc qa/tasks/ceph.py
Simple merge

diff --cc src/crimson/osd/shard_services.cc
Simple merge

diff --cc src/mon/MonCommands.h
Simple merge

diff --cc src/mon/OSDMonitor.cc
Simple merge

diff --cc src/osd/OSDMap.cc
index c36a926245c49f0ff568c8aa229001bfd5caf847,edd649085c1990305d5ce6984ba5951376c67cac..b1f07de5ae0cd7ce67a20e038a46f7718186c9a8
--- 1/src/osd/OSDMap.cc
--- 2/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@@ -3840,9 -3815,18 +3870,10 @@@ void OSDMap::dump(Formatter *f, CephCon
    f->dump_string("require_osd_release",
                 to_string(require_osd_release));
  
+   f->dump_bool("allow_crimson", allow_crimson);
    f->open_array_section("pools");
 -  for (const auto &pool : pools) {
 -    std::string name("<unknown>");
 -    const auto &pni = pool_name.find(pool.first);
 -    if (pni != pool_name.end())
 -      name = pni->second;
 -    f->open_object_section("pool");
 -    f->dump_int("pool", pool.first);
 -    f->dump_string("pool_name", name);
 -    pool.second.dump(f);
 -    f->close_section();
 +  for (const auto &[pid, pdata] : pools) {
 +    dump_pool(cct, pid, pdata, f);
    }
    f->close_section();
  
@@@ -4179,9 -4147,12 +4210,12 @@@ void OSDMap::print(CephContext *cct, os
    }
    if (get_cluster_snapshot().length())
      out << "cluster_snapshot " << get_cluster_snapshot() << "\n";
+   if (allow_crimson) {
+     out << "allow_crimson=true\n";
+   }
    out << "\n";
  
 -  print_pools(out);
 +  print_pools(cct, out);
  
    out << "max_osd " << get_max_osd() << "\n";
    print_osds(out);

diff --cc src/osd/OSDMap.h
Simple merge

diff --cc src/vstart.sh
Simple merge