Skip to content

Send X-Scal-Request-Uids (not x-scal-request-id) on the management config poll#6218

Merged
bert-e merged 2 commits into
development/9.4from
improvement/CLDSRV-948/rename-reqids-mgmt-poll
Jul 17, 2026
Merged

Send X-Scal-Request-Uids (not x-scal-request-id) on the management config poll#6218
bert-e merged 2 commits into
development/9.4from
improvement/CLDSRV-948/rename-reqids-mgmt-poll

Conversation

@delthas

@delthas delthas commented Jul 6, 2026

Copy link
Copy Markdown
Contributor

The management config-overlay poll (lib/management/poll.js,
loadRemoteOverlay) sent the werelogs req_id chain under the wrong
header name x-scal-request-id. Rename the outgoing header to
x-scal-request-uids, which matches cloudserver's own reader in
lib/server.js. The value (log.getSerializedUids()) is unchanged.

Pure rename: no dual-send. Also exports loadRemoteOverlay and adds a
focused unit test asserting the outgoing request carries
x-scal-request-uids and not x-scal-request-id.

Part of the OS-1089 reqUids-propagation audit. Note: the receiving
config/overlay endpoint on pensieve-api doesn't declare this header in
its swagger params, but pensieve reads it via a global middleware
(WithRequestId), so it applies to every endpoint regardless. Related
pensieve-side reqUids work: PSVAPI-131.

Issue: CLDSRV-948

@bert-e

bert-e commented Jul 6, 2026

Copy link
Copy Markdown
Contributor

Hello delthas,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Available options
name description privileged authored
/after_pull_request Wait for the given pull request id to be merged before continuing with the current one.
/bypass_author_approval Bypass the pull request author's approval
/bypass_build_status Bypass the build and test status
/bypass_commit_size Bypass the check on the size of the changeset TBA
/bypass_incompatible_branch Bypass the check on the source branch prefix
/bypass_jira_check Bypass the Jira issue check
/bypass_peer_approval Bypass the pull request peers' approval
/bypass_leader_approval Bypass the pull request leaders' approval
/approve Instruct Bert-E that the author has approved the pull request. ✍️
/create_pull_requests Allow the creation of integration pull requests.
/create_integration_branches Allow the creation of integration branches.
/no_octopus Prevent Wall-E from doing any octopus merge and use multiple consecutive merge instead
/unanimity Change review acceptance criteria from one reviewer at least to all reviewers
/wait Instruct Bert-E not to run until further notice.
Available commands
name description privileged
/help Print Bert-E's manual in the pull request.
/status Print Bert-E's current status in the pull request TBA
/clear Remove all comments from Bert-E from the history TBA
/retry Re-start a fresh build TBA
/build Re-start a fresh build TBA
/force_reset Delete integration branches & pull requests, and restart merge process from the beginning.
/reset Try to remove integration branches unless there are commits on them which do not appear on the source branch.

Status report is not available.

@scality scality deleted a comment from bert-e Jul 6, 2026
@bert-e

bert-e commented Jul 6, 2026

Copy link
Copy Markdown
Contributor

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

@codecov

codecov Bot commented Jul 6, 2026

Copy link
Copy Markdown

❌ 1 Tests Failed:

Tests completed Failed Passed Skipped
9661 1 9660 0
View the full list of 2 ❄️ flaky test(s)
"after each" hook for "should fail if trying to overwrite a delete marker"::MPU with x-scal-s3-version-id header With v4 signature "after each" hook for "should fail if trying to overwrite a delete marker"

Flake rate in main: 100.00% (Passed 0 times, Failed 206 times)

Stack Traces | 0.017s run time
We encountered an internal error. Please try again.
should create a bunch of objects and their versions::put and head object with versioning With v4 signature on versioning suspended then enabled bucket w/ null version should create a bunch of objects and their versions

Flake rate in main: 13.81% (Passed 668 times, Failed 107 times)

Stack Traces | 600s run time
Timeout of 600000ms exceeded. For async tests and hooks, ensure "done()" is called; if returning a Promise, ensure it resolves. (.../test/versioning/objectHead.js)

To view more test analytics, go to the Test Analytics Dashboard
📋 Got 3 mins? Take this short survey to help us improve Test Analytics.

delthas added 2 commits July 6, 2026 16:22
Formatting-only commit: run Prettier on lib/management/poll.js, which was
already prettier-dirty at the base commit, so the functional change on top
stays prettier-clean and diff-minimal.

Issue: CLDSRV-948
The management config-overlay poll emitted the werelogs req_id chain
under the wrong header name. Rename the outgoing header from
x-scal-request-id to x-scal-request-uids, matching cloudserver's own
reader in lib/server.js. Also export loadRemoteOverlay and add a unit
test asserting the header is sent.

Issue: CLDSRV-948
@delthas
delthas force-pushed the improvement/CLDSRV-948/rename-reqids-mgmt-poll branch from 7746fec to f2ca340 Compare July 6, 2026 14:23
@delthas
delthas marked this pull request as ready for review July 7, 2026 14:43
@delthas
delthas requested review from a team, SylvainSenechal and benzekrimaha July 8, 2026 09:36
Comment thread lib/management/poll.js

@benzekrimaha benzekrimaha left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM.
side note and not blocking :
blobserver's lib/management/poll.js has the same x-scal-request-id header , we might need a follow up ticket

@delthas

delthas commented Jul 9, 2026

Copy link
Copy Markdown
Contributor Author

Re blobserver: it looks EOL (last real commit Feb 2021), so I don't think a follow-up is worth it. Let me know and I can create one as needed.

@delthas

delthas commented Jul 17, 2026

Copy link
Copy Markdown
Contributor Author

/approve

@bert-e

bert-e commented Jul 17, 2026

Copy link
Copy Markdown
Contributor

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/9.4

The following branches will NOT be impacted:

  • development/7.10
  • development/7.4
  • development/7.70
  • development/8.8
  • development/9.0
  • development/9.1
  • development/9.2
  • development/9.3

This pull request does not target the following hotfix branch(es) so they
will be left untouched:

  • hotfix/7.70.21
  • hotfix/7.10.27
  • hotfix/7.4.5
  • hotfix/9.0.32
  • hotfix/7.70.73
  • hotfix/7.10.3
  • hotfix/7.10.2
  • hotfix/7.4.7
  • hotfix/7.10.15
  • hotfix/7.4.8
  • hotfix/8.8.45
  • hotfix/7.10.8
  • hotfix/7.2.0
  • hotfix/7.9.0
  • hotfix/7.4.0
  • hotfix/6.4.7
  • hotfix/7.70.51
  • hotfix/7.10.49
  • hotfix/7.6.0
  • hotfix/7.70.11
  • hotfix/7.4.10
  • hotfix/7.10.28
  • hotfix/7.10.4
  • hotfix/7.10.1
  • hotfix/7.4.2
  • hotfix/7.70.45
  • hotfix/7.4.4
  • hotfix/7.8.0
  • hotfix/9.2.36
  • hotfix/9.0.7
  • hotfix/7.10.0
  • hotfix/9.2.24
  • hotfix/7.10.30
  • hotfix/7.4.9
  • hotfix/7.7.0
  • hotfix/7.4.6
  • hotfix/7.4.1
  • hotfix/7.4.3

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

@bert-e

bert-e commented Jul 17, 2026

Copy link
Copy Markdown
Contributor

Queue build failed

The corresponding build for the queue failed:

  • Checkout the status page.
  • Identify the failing build and review the logs.
  • If no issue is found, re-run the build.
  • If an issue is identified, checkout the steps below to remove
    the pull request from the queue for further analysis and maybe rebase/merge.
Remove the pull request from the queue
  • Add a /wait comment on this pull request.
  • Click on login on the status page.
  • Go into the manage page.
  • Find the option called Rebuild the queue and click on it.
    Bert-E will loop again on all pull requests to put the valid ones
    in the queue again, while skipping the one with the /wait comment.
  • Wait for the new queue to merge, then merge/rebase your pull request
    with the latest changes to then work on a proper fix.
  • Once the issue is fixed, delete the /wait comment and
    follow the usual process to merge the pull request.

@bert-e

bert-e commented Jul 17, 2026

Copy link
Copy Markdown
Contributor

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/9.4

The following branches have NOT changed:

  • development/7.10
  • development/7.4
  • development/7.70
  • development/8.8
  • development/9.0
  • development/9.1
  • development/9.2
  • development/9.3

Please check the status of the associated issue CLDSRV-948.

Goodbye delthas.

@bert-e
bert-e merged commit 0d08680 into development/9.4 Jul 17, 2026
58 of 61 checks passed
@bert-e
bert-e deleted the improvement/CLDSRV-948/rename-reqids-mgmt-poll branch July 17, 2026 10:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants