Merge pull request #55 from Azure/dev/dpoole/tweak-resource-governance
Dev/dpoole/tweak resource governance
This commit is contained in:
dpoole73
GitHub
Коммит
b2f10123ea
|
|
@ -7208,6 +7208,125 @@ http://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND
|
|||
|
||||
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
|
||||
To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives.
|
||||
|
||||
Copyright [yyyy] [name of copyright owner]
|
||||
|
||||
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.
|
||||
|
||||
---------------------------------------------------------
|
||||
|
||||
---------------------------------------------------------
|
||||
|
||||
github.com%2Fcontainerd/containerd v1.7.12 - Apache-2.0
|
||||
|
||||
|
||||
Copyright 2018 CNI authors
|
||||
Copyright 2021 ADA Logics Ltd
|
||||
Copyright 2022 ADA Logics Ltd
|
||||
Copyright 2012-2015 Docker, Inc.
|
||||
Copyright 2012-2017 Docker, Inc.
|
||||
Copyright (c) 2009 The Go Authors
|
||||
Copyright (c) Docker/Moby authors
|
||||
Copyright (c) 2013, The GoGo Authors
|
||||
Copyright 2015 The Kubernetes Authors
|
||||
Copyright 2016 The Kubernetes Authors
|
||||
Copyright 2017 The Kubernetes Authors
|
||||
Copyright 2018 The Kubernetes Authors
|
||||
Copyright 2020 The Kubernetes Authors
|
||||
|
||||
Apache License
|
||||
|
||||
Version 2.0, January 2004
|
||||
|
||||
http://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
|
||||
|
||||
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
|
||||
|
||||
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
|
||||
|
||||
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
|
||||
|
||||
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
|
||||
|
||||
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
|
||||
|
||||
|
||||
|
||||
"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
|
||||
|
|
@ -34897,6 +35016,40 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
|
|||
|
||||
---------------------------------------------------------
|
||||
|
||||
github.com%2Finfluxdata/telegraf v1.29.2 - MIT
|
||||
|
||||
|
||||
Copyright 2011 The Go Authors
|
||||
Copyright (c) 2010 The win Authors
|
||||
Copyright (c) 2016 Mendelson Gusmao
|
||||
Copyright 2018 The Prometheus Authors
|
||||
Copyright (c) 2015-2020 InfluxData Inc.
|
||||
Copyright (c) 2013-2021 Jack Christensen
|
||||
Copyright (c) The Internet Society (2005)
|
||||
Copyright (c) 2001 - 2023 Intel Corporation
|
||||
Copyrights (c) 2016, Juniper Networks, Inc.
|
||||
Copyrights (c) 2017, Juniper Networks, Inc.
|
||||
Copyright (c) 2002-16, Bruce Allen, Christian Franke
|
||||
Copyright (c) 2015 Jeff Nickoloff (jeff@allingeek.com)
|
||||
Copyright (c) 2016-now PowerDNS.COM B.V. and its contributors
|
||||
Copyright (c) 2002-16, Bruce Allen, Christian Franke, www.smartmontools.org
|
||||
Copyright (c) 2002-17, Bruce Allen, Christian Franke, www.smartmontools.org
|
||||
Copyright (c) 2002-22, Bruce Allen, Christian Franke, www.smartmontools.org
|
||||
|
||||
MIT License
|
||||
|
||||
Copyright (c) <year> <copyright holders>
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
---------------------------------------------------------
|
||||
|
||||
---------------------------------------------------------
|
||||
|
||||
github.com%2Finfluxdata/toml v0.0.0-20190415235208-270119a8ce65 - MIT
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
1.0.02581.74-official-83ffceb7
|
||||
1.0.02595.76-official-0d3ea044
|
||||
|
|
|
|||
|
|
@ -180,7 +180,6 @@
|
|||
[[outputs.file]]
|
||||
flush_interval = "30s"
|
||||
## Files to write to, "stdout" is a specially handled file.
|
||||
# folder = "/Users/mizhe/tmporary"
|
||||
folder = "${SIGNAL_FOLDER:-stdout}"
|
||||
|
||||
## Use batch serialization format instead of line based delimiting. The
|
||||
|
|
@ -192,6 +191,9 @@
|
|||
## to 0 no time based rotation is performed.
|
||||
rotation_interval = "10s"
|
||||
|
||||
## max number of files that can be present in the folder, if exceeded new files will not be written
|
||||
rotation_max_file_count = 1000
|
||||
|
||||
## The logfile will be rotated when it becomes larger than the specified
|
||||
## size. When set to 0 no size based rotation is performed.
|
||||
# rotation_max_size = "0MB"
|
||||
|
|
@ -206,3 +208,36 @@
|
|||
json_transformation = '''
|
||||
$merge([{"Timestamp": timestamp, "Message": $string( $merge([{"Name": name}, fields]) )}, tags])
|
||||
'''
|
||||
[[outputs.file]]
|
||||
flush_interval = "30s"
|
||||
## this output will be enabled if this variable is set otherwise it is a no-op
|
||||
## it specifies and additional location to write the events to for troubleshooting
|
||||
folder = "${ADDITIONAL_SIGNAL_FOLDER_FOR_TROUBLESHOOTING:-}"
|
||||
|
||||
## Use batch serialization format instead of line based delimiting. The
|
||||
## batch format allows for the production of non line based output formats and
|
||||
## may more efficiently encode and write metrics.
|
||||
use_batch_format = false
|
||||
|
||||
## The file will be rotated after the time interval specified. When set
|
||||
## to 0 no time based rotation is performed.
|
||||
rotation_interval = "10s"
|
||||
|
||||
## max number of files that can be present in the folder, if exceeded new files will not be written
|
||||
rotation_max_file_count = 1000
|
||||
|
||||
## The logfile will be rotated when it becomes larger than the specified
|
||||
## size. When set to 0 no size based rotation is performed.
|
||||
# rotation_max_size = "0MB"
|
||||
|
||||
## Data format to output.
|
||||
## Each data format has its own unique set of configuration options, read
|
||||
## more about them here:
|
||||
## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
|
||||
data_format = "json"
|
||||
json_timestamp_format = "2006-01-02T15:04:05Z07:00"
|
||||
json_nested_fields_include = ["RuntimeParameters", "Errors", "Stats"]
|
||||
json_transformation = '''
|
||||
$merge([{"Timestamp": timestamp, "Message": $string( $merge([{"Name": name}, fields]) )}, tags])
|
||||
'''
|
||||
|
||||
|
|
|
|||
Двоичный файл не отображается.
Двоичный файл не отображается.
|
|
@ -12,7 +12,7 @@ subscription=$4
|
|||
container="${5:-packages}"
|
||||
|
||||
# get the latest build of the linux pipeline from devops
|
||||
latestbuild=$(az pipelines runs list --org $org --project "$projectGuid" --pipeline-ids $pipelineId | jq "[.[].id] | sort | last")
|
||||
latestbuild=$(az pipelines runs list --org $org --project "$projectGuid" --pipeline-ids $pipelineId | jq '[ .[] | select(.result == "succeeded")]' | jq '[.[].id] | sort | last')
|
||||
# download the final output artifacts
|
||||
rm -rf /tmp/linux_artifact
|
||||
az pipelines runs artifact download --org $org --project "$projectGuid" --run-id $latestbuild --artifact-name drop_2_windows --path /tmp/linux_artifact
|
||||
|
|
|
|||
|
|
@ -180,6 +180,7 @@ teardown(){
|
|||
[[ "$output" == *'--config /var/lib/waagent/Extension/bin/VMWatch/vmwatch.conf'* ]]
|
||||
[[ "$output" == *'--disabled-signals clockskew:az_storage_blob:process:dns'* ]]
|
||||
[[ "$output" == *"--apphealth-version $extension_version"* ]]
|
||||
[[ "$output" == *'--memory-limit-bytes 80000000'* ]]
|
||||
[[ "$output" == *'Env: [SIGNAL_FOLDER=/var/log/azure/Extension/events VERBOSE_LOG_FILE_FULL_PATH=/var/log/azure/Extension/VE.RS.ION/vmwatch.log]'* ]]
|
||||
[[ "$output" == *'VMWatch is running'* ]]
|
||||
|
||||
|
|
@ -414,6 +415,30 @@ teardown(){
|
|||
[[ "$output" == *'operation=uninstall seq=0 path=/var/lib/waagent/apphealth event=uninstalled'* ]]
|
||||
}
|
||||
|
||||
@test "handler command: enable/uninstall - vm passes memory to commandline" {
|
||||
mk_container $container_name sh -c "nc -l localhost 22 -k & fake-waagent install && export RUNNING_IN_DEV_CONTAINER=1 && export ALLOW_VMWATCH_CGROUP_ASSIGNMENT_FAILURE=1 && fake-waagent enable && wait-for-enable webserverexit && sleep 5 && fake-waagent uninstall"
|
||||
push_settings '
|
||||
{
|
||||
"protocol": "tcp",
|
||||
"requestPath": "",
|
||||
"port": 22,
|
||||
"numberOfProbes": 1,
|
||||
"intervalInSeconds": 5,
|
||||
"gracePeriod": 600,
|
||||
"vmWatchSettings": {
|
||||
"enabled": true,
|
||||
"memoryLimitInBytes" : 40000000
|
||||
}
|
||||
}' ''
|
||||
run start_container
|
||||
|
||||
echo "$output"
|
||||
[[ "$output" == *'Setup VMWatch command: /var/lib/waagent/Extension/bin/VMWatch/vmwatch_linux_amd64'* ]]
|
||||
[[ "$output" == *'VMWatch process started'* ]]
|
||||
[[ "$output" == *'VMWatch is running'* ]]
|
||||
[[ "$output" == *'--memory-limit-bytes 40000000'* ]]
|
||||
}
|
||||
|
||||
# bats test_tags=linuxhostonly
|
||||
@test "handler command: enable - vm watch oom - process should be killed" {
|
||||
mk_container_priviliged $container_name sh -c "nc -l localhost 22 -k & fake-waagent install && export RUNNING_IN_DEV_CONTAINER=1 && fake-waagent enable && wait-for-enable webserverexit && sleep 300"
|
||||
|
|
|
|||
|
|
@ -97,6 +97,8 @@ type vmWatchSignalFilters struct {
|
|||
|
||||
type vmWatchSettings struct {
|
||||
Enabled bool `json:"enabled,boolean"`
|
||||
MemoryLimitInBytes int64 `json:"memoryLimitInBytes,int64"`
|
||||
MaxCpuPercentage int64 `json:"maxCpuPercentage,int64"`
|
||||
SignalFilters *vmWatchSignalFilters `json:"signalFilters"`
|
||||
ParameterOverrides map[string]interface{} `json:"parameterOverrides,object"`
|
||||
EnvironmentAttributes map[string]interface{} `json:"environmentAttributes,object"`
|
||||
|
|
|
|||
|
|
@ -59,6 +59,19 @@ const (
|
|||
"type": "boolean",
|
||||
"default": false
|
||||
},
|
||||
"memoryLimitInBytes": {
|
||||
"description": "Optional - specifies the max memory that vmwatch can use",
|
||||
"type": "integer",
|
||||
"default": 80000000,
|
||||
"minimum": 30000000
|
||||
},
|
||||
"maxCpuPercentage": {
|
||||
"description": "Optional - specifies the max cpu that the vmwatch process is allowed to consume",
|
||||
"type": "integer",
|
||||
"default": 1,
|
||||
"minimum": 1,
|
||||
"maximum": 100
|
||||
},
|
||||
"signalFilters" : {
|
||||
"description": "Optional - specify filtering for signals, if not specified, all core signals will be enabled",
|
||||
"type": "object",
|
||||
|
|
|
|||
|
|
@ -154,3 +154,22 @@ func TestValidatePublicSettings_gracePeriod(t *testing.T) {
|
|||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestValidatePublicSettings_vmwatch(t *testing.T) {
|
||||
require.Nil(t, validatePublicSettings(`{"port": 1, "vmWatchSettings" : { "enabled" : false }}`), "valid settings")
|
||||
require.Nil(t, validatePublicSettings(`{"port": 1, "vmWatchSettings" : { "enabled" : true }}`), "valid settings")
|
||||
require.Nil(t, validatePublicSettings(`{"port": 1, "vmWatchSettings" : { "enabled" : true, "memoryLimitInBytes" : 30000000 }}`), "valid settings")
|
||||
|
||||
err := validatePublicSettings(`{"port": 1, "vmWatchSettings" : { "enabled" : true, "memoryLimitInBytes" : 20000000 }}`)
|
||||
require.NotNil(t, err)
|
||||
require.Contains(t, err.Error(), "vmWatchSettings.memoryLimitInBytes: Must be greater than or equal to 30000000")
|
||||
|
||||
err = validatePublicSettings(`{"port": 1, "vmWatchSettings" : { "enabled" : true, "maxCpuPercentage" : 0 }}`)
|
||||
require.NotNil(t, err)
|
||||
require.Contains(t, err.Error(), "vmWatchSettings.maxCpuPercentage: Must be greater than or equal to 1")
|
||||
|
||||
err = validatePublicSettings(`{"port": 1, "vmWatchSettings" : { "enabled" : true, "maxCpuPercentage" : 101 }}`)
|
||||
require.NotNil(t, err)
|
||||
require.Contains(t, err.Error(), "vmWatchSettings.maxCpuPercentage: Must be less than or equal to 100")
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -22,8 +22,8 @@ import (
|
|||
type VMWatchStatus string
|
||||
|
||||
const (
|
||||
MaxCpuQuota = 1 // 1% cpu
|
||||
MaxMemoryInBytes = 40000000 // 40MB
|
||||
DefaultMaxCpuPercentage = 1 // 1% cpu
|
||||
DefaultMaxMemoryInBytes = 80000000 // 80MB
|
||||
HoursBetweenRetryAttempts = 3
|
||||
CGroupV2PeriodMs = 1000000 // 1 second
|
||||
)
|
||||
|
|
@ -134,7 +134,7 @@ func executeVMWatchHelper(ctx *log.Context, attempt int, vmWatchSettings *vmWatc
|
|||
pid = cmd.Process.Pid // cmd.Process should be populated on success
|
||||
ctx.Log("event", fmt.Sprintf("Attempt %d: VMWatch process started with pid %d", attempt, pid))
|
||||
|
||||
err = createAndAssignCgroups(ctx, pid)
|
||||
err = createAndAssignCgroups(ctx, vmWatchSettings, pid)
|
||||
if err != nil {
|
||||
err = fmt.Errorf("[%v][PID %d] Failed to assign VMWatch process to cgroup. Error: %w", time.Now().UTC().Format(time.RFC3339), pid, err)
|
||||
ctx.Log("error", err.Error())
|
||||
|
|
@ -229,6 +229,28 @@ func setupVMWatchCommand(s *vmWatchSettings, hEnv HandlerEnvironment) (*exec.Cmd
|
|||
args = append(args, "--heartbeat-file", GetVMWatchHeartbeatFilePath(hEnv))
|
||||
args = append(args, "--execution-environment", GetExecutionEnvironment(hEnv))
|
||||
|
||||
// 0 is the default so allow that but any value below 30MB is not allowed
|
||||
if s.MemoryLimitInBytes == 0 {
|
||||
s.MemoryLimitInBytes = DefaultMaxMemoryInBytes
|
||||
|
||||
}
|
||||
if s.MemoryLimitInBytes < 30000000 {
|
||||
err = fmt.Errorf("[%v] Invalid MemoryLimitInBytes specified must be at least 30000000", time.Now().UTC().Format(time.RFC3339))
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// check cpu, if 0 (default) set to the default value
|
||||
if (s.MaxCpuPercentage == 0) {
|
||||
s.MaxCpuPercentage = DefaultMaxCpuPercentage
|
||||
}
|
||||
|
||||
if s.MaxCpuPercentage < 0 || s.MaxCpuPercentage > 100 {
|
||||
err = fmt.Errorf("[%v] Invalid maxCpuPercentage specified must be between 0 and 100", time.Now().UTC().Format(time.RFC3339))
|
||||
return nil, err
|
||||
}
|
||||
|
||||
args = append(args, "--memory-limit-bytes", strconv.FormatInt(s.MemoryLimitInBytes, 10))
|
||||
|
||||
if s.SignalFilters != nil {
|
||||
if s.SignalFilters.DisabledSignals != nil && len(s.SignalFilters.DisabledSignals) > 0 {
|
||||
args = append(args, "--disabled-signals")
|
||||
|
|
@ -285,10 +307,10 @@ func setupVMWatchCommand(s *vmWatchSettings, hEnv HandlerEnvironment) (*exec.Cmd
|
|||
return cmd, nil
|
||||
}
|
||||
|
||||
func createAndAssignCgroups(ctx *log.Context, vmWatchPid int) error {
|
||||
func createAndAssignCgroups(ctx *log.Context, vmwatchSettings *vmWatchSettings, vmWatchPid int) error {
|
||||
// get our process and use this to determine the appropriate mount points for the cgroups
|
||||
myPid := os.Getpid()
|
||||
memoryLimitInBytes := int64(MaxMemoryInBytes)
|
||||
memoryLimitInBytes := int64(vmwatchSettings.MemoryLimitInBytes)
|
||||
|
||||
// check cgroups mode
|
||||
if cgroups.Mode() == cgroups.Unified {
|
||||
|
|
@ -297,7 +319,7 @@ func createAndAssignCgroups(ctx *log.Context, vmWatchPid int) error {
|
|||
// Quota is the number of microseconds in the period that process can run
|
||||
// Period is the length of the period in microseconds
|
||||
period := uint64(CGroupV2PeriodMs)
|
||||
cpuQuota := int64(MaxCpuQuota * 10000)
|
||||
cpuQuota := int64(vmwatchSettings.MaxCpuPercentage * 10000)
|
||||
resources := cgroup2.Resources{
|
||||
CPU: &cgroup2.CPU{
|
||||
Max: cgroup2.NewCPUMax(&cpuQuota, &period),
|
||||
|
|
@ -327,8 +349,8 @@ func createAndAssignCgroups(ctx *log.Context, vmWatchPid int) error {
|
|||
}
|
||||
|
||||
// in cgroup v1, the interval is implied, 1000 == 1 %
|
||||
cpuQuota := int64(MaxCpuQuota * 1000)
|
||||
memoryLimitInBytes := int64(MaxMemoryInBytes)
|
||||
cpuQuota := int64(vmwatchSettings.MaxCpuPercentage * 1000)
|
||||
memoryLimitInBytes := int64(vmwatchSettings.MemoryLimitInBytes)
|
||||
|
||||
s := specs.LinuxResources{
|
||||
CPU: &specs.LinuxCPU{
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче