CBG-3379 add missing context logging (#6408)

Co-authored-by: Ben Brooks <[email protected]>
couchbase · Apr 8, 2024 · be676b3 · be676b3
1 parent 58d1bc3
commit be676b3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/base/collection_n1ql_common.go b/base/collection_n1ql_common.go
@@ -497,6 +497,7 @@ func (i *gocbRawIterator) Next(ctx context.Context, valuePtr interface{}) bool {
 		return false
 	}
 
+	ctx := context.TODO() // fix in sg-bucket
 	err := JSONUnmarshal(nextBytes, &valuePtr)
 	if err != nil {
 		WarnfCtx(ctx, "Unable to marshal view result row into value: %v", err)

diff --git a/base/config_persistence_test.go b/base/config_persistence_test.go
@@ -157,6 +157,7 @@ func TestXattrConfigPersistence(t *testing.T) {
 	_, reinsertErr := cp.insertConfig(c, configKey, configBody)
 	require.Equal(t, ErrAlreadyExists, reinsertErr)
 
+	ctx := TestCtx(t)
 	// Retrieve the config, cas should still match insertCas
 	var loadedConfig map[string]interface{}
 	loadCas, loadErr := cp.loadConfig(ctx, c, configKey, &loadedConfig)

diff --git a/db/background_mgr_resync_dcp_test.go b/db/background_mgr_resync_dcp_test.go
@@ -360,7 +360,7 @@ func TestResyncImportComputeStat(t *testing.T) {
 	err := resycMgr.Start(ctx, options)
 	require.NoError(t, err)
 
-	err = WaitForConditionWithOptions(func() bool {
+	err = WaitForConditionWithOptions(t, func() bool {
 		var status BackgroundManagerStatus
 		rawStatus, _ := resycMgr.GetStatus()
 		_ = json.Unmarshal(rawStatus, &status)