-
Notifications
You must be signed in to change notification settings - Fork 106
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #536 from cheney-lin/dev/mem_guard
refactor(sysadvisor): support dynamic enable memory guard
- Loading branch information
Showing
15 changed files
with
353 additions
and
97 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
44 changes: 44 additions & 0 deletions
44
cmd/katalyst-agent/app/options/dynamic/adminqos/advisor/advisor_base.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,44 @@ | ||
| /* | ||
| Copyright 2022 The Katalyst 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 advisor | ||
|
|
||
| import ( | ||
| "k8s.io/apimachinery/pkg/util/errors" | ||
| cliflag "k8s.io/component-base/cli/flag" | ||
|
|
||
| "github.com/kubewharf/katalyst-core/pkg/config/agent/dynamic/adminqos/advisor" | ||
| ) | ||
|
|
||
| type AdvisorOptions struct { | ||
| *MemoryGuardOptions | ||
| } | ||
|
|
||
| func NewAdvisorOptions() *AdvisorOptions { | ||
| return &AdvisorOptions{ | ||
| MemoryGuardOptions: NewMemoryGuardOptions(), | ||
| } | ||
| } | ||
|
|
||
| func (o *AdvisorOptions) AddFlags(fss *cliflag.NamedFlagSets) { | ||
| o.MemoryGuardOptions.AddFlags(fss) | ||
| } | ||
|
|
||
| func (o *AdvisorOptions) ApplyTo(c *advisor.AdvisorConfiguration) error { | ||
| var errList []error | ||
| errList = append(errList, o.MemoryGuardOptions.ApplyTo(c.MemoryGuardConfiguration)) | ||
| return errors.NewAggregate(errList) | ||
| } |
46 changes: 46 additions & 0 deletions
46
cmd/katalyst-agent/app/options/dynamic/adminqos/advisor/memory_guard.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,46 @@ | ||
| /* | ||
| Copyright 2022 The Katalyst 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 advisor | ||
|
|
||
| import ( | ||
| cliflag "k8s.io/component-base/cli/flag" | ||
|
|
||
| "github.com/kubewharf/katalyst-core/pkg/config/agent/dynamic/adminqos/advisor" | ||
| ) | ||
|
|
||
| type MemoryGuardOptions struct { | ||
| Enable bool | ||
| } | ||
|
|
||
| func NewMemoryGuardOptions() *MemoryGuardOptions { | ||
| return &MemoryGuardOptions{ | ||
| Enable: true, | ||
| } | ||
| } | ||
|
|
||
| // AddFlags parses the flags to CPUPressureEvictionOptions | ||
| func (o *MemoryGuardOptions) AddFlags(fss *cliflag.NamedFlagSets) { | ||
| fs := fss.FlagSet("memory-guard") | ||
|
|
||
| fs.BoolVar(&o.Enable, "memory-guard-enable", o.Enable, | ||
| "set true to enable memory guard") | ||
| } | ||
|
|
||
| func (o *MemoryGuardOptions) ApplyTo(c *advisor.MemoryGuardConfiguration) error { | ||
| c.Enable = o.Enable | ||
| return nil | ||
| } |
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
Oops, something went wrong.