Skip to content

Commit e3fab2a

Browse files
committed
mon: Add nvmeof group/gateway name in "ceph -s"
In "ceph status" command output, show gateway group names and gateway names. Before: ``` services: mon: 4 daemons, quorum ceph-nvme-vm8,ceph-nvme-vm1,ceph-nvme-vm7,ceph-nvme-vm6 (age 71m) mgr: ceph-nvme-vm8.tgytdq(active, since 73m), standbys: ceph-nvme-vm6.tequqo, ceph-nvme-vm1.pxrofr, ceph-nvme-vm7.lbxrea osd: 4 osds: 4 up (since 70m), 4 in (since 70m) nvmeof: 4 gateways active (4 hosts) ``` After: ``` services: mon: 4 daemons, quorum ceph-nvme-vm14,ceph-nvme-vm11,ceph-nvme-vm13,ceph-nvme-vm12 (age 17m) mgr: ceph-nvme-vm14.gjjgvq(active, since 19m), standbys: ceph-nvme-vm12.shbvpw, ceph-nvme-vm11.gucgiu, ceph-nvme-vm13.inzizw osd: 4 osds: 4 up (since 15m), 4 in (since 16m) nvmeof (mygroup1) : 2 gateways active (ceph-nvme-vm13.azfdpk, ceph-nvme-vm14.hdsoxl) nvmeof (mygroup2) : 2 gateways active (ceph-nvme-vm11.hnooxs, ceph-nvme-vm12.wcjcjs) ``` Signed-off-by: Vallari Agrawal <[email protected]>
1 parent 3cdf529 commit e3fab2a

File tree

1 file changed

+27
-1
lines changed

1 file changed

+27
-1
lines changed

src/mon/Monitor.cc

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3106,8 +3106,19 @@ void Monitor::get_cluster_status(stringstream &ss, Formatter *f,
31063106
{
31073107
size_t maxlen = 3;
31083108
auto& service_map = mgrstatmon()->get_service_map();
3109+
std::map<std::string, std::set<std::string>> nvmeof_groups;
31093110
for (auto& p : service_map.services) {
3110-
maxlen = std::max(maxlen, p.first.size());
3111+
if (p.first == "nvmeof") {
3112+
auto daemons = p.second.daemons;
3113+
for (auto& d : daemons) {
3114+
auto group = d.second.metadata.find("group");
3115+
auto gw_id = d.second.metadata.find("id");
3116+
nvmeof_groups[group->second].insert(gw_id->second);
3117+
maxlen = std::max(maxlen, p.first.size() + group->second.size() + 3);
3118+
}
3119+
} else {
3120+
maxlen = std::max(maxlen, p.first.size());
3121+
}
31113122
}
31123123
string spacing(maxlen - 3, ' ');
31133124
const auto quorum_names = get_quorum_names();
@@ -3153,8 +3164,23 @@ void Monitor::get_cluster_status(stringstream &ss, Formatter *f,
31533164
if (ServiceMap::is_normal_ceph_entity(service)) {
31543165
continue;
31553166
}
3167+
if (p.first == "nvmeof") {
3168+
for (auto& group : nvmeof_groups) {
3169+
ss << " " << p.first << " (" << group.first << "): ";
3170+
ss << string(maxlen - p.first.size() - group.first.size() - 3, ' ');
3171+
ss << group.second.size() << " gateway" << (group.second.size() ? "s" : "") << " active (";
3172+
for (auto gw = group.second.begin(); gw != group.second.end(); ++gw){
3173+
if (gw != group.second.begin()) {
3174+
ss << ", ";
3175+
}
3176+
ss << *gw;
3177+
}
3178+
ss << ") \n";
3179+
}
3180+
} else {
31563181
ss << " " << p.first << ": " << string(maxlen - p.first.size(), ' ')
31573182
<< p.second.get_summary() << "\n";
3183+
}
31583184
}
31593185
}
31603186

0 commit comments

Comments
 (0)