Skip to content

Filter query: has-agent connecting, connected, disconnected, timeout #5145

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

Merged
merged 30 commits into from
Nov 24, 2022
Merged

Filter query: has-agent connecting, connected, disconnected, timeout #5145

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
ee6577d
WIP
mtojek Nov 21, 2022
7d61519
has-agent:connecting, connected
mtojek Nov 22, 2022
b5a1ecc
Fix
mtojek Nov 22, 2022
dca2b8b
Fix
mtojek Nov 22, 2022
0a4746c
has-agent:disconnected, timeout
mtojek Nov 22, 2022
70952e1
Fix: typo
mtojek Nov 22, 2022
7965a54
Fix
mtojek Nov 22, 2022
c1bd839
TODOs
mtojek Nov 22, 2022
2af4133
databasefake
mtojek Nov 22, 2022
f9e2167
Fix: typo
mtojek Nov 22, 2022
45957c1
More TODOs
mtojek Nov 22, 2022
66892d7
databasefake
mtojek Nov 22, 2022
fc93f90
Timeout tests
mtojek Nov 22, 2022
e587b5d
Address PR comments
mtojek Nov 22, 2022
458a8eb
Implement FIXMEs
mtojek Nov 23, 2022
81d9fef
Renamings
mtojek Nov 23, 2022
5ca8c17
Address PR comments
mtojek Nov 23, 2022
ec2d571
Fix: readability
mtojek Nov 23, 2022
4b2f831
Fix: refactor CASE logic
mtojek Nov 23, 2022
3c0d4fe
CASE logic
mtojek Nov 23, 2022
9067a9e
Fix
mtojek Nov 23, 2022
c14663c
Use CTE
mtojek Nov 23, 2022
9c2f64a
Polishing
mtojek Nov 23, 2022
44bf343
Comment
mtojek Nov 24, 2022
598b140
WIP
mtojek Nov 24, 2022
f3787d1
Merge branch 'main' into 4679-surface-agent
mtojek Nov 24, 2022
ba13e03
IS NOT NULL
mtojek Nov 24, 2022
d74b072
Without CTE
mtojek Nov 24, 2022
4255448
One more optimization
mtojek Nov 24, 2022
4ace659
2nd optimization
mtojek Nov 24, 2022
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
Prev Previous commit
Next Next commit
databasefake
  • Loading branch information
@mtojek
mtojek committed Nov 22, 2022
commit 66892d72bc376df82f624b9f76708a4769a4be5b
4 changes: 3 additions & 1 deletion coderd/database/databasefake/databasefake.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -905,7 +905,9 @@ func (q *fakeQuerier) GetAuthorizedWorkspaces(ctx context.Context, arg database.
case "connecting":
hasAgentMatched = !wa.FirstConnectedAt.Valid
case "disconnected":
hasAgentMatched = wa.DisconnectedAt.Valid && wa.DisconnectedAt.Time.After(wa.LastConnectedAt.Time)
// FIXME agentInactiveDisconnectTimeout = 6
hasAgentMatched = (wa.DisconnectedAt.Valid && wa.DisconnectedAt.Time.After(wa.LastConnectedAt.Time)) ||
(wa.LastConnectedAt.Valid && wa.LastConnectedAt.Time.Add(6*time.Second).Before(database.Now()))
case "timeout":
hasAgentMatched = !wa.FirstConnectedAt.Valid &&
wa.CreatedAt.Add(time.Duration(wa.ConnectionTimeoutSeconds)*time.Second).Before(database.Now())
Expand Down
2 changes: 1 addition & 1 deletion coderd/database/queries.sql.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion coderd/database/queries/workspaces.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ WHERE
latest_build.disconnected_at > latest_build.last_connected_at
) OR (
latest_build.last_connected_at IS NOT NULL AND
latest_build.last_connected_at + 6 * INTERVAL '1 second' < NOW() -- agentInactiveDisconnectTimeout = 6
latest_build.last_connected_at + 6 * INTERVAL '1 second' < NOW() -- FIXME agentInactiveDisconnectTimeout = 6
)
WHEN @has_agent = 'connected' THEN
latest_build.last_connected_at IS NOT NULL
Expand Down