Fixes duplicate idempotent key issue during recovery and non-recovery

kwilteam · Dec 1, 2023 · 827a61c · 827a61c
1 parent c139049
commit 827a61c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/internal/sessions/committable/committable.go b/internal/sessions/committable/committable.go
@@ -141,15 +141,14 @@ func (a *SavepointCommittable) Commit(ctx context.Context, idempotencyKey []byte
 	a.writable = false
 
 	if a.skip {
+		a.skip = false
 		return a.db.Get(ctx, ApphashKey, true)
 	}
 
 	if a.savepoint == nil {
 		return nil, fmt.Errorf("no session exists")
 	}
 
-	a.skip = false
-
 	var appHash []byte
 	if a.idFn != nil {
 		var err error

diff --git a/internal/sessions/session.go b/internal/sessions/session.go
@@ -80,10 +80,7 @@ func (m *MultiCommitter) Begin(ctx context.Context, idempotencyKey []byte) (err
 	}
 
 	// if lastKey is not nil, we are recovering from a crash
-	if lastKey != nil {
-		if !bytes.Equal(lastKey, idempotencyKey) {
-			return fmt.Errorf("%w on recovery: expected %s, got %s", ErrIdempotencyKeyMismatch, lastKey, idempotencyKey)
-		}
+	if bytes.Equal(lastKey, idempotencyKey) {
 		for _, committable := range m.committables {
 			err = committable.BeginRecovery(ctx, idempotencyKey)
 			if err != nil {
@@ -143,7 +140,6 @@ func (m *MultiCommitter) Commit(ctx context.Context, idempotencyKey []byte) (id
 		id = append(id, newId...)
 	}
 
-	err = deleteCurrentKey(m.kv)
 	return id, err
 }