Merge branch 'master' into fix-alloc

VKCOM · Jul 15, 2023 · 17816d2 · 17816d2
2 parents 484433f + 1dca9af
commit 17816d2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 25 deletions.
diff --git a/common/type_traits/is_copyable.h b/common/type_traits/is_copyable.h
diff --git a/server/job-workers/pipe-io.h b/server/job-workers/pipe-io.h
@@ -6,7 +6,7 @@
 
 #include <climits>
 #include <cstdint>
-#include "common/type_traits/is_copyable.h"
+#include <type_traits>
 
 namespace job_workers {
 
@@ -24,13 +24,13 @@ class PipeIO {
 
   PipeIO() = default;
 
-  template<typename T, typename = typename std::enable_if<vk::is_trivially_copyable<T>::value>::type>
+  template<typename T, typename = typename std::enable_if<std::is_trivially_copyable<T>::value>::type>
   void copy_to_buffer(T x) {
     memcpy(buf + buf_end_pos, &x, sizeof(T));
     buf_end_pos += sizeof(T);
   }
 
-  template<typename T, typename = typename std::enable_if<vk::is_trivially_copyable<T>::value>::type>
+  template<typename T, typename = typename std::enable_if<std::is_trivially_copyable<T>::value>::type>
   void extract_from_buffer(T &dest) {
     memcpy(&dest, buf, sizeof(T));
   }

diff --git a/tests/python/tests/http_server/test_oom_handler.py b/tests/python/tests/http_server/test_oom_handler.py
@@ -74,6 +74,6 @@ def test_timeout_in_oom_handler(self):
         self.assertEqual(resp.status_code, 500)
         self.kphp_server.assert_log([
             "allocations_cnt=[1-9]\\d?,memory_allocated=8\\d{5},estimate_memory_usage\\(arr\\)=8\\d{5}",
-            "Warning: Can't allocate \\d+ bytes",
+            # "Warning: Can't allocate \\d+ bytes",
             "timeout exit",
         ], timeout=5)