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

[3.1.4 Backport] CBG-3751: Cherry-pick CBG-3742: Allow registry rollb… #6718

Merged
merged 2 commits into from
Mar 7, 2024

Conversation

bbrks
Copy link
Member

@bbrks bbrks commented Mar 6, 2024

CBG-3751

Backports #6709 to 3.1.4

  • Non-clean cherry pick
    • Required changes in test code
    • And selectively pulling in some additional bootstrap/server test helpers (they wouldn't cherry-pick in full cleanly either)

Integration Tests

…acks based on db config doc rollbacks (#6709)

* Extend startBootstrapServerWithoutConfigPolling polling interval

* tidy return

* Use config from bucket to roll back if no previous version is found (config vbucket rollback/config restore)

* wip

* Mark conflicting rollbacks as invalid in db registry and prevent loading by SG. Allows for manual repair of database config.

* Improve log message for invalid database configurations - handle multiple scenarios

* Handle unknown reasons why a db could be invalid

* Do database repair via normal Admin REST API rather to ensure externally recoverable

* Equal(len())->Len()

* Rename stat

* UD->MD fix

* lower retry timeout for testing

* Require 3 datastores

* Replace registry entry with one built from config

* Reword unexpected InvalidDatabase case

* Push mutliDatabsaeRollback into subtest

* fix ineffassign

* Fix non-deterministic slice ordering from RequireInvalidDatabaseConfigNames helper
@bbrks bbrks self-assigned this Mar 6, 2024
@bbrks bbrks assigned adamcfraser and unassigned bbrks Mar 7, 2024
@bbrks bbrks requested review from torcolvin and adamcfraser March 7, 2024 12:00
@adamcfraser adamcfraser merged commit 52ba5e6 into release/3.1.4 Mar 7, 2024
24 checks passed
@adamcfraser adamcfraser deleted the CBG-3751 branch March 7, 2024 17:47
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