Skip to content

*: tentacle pre-kickoff#59224

Closed
batrick wants to merge 1 commit intoceph:mainfrom
batrick:tentacle-prekickoff
Closed

*: tentacle pre-kickoff#59224
batrick wants to merge 1 commit intoceph:mainfrom
batrick:tentacle-prekickoff

Conversation

@batrick
Copy link
Member

@batrick batrick commented Aug 14, 2024

DNM, testing if this is a valid band-aid in an fs run.

To get upgrade tests working before kickoff, band-aid the version to vX.3.0. I think this could be a valid pre-kickoff task after branching a new release so that upgrade runs work as expected. Right now we are doing tests from v19.1.X (squid RC) to v19.0.0 (main) which fails with errors like:

https://pulpito.ceph.com/pdonnell-2024-08-14_02:13:41-fs-wip-pdonnell-testing-20240813.125846-debug-distro-default-smithi/7854205/

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

@batrick
Copy link
Member Author

batrick commented Aug 15, 2024

jenkins test make check

@batrick
Copy link
Member Author

batrick commented Aug 15, 2024

jenkins test make check arm64

@batrick
Copy link
Member Author

batrick commented Aug 15, 2024

set_target_properties(librbd PROPERTIES
OUTPUT_NAME rbd
VERSION 1.19.0
VERSION 1.19.3
Copy link
Member Author

Choose a reason for hiding this comment

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

@idryomov ^ is this okay? We've never done a release bump like this before TMK.

Copy link
Contributor

@idryomov idryomov Aug 15, 2024

Choose a reason for hiding this comment

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

I don't have the context for "pre-kickoff".

For tentacle I'd expect it to be 1.20.0. For a temporary workaround in main for something, this version could probably be left as is (i.e. 1.19.0).

Copy link
Member Author

Choose a reason for hiding this comment

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

This "pre-kickoff" is just minimal changes necessary to get upgrades working from squid to main. (There are barriers in teuthology and possibly other places which prevent upgrades that appear to go backwards.)

Copy link
Member Author

Choose a reason for hiding this comment

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

@idryomov also as a meta comment: would it not be better for this version to be pulled from the top-level CMakeLists.txt?

Copy link
Contributor

Choose a reason for hiding this comment

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

Probably not. It might make more sense to pull it from src/include/rbd/librbd.h -- it corresponds to LIBRBD_VER_MAJOR, LIBRBD_VER_MINOR and LIBRBD_VER_EXTRA there.

Note that we only change the minor there (the second component) and that nothing changes in stable branches (i.e. 1.19.0 would be the version both the initial squid release and all squid backport releases).

@batrick batrick force-pushed the tentacle-prekickoff branch from bbfbc17 to f22fdf1 Compare August 15, 2024 13:10
To get upgrade tests working before kickoff, band-aid the version to vX.3.0.

Fixes: https://tracker.ceph.com/issues/67335
Signed-off-by: Patrick Donnelly <[email protected]>
@batrick batrick force-pushed the tentacle-prekickoff branch from f22fdf1 to 1b0e5d8 Compare August 15, 2024 14:40
@batrick
Copy link
Member Author

batrick commented Aug 26, 2024

@batrick
Copy link
Member Author

batrick commented Aug 27, 2024

jenkins test make check

@batrick
Copy link
Member Author

batrick commented Aug 27, 2024

jenkins test make check arm64

@batrick
Copy link
Member Author

batrick commented Aug 27, 2024

@batrick
Copy link
Member Author

batrick commented Aug 29, 2024

@batrick
Copy link
Member Author

batrick commented Aug 29, 2024

I don't think this will need to be merged since the git tag v19.3.0 is all that's needed.

@batrick batrick closed this Aug 29, 2024
@batrick batrick deleted the tentacle-prekickoff branch August 29, 2024 17:48
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.

2 participants