search

scality / cloudserver

Zenko CloudServer, an open-source Node.js implementation of the Amazon S3 protocol on the front-end and backend storage capabilities to multiple clouds, including Azure and Google.
https://www.zenko.io/cloudserver
Apache License 2.0
1.71k stars 241 forks source link

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

Closed jonathan-gramain closed 7 months ago

jonathan-gramain commented 8 months ago

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 commented 8 months ago

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 | :star: | `/bypass_build_status` | Bypass the build and test status | :star: | `/bypass_commit_size` | Bypass the check on the size of the changeset ```TBA``` | :star: | `/bypass_incompatible_branch` | Bypass the check on the source branch prefix | :star: | `/bypass_jira_check` | Bypass the Jira issue check | :star: | `/bypass_peer_approval` | Bypass the pull request peers' approval | :star: | `/bypass_leader_approval` | Bypass the pull request leaders' approval | :star: | `/approve` | Instruct Bert-E that the author has approved the pull request. | | :writing_hand: `/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 commented 8 months ago

Incorrect fix version

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

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

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

bert-e commented 8 months ago

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 commented 8 months ago

/create_integration_branches

bert-e commented 8 months ago

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 commented 8 months ago

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 commented 8 months ago

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 commented 8 months ago

Integration data created

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

The following branches will NOT be impacted:

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 commented 8 months ago

Waiting for approval

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

The following options are set: create_integration_branches

bert-e commented 7 months ago

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

bert-e commented 7 months ago

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 commented 7 months ago

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 commented 7 months ago

Integration data created

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

The following branches will NOT be impacted:

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 commented 7 months ago

Waiting for approval

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

The following options are set: create_integration_branches

jonathan-gramain commented 7 months ago

ping

bert-e commented 7 months ago

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 commented 7 months ago

ping

bert-e commented 7 months ago

Waiting for approval

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

The following options are set: create_integration_branches

jonathan-gramain commented 7 months ago

/approve

bert-e commented 7 months ago

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:

The following branches will NOT be impacted:

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.

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 commented 7 months ago

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

The following branches have NOT changed:

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

Goodbye jonathan-gramain.