session: add context to DeleteReservedSessions

Author: ellemouton

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.

session/kvdb_store.go

@@ -431,7 +431,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 {

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)

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)
 	}