Merge branch 'jiashuo_fix-consul-init-server-startup' into 'cnch-dev'

fix(clickhousech@m-5390027644): skip pre-fetch nnproxy result when type is not nnproxy

See merge request dp/ClickHouse!26081

programs/server/Server.cpp

@@ -1373,8 +1373,9 @@ int Server::main(const std::vector<std::string> & /*args*/)
     global_context->setHdfsConnectionParams(hdfs_params);
 
     // pre lookup and cache consult result to avoid the overhead of lookupNNProxy
-    if (!hdfs_nnproxy.empty())
+    if (!hdfs_nnproxy.empty() && hdfs_params.conn_type == HDFSConnectionParams::CONN_NNPROXY)
         lookupNNProxy(hdfs_nnproxy);
+    
 #endif
     auto vetos_params = VETosConnectionParams::parseVeTosFromConfig(config());
     global_context->setVETosConnectParams(vetos_params);

src/Storages/HDFS/HDFSFileSystem.cpp

@@ -16,7 +16,6 @@
 #include <algorithm>
 #include <filesystem>
 #include <random>
-#include <consul/bridge.h>
 #include "common/types.h"
 #include <Common/formatIPv6.h>
 #include <Common/filesystemHelpers.h>