-
Notifications
You must be signed in to change notification settings - Fork 337
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
koordlet: add cold memory collection and reporting (#1574)
Signed-off-by: BUPT-wxq <[email protected]>
- Loading branch information
Showing
21 changed files
with
2,294 additions
and
32 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
62 changes: 62 additions & 0 deletions
62
pkg/koordlet/metricsadvisor/collectors/coldmemoryresource/cold_page_collector.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| /* | ||
| Copyright 2022 The Koordinator Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package coldmemoryresource | ||
|
|
||
| import ( | ||
| "go.uber.org/atomic" | ||
|
|
||
| "github.com/koordinator-sh/koordinator/pkg/koordlet/metricsadvisor/framework" | ||
| "github.com/koordinator-sh/koordinator/pkg/koordlet/util/system" | ||
| ) | ||
|
|
||
| const ( | ||
| CollectorName = "ColdPageCollector" | ||
| ) | ||
|
|
||
| type nonColdPageCollector struct { | ||
| } | ||
|
|
||
| func New(opt *framework.Options) framework.Collector { | ||
| // check whether support kidled cold page info collector | ||
| if system.IsKidledSupport() { | ||
| return &kidledcoldPageCollector{ | ||
| collectInterval: opt.Config.ColdPageCollectorInterval, | ||
| cgroupReader: opt.CgroupReader, | ||
| statesInformer: opt.StatesInformer, | ||
| // TODO(BUPT-wxq): implement podFilter for the VM-based pods and containers | ||
| podFilter: framework.DefaultPodFilter, | ||
| appendableDB: opt.MetricCache, | ||
| metricDB: opt.MetricCache, | ||
| started: atomic.NewBool(false), | ||
| } | ||
| } | ||
| // TODO(BUPT-wxq): check kstaled cold page collector | ||
| // nonCollector does nothing | ||
| return &nonColdPageCollector{} | ||
| } | ||
|
|
||
| func (n *nonColdPageCollector) Run(stopCh <-chan struct{}) {} | ||
|
|
||
| func (n *nonColdPageCollector) Started() bool { | ||
| return false | ||
| } | ||
|
|
||
| func (n *nonColdPageCollector) Enabled() bool { | ||
| return false | ||
| } | ||
|
|
||
| func (n *nonColdPageCollector) Setup(c1 *framework.Context) {} |
102 changes: 102 additions & 0 deletions
102
pkg/koordlet/metricsadvisor/collectors/coldmemoryresource/cold_page_collector_test.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| /* | ||
| Copyright 2022 The Koordinator Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package coldmemoryresource | ||
|
|
||
| import ( | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/golang/mock/gomock" | ||
| "github.com/stretchr/testify/assert" | ||
| "go.uber.org/atomic" | ||
|
|
||
| "github.com/koordinator-sh/koordinator/pkg/koordlet/metriccache" | ||
| "github.com/koordinator-sh/koordinator/pkg/koordlet/metricsadvisor/framework" | ||
| "github.com/koordinator-sh/koordinator/pkg/koordlet/resourceexecutor" | ||
| mock_statesinformer "github.com/koordinator-sh/koordinator/pkg/koordlet/statesinformer/mockstatesinformer" | ||
| "github.com/koordinator-sh/koordinator/pkg/koordlet/util/system" | ||
| ) | ||
|
|
||
| func Test_NewColdPageCollector(t *testing.T) { | ||
| helper := system.NewFileTestUtil(t) | ||
| defer helper.Cleanup() | ||
| metricCache, err := metriccache.NewMetricCache(&metriccache.Config{ | ||
| TSDBPath: t.TempDir(), | ||
| TSDBEnablePromMetrics: false, | ||
| }) | ||
| defer func() { | ||
| err = metricCache.Close() | ||
| assert.NoError(t, err) | ||
| }() | ||
| ctrl := gomock.NewController(t) | ||
| defer ctrl.Finish() | ||
| statesInformer := mock_statesinformer.NewMockStatesInformer(ctrl) | ||
| opt := &framework.Options{ | ||
| Config: &framework.Config{ | ||
| ColdPageCollectorInterval: 1 * time.Second, | ||
| }, | ||
| CgroupReader: resourceexecutor.NewCgroupReader(), | ||
| StatesInformer: statesInformer, | ||
| MetricCache: metricCache, | ||
| } | ||
| type fields struct { | ||
| SetSysUtil func(helper *system.FileTestUtil) | ||
| } | ||
| tests := []struct { | ||
| name string | ||
| fields fields | ||
| want framework.Collector | ||
| }{ | ||
| { | ||
| name: "os doesn't support cold page collector and return nonCollector", | ||
| want: &nonColdPageCollector{}, | ||
| }, | ||
| { | ||
| name: "os support kidled cold page collector but cold page collector feature-gate false", | ||
| fields: fields{ | ||
| SetSysUtil: func(helper *system.FileTestUtil) { | ||
|
|
||
| helper.SetResourcesSupported(true, system.KidledScanPeriodInSeconds) | ||
| helper.SetResourcesSupported(true, system.KidledUseHierarchy) | ||
| }, | ||
| }, | ||
| want: &kidledcoldPageCollector{ | ||
| collectInterval: opt.Config.ColdPageCollectorInterval, | ||
| cgroupReader: opt.CgroupReader, | ||
| statesInformer: opt.StatesInformer, | ||
| podFilter: framework.DefaultPodFilter, | ||
| appendableDB: opt.MetricCache, | ||
| metricDB: opt.MetricCache, | ||
| started: atomic.NewBool(false), | ||
| }, | ||
| }, | ||
| } | ||
| for _, tt := range tests { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| helper := system.NewFileTestUtil(t) | ||
| defer helper.Cleanup() | ||
| if tt.fields.SetSysUtil != nil { | ||
| tt.fields.SetSysUtil(helper) | ||
| } | ||
| got := New(opt) | ||
| assert.Equal(t, tt.want, got) | ||
| assert.NotPanics(t, func() { | ||
| got.Setup(&framework.Context{}) | ||
| }) | ||
| }) | ||
| } | ||
| } |
Oops, something went wrong.