merge main (7e891607bdc) into anemone #7403
Merged
+1,451
−498
Conversation
This file contains 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
Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.30.0 to 0.31.0. - [Commits](golang/crypto@v0.30.0...v0.31.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>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* CBG-4336: add updated at field for persisted configs * change time to utc * fix default collection test issues * flakyness with tests * add delay to other tests too * updates to add created_at field to configs * remove unnecessary method
Bumps [golang.org/x/oauth2](https://github.com/golang/oauth2) from 0.24.0 to 0.25.0. - [Commits](golang/oauth2@v0.24.0...v0.25.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 [github.com/coreos/go-oidc/v3](https://github.com/coreos/go-oidc) from 3.11.0 to 3.12.0. - [Release notes](https://github.com/coreos/go-oidc/releases) - [Commits](coreos/go-oidc@v3.11.0...v3.12.0) --- updated-dependencies: - dependency-name: github.com/coreos/go-oidc/v3 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>
…nge in a channel filter on channel filter removal (#7269)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* CBG-4370 create a cancel context inside BlipSyncContext This cancel context allows a forceable closure of the underlying blip connection. In the case there is a continuous pull replication and there is an error on the changes feed, the only way to stop the pull replication is to shut down the connection. CBL clients do not listen to unsolicited error messages. * Avoid refactoring with the change * pass lint * test active replicator reconnection * test fixup * lint correctly * PR comments * Acquire read lock to present data race * switch query to use all docs index
* Cover all test files * Mark only gosimple as a disabled linter, future proof removing disabled linters in the future, fix regex again
* Count scheduled compaction runs as idle KV/Query ops * Relax assertions because there are other idle KV ops happening behind the test * remove test logging
…tries updating principals (#7316) * Release unused sequences allocated when encountering CAS retries updating principals * Convert test to table driven test - try multiple different CAS retry counts * avoid shadowing err in principal cas retry loop * Improve releaseSequence failure log * Lower test logging * Check error contains * Fencepost error for auth.PrincipalUpdateMaxCasRetries test c ase * Include principal name in release unused sequence error logging
* Replace LeakyBucket callback with Set instead of SetRaw to preserve JSON doc type in bucket * Remove GetRaw from LeakyBucket callback
…#7295) * CBG-4309: add rollback hook for cbgt to call during rollback of pIndex * remove temp test * update cbgt to include rollback hook * CBG-4309 add Rollback to to PIndexImplType * Update cbgt fix to trigger janitor kick --------- Co-authored-by: Tor Colvin <[email protected]>
Redocly previews |
gregns1
reviewed
Feb 28, 2025
torcolvin
force-pushed
the
anemone-merge
branch
from
02ef8e5 to
8d5d426
Compare
gregns1
approved these changes
Feb 28, 2025
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.
merge main (7e89160) into anemone. This is not the full merge, that will be done in subsequent tickets.
Nearly every conflict was in test code, the only non-test file that had conflicts was in the active replicator code.
Pre-review checklist
fmt.Print,log.Print, ...)base.UD(docID),base.MD(dbName))docs/apiIntegration Tests
GSI=true,xattrs=truehttps://jenkins.sgwdev.com/job/SyncGateway-Integration/2974/ fails with https://github.com/couchbase/sync_gateway/pull/7379/files will fix after this commit goes in.