Skip to content

Comments

rgw: fix the version in DECODE_START() of RGWZoneGroupPlacementTier#62515

Merged
rzarzynski merged 1 commit intoceph:mainfrom
rzarzynski:wip-ftbfs-rgwzoneplctier
Mar 26, 2025
Merged

rgw: fix the version in DECODE_START() of RGWZoneGroupPlacementTier#62515
rzarzynski merged 1 commit intoceph:mainfrom
rzarzynski:wip-ftbfs-rgwzoneplctier

Conversation

@rzarzynski
Copy link
Contributor

@rzarzynski rzarzynski commented Mar 26, 2025

This commit fixes an undetected merge conflict between PRs #61745 and #60159. The dencoding problem has been introduced very recently, it is straightforward and causes failures of the make check bot everywhere, therefore -- if no objections -- I want to merge this patch without the Teuthology testing.

/home/jenkins-build/build/workspace/ceph-pull-requests/src/rgw/rgw_zone_types.h:650:21: error: call to consteval function 'StructVChecker<'\x03'>::CheckingWrapper::CheckingWrapper' is not a constant expression
  650 |     if (struct_v >= 4) {
      |                     ^
/home/jenkins-build/build/workspace/ceph-pull-requests/src/include/denc.h:1804:7: note: subexpression not valid in a constant expression
 1804 |       consteval_assert(
      |       ^~~~~~~~~~~~~~~~~
 1805 |         c <= MaxV,
      |         ~~~~~~~~~~
 1806 |         "checking against higher version than declared in DECODE_START");
      |         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/home/jenkins-build/build/workspace/ceph-pull-requests/src/include/ceph_assert.h:150:7: note: expanded from macro 'consteval_assert'
  150 |       throw (msg);                      \
      |       ^~~~~~~~~~~
/home/jenkins-build/build/workspace/ceph-pull-requests/src/rgw/rgw_zone_types.h:650:21: note: in call to 'CheckingWrapper(4)'
  650 |     if (struct_v >= 4) {
      |                     ^
1 error generated.

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

This commit fixes an undetected merge conflict between PRs ceph#61745
and ceph#60159. The dencoding problem has been introduced very recently,
it is straightforward and causes failures of the make check bot
everywhere, therefore -- if no objections -- I want to merge this
patch without the Teuthology testing.

Signed-off-by: Radoslaw Zarzynski <[email protected]>
@rzarzynski rzarzynski requested a review from a team as a code owner March 26, 2025 08:45
@github-actions github-actions bot added the rgw label Mar 26, 2025
Copy link
Contributor

@tchaikov tchaikov left a comment

Choose a reason for hiding this comment

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

lgtm

Copy link
Contributor

@bill-scales bill-scales left a comment

Choose a reason for hiding this comment

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

lgtm

@cbodley
Copy link
Contributor

cbodley commented Mar 26, 2025

what the heck happened with 'make check'? https://jenkins.ceph.com/job/ceph-pull-requests/154687/

92 tests failed out of 310

error while loading shared libraries: /home/jenkins-build/build/workspace/ceph-pull-requests/build/lib/libceph-common.so.2: file too short

@rzarzynski
Copy link
Contributor Author

jenkins test make check

@rzarzynski rzarzynski changed the title rgw: fix the version in DOCODE_START() of RGWZoneGroupPlacementTier rgw: fix the version in DEOCODE_START() of RGWZoneGroupPlacementTier Mar 26, 2025
@rzarzynski rzarzynski changed the title rgw: fix the version in DEOCODE_START() of RGWZoneGroupPlacementTier rgw: fix the version in DECODE_START() of RGWZoneGroupPlacementTier Mar 26, 2025
@rzarzynski rzarzynski merged commit 95d6395 into ceph:main Mar 26, 2025
18 of 19 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants