Added config option

programs/server/Server.cpp

@@ -306,13 +306,15 @@ int Server::main(const std::vector<std::string> & /*args*/)
 
     /// After full config loaded
     {
-        if (config().getBool("mlock_executable", false))
+        if (config().getBool("remap_executable", false))
         {
             LOG_DEBUG(log, "Will remap executable in memory.");
             remapExecutable();
             LOG_DEBUG(log, "The code in memory has been successfully remapped.");
+        }
 
-/*
+        if (config().getBool("mlock_executable", false))
+        {
             if (hasLinuxCapability(CAP_IPC_LOCK))
             {
                 LOG_TRACE(log, "Will mlockall to prevent executable memory from being paged out. It may take a few seconds.");
@@ -327,7 +329,7 @@ int Server::main(const std::vector<std::string> & /*args*/)
                     " It could happen due to incorrect ClickHouse package installation."
                     " You could resolve the problem manually with 'sudo setcap cap_ipc_lock=+ep {}'."
                     " Note that it will not work on 'nosuid' mounted filesystems.", executable_path);
-            }*/
+            }
         }
     }
 #endif

programs/server/config.xml

@@ -302,6 +302,9 @@
     -->
     <mlock_executable>true</mlock_executable>
 
+    <!-- Reallocate memory for machine code ("text") using huge pages. Highly experimental. -->
+    <remap_executable>false</remap_executable>
+
     <!-- Configuration of clusters that could be used in Distributed tables.
          https://clickhouse.tech/docs/en/operations/table_engines/distributed/
       -->