tentacle: mon: Add command "nvme-gw listeners"#66584
Conversation
|
jenkins test docs |
|
qa tracker: https://tracker.ceph.com/issues/74474 |
|
This pull request can no longer be automatically merged: a rebase is needed and changes have to be manually resolved |
This command will help to list all existing listeners, even when they are not in OMAP (eg, auto-listeners). Fixes: https://tracker.ceph.com/issues/73782 Signed-off-by: Vallari Agrawal <vallari.agrawal@ibm.com> (cherry picked from commit 7e106fd)
9f3235e to
e4f6e6a
Compare
|
jenkins test api |
1 similar comment
|
jenkins test api |
| f->flush(rdata); | ||
| sstrm.str(""); | ||
| } else { | ||
| get_gw_listeners(f.get(), group_key); |
There was a problem hiding this comment.
I'm puzzled how this PR was merged. The original PR has a change to
but it's not in this backport. It was eventually added in
but that was done weeks later.
There was a problem hiding this comment.
Hi @batrick, so the main PRs were merged in order. First #65689 (which introduced the change) was merged to main and then #65563 was merged to main.
Then the tentacle backport PR for 65563 accidentally included that change from my PR 65689 (see https://github.com/ceph/ceph/pull/66958/changes#diff-2f2e236298d9c0243b1e81900cdf814f5b59ac934981200912642a1675355381) and it was merged to tentacle first. So I saw merge conflict in this backport PR of 65689 (since that change was already in tentacle now). I confirmed that the line in src/mon/NVMeofGwMon.h was in tentacle (I also realised then what had happened) and rebase this backport PR.
While main PRs were independent, the tentacle PR 66584 (this one) ended up being dependent on tentacle PR 66958. Since the change was only a function declaration, it probably didn't cause any problem being accidentally introduced in tentacle first and raised no alarms in builds and QA.
I see you're reverting backport PR 66958, please don't remove the change. Your revert commit batrick@ddef0d1#diff-2f2e236298d9c0243b1e81900cdf814f5b59ac934981200912642a1675355381 src/mon/NVMeofGwMon.h looks right to me - sorry about the confusion!
This reverts commit 6dddf54, reversing changes made to 07ec509. Backport 6dddf54 introduced a new connection feature bit NVMEOF_BEACON_DIFF but there are plans (ceph#66624) to make further enhancements on that feature bit. This would cause the mons to crash during upgrades. However, this connection feature bit should not have been added to begin with. The correct way to do this is extend e55ad7b by @athanatos to require `CEPH_MON_FEATURE_INCOMPAT_NVMEOF_BEACON_DIFF` if all mons support it. This should be done by having mons add/update their supported features the MonMap via an update from `MMonJoin` (see for instance `crush_loc` which was recently added to `mon_info_t`). Once the supported features indicated for each mon in the `MonMap` show they understand the new NVMEOF_BEACON_DIFF, then it should be turned on globally in the `MonMap` as a required feature (added to the incompat set). Conflicts: src/mon/NVMeofGwMon.h: conflicts with header change from 19c9be2 fix missing header change in ceph#66584 Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
backport tracker: https://tracker.ceph.com/issues/74172
backport of #65689
parent tracker: https://tracker.ceph.com/issues/73782
this backport was staged using ceph-backport.sh version 16.0.0.6848
find the latest version at https://github.com/ceph/ceph/blob/main/src/script/ceph-backport.sh