v0.56.0: resolve a raw enrolled drive's durable-id from the mount table
durableIDForMount was Observe-only, so a raw (non-PVE-storage) drive's enroll
intent + guest-bind went unrecorded ("durable-id unresolved") — it mounted+bound
but wasn't intent-tracked (RegistryKnownTargets skips intent==new). Fall back to
resolving the mount's device fs-UUID (HostReader.Mounts + ResolveUUID) →
uuid:<fs-uuid>, same scheme as Observe. Test + red-proof. Residual:
ReassertGuestBinds still Observe-based (raw guest-bind not re-asserted post-reboot).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -0,0 +1,43 @@
|
||||
package localapi
|
||||
|
||||
import (
|
||||
"context"
|
||||
"testing"
|
||||
|
||||
"gitea.dooplex.hu/admin/felhom-agent/internal/storage"
|
||||
)
|
||||
|
||||
// uuidHostReader is a HostReader that resolves specific device fs-UUIDs (fakeHostReader always fails).
|
||||
type uuidHostReader struct {
|
||||
mounts []storage.Mount
|
||||
uuids map[string]string
|
||||
}
|
||||
|
||||
func (u uuidHostReader) Mounts() ([]storage.Mount, error) { return u.mounts, nil }
|
||||
func (u uuidHostReader) ResolveUUID(dev string) (string, bool) {
|
||||
v, ok := u.uuids[dev]
|
||||
return v, ok
|
||||
}
|
||||
func (u uuidHostReader) DeviceExists(string) bool { return true }
|
||||
func (u uuidHostReader) Rotational(string) (bool, bool) { return false, false }
|
||||
func (u uuidHostReader) Removable(string) (bool, bool) { return false, false }
|
||||
|
||||
// Impl-2b: a RAW enrolled drive is not a PVE storage (absent from Observe), so its durable-id must be
|
||||
// resolved from the mount table's device fs-UUID. RED-PROOF: with the Observe-only resolution (before
|
||||
// the host fallback) this returns "" → intent + guest-bind go unrecorded.
|
||||
func TestDurableIDForMount_RawFallback(t *testing.T) {
|
||||
s := &Server{
|
||||
storage: fakeStorage{}, // Observe empty — the raw drive isn't a PVE storage
|
||||
host: uuidHostReader{
|
||||
mounts: []storage.Mount{{Device: "/dev/sdd", MountPoint: "/mnt/teszt"}},
|
||||
uuids: map[string]string{"/dev/sdd": "RAW-UUID"},
|
||||
},
|
||||
}
|
||||
if got := s.durableIDForMount(context.Background(), "/mnt/teszt"); got != "uuid:RAW-UUID" {
|
||||
t.Fatalf("raw mount durable-id: got %q want uuid:RAW-UUID", got)
|
||||
}
|
||||
// An unknown mount still resolves to "" (no false positive).
|
||||
if got := s.durableIDForMount(context.Background(), "/mnt/nope"); got != "" {
|
||||
t.Fatalf("unknown mount: got %q want empty", got)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user