This is an automated email from the ASF dual-hosted git repository. qianzhang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mesos.git
commit 0a9d97f801551d273b17d6c4515b4a8884c0be91 Author: Qian Zhang <[email protected]> AuthorDate: Fri Apr 17 20:53:03 2020 +0800 Added `cpus_soft_limit` field to `ResourceStatistics` protobuf message. Review: https://reviews.apache.org/r/72398 --- include/mesos/mesos.proto | 9 ++++++--- include/mesos/v1/mesos.proto | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/include/mesos/mesos.proto b/include/mesos/mesos.proto index 470343c..5f795f5 100644 --- a/include/mesos/mesos.proto +++ b/include/mesos/mesos.proto @@ -1759,9 +1759,12 @@ message ResourceStatistics { optional double cpus_user_time_secs = 2; optional double cpus_system_time_secs = 3; - // Number of CPUs allocated. + // Hard CPU limit. optional double cpus_limit = 4; + // Soft CPU limit. + optional double cpus_soft_limit = 45; + // cpu.stat on process throttling (for contention issues). optional uint32 cpus_nr_periods = 7; optional uint32 cpus_nr_throttled = 8; @@ -1779,10 +1782,10 @@ message ResourceStatistics { // Total memory + swap usage. This is set if swap is enabled. optional uint64 mem_total_memsw_bytes = 37; - // Hard memory limit for a container. + // Hard memory limit. optional uint64 mem_limit_bytes = 6; - // Soft memory limit for a container. + // Soft memory limit. optional uint64 mem_soft_limit_bytes = 38; // Broken out memory usage information: pagecache, rss (anonymous), diff --git a/include/mesos/v1/mesos.proto b/include/mesos/v1/mesos.proto index ecf717a..07d2f40 100644 --- a/include/mesos/v1/mesos.proto +++ b/include/mesos/v1/mesos.proto @@ -1719,9 +1719,12 @@ message ResourceStatistics { optional double cpus_user_time_secs = 2; optional double cpus_system_time_secs = 3; - // Number of CPUs allocated. + // Hard CPU limit. optional double cpus_limit = 4; + // Soft CPU limit. + optional double cpus_soft_limit = 45; + // cpu.stat on process throttling (for contention issues). optional uint32 cpus_nr_periods = 7; optional uint32 cpus_nr_throttled = 8; @@ -1739,10 +1742,10 @@ message ResourceStatistics { // Total memory + swap usage. This is set if swap is enabled. optional uint64 mem_total_memsw_bytes = 37; - // Hard memory limit for a container. + // Hard memory limit. optional uint64 mem_limit_bytes = 6; - // Soft memory limit for a container. + // Soft memory limit. optional uint64 mem_soft_limit_bytes = 38; // Broken out memory usage information: pagecache, rss (anonymous),
