fix: avoid eliminating rebuilding replicas without heads

Signed-off-by: Shuo Wu <[email protected]>
longhorn · Nov 16, 2024 · f09c9b9 · f09c9b9
1 parent be17c30
commit f09c9b9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/pkg/spdk/replica.go b/pkg/spdk/replica.go
@@ -182,6 +182,12 @@ func NewReplica(ctx context.Context, replicaName, lvsName, lvsUUID string, specS
 	}
 }
 
+func (r *Replica) IsRebuilding() bool {
+	r.RLock()
+	defer r.RUnlock()
+	return r.State == types.InstanceStateRunning && r.isRebuilding
+}
+
 func (r *Replica) replicaLvolFilter(bdev *spdktypes.BdevInfo) bool {
 	if bdev == nil || len(bdev.Aliases) < 1 || bdev.DriverSpecific.Lvol == nil {
 		return false

diff --git a/pkg/spdk/server.go b/pkg/spdk/server.go
@@ -255,8 +255,11 @@ func (s *Server) verify() (err error) {
 		replicaMapForSync[lvolName] = replicaMap[lvolName]
 	}
 	for replicaName, r := range replicaMap {
-		// Try the best to avoid eliminating broken replicas without a head lvol
+		// Try the best to avoid eliminating broken replicas or rebuilding replicas without head lvols
 		if bdevLvolMap[r.Name] == nil {
+			if r.IsRebuilding() {
+				continue
+			}
 			noReplicaLvol := true
 			for lvolName := range bdevLvolMap {
 				if IsReplicaLvol(r.Name, lvolName) {