tentacle: Revert "Merge pull request #66958 from Hezko/wip-74413-tentacle"#67750
Merged
batrick merged 1 commit intoceph:tentaclefrom Mar 18, 2026
Merged
tentacle: Revert "Merge pull request #66958 from Hezko/wip-74413-tentacle"#67750batrick merged 1 commit intoceph:tentaclefrom
batrick merged 1 commit intoceph:tentaclefrom
Conversation
Contributor
|
There is an FTBFS. Looks there is a hidden dependency of the reverted commits. |
Contributor
|
I couldn't build it https://tracker.ceph.com/issues/75477 |
rzarzynski
reviewed
Mar 13, 2026
| DEFINE_CEPH_FEATURE(49, 2, SERVER_SQUID); | ||
| DEFINE_CEPH_FEATURE_RETIRED(50, 1, MON_METADATA, MIMIC, OCTOPUS) | ||
| DEFINE_CEPH_FEATURE(50, 2, SERVER_TENTACLE); | ||
| DEFINE_CEPH_FEATURE(51, 2, NVMEOF_BEACON_DIFF) |
Contributor
There was a problem hiding this comment.
Manual checking confirms we haven't released this.
$ git fetch origin
$ git tag --contains 3b5d28bfa51e3bf024ee0d66acd5cf6eec78eb52
testing/wip-jcollin-testing-20260212.143545-tentacle
testing/wip-jcollin-testing-20260212.151113-tentacle
testing/wip-jcollin-testing-20260213.113451-tentacle
testing/wip-jcollin-testing-20260213.155635-tentacle
testing/wip-jcollin-testing-20260303.104211-tentacle
testing/wip-jcollin-testing-20260305.104944-tentacle
$ git log origin/tentacle | grep "nvmeofgw: beacon diff implementation in the monitor and in the MonClient"
nvmeofgw: beacon diff implementation in the monitor and in the MonClient.
$ git log v20.0.0 | grep "nvmeofgw: beacon diff implementation in the monitor and in the MonClient"
$ git log v20.1.0 | grep "nvmeofgw: beacon diff implementation in the monitor and in the MonClient"
$ git log v20.1.1 | grep "nvmeofgw: beacon diff implementation in the monitor and in the MonClient"
$ git log v20.2.0 | grep "nvmeofgw: beacon diff implementation in the monitor and in the MonClient"
$ git log v20.3.0 | grep "nvmeofgw: beacon diff implementation in the monitor and in the MonClient"
@yuriw: I think this PR is a strong dependency for any further Tentacle release.
Member
Author
|
https://github.com/ceph/ceph/pull/66584/changes#r2936078691 Odd. I'll fix this. |
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>
batrick
commented
Mar 18, 2026
Member
Author
batrick
left a comment
There was a problem hiding this comment.
Tested-by: Patrick Donnelly <pdonnell@redhat.com>
yuriw
approved these changes
Mar 18, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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 e55ad7b by @athanatos to require
CEPH_MON_FEATURE_INCOMPAT_NVMEOF_BEACON_DIFFif all mons support it. This should be done by having mons add/update their supported features the MonMap via an update fromMMonJoin(see for instancecrush_locwhich was recently added tomon_info_t). Once the supported features indicated for each mon in theMonMapshow they understand the new NVMEOF_BEACON_DIFF, then it should be turned on globally in theMonMapas a required feature (added to the incompat set).Contribution Guidelines
To sign and title your commits, please refer to Submitting Patches to Ceph.
If you are submitting a fix for a stable branch (e.g. "quincy"), please refer to Submitting Patches to Ceph - Backports for the proper workflow.
When filling out the below checklist, you may click boxes directly in the GitHub web UI. When entering or editing the entire PR message in the GitHub web UI editor, you may also select a checklist item by adding an
xbetween the brackets:[x]. Spaces and capitalization matter when checking off items this way.Checklist
Show available Jenkins commands
jenkins test classic perfJenkins Job | Jenkins Job Definitionjenkins test crimson perfJenkins Job | Jenkins Job Definitionjenkins test signedJenkins Job | Jenkins Job Definitionjenkins test make checkJenkins Job | Jenkins Job Definitionjenkins test make check arm64Jenkins Job | Jenkins Job Definitionjenkins test submodulesJenkins Job | Jenkins Job Definitionjenkins test dashboardJenkins Job | Jenkins Job Definitionjenkins test dashboard cephadmJenkins Job | Jenkins Job Definitionjenkins test apiJenkins Job | Jenkins Job Definitionjenkins test docsReadTheDocs | Github Workflow Definitionjenkins test ceph-volume allJenkins Jobs | Jenkins Jobs Definitionjenkins test windowsJenkins Job | Jenkins Job Definitionjenkins test rook e2eJenkins Job | Jenkins Job DefinitionYou must only issue one Jenkins command per-comment. Jenkins does not understand
comments with more than one command.