add strategy method: FILLGLOBAL (#305)

* add strategy method: FILLGLOBAL

* pass test

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,19 @@
+package strategy
+
+import (
+	"github.com/projecteru2/core/log"
+	"github.com/projecteru2/core/types"
+)
+
+// FillGlobalPlan try fill strategy and fallback to global strategy
+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.Infof("[FillGlobalPlan] fill plan failed, try global fill: %+v", err)
+	return GlobalPlan(originStrategyInfo, need, total, limit, resourceType)
+}

strategy/fill_global.go

@@ -0,0 +1,48 @@
+package strategy
+
+import (
+	"testing"
+
+	"github.com/projecteru2/core/types"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestFillGlobalPlan(t *testing.T) {
+	// can fill
+	strategyInfos := []Info{
+		{
+			Nodename: "n1",
+			Capacity: 10,
+			Count:    1,
+		},
+		{
+			Nodename: "n2",
+			Capacity: 10,
+			Count:    0,
+		},
+	}
+	deployMap, err := FillPlan(strategyInfos, 1, 2, 1, types.ResourceAll)
+	assert.Nil(t, err)
+	assert.EqualValues(t, 0, deployMap["n1"])
+	assert.EqualValues(t, 1, deployMap["n2"])
+	deployMap, err = FillGlobalPlan(strategyInfos, 1, 2, 1, types.ResourceAll)
+	assert.Nil(t, err)
+	assert.EqualValues(t, 0, deployMap["n1"])
+	assert.EqualValues(t, 1, deployMap["n2"])
+
+	// can't fill
+	strategyInfos = []Info{
+		{
+			Nodename: "n1",
+			Capacity: 10,
+			Count:    1,
+			Usages:   map[types.ResourceType]float64{types.ResourceAll: 0.1},
+			Rates:    map[types.ResourceType]float64{types.ResourceAll: 0.1},
+		},
+	}
+	_, err = FillPlan(strategyInfos, 1, 2, 1, types.ResourceAll)
+	assert.EqualError(t, err, "Cannot alloc a fill node plan, each node has enough workloads")
+	deployMap, err = FillGlobalPlan(strategyInfos, 1, 2, 1, types.ResourceAll)
+	assert.Nil(t, err)
+	assert.EqualValues(t, 1, deployMap["n1"])
+}

strategy/fillglobal_test.go

@@ -18,15 +18,18 @@ const (
 	Each = "EACH"
 	// Global .
 	Global = "GLOBAL"
+	// FillGlobal .
+	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)