From aa5674cabde8cac3dcd28d44feaa0af42c77f65c Mon Sep 17 00:00:00 2001 From: Elle Mouton Date: Tue, 25 Feb 2025 13:25:26 +0200 Subject: [PATCH] session: add context to DeleteReservedSessions --- session/interface.go | 2 +- session/kvdb_store.go | 2 +- session/store_test.go | 4 ++-- session_rpcserver.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/session/interface.go b/session/interface.go index b9041441..8293cf71 100644 --- a/session/interface.go +++ b/session/interface.go @@ -302,7 +302,7 @@ type Store interface { // DeleteReservedSessions deletes all sessions that are in the // StateReserved state. - DeleteReservedSessions() error + DeleteReservedSessions(ctx context.Context) error // ShiftState updates the state of the session with the given ID to the // "dest" state. diff --git a/session/kvdb_store.go b/session/kvdb_store.go index 3f6ae31a..0c415ae6 100644 --- a/session/kvdb_store.go +++ b/session/kvdb_store.go @@ -436,7 +436,7 @@ func (db *BoltStore) listSessions(filterFn func(s *Session) bool) ([]*Session, // state. // // NOTE: this is part of the Store interface. -func (db *BoltStore) DeleteReservedSessions() error { +func (db *BoltStore) DeleteReservedSessions(_ context.Context) error { return db.Update(func(tx *bbolt.Tx) error { sessionBucket, err := getBucket(tx, sessionBucketKey) if err != nil { diff --git a/session/store_test.go b/session/store_test.go index 8692627c..6c70e4fa 100644 --- a/session/store_test.go +++ b/session/store_test.go @@ -151,7 +151,7 @@ func TestBasicSessionStore(t *testing.T) { // // Calling DeleteReservedSessions should have no effect yet since none // of the sessions are reserved. - require.NoError(t, db.DeleteReservedSessions()) + require.NoError(t, db.DeleteReservedSessions(ctx)) sessions, err = db.ListSessionsByState(ctx, StateReserved) require.NoError(t, err) @@ -180,7 +180,7 @@ func TestBasicSessionStore(t *testing.T) { // Now delete the reserved session and show that it is no longer in the // database and no longer in the group ID/session ID index. - require.NoError(t, db.DeleteReservedSessions()) + require.NoError(t, db.DeleteReservedSessions(ctx)) sessions, err = db.ListSessionsByState(ctx, StateReserved) require.NoError(t, err) diff --git a/session_rpcserver.go b/session_rpcserver.go index df391f23..06832357 100644 --- a/session_rpcserver.go +++ b/session_rpcserver.go @@ -96,7 +96,7 @@ func newSessionRPCServer(cfg *sessionRpcServerConfig) (*sessionRpcServer, // requests. This includes resuming all non-revoked sessions. func (s *sessionRpcServer) start(ctx context.Context) error { // Delete all sessions in the Reserved state. - err := s.cfg.db.DeleteReservedSessions() + err := s.cfg.db.DeleteReservedSessions(ctx) if err != nil { return fmt.Errorf("error deleting reserved sessions: %v", err) }