Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bugfix: CLDSRV-177 fix crash with empty object replication #4460

Merged
merged 1 commit into from
Apr 20, 2022
Merged

bugfix: CLDSRV-177 fix crash with empty object replication #4460

merged 1 commit into from
Apr 20, 2022

Conversation

jonathan-gramain
Copy link
Contributor

Fix a case of crash when a replication occurs with an empty object
over a non-empty object.

It is not clear how this happens in practice but there can be some
corner cases with race conditions between object replication and
versioning getting suspended on the target bucket at the same time,
that could lead to this situation, as the check between replication
configuration and actual replication is not atomic.

@jonathan-gramain
bugfix: CLDSRV-177 fix crash with empty object replication
a4e8cbe 
Fix a case of crash when a replication occurs with an empty object
over a non-empty object.

It is not clear how this happens in practice but there can be some
corner cases with race conditions between object replication and
versioning getting suspended on the target bucket at the same time,
that could lead to this situation, as the check between replication
configuration and actual replication is not atomic.
@bert-e
Copy link
Contributor

bert-e commented Apr 19, 2022

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.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Apr 19, 2022

Incorrect fix version

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

  • 7.10.3

  • 7.4.12

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

  • 7.10.4

  • 7.4.12

  • 8.2.21

  • 8.3.13

  • 8.4.9

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

@jonathan-gramain
Copy link
Contributor Author

ping

@bert-e
Copy link
Contributor

bert-e commented Apr 19, 2022

Conflict

A conflict has been raised during the creation of
integration branch w/8.2/bugfix/CLDSRV-177-checkEmptyLocationsInLocationsSanityCheck with contents from w/7.10/bugfix/CLDSRV-177-checkEmptyLocationsInLocationsSanityCheck
and development/8.2.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.2/bugfix/CLDSRV-177-checkEmptyLocationsInLocationsSanityCheck origin/development/8.2
 $ git merge origin/w/7.10/bugfix/CLDSRV-177-checkEmptyLocationsInLocationsSanityCheck
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.2/bugfix/CLDSRV-177-checkEmptyLocationsInLocationsSanityCheck

This was referenced Apr 19, 2022
Merged
Merged
Merged
Merged
@bert-e
Copy link
Contributor

bert-e commented Apr 19, 2022

Integration data created

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

The following branches will NOT be impacted:

  • development/6.4

Follow integration pull requests if you would like to be notified of
build statuses by email.

@bert-e
Copy link
Contributor

bert-e commented Apr 19, 2022

Waiting for approval

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

  • the author

  • 2 peers

@bert-e
Copy link
Contributor

bert-e commented Apr 20, 2022

Conflict

A conflict has been raised during the update of
integration branch w/8.2/bugfix/CLDSRV-177-checkEmptyLocationsInLocationsSanityCheck with contents from w/7.10/bugfix/CLDSRV-177-checkEmptyLocationsInLocationsSanityCheck
and development/8.2.

Please resolve the conflict on the integration branch (w/8.2/bugfix/CLDSRV-177-checkEmptyLocationsInLocationsSanityCheck).

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout w/8.2/bugfix/CLDSRV-177-checkEmptyLocationsInLocationsSanityCheck
 $ git pull  # or "git reset --hard origin/w/8.2/bugfix/CLDSRV-177-checkEmptyLocationsInLocationsSanityCheck"
 $ git merge origin/development/8.2
 $ # <intense conflict resolution>
 $ git commit
 $ git merge origin/w/7.10/bugfix/CLDSRV-177-checkEmptyLocationsInLocationsSanityCheck
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.2/bugfix/CLDSRV-177-checkEmptyLocationsInLocationsSanityCheck

@bert-e
Copy link
Contributor

bert-e commented Apr 20, 2022

Waiting for approval

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

  • the author

  • 2 peers

@jonathan-gramain
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Apr 20, 2022

Build failed

The build for commit did not succeed in branch w/8.4/bugfix/CLDSRV-177-checkEmptyLocationsInLocationsSanityCheck.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Apr 20, 2022

Queue out of order

The changeset has received all authorizations to enter the merge queue,
however the merge queue is currently in an incoherent state. In order
to protect this pull-request, I have not added the changeset to the
queue.

Please contact a member of release engineering.

The following options are set: approve

@jonathan-gramain
Copy link
Contributor Author

ping

@bert-e
Copy link
Contributor

bert-e commented Apr 20, 2022

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.4

  • ✔️ development/7.10

  • ✔️ development/8.2

  • ✔️ development/8.3

  • ✔️ development/8.4

The following branches will NOT be impacted:

  • development/6.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

@bert-e
Copy link
Contributor

bert-e commented Apr 20, 2022

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

  • ✔️ development/7.4

  • ✔️ development/7.10

  • ✔️ development/8.2

  • ✔️ development/8.3

  • ✔️ development/8.4

The following branches have NOT changed:

  • development/6.4

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

Goodbye jonathan-gramain.

@bert-e bert-e merged commit a4e8cbe into development/7.4 Apr 20, 2022
@bert-e bert-e deleted the bugfix/CLDSRV-177-checkEmptyLocationsInLocationsSanityCheck branch April 20, 2022 19:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@francoisferrand francoisferrand francoisferrand approved these changes

@watsaqat watsaqat watsaqat 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 @francoisferrand @watsaqat