mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-11-15 00:09:00 +01:00
shell: report a failed tier download source restore
A restore that leaves the source unmounted or frozen was only printed, so the command still returned success. Join the restore error into the result. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
2e0ccfbd0f
commit
8b9e2b38f2
2 files changed
+27
-9
No files matched your search
@@ -45,7 +45,8 @@ type tierDownloadCluster struct {
|
||||
// staleTwin lists a remote-backed twin of the volume on another disk
|
||||
staleTwin map[pb.ServerAddress]bool
|
||||
// markFails applies the readonly mark, then fails as a lost master notification does
|
||||
markFails map[pb.ServerAddress]bool
|
||||
markFails map[pb.ServerAddress]bool
|
||||
mountFails map[pb.ServerAddress]bool
|
||||
}
|
||||
|
||||
type tierDownloadTestServer struct {
|
||||
@@ -89,6 +90,9 @@ func (s *tierDownloadTestServer) VolumeMount(context.Context, *volume_server_pb.
|
||||
c := s.cluster
|
||||
c.mu.Lock()
|
||||
defer c.mu.Unlock()
|
||||
if c.mountFails[s.addr] {
|
||||
return nil, fmt.Errorf("mount volume: disk error")
|
||||
}
|
||||
c.frozen[s.addr] = false
|
||||
c.remounts[s.addr]++
|
||||
return &volume_server_pb.VolumeMountResponse{}, nil
|
||||
@@ -171,6 +175,7 @@ func newTierDownloadCluster(t *testing.T, states ...string) *tierDownloadCluster
|
||||
remounts: make(map[pb.ServerAddress]int),
|
||||
staleTwin: make(map[pb.ServerAddress]bool),
|
||||
markFails: make(map[pb.ServerAddress]bool),
|
||||
mountFails: make(map[pb.ServerAddress]bool),
|
||||
}
|
||||
for _, state := range states {
|
||||
lis, err := net.Listen("tcp", "127.0.0.1:0")
|
||||
@@ -412,3 +417,14 @@ func TestTierDownloadRestoresSourceWhenMarkFailsAfterApplying(t *testing.T) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestTierDownloadReportsSourceRestoreFailure(t *testing.T) {
|
||||
c := newTierDownloadCluster(t, tierReplicaLocal, tierReplicaRemote, tierReplicaRemote)
|
||||
source := c.servers[0]
|
||||
c.mountFails[source] = true
|
||||
err := c.run(t)
|
||||
if err == nil || !strings.Contains(err.Error(), "restore volume 7 state") {
|
||||
t.Fatalf("tier download should report the failed source restore, got %v", err)
|
||||
}
|
||||
c.assertAllLocal(t)
|
||||
}
|
||||
Reference in new issue
Block a user