issue-2869: remove libnl

ydb-platform · Mar 10, 2025 · 47159af · 47159af
1 parent fcd85bf
commit 47159af
Show file tree

Hide file tree

Showing 305 changed files with 20 additions and 96,281 deletions.
diff --git a/cloud/blockstore/libs/daemon/common/bootstrap.cpp b/cloud/blockstore/libs/daemon/common/bootstrap.cpp
@@ -556,8 +556,7 @@ void TBootstrapBase::Init()
             Logging,
             Configs->ServerConfig->GetNbdRequestTimeout(),
             Configs->ServerConfig->GetNbdConnectionTimeout(),
-            true,   // reconfigure
-            false   // without libnl
+            true   // reconfigure
         );
     }
 

diff --git a/cloud/blockstore/libs/endpoint_proxy/server/bootstrap.cpp b/cloud/blockstore/libs/endpoint_proxy/server/bootstrap.cpp
@@ -30,7 +30,6 @@ void TBootstrap::Init()
         Options.StoredEndpointsPath,
         Options.NbdRequestTimeout,
         Options.NbdReconnectDelay,
-        Options.WithoutLibnl,
     },
     CreateWallClockTimer(),
     Scheduler,

diff --git a/cloud/blockstore/libs/endpoint_proxy/server/options.cpp b/cloud/blockstore/libs/endpoint_proxy/server/options.cpp
@@ -44,6 +44,7 @@ TOptions::TOptions()
             NbdReconnectDelay = TDuration::Parse(s);
         });
 
+    // deprecated
     Opts.AddLongOption("without-libnl")
         .NoArgument()
         .SetFlag(&WithoutLibnl);

diff --git a/cloud/blockstore/libs/endpoint_proxy/server/server.cpp b/cloud/blockstore/libs/endpoint_proxy/server/server.cpp
@@ -977,8 +977,7 @@ struct TServer: IEndpointProxyServer
                 ep.NbdDevicePath,
                 Config.NbdRequestTimeout,
                 NBD_CONNECTION_TIMEOUT,
-                NBD_RECONFIGURE_CONNECTED,
-                Config.WithoutLibnl);
+                NBD_RECONFIGURE_CONNECTED);
         } else {
             // The only case we want kernel to retry requests is when the socket
             // is dead due to nbd server restart. And since we can't configure

diff --git a/cloud/blockstore/libs/endpoint_proxy/server/server.h b/cloud/blockstore/libs/endpoint_proxy/server/server.h
@@ -29,7 +29,6 @@ struct TEndpointProxyServerConfig
     TString StoredEndpointsPath;
     TDuration NbdRequestTimeout;
     TDuration NbdReconnectDelay;
-    bool WithoutLibnl;
 
     TEndpointProxyServerConfig(
             ui16 port,
@@ -41,8 +40,7 @@ struct TEndpointProxyServerConfig
             bool netlink,
             TString storedEndpointsPath,
             TDuration nbdRequestTimeout,
-            TDuration nbdReconnectDelay,
-            bool withoutLibnl)
+            TDuration nbdReconnectDelay)
         : Port(port)
         , SecurePort(securePort)
         , RootCertsFile(std::move(rootCertsFile))
@@ -53,7 +51,6 @@ struct TEndpointProxyServerConfig
         , StoredEndpointsPath(std::move(storedEndpointsPath))
         , NbdRequestTimeout(nbdRequestTimeout)
         , NbdReconnectDelay(nbdReconnectDelay)
-        , WithoutLibnl(withoutLibnl)
     {
     }
 };