CBG-4704: Anemone merge #7621
Closed
CBG-4704: Anemone merge #7621
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…import (#7326) * CBG-4487: dealock in revision cache between Get and On demand import * remove commented out code * suppress lint * add import test skip * err check stuff * updated on comments + extra tests * test refactor issue * add dev mode assert * updates to make goroutines exit upon test finish
* Remove dead code * force import sorting
…necting replicator (#7355) * Move StatsReporter goroutine lifecycle up into Replicator start instead of replicator connect * Address PR feedback - pass context explicitly into StatusReporter
* CBG-4390: provide cluster UUID at top level endpoint * update to fix for non persistent config * fix for rosmar * remove pre paramatised test * nit * move mgtrequest into common function * updates * remove unused code * fix failing test * update to create separate struct of info for runtime only info
…7358) * CBG-4391: bubble up errors from startup db process to db summaries * lint error and comments need removing + fix uint test mishap * address review * updates to have gloabl map * remove iota * Update rest/database_error.go Co-authored-by: Ben Brooks <[email protected]> --------- Co-authored-by: Ben Brooks <[email protected]>
…es out (#7361) * Put the replicator into an error and stopped state when a reconnect loop times out * Conditionally set reconnectLoop error state based on context error * Rewrite error handling to have early returns * Defer unlock inside retry func * add comment for setState instead of setError * Simplify reconnectLoop error handling for logging - rely on retry loop error message which is now wrapping context err
Bumps [golang.org/x/oauth2](https://github.com/golang/oauth2) from 0.25.0 to 0.26.0. - [Commits](golang/oauth2@v0.25.0...v0.26.0) --- updated-dependencies: - dependency-name: golang.org/x/oauth2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.32.0 to 0.33.0. - [Commits](golang/crypto@v0.32.0...v0.33.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Shorten the time it takes to run tests - Create test buckets in the background instead of before the tests. This shortens time in the case of no running tests, all tests are skipped, or a test only requires a single bucket. - Do not wait for buckets to be torn down for test exit, since they will be deleted in the next test run. - Only create 3 collections when we need to, otherwise create two. - Put bucket into readyBucketPool directly instead of addToBucketReadierQueue after creation. Dropping the immediate flush saves about 6 secs per bucket for the buckets to become ready. - Running the bucket creation in parallel is faster when Flush buckets are used, but slower when GSI is used, so running parallel init is off by default.
Co-authored-by: Tor Colvin <[email protected]>
Co-authored-by: Ben Brooks <[email protected]>
Co-authored-by: Copilot <[email protected]>
Co-authored-by: Copilot <[email protected]>
…tat (#7611) Co-authored-by: Copilot <[email protected]>
Redocly previews |
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR merges the “anemone” branch into main, bringing in new version-vector (HLV/CV) support, extensive test updates, and bulk API enhancements.
- Replace legacy
RevIDusage withRevTreeIDand integrateCurrentVersion(CV) in change feeds and BLIP tests. - Extend
/bulk_docsand/_all_docsendpoints to includecvfields controlled by ashow_cvquery parameter. - Consolidate change-entry assertions via
assertChangeEntryMatchesand add a new TLS/no-certs test.
Reviewed Changes
Copilot reviewed 98 out of 131 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| rest/config_test.go | Added TestTLSWithoutCerts to validate import feeds over TLS without certs. |
| rest/changestest/changes_api_test.go | Swapped RevID references to RevTreeID and introduced assertChangeEntryMatches. |
| rest/bulk_api.go | Added CV field and show_cv support to bulk handlers. |
| rest/blip_legacy_revid_test.go | New long-running BLIP tests for legacy rev-tree behavior. |
Comments suppressed due to low confidence (4)
rest/bulk_api.go:76
- [nitpick] The flag names
includeCVsandshowCVare inconsistent for the same concept. Consider unifying them (e.g.,includeCVorshowCV) for clarity.
includeCVs := h.getBoolQuery("show_cv")
rest/blip_legacy_revid_test.go:11
- [nitpick] This file is over 1000 lines long, which can be difficult to navigate. Consider splitting it into smaller, feature-focused test files to improve readability and maintainability.
package rest
rest/config_test.go:3140
- This test uses
time.Secondandtime.Millisecondbut thetimepackage may not be imported. Ensureimport "time"is present to avoid build errors.
func TestTLSWithoutCerts(t *testing.T) {
rest/blip_api_attachment_test.go:48
- [nitpick] Older tests use
SkipVersionVectorInitializationwhereas this usesSkipSubtest. Consider standardizing on one skip mechanism to reduce confusion.
btcRunner.SkipSubtest[VersionVectorSubtestName] = true // Doesn't require HLV - attachment v2 protocol test
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
Collaborator
|
This PR was never intended to be merged, it was for analysis. The state of main before the branch is now in https://github.com/couchbase/sync_gateway/tree/main-backup-2025-07-10 and main was pushed with the merge in place. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
CBG-4704
Pre-review checklist
fmt.Print,log.Print, ...)base.UD(docID),base.MD(dbName))docs/apiDependencies (if applicable)
Integration Tests
GSI=true,xattrs=truehttps://jenkins.sgwdev.com/job/SyncGateway-Integration/3202/