bf: CLDSRV-513 fix request logger for batchDelete #5544

jonathan-gramain · 2024-02-28T23:57:48Z

Arsenal's DataWrapper.batchDelete() now already creates a request logger on which it calls end() to get the elapsed time. So as there's no need to create one before the call, remove the corresponding code.

Note that the main fix is the arsenal version bump which, by creating a request logger, fixes naturally the forgotten case in checkHashMatchMD5.

Also bump werelogs dependency.

bert-e · 2024-02-28T23:57:51Z

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	⭐
`/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.

bert-e · 2024-02-28T23:58:02Z

Incorrect fix version

The Fix Version/s in issue CLDSRV-513 contains:

7.10.46

Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:

7.10.46
7.70.46
8.6.27
8.7.48
8.8.21

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

bert-e · 2024-02-29T00:14:11Z

Request integration branches

Waiting for integration branch creation to be requested by the user.

To request integration branches, please comment on this pull request with the following command:

/create_integration_branches

Alternatively, the /approve and /create_pull_requests commands will automatically
create the integration branches.

jonathan-gramain · 2024-02-29T17:28:50Z

/create_integration_branches

bert-e · 2024-02-29T17:29:09Z

Conflict

A conflict has been raised during the creation of
integration branch w/7.70/bugfix/CLDSRV-513-batchDeleteRequestLogger with contents from bugfix/CLDSRV-513-batchDeleteRequestLogger
and development/7.70.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/7.70/bugfix/CLDSRV-513-batchDeleteRequestLogger origin/development/7.70
 $ git merge origin/bugfix/CLDSRV-513-batchDeleteRequestLogger
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/7.70/bugfix/CLDSRV-513-batchDeleteRequestLogger

The following options are set: create_integration_branches

bert-e · 2024-02-29T17:54:08Z

Conflict

A conflict has been raised during the creation of
integration branch w/8.6/bugfix/CLDSRV-513-batchDeleteRequestLogger with contents from w/7.70/bugfix/CLDSRV-513-batchDeleteRequestLogger
and development/8.6.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.6/bugfix/CLDSRV-513-batchDeleteRequestLogger origin/development/8.6
 $ git merge origin/w/7.70/bugfix/CLDSRV-513-batchDeleteRequestLogger
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.6/bugfix/CLDSRV-513-batchDeleteRequestLogger

The following options are set: create_integration_branches

bert-e · 2024-02-29T19:50:27Z

Conflict

A conflict has been raised during the creation of
integration branch w/8.7/bugfix/CLDSRV-513-batchDeleteRequestLogger with contents from w/8.6/bugfix/CLDSRV-513-batchDeleteRequestLogger
and development/8.7.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.7/bugfix/CLDSRV-513-batchDeleteRequestLogger origin/development/8.7
 $ git merge origin/w/8.6/bugfix/CLDSRV-513-batchDeleteRequestLogger
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.7/bugfix/CLDSRV-513-batchDeleteRequestLogger

The following options are set: create_integration_branches

bert-e · 2024-02-29T20:08:29Z

Integration data created

I have created the integration data for the additional destination branches.

this pull request will merge bugfix/CLDSRV-513-batchDeleteRequestLogger into
development/7.10
w/7.70/bugfix/CLDSRV-513-batchDeleteRequestLogger will be merged into development/7.70
w/8.6/bugfix/CLDSRV-513-batchDeleteRequestLogger will be merged into development/8.6
w/8.7/bugfix/CLDSRV-513-batchDeleteRequestLogger will be merged into development/8.7
w/8.8/bugfix/CLDSRV-513-batchDeleteRequestLogger will be merged into development/8.8

The following branches will NOT be impacted:

development/7.4

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

The following options are set: create_integration_branches

bert-e · 2024-02-29T20:08:31Z

Waiting for approval

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

the author
2 peers

The following options are set: create_integration_branches

williamlardier · 2024-03-06T09:59:46Z

package.json

@@ -20,7 +20,7 @@
  "homepage": "https://github.com/scality/S3#readme",
  "dependencies": {
    "@hapi/joi": "^17.1.0",
-    "arsenal": "git+https://github.com/scality/arsenal#7.10.58",
+    "arsenal": "git+https://github.com/scality/arsenal#01294a6efdee7a5de2c69d700a0fa855dc30470d",


Just a reminder to bump the version before merging

bert-e · 2024-03-13T09:15:28Z

Conflict

There is a conflict between your branch bugfix/CLDSRV-513-batchDeleteRequestLogger and the
destination branch development/7.10.

Please resolve the conflict on the feature branch (bugfix/CLDSRV-513-batchDeleteRequestLogger).

git fetch && \
git checkout origin/bugfix/CLDSRV-513-batchDeleteRequestLogger && \
git merge origin/development/7.10

Resolve merge conflicts and commit

git push origin HEAD:bugfix/CLDSRV-513-batchDeleteRequestLogger

The following options are set: create_integration_branches

Arsenal's `DataWrapper.batchDelete()` now already creates a request logger on which it calls `end()` to get the elapsed time. So as there's no need to create one before the call, remove the corresponding code. Note that the main fix is the arsenal version bump which, by creating a request logger, fixes naturally the forgotten case in `checkHashMatchMD5`.

bert-e · 2024-03-13T16:34:55Z

History mismatch

Merge commit #7a945658e4a8fbdd47957351f2ad0a553c7919e8 on the integration branch
w/7.70/bugfix/CLDSRV-513-batchDeleteRequestLogger is merging a branch which is neither the current
branch bugfix/CLDSRV-513-batchDeleteRequestLogger nor the development branch
development/7.70.

It is likely due to a rebase of the branch bugfix/CLDSRV-513-batchDeleteRequestLogger and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

The following options are set: create_integration_branches

bert-e · 2024-03-13T16:54:52Z

Conflict

A conflict has been raised during the creation of
integration branch w/8.7/bugfix/CLDSRV-513-batchDeleteRequestLogger with contents from w/8.6/bugfix/CLDSRV-513-batchDeleteRequestLogger
and development/8.7.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.7/bugfix/CLDSRV-513-batchDeleteRequestLogger origin/development/8.7
 $ git merge origin/w/8.6/bugfix/CLDSRV-513-batchDeleteRequestLogger
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.7/bugfix/CLDSRV-513-batchDeleteRequestLogger

The following options are set: create_integration_branches

bert-e · 2024-03-13T17:36:41Z

Integration data created

I have created the integration data for the additional destination branches.

this pull request will merge bugfix/CLDSRV-513-batchDeleteRequestLogger into
development/7.10
w/7.70/bugfix/CLDSRV-513-batchDeleteRequestLogger will be merged into development/7.70
w/8.6/bugfix/CLDSRV-513-batchDeleteRequestLogger will be merged into development/8.6
w/8.7/bugfix/CLDSRV-513-batchDeleteRequestLogger will be merged into development/8.7
w/8.8/bugfix/CLDSRV-513-batchDeleteRequestLogger will be merged into development/8.8

The following branches will NOT be impacted:

development/7.4

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

The following options are set: create_integration_branches

bert-e · 2024-03-13T17:36:42Z

Waiting for approval

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

the author
2 peers

The following options are set: create_integration_branches

jonathan-gramain · 2024-03-13T21:01:56Z

ping

bert-e · 2024-03-13T21:02:05Z

Conflict

A conflict has been raised during the update of
integration branch w/7.70/bugfix/CLDSRV-513-batchDeleteRequestLogger with contents from bugfix/CLDSRV-513-batchDeleteRequestLogger
and development/7.70.

Please resolve the conflict on the integration branch (w/7.70/bugfix/CLDSRV-513-batchDeleteRequestLogger).

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout w/7.70/bugfix/CLDSRV-513-batchDeleteRequestLogger
 $ git pull  # or "git reset --hard origin/w/7.70/bugfix/CLDSRV-513-batchDeleteRequestLogger"
 $ git merge origin/development/7.70
 $ # <intense conflict resolution>
 $ git commit
 $ git merge origin/bugfix/CLDSRV-513-batchDeleteRequestLogger
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/7.70/bugfix/CLDSRV-513-batchDeleteRequestLogger

The following options are set: create_integration_branches

jonathan-gramain · 2024-03-13T21:04:48Z

ping

bert-e · 2024-03-13T21:04:59Z

Waiting for approval

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

the author
2 peers

The following options are set: create_integration_branches

jonathan-gramain · 2024-03-13T22:40:38Z

/approve

bert-e · 2024-03-13T22:40:54Z

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/7.10
✔️ development/7.70
✔️ development/8.6
✔️ development/8.7
✔️ development/8.8

The following branches will NOT be impacted:

development/7.4

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, create_integration_branches

bert-e · 2024-03-13T22:41:09Z

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

✔️ development/7.10
✔️ development/7.70
✔️ development/8.6
✔️ development/8.7
✔️ development/8.8

The following branches have NOT changed:

development/7.4

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

Goodbye jonathan-gramain.

jonathan-gramain force-pushed the bugfix/CLDSRV-513-batchDeleteRequestLogger branch from 735682f to 9d47427 Compare February 29, 2024 00:06

jonathan-gramain force-pushed the bugfix/CLDSRV-513-batchDeleteRequestLogger branch 2 times, most recently from ac6927c to 18816ac Compare February 29, 2024 00:50

williamlardier approved these changes Mar 6, 2024

View reviewed changes

nicolas2bert approved these changes Mar 13, 2024

View reviewed changes

jonathan-gramain added 3 commits March 13, 2024 09:31

CLDSRV-513 bump werelogs dependency

20f6e30

CLDSRV-513 bump arsenal dependency

8426034

jonathan-gramain force-pushed the bugfix/CLDSRV-513-batchDeleteRequestLogger branch from 18816ac to 8426034 Compare March 13, 2024 16:34

CLDSRV-513 bump cloudserver

e028eb2

bert-e merged commit e028eb2 into development/7.10 Mar 13, 2024
14 checks passed

bert-e deleted the bugfix/CLDSRV-513-batchDeleteRequestLogger branch March 13, 2024 22:41

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

bf: CLDSRV-513 fix request logger for batchDelete #5544

bf: CLDSRV-513 fix request logger for batchDelete #5544

jonathan-gramain commented Feb 28, 2024

bert-e commented Feb 28, 2024

bert-e commented Feb 28, 2024

bert-e commented Feb 29, 2024

jonathan-gramain commented Feb 29, 2024

bert-e commented Feb 29, 2024

bert-e commented Feb 29, 2024

bert-e commented Feb 29, 2024

bert-e commented Feb 29, 2024

bert-e commented Feb 29, 2024

williamlardier Mar 6, 2024 •

edited

Loading

bert-e commented Mar 13, 2024

bert-e commented Mar 13, 2024

bert-e commented Mar 13, 2024

bert-e commented Mar 13, 2024

bert-e commented Mar 13, 2024

jonathan-gramain commented Mar 13, 2024

bert-e commented Mar 13, 2024

jonathan-gramain commented Mar 13, 2024

bert-e commented Mar 13, 2024

jonathan-gramain commented Mar 13, 2024

bert-e commented Mar 13, 2024

bert-e commented Mar 13, 2024

bf: CLDSRV-513 fix request logger for batchDelete #5544

bf: CLDSRV-513 fix request logger for batchDelete #5544

Conversation

jonathan-gramain commented Feb 28, 2024

bert-e commented Feb 28, 2024

Hello jonathan-gramain,

bert-e commented Feb 28, 2024

Incorrect fix version

bert-e commented Feb 29, 2024

Request integration branches

jonathan-gramain commented Feb 29, 2024

bert-e commented Feb 29, 2024

Conflict

bert-e commented Feb 29, 2024

Conflict

bert-e commented Feb 29, 2024

Conflict

bert-e commented Feb 29, 2024

Integration data created

bert-e commented Feb 29, 2024

Waiting for approval

williamlardier Mar 6, 2024 • edited Loading

Choose a reason for hiding this comment

bert-e commented Mar 13, 2024

Conflict

bert-e commented Mar 13, 2024

History mismatch

bert-e commented Mar 13, 2024

Conflict

bert-e commented Mar 13, 2024

Integration data created

bert-e commented Mar 13, 2024

Waiting for approval

jonathan-gramain commented Mar 13, 2024

bert-e commented Mar 13, 2024

Conflict

jonathan-gramain commented Mar 13, 2024

bert-e commented Mar 13, 2024

Waiting for approval

jonathan-gramain commented Mar 13, 2024

bert-e commented Mar 13, 2024

In the queue

bert-e commented Mar 13, 2024

williamlardier Mar 6, 2024 •

edited

Loading