From 287cce7d211b9386895a4fa898f87405eccb3e96 Mon Sep 17 00:00:00 2001
From: Antonio Andelic <antonio@clickhouse.com>
Date: Fri, 26 Jul 2024 09:20:15 +0200
Subject: [PATCH] Fixes

---
 .gitmodules                               | 2 +-
 contrib/numactl                           | 2 +-
 docker/test/performance-comparison/run.sh | 1 +
 programs/server/Server.cpp                | 9 ++++++++-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index b5d7e1e56b3..7e0b4df4ad1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -374,4 +374,4 @@
 	url = https://github.com/ClickHouse/double-conversion.git
 [submodule "contrib/numactl"]
 	path = contrib/numactl
-	url = https://github.com/numactl/numactl.git
+	url = https://github.com/ClickHouse/numactl.git
diff --git a/contrib/numactl b/contrib/numactl
index 3871b1c42fc..8d13d63a05f 160000
--- a/contrib/numactl
+++ b/contrib/numactl
@@ -1 +1 @@
-Subproject commit 3871b1c42fc71bceadafd745d2eff5dddfc2d67e
+Subproject commit 8d13d63a05f0c3cd88bf777cbb61541202b7da08
diff --git a/docker/test/performance-comparison/run.sh b/docker/test/performance-comparison/run.sh
index 7afb5da59b1..6ef781fa4c8 100644
--- a/docker/test/performance-comparison/run.sh
+++ b/docker/test/performance-comparison/run.sh
@@ -13,6 +13,7 @@ entry="/usr/share/clickhouse-test/performance/scripts/entrypoint.sh"
 # https://www.kernel.org/doc/Documentation/filesystems/tmpfs.txt
 # Double-escaped backslashes are a tribute to the engineering wonder of docker --
 # it gives '/bin/sh: 1: [bash,: not found' otherwise.
+numactl --hardware
 node=$(( RANDOM % $(numactl --hardware | sed -n 's/^.*available:\(.*\)nodes.*$/\1/p') ));
 echo Will bind to NUMA node $node;
 numactl --cpunodebind=$node --membind=$node $entry
diff --git a/programs/server/Server.cpp b/programs/server/Server.cpp
index b9a7c298f00..b818ff1f3a2 100644
--- a/programs/server/Server.cpp
+++ b/programs/server/Server.cpp
@@ -775,9 +775,16 @@ try
 
             LOG_INFO(
                 log,
-                "ClickHouse is bound to a subset of NUMA nodes. Total memory of all available nodes {}",
+                "ClickHouse is bound to a subset of NUMA nodes. Total memory of all available nodes: {}",
                 ReadableSize(total_numa_memory));
         }
+        else
+        {
+            LOG_TRACE(
+                log,
+                "All NUMA nodes are used. Detected NUMA nodes: {}",
+                numa_num_configured_nodes());
+        }
 
         numa_bitmask_free(membind);
     }