diff --git a/.changelog/11500.txt b/.changelog/11500.txt new file mode 100644 index 000000000000..8fdb7ca67fb2 --- /dev/null +++ b/.changelog/11500.txt @@ -0,0 +1,3 @@ +```release-note:improvement +metrics: added nomad.client.allocs.memory.mapped_file metric +``` diff --git a/client/allocrunner/taskrunner/task_runner.go b/client/allocrunner/taskrunner/task_runner.go index 68df0827f60e..94c8d12e7d85 100644 --- a/client/allocrunner/taskrunner/task_runner.go +++ b/client/allocrunner/taskrunner/task_runner.go @@ -1388,6 +1388,7 @@ func (tr *TaskRunner) setGaugeForMemory(ru *cstructs.TaskResourceUsage) { publishMetric(ms.RSS, "rss", "RSS") publishMetric(ms.Cache, "cache", "Cache") publishMetric(ms.Swap, "swap", "Swap") + publishMetric(ms.MappedFile, "mapped_file", "Mapped File") publishMetric(ms.Usage, "usage", "Usage") publishMetric(ms.MaxUsage, "max_usage", "Max Usage") publishMetric(ms.KernelUsage, "kernel_usage", "Kernel Usage") diff --git a/client/structs/structs.go b/client/structs/structs.go index d91295b15d44..77a2c71c0ef6 100644 --- a/client/structs/structs.go +++ b/client/structs/structs.go @@ -206,6 +206,7 @@ type MemoryStats struct { RSS uint64 Cache uint64 Swap uint64 + MappedFile uint64 Usage uint64 MaxUsage uint64 KernelUsage uint64 @@ -223,6 +224,7 @@ func (ms *MemoryStats) Add(other *MemoryStats) { ms.RSS += other.RSS ms.Cache += other.Cache ms.Swap += other.Swap + ms.MappedFile += other.MappedFile ms.Usage += other.Usage ms.MaxUsage += other.MaxUsage ms.KernelUsage += other.KernelUsage diff --git a/drivers/docker/stats_test.go b/drivers/docker/stats_test.go index f9c290c3c047..4ae932bf4aac 100644 --- a/drivers/docker/stats_test.go +++ b/drivers/docker/stats_test.go @@ -27,6 +27,7 @@ func TestDriver_DockerStatsCollector(t *testing.T) { stats.MemoryStats.Stats.Rss = 6537216 stats.MemoryStats.Stats.Cache = 1234 stats.MemoryStats.Stats.Swap = 0 + stats.MemoryStats.Stats.MappedFile = 1024 stats.MemoryStats.Usage = 5651904 stats.MemoryStats.MaxUsage = 6651904 stats.MemoryStats.Commit = 123231 @@ -47,6 +48,7 @@ func TestDriver_DockerStatsCollector(t *testing.T) { require.Equal(stats.MemoryStats.Stats.Rss, ru.ResourceUsage.MemoryStats.RSS) require.Equal(stats.MemoryStats.Stats.Cache, ru.ResourceUsage.MemoryStats.Cache) require.Equal(stats.MemoryStats.Stats.Swap, ru.ResourceUsage.MemoryStats.Swap) + require.Equal(stats.MemoryStats.Stats.MappedFile, ru.ResourceUsage.MemoryStats.MappedFile) require.Equal(stats.MemoryStats.Usage, ru.ResourceUsage.MemoryStats.Usage) require.Equal(stats.MemoryStats.MaxUsage, ru.ResourceUsage.MemoryStats.MaxUsage) require.Equal(stats.CPUStats.ThrottlingData.ThrottledPeriods, ru.ResourceUsage.CpuStats.ThrottledPeriods) diff --git a/drivers/docker/util/stats_posix.go b/drivers/docker/util/stats_posix.go index ae755c430039..ba1167f344b2 100644 --- a/drivers/docker/util/stats_posix.go +++ b/drivers/docker/util/stats_posix.go @@ -29,12 +29,13 @@ func DockerStatsToTaskResourceUsage(s *docker.Stats) *cstructs.TaskResourceUsage } ms := &cstructs.MemoryStats{ - RSS: s.MemoryStats.Stats.Rss, - Cache: s.MemoryStats.Stats.Cache, - Swap: s.MemoryStats.Stats.Swap, - Usage: s.MemoryStats.Usage, - MaxUsage: s.MemoryStats.MaxUsage, - Measured: measuredMems, + RSS: s.MemoryStats.Stats.Rss, + Cache: s.MemoryStats.Stats.Cache, + Swap: s.MemoryStats.Stats.Swap, + MappedFile: s.MemoryStats.Stats.MappedFile, + Usage: s.MemoryStats.Usage, + MaxUsage: s.MemoryStats.MaxUsage, + Measured: measuredMems, } cs := &cstructs.CpuStats{ diff --git a/drivers/shared/executor/executor_linux.go b/drivers/shared/executor/executor_linux.go index c2788e9b9c28..7ee6ba6e7d2f 100644 --- a/drivers/shared/executor/executor_linux.go +++ b/drivers/shared/executor/executor_linux.go @@ -383,10 +383,12 @@ func (l *LibcontainerExecutor) handleStats(ch chan *cstructs.TaskResourceUsage, maxUsage := stats.MemoryStats.Usage.MaxUsage rss := stats.MemoryStats.Stats["rss"] cache := stats.MemoryStats.Stats["cache"] + mapped_file := stats.MemoryStats.Stats["mapped_file"] ms := &cstructs.MemoryStats{ RSS: rss, Cache: cache, Swap: swap.Usage, + MappedFile: mapped_file, Usage: stats.MemoryStats.Usage.Usage, MaxUsage: maxUsage, KernelUsage: stats.MemoryStats.KernelUsage.Usage,