Deviations: Improve reporting ruling out additional possible race

steiler · steiler · commit f0de3f97b936 · 2025-09-03T10:14:19.000+02:00
diff --git a/pkg/datastore/transaction_rpc.go b/pkg/datastore/transaction_rpc.go
@@ -163,7 +163,8 @@ func (d *Datastore) LoadAllButRunningIntents(ctx context.Context, root *tree.Roo
 		case intent, ok := <-IntentChan:
 			if !ok {
 				// IntentChan closed due to finish
-				return intentNames, nil
+				IntentChan = nil
+				continue
 			}
 			if excludeDeviations && intent.Deviation {
 				continue
@@ -177,6 +178,9 @@ func (d *Datastore) LoadAllButRunningIntents(ctx context.Context, root *tree.Roo
 				return nil, err
 			}
 		}
+		if ErrChan == nil && IntentChan == nil {
+			return intentNames, nil
+		}
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,8 @@ func (d Datastore) LoadAllButRunningIntents(ctx context.Context, root tree.Roo`
`163`	`163`	`case intent, ok := <-IntentChan:`
`164`	`164`	`if !ok {`
`165`	`165`	`// IntentChan closed due to finish`
`166`		`- return intentNames, nil`
	`166`	`+ IntentChan = nil`
	`167`	`+ continue`
`167`	`168`	`}`
`168`	`169`	`if excludeDeviations && intent.Deviation {`
`169`	`170`	`continue`
`@@ -177,6 +178,9 @@ func (d Datastore) LoadAllButRunningIntents(ctx context.Context, root tree.Roo`
`177`	`178`	`return nil, err`
`178`	`179`	`}`
`179`	`180`	`}`
	`181`	`+ if ErrChan == nil && IntentChan == nil {`
	`182`	`+ return intentNames, nil`
	`183`	`+ }`
`180`	`184`	`}`
`181`	`185`	`}`
`182`	`186`