]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Revert "Merge pull request #66958 from Hezko/wip-74413-tentacle" 67750/head
authorPatrick Donnelly <pdonnell@redhat.com>
Thu, 12 Mar 2026 06:46:09 +0000 (12:16 +0530)
committerPatrick Donnelly <pdonnell@ibm.com>
Sun, 15 Mar 2026 01:14:51 +0000 (21:14 -0400)
commitddef0d1e6cc6de05f4cb424d4ff0f00c4d30fc18
treede50ca0a28e9ba0f985c8f3137fa7de2e189f9a5
parent70f8415b300f041766fa27faf7d5472699e32388
Revert "Merge pull request #66958 from Hezko/wip-74413-tentacle"

This reverts commit 6dddf544a44d3944e883c051d886f0049a95a2e5, reversing
changes made to 07ec509cf156d83e38aa6c2a151d4f06009e8dfa.

Backport 6dddf54 introduced a new connection feature bit
NVMEOF_BEACON_DIFF but there are plans (#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
e55ad7bce2fb85096cd31ff9846403f9dbd01e85 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 #66584

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
22 files changed:
src/CMakeLists.txt
src/include/ceph_features.h
src/messages/MNVMeofGwBeacon.h
src/mon/MonClient.h
src/mon/Monitor.cc
src/mon/Monitor.h
src/mon/NVMeofGwBeaconConstants.h [deleted file]
src/mon/NVMeofGwMap.cc
src/mon/NVMeofGwMap.h
src/mon/NVMeofGwMon.cc
src/mon/NVMeofGwMon.h
src/mon/NVMeofGwSerialize.h
src/mon/NVMeofGwTypes.h
src/mon/mon_types.h
src/nvmeof/NVMeofGwMonitorClient.cc
src/nvmeof/NVMeofGwMonitorClient.h
src/nvmeof/NVMeofGwUtils.cc [deleted file]
src/nvmeof/NVMeofGwUtils.h [deleted file]
src/test/CMakeLists.txt
src/test/cli/monmaptool/feature-set-unset-list.t
src/test/test_nvmeof_gw_utils.cc [deleted file]
src/test/test_nvmeof_mon_encoding.cc