Skip to content

armgit / Pulse

Public Imported from GitHub
0

Real-time monitoring dashboard for Proxmox VE, PBS, Docker, Kubernetes, TrueNAS and vSphere. Self-hosted, with alerts for failed backups, full disks, unhealthy containers and offline nodes.

Keep interrupted VM Discovery as an explicit safety deferral

pulse-triage[bot]f9ed9311f2f0
diff --git a/internal/servicediscovery/deep_scanner.go b/internal/servicediscovery/deep_scanner.go
index 794e0aac6b..efddea99c3 100644
--- a/internal/servicediscovery/deep_scanner.go
+++ b/internal/servicediscovery/deep_scanner.go
@@ -2,6 +2,7 @@ package servicediscovery
import (
"context"
+ "errors"
"fmt"
"strings"
"sync"
@@ -241,11 +242,23 @@ func (s *DeepScanner) Scan(ctx context.Context, req DiscoveryRequest) (*ScanResu
var safetyError error
runCommand := func(cmd DiscoveryCommand) {
-
+ cancelBeforeAdmission := func() {
+ if vmTarget {
+ mu.Lock()
+ defer mu.Unlock()
+ safetyError = agentexec.GuestExecDeferred("the scan was canceled before guest admission")
+ result.Errors[cmd.Name] = safetyError.Error()
+ }
+ }
+ if ctx.Err() != nil {
+ cancelBeforeAdmission()
+ return
+ }
select {
case semaphore <- struct{}{}:
defer func() { <-semaphore }()
case <-ctx.Done():
+ cancelBeforeAdmission()
return
}
@@ -292,6 +305,12 @@ func (s *DeepScanner) Scan(ctx context.Context, req DiscoveryRequest) (*ScanResu
} else if cmdResult != nil {
message = cmdResult.Error
}
+ // The server can stop waiting before the agent returns its final
+ // safety result. A canceled/timed-out handoff cannot become an
+ // optional successful scan or fresh metadata fallback meanwhile.
+ if cmdCtx.Err() != nil || errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded) {
+ message = agentexec.GuestExecDeferred(agentexec.GuestExecCompletionUnknown).Error()
+ }
if agentexec.IsGuestExecDeferred(message) {
safetyError = fmt.Errorf("%s", message)
result.Errors[cmd.Name] = message
diff --git a/internal/servicediscovery/guest_exec_safety_test.go b/internal/servicediscovery/guest_exec_safety_test.go
index afe5ed5676..2eb4143e5b 100644
--- a/internal/servicediscovery/guest_exec_safety_test.go
+++ b/internal/servicediscovery/guest_exec_safety_test.go
@@ -106,3 +106,37 @@ func TestVMDiscoveryRequiresUniqueOwningNode(t *testing.T) {
})
}
}
+
+type timedOutGuestExecutor struct {
+ *stubExecutor
+ calls int
+}
+
+func (e *timedOutGuestExecutor) ExecuteCommand(context.Context, string, ExecuteCommandPayload) (*CommandResultPayload, error) {
+ e.calls++
+ return nil, context.DeadlineExceeded
+}
+
+func TestVMDiscoveryCancellationIsNotSuccessfulEvidence(t *testing.T) {
+ for _, before := range []bool{true, false} {
+ t.Run(time.Duration(map[bool]int{true: 0, false: 1}[before]).String(), func(t *testing.T) {
+ e := &timedOutGuestExecutor{stubExecutor: &stubExecutor{agents: []ConnectedAgent{{AgentID: "node", Hostname: "node"}}}}
+ scanner := NewDeepScanner(e)
+ var terminal *DiscoveryProgress
+ scanner.SetProgressCallback(func(p *DiscoveryProgress) { copy := *p; terminal = &copy })
+ ctx, cancel := context.WithCancel(context.Background())
+ defer cancel()
+ if before {
+ cancel()
+ }
+ result, err := scanner.Scan(ctx, DiscoveryRequest{ResourceType: ResourceTypeVM, ResourceID: "105", TargetID: "node"})
+ wantCalls := 1
+ if before {
+ wantCalls = 0
+ }
+ if err == nil || !agentexec.IsGuestExecDeferred(err.Error()) || result == nil || len(result.CommandOutputs) != 0 || e.calls != wantCalls || terminal == nil || terminal.Error == "" || terminal.PercentComplete == 100 {
+ t.Fatalf("cancellation became successful scan: result=%+v err=%v calls=%d terminal=%+v", result, err, e.calls, terminal)
+ }
+ })
+ }
+}
diff --git a/internal/servicediscovery/service_test.go b/internal/servicediscovery/service_test.go
index 274c9c5867..734f651557 100644
--- a/internal/servicediscovery/service_test.go
+++ b/internal/servicediscovery/service_test.go
@@ -2764,3 +2764,7 @@ func TestService_BackfillPreservesConcurrentManualRepair(t *testing.T) {
func TestDiscoveryGuestSafetyStopsAndPreservesSavedEvidence(t *testing.T) {
testDiscoveryGuestSafetyStopsAndPreservesSavedEvidence(t)
}
+
+func TestDiscoveryGuestCancellationContract(t *testing.T) {
+ TestVMDiscoveryCancellationIsNotSuccessfulEvidence(t)
+}