Skip to content

Tentacle kickoff!#61321

Merged
batrick merged 28 commits intoceph:mainfrom
batrick:tentacle-kickoff
Mar 3, 2025
Merged

Tentacle kickoff!#61321
batrick merged 28 commits intoceph:mainfrom
batrick:tentacle-kickoff

Conversation

@batrick
Copy link
Member

@batrick batrick commented Jan 10, 2025

Dependencies:

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 x between the brackets: [x]. Spaces and capitalization matter when checking off items this way.

Checklist

  • Tracker (select at least one)
    • References tracker ticket
    • Very recent bug; references commit where it was introduced
    • New feature (ticket optional)
    • Doc update (no ticket needed)
    • Code cleanup (no ticket needed)
  • Component impact
    • Affects Dashboard, opened tracker ticket
    • Affects Orchestrator, opened tracker ticket
    • No impact that needs to be tracked
  • Documentation (select at least one)
    • Updates relevant documentation
    • No doc update is appropriate
  • Tests (select at least one)
Show available Jenkins commands
  • jenkins retest this please
  • jenkins test classic perf
  • jenkins test crimson perf
  • jenkins test signed
  • jenkins test make check
  • jenkins test make check arm64
  • jenkins test submodules
  • jenkins test dashboard
  • jenkins test dashboard cephadm
  • jenkins test api
  • jenkins test docs
  • jenkins render docs
  • jenkins test ceph-volume all
  • jenkins test ceph-volume tox
  • jenkins test windows
  • jenkins test rook e2e

Copy link
Contributor

@rzarzynski rzarzynski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review in progress.

- [ ] update src/ceph-volume/ceph_volume/__init__.py (`__release__`)
- [ ] update src/cephadm/cephadmlib/constants.py (`DEFAULT_IMAGE_RELEASE` to X)
- [x] update src/ceph-volume/ceph_volume/__init__.py (`__release__`)
- [x] update src/cephadm/cephadmlib/constants.py (`DEFAULT_IMAGE_RELEASE` and `LATEST_STABLE_RELEASE` to X)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

DEFINE_CEPH_FEATURE(49, 2, SERVER_SQUID);
DEFINE_CEPH_FEATURE_RETIRED(50, 1, MON_METADATA, MIMIC, OCTOPUS)
// available
DEFINE_CEPH_FEATURE(50, 2, SERVER_TENTACLE);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems fine.

Copy link
Contributor

@rzarzynski rzarzynski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK from core.

- [ ] cherry-pick 8cf9ad62949516666ad0f2c0bb7726ef68e4d666 ("doc: add releases links to toc"). There will be trivial conflicts.
- [ ] add redirect for new major release at `RTD <https://readthedocs.org/dashboard/ceph/redirects/>`_.
- [ ] add release name to redmine (using https://tracker.ceph.com/custom_fields/16/edit)
- [x] add release name to redmine (using https://tracker.ceph.com/custom_fields/16/edit)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

- [x] create qa/workunits/test_telemetry_(X-1)_x.sh
- [x] create qa/suites/upgrade/(X-1)-x
- [x] remove qa/suites/upgrade/(X-3)-x-*
- [x] update qa/fs/upgrade/ to remove (X-3) and add (X-1); check with fs team to confirm / help
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jmundack
Copy link
Contributor

jmundack commented Feb 6, 2025

from what i can tell, there seems to be 3 sets of changes here

  1. tentacle related things
  2. remove quicy
  3. add some things for squid

can/shall we separate out these into separate PR's?

@ceph ceph deleted a comment from github-actions bot Feb 6, 2025
batrick added a commit to batrick/ceph that referenced this pull request Feb 6, 2025
ceph#61321 (comment)

Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>
Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>
Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>
Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>
See ceph/ceph-build#2315

Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>
Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>
ceph#61321 (comment)

Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>
I don't see a reason to restrict the update to X-1. Just add up to X.

Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>
It's no longer necessary per:

    ceph#61321 (comment)

Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>
I don't see a good reason to set this to X-2 for a new cluster so I've adjusted
it to X and updated this missing item in the doc.

Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>
Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>
@batrick
Copy link
Member Author

batrick commented Feb 17, 2025

This PR is under test in https://tracker.ceph.com/issues/70000.

@rzarzynski
Copy link
Contributor

jenkins test api

@batrick
Copy link
Member Author

batrick commented Feb 21, 2025

@rzarzynski I think this is close to being ready. the upgrade suite continues to be very broken 😠. Mostly failures like:

https://pulpito.ceph.com/pdonnell-2025-02-20_01:59:34-fs-wip-pdonnell-testing-20250218.200348-debug-distro-default-smithi/8141856/

but at least some of those are from cephadm upgrades and should have set tentacle AFAICT. So some work to figure that out.

I recommend scheduling anything additional you like with this branch/ticket:

https://tracker.ceph.com/issues/70000

cc @adamemerson @vshankar @idryomov

@batrick
Copy link
Member Author

batrick commented Feb 21, 2025

I'd like to add: in the interest of avoiding rebases and "getting this out the door", we might merge soon and then incrementally clean up before branching off tentacle.

@rzarzynski
Copy link
Contributor

@ljflores, @yuriw: let's run this through the RADOS suite using https://tracker.ceph.com/issues/70000 for tracking, if possible.

rzarzynski pushed a commit to rzarzynski/ceph that referenced this pull request Feb 21, 2025
ceph#61321 (comment)

Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>
rzarzynski pushed a commit to rzarzynski/ceph that referenced this pull request Feb 21, 2025
It's no longer necessary per:

    ceph#61321 (comment)

Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>
@batrick
Copy link
Member Author

batrick commented Feb 24, 2025

cephadm upgrade issue is noted:

https://tracker.ceph.com/issues/70000#note-3

I think we can merge this.

@rzarzynski
Copy link
Contributor

@ljflores: are you fine?

@ljflores
Copy link
Member

@ljflores: are you fine?

I'll reply shortly with a rados review.

@ljflores
Copy link
Member

Rados approved: https://tracker.ceph.com/projects/rados/wiki/MAIN#httpstrackercephcomissues70000

Please note that there are three new trackers directly related to this PR, but @rzarzynski confirmed they are not blockers:

  1. https://tracker.ceph.com/issues/70212 - cephadm/test_cephadm: ERROR: Container release squid != cephadm release tentacle
  2. https://tracker.ceph.com/issues/70214 - rados/upgrade: Health check failed: all OSDs are running tentacle or later but require_osd_release < tentacle (OSD_UPGRADE_FINISHED)
  3. https://tracker.ceph.com/issues/70215 - rados/thrash-old-clients: unable to install tentacle packages

@batrick batrick merged commit 58ab881 into ceph:main Mar 3, 2025
12 of 13 checks passed
@batrick batrick deleted the tentacle-kickoff branch March 3, 2025 13:35
@batrick batrick mentioned this pull request Dec 6, 2025
14 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants