From beba4cdb85f3cdd90e0831bd884426d85169de7e Mon Sep 17 00:00:00 2001 From: CMGS Date: Tue, 10 Jan 2023 15:45:29 +0800 Subject: [PATCH] without hax to speedup --- resource3/plugins/cpumem/node.go | 23 ++++++----------------- resource3/plugins/cpumem/node_test.go | 2 +- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/resource3/plugins/cpumem/node.go b/resource3/plugins/cpumem/node.go index b8dedd18e..e504dcadc 100644 --- a/resource3/plugins/cpumem/node.go +++ b/resource3/plugins/cpumem/node.go @@ -7,7 +7,6 @@ import ( "math" "strconv" - "github.com/alphadose/haxmap" "github.com/cockroachdb/errors" "github.com/mitchellh/mapstructure" enginetypes "github.com/projecteru2/core/engine/types" @@ -341,25 +340,15 @@ func (p Plugin) doGetNodesResourceInfo(ctx context.Context, nodenames []string) return nil, err } - tmp := haxmap.New[string, *cpumemtypes.NodeResourceInfo]() result := map[string]*cpumemtypes.NodeResourceInfo{} for _, resp := range resps { - resp := resp - go func() { - r := &cpumemtypes.NodeResourceInfo{} - if err := json.Unmarshal(resp.Value, r); err != nil { - log.WithFunc("resource.cpumem.doGetNodesResourceInfo").Error(ctx, err) - return - } - nodename := utils.Tail(string(resp.Key)) - tmp.Set(nodename, r) - }() - } - tmp.ForEach(func(k string, v *cpumemtypes.NodeResourceInfo) bool { - result[k] = v - return true - }) + r := &cpumemtypes.NodeResourceInfo{} + if err := json.Unmarshal(resp.Value, r); err != nil { + return nil, err + } + result[utils.Tail(string(resp.Key))] = r + } return result, nil } diff --git a/resource3/plugins/cpumem/node_test.go b/resource3/plugins/cpumem/node_test.go index 4e3313207..63f7a5968 100644 --- a/resource3/plugins/cpumem/node_test.go +++ b/resource3/plugins/cpumem/node_test.go @@ -179,7 +179,7 @@ func BenchmarkGetNodesCapacity(b *testing.B) { t := &testing.T{} ctx := context.Background() cm := initCPUMEM(ctx, t) - nodes := generateNodes(ctx, t, cm, 10000, 24, 128*units.GB, 100, 0) + nodes := generateNodes(ctx, t, cm, 1000, 24, 128*units.GB, 100, 0) req := &plugintypes.WorkloadResourceRequest{ "cpu-bind": true, "cpu-request": 1.3,