add strategy method: FILLGLOBAL

Author: jschwinger233

rpc/gen/core.pb.go

@@ -408,6 +408,7 @@ message DeployOptions {
         FILL = 1;
         EACH = 2;
         GLOBAL = 3;
+        FILLGLOBAL = 4;
         DUMMY = 99;
     }
     string name = 1;

rpc/gen/core.proto

@@ -0,0 +1,18 @@
+package strategy
+
+import (
+	"github.com/projecteru2/core/log"
+	"github.com/projecteru2/core/types"
+)
+
+func FillGlobalPlan(strategyInfo []Info, need, total, limit int, resourceType types.ResourceType) (map[string]int, error) {
+	originStrategyInfo := make([]Info, len(strategyInfo))
+	copy(originStrategyInfo, strategyInfo)
+
+	deployMap, err := FillPlan(strategyInfo, need, total, limit, resourceType)
+	if err == nil {
+		return deployMap, nil
+	}
+	log.Info("[FillGlobalPlan] fill plan failed, try global fill: %+v", err)
+	return GlobalPlan(originStrategyInfo, need, total, limit, resourceType)
+}

strategy/fill_global.go

@@ -18,15 +18,18 @@ const (
 	Each = "EACH"
 	// Global .
 	Global = "GLOBAL"
+	// Fill + Global
+	FillGlobal = "FILLGLOBAL"
 	// Dummy for calculate capacity
 	Dummy = "DUMMY"
 )
 
 var Plans = map[string]startegyFunc{
-	Auto:   CommunismPlan,
-	Fill:   FillPlan,
-	Each:   AveragePlan,
-	Global: GlobalPlan,
+	Auto:       CommunismPlan,
+	Fill:       FillPlan,
+	Each:       AveragePlan,
+	Global:     GlobalPlan,
+	FillGlobal: FillGlobalPlan,
 }
 
 type startegyFunc = func(_ []Info, need, total, limit int, _ types.ResourceType) (map[string]int, error)