Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Runtime: Refactor conn cache to contain and detect hanging opens/closes #3666

Merged
merged 12 commits into from
Dec 15, 2023
Merged

Runtime: Refactor conn cache to contain and detect hanging opens/closes #3666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
672de4f
Runtime: Refactor conn cache to contain and detect hanging opens/closes
begelundmuller Dec 8, 2023
38850b5
Extract connection cache to pkg + use a singleflight
begelundmuller Dec 12, 2023
bff5883
Add tests
begelundmuller Dec 13, 2023
6b38206
Make tests pass
begelundmuller Dec 13, 2023
cb7bda4
increase test sleeps for clsoe
begelundmuller Dec 13, 2023
4833bf0
Fix various race conditions
begelundmuller Dec 14, 2023
fd3d077
Integrate singleflight with conncache's mutex
begelundmuller Dec 14, 2023
3b23f69
Increase timeouts
begelundmuller Dec 14, 2023
62ecca1
Better comments
begelundmuller Dec 14, 2023
ac71051
Prevent deadlock when closing while opening
begelundmuller Dec 14, 2023
a95ed07
Address review comments
begelundmuller Dec 15, 2023
377b306
Remove redundant var
begelundmuller Dec 15, 2023
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
344 changes: 75 additions & 269 deletions runtime/connection_cache.go
View file
Open in desktop

Large diffs are not rendered by default.

417 changes: 0 additions & 417 deletions runtime/connection_cache_test.go
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions runtime/connections.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ func (r *Runtime) AcquireSystemHandle(ctx context.Context, connector string) (dr
cfg[strings.ToLower(k)] = v
}
cfg["allow_host_access"] = r.opts.AllowHostAccess
return r.connCache.get(ctx, "", c.Type, cfg, true)
return r.getConnection(ctx, "", c.Type, cfg, true)
}
}
return nil, nil, fmt.Errorf("connector %s doesn't exist", connector)
Expand All @@ -36,7 +36,7 @@ func (r *Runtime) AcquireHandle(ctx context.Context, instanceID, connector strin
// So we take this moment to make sure the ctx gets checked for cancellation at least every once in a while.
return nil, nil, ctx.Err()
}
return r.connCache.get(ctx, instanceID, driver, cfg, false)
return r.getConnection(ctx, instanceID, driver, cfg, false)
}

func (r *Runtime) Repo(ctx context.Context, instanceID string) (drivers.RepoStore, func(), error) {
Expand Down
2 changes: 1 addition & 1 deletion runtime/drivers/duckdb/duckdb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -806,7 +806,7 @@ func (c *connection) periodicallyCheckConnDurations(d time.Duration) {
c.connTimesMu.Lock()
for connID, connTime := range c.connTimes {
if time.Since(connTime) > maxAcquiredConnDuration {
c.logger.Error("duckdb: a connection has been held for more longer than the maximum allowed duration", zap.Int("conn_id", connID), zap.Duration("duration", time.Since(connTime)))
c.logger.Error("duckdb: a connection has been held for longer than the maximum allowed duration", zap.Int("conn_id", connID), zap.Duration("duration", time.Since(connTime)))
}
}
c.connTimesMu.Unlock()
Expand Down
Loading