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.

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

MB-60945 - Add scorch event for pre merge check #1971

Merged
merged 5 commits into from
May 16, 2024
Merged

Conversation

metonymic-smokey
Copy link
Member

@metonymic-smokey metonymic-smokey commented Jan 25, 2024

This PR adds an event to check whether a merge can proceed based on criteria set by the caller(eg. cbft). If not, it's aborted and the merger loop continues its next iteration.
Also includes minor refactor to the function signature of the event callback registry to accommodate the new event type.

@metonymic-smokey metonymic-smokey changed the title scorch event for pre merge mem check MB-60383 - Add scorch event for pre merge memory check Jan 29, 2024
@metonymic-smokey metonymic-smokey marked this pull request as ready for review January 29, 2024 17:35
@metonymic-smokey metonymic-smokey marked this pull request as draft January 30, 2024 12:58
@metonymic-smokey metonymic-smokey marked this pull request as ready for review February 1, 2024 10:38
@metonymic-smokey metonymic-smokey changed the title MB-60383 - Add scorch event for pre merge memory check MB-60383 - Add scorch event for pre merge check Feb 1, 2024
@abhinavdangeti abhinavdangeti added this to the v2.4.1 milestone Apr 9, 2024
@metonymic-smokey metonymic-smokey changed the base branch from 7.6-couchbase to master April 11, 2024 09:20
@metonymic-smokey metonymic-smokey changed the base branch from master to 7.6-couchbase April 11, 2024 09:21
@metonymic-smokey metonymic-smokey changed the base branch from 7.6-couchbase to master April 11, 2024 13:49
@metonymic-smokey metonymic-smokey changed the title MB-60383 - Add scorch event for pre merge check MB-60945 - Add scorch event for pre merge check Apr 11, 2024
index/scorch/scorch.go Outdated Show resolved Hide resolved
index/scorch/scorch.go Outdated Show resolved Hide resolved
index/scorch/event.go Outdated Show resolved Hide resolved
@abhinavdangeti
Copy link
Member

@metonymic-smokey have you checked why the unit tests are failing?

@metonymic-smokey metonymic-smokey marked this pull request as draft April 19, 2024 14:10
@metonymic-smokey metonymic-smokey marked this pull request as ready for review April 19, 2024 14:15
Copy link
Member

@abhinavdangeti abhinavdangeti left a comment

Choose a reason for hiding this comment

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

Minor comment, looks ok to me otherwise.

index/scorch/event.go Show resolved Hide resolved
@metonymic-smokey metonymic-smokey merged commit 06449e9 into master May 16, 2024
9 checks passed
@metonymic-smokey metonymic-smokey deleted the merge branch May 16, 2024 04:26
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.

2 participants