[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mesos-commits
Subject:    (mesos) branch master updated: [FIX] Mesos-Tidy "mesos-redundant-get" errors.
From:       bmahler () apache ! org
Date:       2024-01-23 20:14:03
Message-ID: 170604084385.780814.1380530271353430741 () gitbox2-he-fi ! apache ! org
[Download RAW message or body]

This is an automated email from the ASF dual-hosted git repository.

bmahler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git


The following commit(s) were added to refs/heads/master by this push:
     new 167192e39 [FIX] Mesos-Tidy "mesos-redundant-get" errors.
167192e39 is described below

commit 167192e39c26213838f17d487b5e45f6755bf91f
Author: Devin Leamy <dleamy@twitter.com>
AuthorDate: Tue Jan 23 19:37:55 2024 +0000

    [FIX] Mesos-Tidy "mesos-redundant-get" errors.
---
 src/slave/containerizer/mesos/isolators/cgroups/subsystems/memory.cpp | 4 ++--
 src/tests/containerizer/memory_isolator_tests.cpp                     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/slave/containerizer/mesos/isolators/cgroups/subsystems/memory.cpp \
b/src/slave/containerizer/mesos/isolators/cgroups/subsystems/memory.cpp index \
                566cbd3e3..788ab04c5 100644
--- a/src/slave/containerizer/mesos/isolators/cgroups/subsystems/memory.cpp
+++ b/src/slave/containerizer/mesos/isolators/cgroups/subsystems/memory.cpp
@@ -467,7 +467,7 @@ Future<ResourceStatistics> MemorySubsystemProcess::usage(
     return Failure("Failed to parse 'memory.kmem.usage_in_bytes': " +
                    kmem_usage.error());
   } else if (kmem_usage.isSome()) {
-    result.set_mem_kmem_usage_bytes(kmem_usage.get().bytes());
+    result.set_mem_kmem_usage_bytes(kmem_usage->bytes());
   }
 
   Result<Bytes> kmem_tcp_usage = cgroups::memory::kmem_tcp_usage_in_bytes(
@@ -477,7 +477,7 @@ Future<ResourceStatistics> MemorySubsystemProcess::usage(
     return Failure("Failed to parse 'memory.kmem.tcp.usage_in_bytes': " +
                    kmem_tcp_usage.error());
   } else if (kmem_tcp_usage.isSome()) {
-    result.set_mem_kmem_tcp_usage_bytes(kmem_tcp_usage.get().bytes());
+    result.set_mem_kmem_tcp_usage_bytes(kmem_tcp_usage->bytes());
   }
 
   if (flags.cgroups_limit_swap) {
diff --git a/src/tests/containerizer/memory_isolator_tests.cpp \
b/src/tests/containerizer/memory_isolator_tests.cpp index 266a79f93..ec0f359a2 100644
--- a/src/tests/containerizer/memory_isolator_tests.cpp
+++ b/src/tests/containerizer/memory_isolator_tests.cpp
@@ -162,7 +162,7 @@ TEST_P(MemoryIsolatorTest, ROOT_MemUsage)
     if (kmemExists.get()) {
       // We can assume more than 4096 bytes here, since a kernel page size is
       // 4kB and we are allocating at least one.
-      ASSERT_LT(4096u, usage.get().mem_kmem_usage_bytes());
+      ASSERT_LT(4096u, usage->mem_kmem_usage_bytes());
     }
   }
 


[prev in list] [next in list] [prev in thread] [next in thread]