CBG3026 prereq: More low-risk cleanup/refactoring #7120
Merged
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
- Move `DatabaseLogCtx` earlier in `_getOrAddDatabaseFromConfig` so we can identify which database init-related logging is for - `t.Run`->`rt.Run` fixes (prevents panics with failing subtests) - Minor rename and TODO comment for upcoming work
torcolvin
previously approved these changes
Sep 20, 2024
rest/server_context.go
Outdated
| @@ -588,6 +588,14 @@ func (sc *ServerContext) _getOrAddDatabaseFromConfig(ctx context.Context, config | |||
| dbName = spec.BucketName | |||
| } | |||
|
|
|||
| // Generate database context options from config and server context | |||
| contextOptions, err := dbcOptionsFromConfig(ctx, sc, &config.DbConfig, dbName) | |||
There was a problem hiding this comment.
Can you check that this is okay that this isn't going to return an error for db.ValidateDatabaseName?
There was a problem hiding this comment.
Ah! I missed that. I also realised this code is being put before the defer as well, so I'll move things down a bit. There's also the duplicate check we probably want to do first to exit early.
2 tasks
torcolvin
approved these changes
Sep 20, 2024
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.
This PR contains the changes unrelated to
DatabaseInitManagerthat are in the upcoming CBG-3026 PR just to completely isolate those changes given the complexity.DatabaseLogCtxearlier in_getOrAddDatabaseFromConfigso we can identify which database init-related logging is fort.Run->rt.Runfixes (prevents panics with failing subtests)Integration Tests
GSI=true,xattrs=truehttps://jenkins.sgwdev.com/job/SyncGateway-Integration/2694/