Skip to content

Commit 6e3889c

Browse files
committed
Update cbgt fix to trigger janitor kick
1 parent f673f65 commit 6e3889c

File tree

3 files changed

+3
-20
lines changed

3 files changed

+3
-20
lines changed

db/import_pindex.go

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -39,28 +39,11 @@ func RegisterImportPindexImpl(ctx context.Context, configGroup string) {
3939
New: getNewPIndexImplType(ctx),
4040
Open: OpenImportPIndexImpl,
4141
OpenUsing: getOpenImportPIndexImplUsing(ctx),
42-
Rollback: getPIndexImplRollbackCallback(ctx),
4342
Description: "general/syncGateway-import " +
4443
" - import processing for shared bucket access",
4544
})
4645
}
4746

48-
func getPIndexImplRollbackCallback(ctx context.Context) func(indexType, indexParams, sourceParams, path string, mgr *cbgt.Manager,
49-
restart func()) (cbgt.PIndexImpl, cbgt.Dest, error) {
50-
51-
rollback := func(indexType, indexParams, sourceParams, path string, mgr *cbgt.Manager,
52-
restart func()) (cbgt.PIndexImpl, cbgt.Dest, error) {
53-
go mgr.JanitorKick("rollback from PIndexImpl.Rollback")
54-
importDest, err := getListenerImportDest(ctx, indexParams, restart)
55-
if err != nil {
56-
base.InfofCtx(ctx, base.KeyDCP, "No importDest found for indexParams on rollback. sourceParams=%v indexParams=%v %v. Not able to start import feed", err, base.MD(sourceParams), base.MD(indexParams))
57-
return nil, nil, err
58-
}
59-
return nil, importDest, nil
60-
}
61-
return rollback
62-
}
63-
6447
// getListenerForIndex looks up the importListener for the dbName specified in the index params
6548
func getListenerImportDest(ctx context.Context, indexParams string, restart func()) (cbgt.Dest, error) {
6649

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
dario.cat/mergo v1.0.0
77
github.com/KimMachineGun/automemlimit v0.7.0
88
github.com/coreos/go-oidc/v3 v3.12.0
9-
github.com/couchbase/cbgt v1.3.9
9+
github.com/couchbase/cbgt v1.3.10-0.20250128173458-04138cb9d33d
1010
github.com/couchbase/clog v0.1.0
1111
github.com/couchbase/go-blip v0.0.0-20241014144256-13a798c348fd
1212
github.com/couchbase/gocb/v2 v2.9.1

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ github.com/couchbase/blance v0.1.5 h1:kNSAwhb8FXSJpicJ8R8Kk7+0V1+MyTcY1MOHIDbU79
3434
github.com/couchbase/blance v0.1.5/go.mod h1:2Sa/nsJSieN/r3T9LsrUYWeQ015qDsuHybhz4F4JcHU=
3535
github.com/couchbase/cbauth v0.1.11 h1:LLyGiVnsKxyHp9wbOQk87oF9eDUSh1in2vh/l6vaezg=
3636
github.com/couchbase/cbauth v0.1.11/go.mod h1:W7zkNXa0B2cTDg90YmmuTSbu+PlYOvMqzQvmNlNH/Mg=
37-
github.com/couchbase/cbgt v1.3.9 h1:MAT3FwD1ctekxuFe0yau0H1BCTvgLXvh1ipbZ3nZhBE=
38-
github.com/couchbase/cbgt v1.3.9/go.mod h1:MImhtmvk0qjJit5HbmA34tnYThZoNtvgjL7jJH/kCAE=
37+
github.com/couchbase/cbgt v1.3.10-0.20250128173458-04138cb9d33d h1:X80jy41uF1ivq513eSm+k+Vih+eSMHZKjQJ5JawMuRs=
38+
github.com/couchbase/cbgt v1.3.10-0.20250128173458-04138cb9d33d/go.mod h1:MImhtmvk0qjJit5HbmA34tnYThZoNtvgjL7jJH/kCAE=
3939
github.com/couchbase/clog v0.1.0 h1:4Kh/YHkhRjMCbdQuvRVsm39XZh4FtL1d8fAwJsHrEPY=
4040
github.com/couchbase/clog v0.1.0/go.mod h1:7tzUpEOsE+fgU81yfcjy5N1H6XtbVC8SgOz/3mCjmd4=
4141
github.com/couchbase/go-blip v0.0.0-20241014144256-13a798c348fd h1:ERQXaXuX1eix3NUqrxQ5VY0hqHH90vcfrWdbEWKzlEY=

0 commit comments

Comments
 (0)