Skip to content

[HOTFIX] cherry-picks of S3UTILS-192 S3UTILS-241 S3UTILS-242 S3UTILS-237 - #413

Merged
bert-e merged 8 commits into
hotfix/1.14.19from
bugfix/S3UTILS-192-S3UTILS-241-S3UTILS-242-S3UTILS-237-hotfix-1.14.19
Sep 30, 2026
Merged

[HOTFIX] cherry-picks of S3UTILS-192 S3UTILS-241 S3UTILS-242 S3UTILS-237#413
bert-e merged 8 commits into
hotfix/1.14.19from
bugfix/S3UTILS-192-S3UTILS-241-S3UTILS-242-S3UTILS-237-hotfix-1.14.19

Conversation

@jonathan-gramain

@jonathan-gramain jonathan-gramain commented Sep 29, 2026

Copy link
Copy Markdown
Contributor

No description provided.

jonathan-gramain and others added 6 commits September 29, 2026 11:11
@jonathan-gramain
S3UTILS-192 [tests] ObjectRepair: ensure async tests have a cb
120dc7e 
(cherry picked from commit 2d2308a)
@jonathan-gramain
ObjectRepair: fix exception with HTTP error responses
f436ae0 
Fix exceptions `SyntaxError: Unexpected end of JSON input` in
ObjectRepair when trying to fetch the RAFT oplog returns an HTTP error
status with an empty body. Also do not crash if the returned JSON is
invalid, although this is unlikely to happen.

Issue: S3UTILS-192
(cherry picked from commit 6b73c74)
@jonathan-gramain
S3UTILS-237 [bf] object repair: increase socket timeout
6bfb38d 
Increase the default idle socket timeout from 10 seconds to 300
seconds, to avoid issues in particular when fetching a range of oplog
from a large backup, causing the socket to not send any data for more
than 10 seconds.

Make the socket timeout configurable as well in case we need to change
it on some platforms, via `OBJECT_REPAIR_SOCKET_TIMEOUT_SECONDS`
environment variable.

(cherry picked from commit de4aa4d)
@jonathan-gramain @claude
S3UTILS-241: fix content-length for multi-byte UTF-8 bodies; add http…
9205a00 
…Request tests

Convert string request bodies to Buffer before sending so that
content-length reflects byte length rather than character count,
preventing truncated writes for bodies containing multi-byte UTF-8
characters.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
(cherry picked from commit 585df98)
@jonathan-gramain @claude
S3UTILS-241: add putObjectMetadata unit tests
e120342 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
(cherry picked from commit a16c506)
@jonathan-gramain @claude
S3UTILS-242: add repairedInfo metadata field on object repair
fc11a00 
When repairObject repairs a version with duplicate sproxyd keys, it
now stamps a repairedInfo field on the metadata with a timestamp and
the reason, to aid forensic investigation of repaired objects.
Document the new field in README.md.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
(cherry picked from commit 8a22286)
@bert-e

bert-e commented Sep 29, 2026

Copy link
Copy Markdown
Contributor

Hello jonathan-gramain,

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 ⭐
/bypass_source_branch_lineage Bypass the cross-branch contamination check ⭐
/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.
/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.

@bert-e

bert-e commented Sep 29, 2026

Copy link
Copy Markdown
Contributor

Incorrect fix version

The Fix Version/s in issue S3UTILS-192 contains:

  • 1.15.9

  • 1.16.0

Considering where you are trying to merge, I expected to find at least:

  • 1.14.19.1

Please check the Fix Version/s of S3UTILS-192, or the target
branch of this pull request.

@jonathan-gramain
jonathan-gramain force-pushed the bugfix/S3UTILS-192-S3UTILS-241-S3UTILS-242-S3UTILS-237-hotfix-1.14.19 branch from cce24b2 to 62d5cb2 Compare September 29, 2026 21:45
@jonathan-gramain

jonathan-gramain commented Sep 29, 2026

Copy link
Copy Markdown
Contributor Author

ping

@bert-e

bert-e commented Sep 29, 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

@jonathan-gramain

jonathan-gramain commented Sep 30, 2026

Copy link
Copy Markdown
Contributor Author

/approve

@bert-e
bert-e merged commit 62d5cb2 into hotfix/1.14.19 Sep 30, 2026
13 of 14 checks passed
@bert-e

bert-e commented Sep 30, 2026

Copy link
Copy Markdown
Contributor

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

  • ✔️ hotfix/1.14.19

The following branches have NOT changed:

  • development/1
  • development/1.13
  • development/1.14
  • development/1.15
  • development/1.16
  • development/1.17
  • development/1.18
  • development/1.19
  • development/1.4
  • development/1.7

Please check the status of the associated issue S3UTILS-192.

Goodbye jonathan-gramain.

The following options are set: approve

@bert-e
bert-e deleted the bugfix/S3UTILS-192-S3UTILS-241-S3UTILS-242-S3UTILS-237-hotfix-1.14.19 branch September 30, 2026 20:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tcarmet tcarmet tcarmet approved these changes
@tmacro tmacro tmacro approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@jonathan-gramain @bert-e @tcarmet @tmacro