@@ -172,7 +172,6 @@ namespace NYql::NDq::NWorker {
172
172
TString fileCacheDir = GetEnv (NCommonJobVars::UDFS_PATH);
173
173
TString ytCoordinatorStr = GetEnv (TString (" YT_SECURE_VAULT_" ) + NCommonJobVars::YT_COORDINATOR);
174
174
TString ytBackendStr = GetEnv (TString (" YT_SECURE_VAULT_" ) + NCommonJobVars::YT_BACKEND);
175
- NYT::NYson::TYsonString addressResolverYson = NYT::NYson::TYsonString (GetEnv (NCommonJobVars::ADDRESS_RESOLVER_CONFIG));
176
175
177
176
TString operationId = GetEnv (" YT_OPERATION_ID" );
178
177
TString jobId = GetEnv (" YT_JOB_ID" );
@@ -190,11 +189,20 @@ namespace NYql::NDq::NWorker {
190
189
TRangeWalker<int > portWalker (startPort, startPort+100 );
191
190
auto ports = BindInRange (portWalker);
192
191
193
- auto addressResolverConfig = NYT::NYTree::ConvertTo<NYT::NNet::TAddressResolverConfigPtr>(addressResolverYson);
194
- NYT::NNet::TAddressResolver::Get ()->Configure (addressResolverConfig);
195
-
196
192
auto forceIPv4 = IsTrue (GetEnv (TString (" YT_SECURE_VAULT_" ) + NCommonJobVars::YT_FORCE_IPV4, " " ));
197
193
194
+ auto addressResolverStr = GetEnv (NCommonJobVars::ADDRESS_RESOLVER_CONFIG, " " );
195
+ if (!addressResolverStr.Empty ()) {
196
+ auto addressResolverConfig = NYT::NYTree::ConvertTo<NYT::NNet::TAddressResolverConfigPtr>(NYT::NYson::TYsonString (addressResolverStr));
197
+ NYT::NNet::TAddressResolver::Get ()->Configure (addressResolverConfig);
198
+ } else if (forceIPv4) {
199
+ // Keep the previous behavior for compatibility.
200
+ auto config = NYT::New<NYT::NNet::TAddressResolverConfig>();
201
+ config->EnableIPv4 = true ;
202
+ config->EnableIPv6 = false ;
203
+ NYT::NNet::TAddressResolver::Get ()->Configure (config);
204
+ }
205
+
198
206
auto [host, ip] = NYql::NDqs::GetLocalAddress (
199
207
coordinatorConfig.HasHostName () ? &coordinatorConfig.GetHostName () : nullptr ,
200
208
forceIPv4 ? AF_INET : AF_INET6
0 commit comments