mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-10-08 15:27:43 +02:00
fix(replication): verify-before-destroy in VolumeCopy, check.disk, and over-replication trim (#9943)
* volume: verify before destroy in VolumeCopy and replication repair Four data-safety fixes around copy/repair paths that could destroy or resurrect data before verifying the source or survivors. (a) VolumeCopy no longer deletes a pre-existing local replica up front. The delete is deferred until ReadVolumeFileStatus on the source succeeds, so a transient source outage (or a retry after one) can no longer wipe a healthy destination replica. Gated on source readability only; size/count comparisons are intentionally not used because they invert legitimately after divergent vacuum/compaction. Mirrored in the Rust volume server. (b) volume.check.disk no longer resurrects vacuumed-deleted needles. A key present-and-live on the source but entirely absent on the target is ambiguous: it may be a genuine missing write, or a needle deleted on the target and then vacuumed (its index entry and any tombstone are gone). An individual needle AppendAtNs has no monotonic relation to a vacuum watermark, so the old cutoff heuristic could not tell them apart. Without positive proof the absence is a missing write, the safe default is to NOT push it back. Tradeoff: a real missing write may go unrepaired until a tombstone-aware path exists, but we never raise back deleted data. (c) Over-replication trim no longer resurrects needles or removes the wrong replica. The pre-delete sync now runs read-only (divergence check only) instead of writing the doomed replica's needles into the survivor. pickOneReplicaToDelete only ever removes the smallest of multiple healthy writable replicas; it refuses the trim when doing so would leave only read-only/integrity-flagged survivors, since file_count>0 alone cannot prove the survivor's .dat is readable. (d) Incomplete-volume (.note) cleanup keeps the shared .vif when an .ecx for the same vid coexists on the disk, so removing an interrupted regular copy cannot strip a coexisting EC volume's info file. VolumeCopy now surfaces .note write/remove errors instead of ignoring them. In the Rust volume server (where a persisting note is actually reachable) the .note check moves below the empty-stub sweep and EC validation, keeps the .vif on EC coexistence, and the mount path fails when a .note still persists. * shell: scope the over-replication writable-survivor guard to the trim path only The writable-survivor guard (never trim down to a read-only survivor) lived inside the shared pickOneReplicaToDelete, so it also gated the misplaced-volume relocation via pickOneMisplacedVolume -- a misplaced read-only volume (e.g. a full one) would silently stop being rebalanced. Extract pickSmallestReplica for the relocation path (which deletes-and-recreates and must act on read-only replicas), and keep the writable-survivor guard only in pickOneReplicaToDelete used by the over-replication trim. * seaweed-volume: recompute keep_vif after invalid-EC cleanup in the .note path keep_vif used the pre-validation ecx_exists snapshot, so when the EC-validation step above removed the invalid .ecx/shards, the .note cleanup still preserved a now-orphaned .vif. Re-check .ecx existence at cleanup time, matching the Go hasEcxFile re-check. * shell: keep placement when picking an over-replication victim to delete The trim picked the smallest writable replica without regard to placement, so it could delete the only replica in a required failure domain (e.g. with "100" and replicas dc1 + two in dc2, deleting dc1 leaves both survivors in dc2). Prefer a writable replica whose removal still satisfies placement, falling back to the smallest writable only when none does.
This commit is contained in:
1 parent
aabd44fbb5
commit
c2591b4395
10 files changed
+453
-73
No files matched your search
@@ -439,6 +439,127 @@ func TestPickingMisplacedVolumeToDelete(t *testing.T) {
|
||||
|
||||
}
|
||||
|
||||
func TestPickOneReplicaToDeleteSkipsReadOnlySurvivor(t *testing.T) {
|
||||
replicaPlacement, _ := super_block.NewReplicaPlacementFromString("001")
|
||||
|
||||
// One writable replica and one read-only replica. The trim must never
|
||||
// delete the only writable replica while the survivor is read-only:
|
||||
// VolumeStatus alone cannot prove the read-only .dat is readable, so the
|
||||
// trim is refused.
|
||||
t.Run("refuses to delete the only writable replica while a read-only survivor remains", func(t *testing.T) {
|
||||
replicas := []*VolumeReplica{
|
||||
{
|
||||
location: &location{"dc1", "r1", &master_pb.DataNodeInfo{Id: "dn-writable"}},
|
||||
info: &master_pb.VolumeInformationMessage{Size: 90, ReadOnly: false},
|
||||
},
|
||||
{
|
||||
location: &location{"dc1", "r2", &master_pb.DataNodeInfo{Id: "dn-readonly"}},
|
||||
info: &master_pb.VolumeInformationMessage{Size: 100, ReadOnly: true},
|
||||
},
|
||||
}
|
||||
if got := pickOneReplicaToDelete(replicas, replicaPlacement); got != nil {
|
||||
t.Fatalf("expected no replica to delete, got %s", got.location.dataNode.Id)
|
||||
}
|
||||
})
|
||||
|
||||
// All survivors read-only: never trim.
|
||||
t.Run("refuses when all replicas are read-only", func(t *testing.T) {
|
||||
replicas := []*VolumeReplica{
|
||||
{
|
||||
location: &location{"dc1", "r1", &master_pb.DataNodeInfo{Id: "dn1"}},
|
||||
info: &master_pb.VolumeInformationMessage{Size: 100, ReadOnly: true},
|
||||
},
|
||||
{
|
||||
location: &location{"dc1", "r2", &master_pb.DataNodeInfo{Id: "dn2"}},
|
||||
info: &master_pb.VolumeInformationMessage{Size: 100, ReadOnly: true},
|
||||
},
|
||||
}
|
||||
if got := pickOneReplicaToDelete(replicas, replicaPlacement); got != nil {
|
||||
t.Fatalf("expected no replica to delete, got %s", got.location.dataNode.Id)
|
||||
}
|
||||
})
|
||||
|
||||
// Two healthy writable replicas plus a read-only one: trim the smallest
|
||||
// writable, never the read-only one.
|
||||
t.Run("trims the smallest writable replica and never the read-only one", func(t *testing.T) {
|
||||
replicas := []*VolumeReplica{
|
||||
{
|
||||
location: &location{"dc1", "r1", &master_pb.DataNodeInfo{Id: "dn-big"}},
|
||||
info: &master_pb.VolumeInformationMessage{Size: 100, ReadOnly: false},
|
||||
},
|
||||
{
|
||||
location: &location{"dc1", "r2", &master_pb.DataNodeInfo{Id: "dn-small"}},
|
||||
info: &master_pb.VolumeInformationMessage{Size: 90, ReadOnly: false},
|
||||
},
|
||||
{
|
||||
location: &location{"dc1", "r3", &master_pb.DataNodeInfo{Id: "dn-readonly"}},
|
||||
info: &master_pb.VolumeInformationMessage{Size: 80, ReadOnly: true},
|
||||
},
|
||||
}
|
||||
got := pickOneReplicaToDelete(replicas, replicaPlacement)
|
||||
if got == nil {
|
||||
t.Fatalf("expected a writable replica to delete, got nil")
|
||||
}
|
||||
if got.location.dataNode.Id != "dn-small" {
|
||||
t.Fatalf("expected to delete smallest writable dn-small, got %s", got.location.dataNode.Id)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// The over-replication writable-survivor guard must NOT leak into the misplaced
|
||||
// relocation path: a misplaced volume whose replicas are all read-only (e.g. a
|
||||
// full volume) must still be relocated, picking the smallest replica to delete
|
||||
// and recreate at a correct placement.
|
||||
func TestPickOneMisplacedVolumeRelocatesReadOnlyReplicas(t *testing.T) {
|
||||
replicaPlacement, _ := super_block.NewReplicaPlacementFromString("001")
|
||||
replicas := []*VolumeReplica{
|
||||
{
|
||||
location: &location{"dc1", "r1", &master_pb.DataNodeInfo{Id: "dn1"}},
|
||||
info: &master_pb.VolumeInformationMessage{Size: 100, ReadOnly: true},
|
||||
},
|
||||
{
|
||||
location: &location{"dc1", "r2", &master_pb.DataNodeInfo{Id: "dn2"}},
|
||||
info: &master_pb.VolumeInformationMessage{Size: 99, ReadOnly: true},
|
||||
},
|
||||
}
|
||||
got := pickOneMisplacedVolume(replicas, replicaPlacement)
|
||||
if got == nil {
|
||||
t.Fatal("misplaced read-only volume must still be relocated, got nil")
|
||||
}
|
||||
if got.location.dataNode.Id != "dn2" {
|
||||
t.Fatalf("expected to relocate smallest replica dn2, got %s", got.location.dataNode.Id)
|
||||
}
|
||||
}
|
||||
|
||||
// The over-replication trim must not strip the only replica in a required
|
||||
// failure domain: with "100" and replicas in dc1 + two in dc2, deleting the
|
||||
// smallest (dc1) leaves both survivors in dc2 and violates placement, so the
|
||||
// trim must instead delete a dc2 writable replica.
|
||||
func TestPickOneReplicaToDeletePreservesPlacement(t *testing.T) {
|
||||
replicaPlacement, _ := super_block.NewReplicaPlacementFromString("100")
|
||||
replicas := []*VolumeReplica{
|
||||
{
|
||||
location: &location{"dc1", "r1", &master_pb.DataNodeInfo{Id: "dc1-writable"}},
|
||||
info: &master_pb.VolumeInformationMessage{Size: 90, ReadOnly: false},
|
||||
},
|
||||
{
|
||||
location: &location{"dc2", "r2", &master_pb.DataNodeInfo{Id: "dc2-readonly"}},
|
||||
info: &master_pb.VolumeInformationMessage{Size: 80, ReadOnly: true},
|
||||
},
|
||||
{
|
||||
location: &location{"dc2", "r3", &master_pb.DataNodeInfo{Id: "dc2-writable"}},
|
||||
info: &master_pb.VolumeInformationMessage{Size: 100, ReadOnly: false},
|
||||
},
|
||||
}
|
||||
got := pickOneReplicaToDelete(replicas, replicaPlacement)
|
||||
if got == nil {
|
||||
t.Fatal("expected a replica to delete")
|
||||
}
|
||||
if got.location.dataNode.Id != "dc2-writable" {
|
||||
t.Fatalf("expected to delete dc2-writable to preserve placement, got %s", got.location.dataNode.Id)
|
||||
}
|
||||
}
|
||||
|
||||
func TestSatisfyReplicaCurrentLocation(t *testing.T) {
|
||||
|
||||
var tests = []testcase{
|
||||
|
||||
Reference in new issue
Block a user