Allow to set "force tcp" and "keep-socket" options for dns resolver. (y…

…db-platform#4123)
shnikd · Apr 26, 2024 · a2a8b1a · a2a8b1a
1 parent c7d8845
commit a2a8b1a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/ydb/core/driver_lib/run/kikimr_services_initializers.cpp b/ydb/core/driver_lib/run/kikimr_services_initializers.cpp
@@ -602,6 +602,8 @@ void TBasicServicesInitializer::InitializeServices(NActors::TActorSystemSetup* s
 
         NDnsResolver::TOnDemandDnsResolverOptions resolverOptions;
         resolverOptions.MonCounters = GetServiceCounters(counters, "utils")->GetSubgroup("subsystem", "dns_resolver");
+        resolverOptions.ForceTcp = nsConfig.GetForceTcp();
+        resolverOptions.KeepSocket = nsConfig.GetKeepSocket();
         IActor *resolver = NDnsResolver::CreateOnDemandDnsResolver(resolverOptions);
 
         setup->LocalServices.emplace_back(

diff --git a/ydb/core/protos/config.proto b/ydb/core/protos/config.proto
@@ -158,6 +158,8 @@ message TStaticNameserviceConfig {
     repeated string AcceptUUID = 3;
     optional bool SuppressVersionCheck = 4;
     optional ENameserviceType Type = 5;
+    optional bool KeepSocket = 6 [default = true];
+    optional bool ForceTcp = 7 [default = false];
 }
 
 message TDynamicNameserviceConfig {

diff --git a/ydb/library/actors/dnsresolver/dnsresolver.cpp b/ydb/library/actors/dnsresolver/dnsresolver.cpp
@@ -172,7 +172,13 @@ namespace NDnsResolver {
             memset(&options, 0, sizeof(options));
             int optmask = 0;
 
-            options.flags = ARES_FLAG_STAYOPEN;
+            if (Options.ForceTcp) {
+                options.flags |= ARES_FLAG_USEVC;
+            }
+            if (Options.KeepSocket) {
+                options.flags |= ARES_FLAG_STAYOPEN;
+            }
+
             optmask |= ARES_OPT_FLAGS;
 
             options.sock_state_cb = &TThis::SockStateCallback;

diff --git a/ydb/library/actors/dnsresolver/dnsresolver.h b/ydb/library/actors/dnsresolver/dnsresolver.h
@@ -89,6 +89,10 @@ namespace NDnsResolver {
         int Attempts = 2;
         // Optional list of custom dns servers (ip.v4[:port], ip::v6 or [ip::v6]:port format)
         TVector<TString> Servers;
+        // Keep soket open between dns requests
+        bool KeepSocket = true;
+        // Force tcp to perform dns requests
+        bool ForceTcp = false;
     };
 
     IActor* CreateSimpleDnsResolver(TSimpleDnsResolverOptions options = TSimpleDnsResolverOptions());