Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 22 additions & 4 deletions flow/connectors/mongo/cdc.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ type ChangeStream interface {
Next(ctx context.Context) bool
ResumeToken() bson.Raw
Err() error
Close(ctx context.Context) error
Close() error
Current() bson.Raw
}

Expand All @@ -55,6 +55,17 @@ func (w *changeStreamWrapper) Current() bson.Raw {
return w.ChangeStream.Current
}

func (w *changeStreamWrapper) Close() error {
// Intentionally not tied to the caller's context since Close often runs when
// context is already canceled, preventing Close from executing a killCursors
// command. This can lead to "Cannot open a new cursor since too many cursors
// are already opened" error on DocumentDB (which caps cursor per instance),
// as server's idle-cursor reaper can take time to kick in.
closeCtx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
defer cancel()
return w.ChangeStream.Close(closeCtx)
}

func (c *MongoConnector) GetTableSchema(
ctx context.Context,
_ map[string]string,
Expand Down Expand Up @@ -114,7 +125,7 @@ func (c *MongoConnector) SetupReplication(
if err != nil {
return model.SetupReplicationResult{}, fmt.Errorf("failed to start change stream for storing initial resume token: %w", err)
}
defer changeStream.Close(ctx)
defer changeStream.Close()

c.logger.Info("SetupReplication started, waiting for initial resume token")
var resumeToken bson.Raw
Expand Down Expand Up @@ -212,7 +223,14 @@ func (c *MongoConnector) PullRecords(
return fmt.Errorf("failed to create change stream: %w", err)
}
}
defer changeStream.Close(ctx)
defer func() {
// Wrapped in a closure so changeStream is evaluated at return time. A direct
// `defer changeStream.Close()` would bind the original stream created above
// and miss any replacement made by recreateChangeStream.
if err := changeStream.Close(); err != nil {
c.logger.Warn("failed to close change stream", slog.Any("error", err))
}
}()

var recordCount uint32
var deltaBytesProcessed, cumulativeBytesProcessed atomic.Int64
Expand Down Expand Up @@ -337,7 +355,7 @@ func (c *MongoConnector) PullRecords(
}

// close existing change stream
if err := changeStream.Close(ctx); err != nil {
if err := changeStream.Close(); err != nil {
return fmt.Errorf("failed to close change stream: %w", err)
}

Expand Down
8 changes: 4 additions & 4 deletions flow/connectors/mongo/cdc_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,10 @@ func (cs *mockChangeStream) Next(context.Context) bool {
}
}

func (cs *mockChangeStream) ResumeToken() bson.Raw { return cs.resumeToken }
func (cs *mockChangeStream) Err() error { return cs.err }
func (cs *mockChangeStream) Current() bson.Raw { return cs.current }
func (cs *mockChangeStream) Close(context.Context) error { return nil }
func (cs *mockChangeStream) ResumeToken() bson.Raw { return cs.resumeToken }
func (cs *mockChangeStream) Err() error { return cs.err }
func (cs *mockChangeStream) Current() bson.Raw { return cs.current }
func (cs *mockChangeStream) Close() error { return nil }

var _ ChangeStream = (*mockChangeStream)(nil)

Expand Down
Loading