Merge branch 'development' of https://github.com/opensds/opensds into…

… new-patch

pkg/controller/selector/filter.go

@@ -57,22 +57,28 @@ func GetPoolCapabilityMap(pool *model.StoragePoolSpec) (map[string]interface{},
 		return nil, err
 	}
 
-	lastSimpleMap := make(map[string]interface{})
+	result := make(map[string]interface{})
 
-	for {
+	// There is no infinite loop here, so set the maximum number of loops to 10.
+	for i := 0; i < 10; i++ {
 		simpleMap, unSimpleMap := simplifyPoolCapabilityMap(temMap)
 
-		if 0 == len(unSimpleMap) {
-			for key, value := range lastSimpleMap {
-				simpleMap[key] = value
+		if 0 != len(result) {
+			for key, value := range simpleMap {
+				result[key] = value
 			}
+		} else {
+			result = simpleMap
+		}
 
-			return simpleMap, nil
+		if 0 == len(unSimpleMap) {
+			return result, nil
 		}
 
-		lastSimpleMap = simpleMap
 		temMap = unSimpleMap
 	}
+
+	return result, nil
 }
 
 // IsAvailablePool ...