Skip to content

Commit 06419bc

Browse files
committed
remove fill global, fill now can calcuate with capacity
1 parent 58385f1 commit 06419bc

File tree

6 files changed

+22
-93
lines changed

6 files changed

+22
-93
lines changed

Makefile

+3-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ unit-test:
3737
go vet `go list ./... | grep -v '/vendor/' | grep -v '/tools'`
3838
go test -timeout 120s -count=1 -cover ./utils/... \
3939
./types/... \
40-
./store/etcdv3/... \
40+
./store/etcdv3/. \
41+
./store/etcdv3/embedded/. \
42+
./store/etcdv3/meta/. \
4143
./source/common/... \
4244
./strategy/... \
4345
./scheduler/complex/... \

rpc/gen/core.pb.go

+15-19
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rpc/gen/core.proto

-1
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,6 @@ message DeployOptions {
422422
FILL = 1;
423423
EACH = 2;
424424
GLOBAL = 3;
425-
FILLGLOBAL = 4;
426425
DUMMY = 99;
427426
}
428427
string name = 1;

strategy/fill_global.go

-18
This file was deleted.

strategy/fillglobal_test.go

-47
This file was deleted.

strategy/strategy.go

+4-7
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,15 @@ const (
1818
Each = "EACH"
1919
// Global .
2020
Global = "GLOBAL"
21-
// FillGlobal .
22-
FillGlobal = "FILLGLOBAL"
2321
// Dummy for calculate capacity
2422
Dummy = "DUMMY"
2523
)
2624

2725
var Plans = map[string]startegyFunc{
28-
Auto: CommunismPlan,
29-
Fill: FillPlan,
30-
Each: AveragePlan,
31-
Global: GlobalPlan,
32-
FillGlobal: FillGlobalPlan,
26+
Auto: CommunismPlan,
27+
Fill: FillPlan,
28+
Each: AveragePlan,
29+
Global: GlobalPlan,
3330
}
3431

3532
type startegyFunc = func(_ []Info, need, total, limit int) (map[string]int, error)

0 commit comments

Comments
 (0)