Merge pull request cubefs#937 from yinlei-jinan/master

fix: remove failed dp when create extent and fix RemoveDP bug for Def…
employeesns · Sep 22, 2020 · 5bb1c9f · 5bb1c9f
2 parents 6afb4f1 + cdfd90c
commit 5bb1c9f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/sdk/data/stream/extent_handler.go b/sdk/data/stream/extent_handler.go
@@ -17,7 +17,6 @@ package stream
 import (
 	"fmt"
 	"net"
-	"strings"
 	"sync/atomic"
 	"time"
 
@@ -498,13 +497,9 @@ func (eh *ExtentHandler) allocateExtent() (err error) {
 			extID, err = eh.createExtent(dp)
 		}
 		if err != nil {
-			if strings.Contains(err.Error(), "DiskNoSpaceErr") {
-				log.LogWarnf("allocateExtent: delete dp[%v] caused by create extent failed, eh(%v) err(%v) exclude(%v)",
-					dp, eh, err, exclude)
-				eh.stream.client.dataWrapper.RemoveDataPartitionForWrite(dp.PartitionID)
-				continue
-			}
-			log.LogWarnf("allocateExtent: failed to create extent, eh(%v) err(%v) exclude(%v)", eh, err, exclude)
+			log.LogWarnf("allocateExtent: delete dp[%v] caused by create extent failed, eh(%v) err(%v) exclude(%v)",
+				dp, eh, err, exclude)
+			eh.stream.client.dataWrapper.RemoveDataPartitionForWrite(dp.PartitionID)
 			dp.CheckAllHostsIsAvail(exclude)
 			continue
 		}

diff --git a/sdk/data/wrapper/default_random_selector.go b/sdk/data/wrapper/default_random_selector.go
@@ -104,6 +104,12 @@ func (s *DefaultRandomSelector) RemoveDP(partitionID uint64) {
 	newRwPartition = append(newRwPartition, rwPartitionGroups[:i]...)
 	newRwPartition = append(newRwPartition, rwPartitionGroups[i+1:]...)
 
+	defer func() {
+		s.Lock()
+		s.partitions = newRwPartition
+		s.Unlock()
+	}()
+
 	for i = 0; i < len(localLeaderPartitions); i++ {
 		if localLeaderPartitions[i].PartitionID == partitionID {
 			break
@@ -118,7 +124,6 @@ func (s *DefaultRandomSelector) RemoveDP(partitionID uint64) {
 
 	s.Lock()
 	defer s.Unlock()
-	s.partitions = newRwPartition
 	s.localLeaderPartitions = newLocalLeaderPartitions
 
 	return