diff options
author | hiddenpath <hiddenpath@yandex-team.com> | 2025-04-02 02:02:00 +0300 |
---|---|---|
committer | hiddenpath <hiddenpath@yandex-team.com> | 2025-04-02 02:16:52 +0300 |
commit | 71dbc38bded6bb95ef3da39caaeb56d8f61fa008 (patch) | |
tree | 4f6b4f7c68acdd83b0f024067829c0a0f564640d | |
parent | 4157756a3454887710fee0613e550ea1d3051f2c (diff) | |
download | ydb-71dbc38bded6bb95ef3da39caaeb56d8f61fa008.tar.gz |
Change UnixDomainSocket option into boolean
commit_hash:b2716bf7efedb55f6a99c800356dfaaeab6abaff
-rw-r--r-- | yt/cpp/mapreduce/client/client.cpp | 8 | ||||
-rw-r--r-- | yt/cpp/mapreduce/http/context.cpp | 2 | ||||
-rw-r--r-- | yt/cpp/mapreduce/http/context.h | 2 | ||||
-rw-r--r-- | yt/cpp/mapreduce/interface/client_method_options.h | 6 |
4 files changed, 11 insertions, 7 deletions
diff --git a/yt/cpp/mapreduce/client/client.cpp b/yt/cpp/mapreduce/client/client.cpp index 690580285a..fccf3501a9 100644 --- a/yt/cpp/mapreduce/client/client.cpp +++ b/yt/cpp/mapreduce/client/client.cpp @@ -1561,13 +1561,17 @@ TClientContext CreateClientContext( context.Config = options.Config_ ? options.Config_ : TConfig::Get(); context.TvmOnly = options.TvmOnly_; context.ProxyAddress = options.ProxyAddress_; - context.ProxyUnixDomainSocket = options.ProxyUnixDomainSocket_; + context.UseProxyUnixDomainSocket = options.UseProxyUnixDomainSocket_; if (options.UseTLS_) { context.UseTLS = *options.UseTLS_; } - SetupClusterContext(context, serverName); + if (!options.UseProxyUnixDomainSocket_) { + SetupClusterContext(context, serverName); + } else { + context.ServerName = serverName; + } if (context.Config->HttpProxyRole && context.Config->Hosts == DefaultHosts) { context.Config->Hosts = "hosts?role=" + context.Config->HttpProxyRole; diff --git a/yt/cpp/mapreduce/http/context.cpp b/yt/cpp/mapreduce/http/context.cpp index a2e59c0fd8..26873d248b 100644 --- a/yt/cpp/mapreduce/http/context.cpp +++ b/yt/cpp/mapreduce/http/context.cpp @@ -15,7 +15,7 @@ bool operator==(const TClientContext& lhs, const TClientContext& rhs) lhs.TvmOnly == rhs.TvmOnly && lhs.ProxyAddress == rhs.ProxyAddress && lhs.RpcProxyRole == rhs.RpcProxyRole && - lhs.ProxyUnixDomainSocket == rhs.ProxyUnixDomainSocket; + lhs.UseProxyUnixDomainSocket == rhs.UseProxyUnixDomainSocket; } //////////////////////////////////////////////////////////////////////////////// diff --git a/yt/cpp/mapreduce/http/context.h b/yt/cpp/mapreduce/http/context.h index 0601b495f1..85bed9a030 100644 --- a/yt/cpp/mapreduce/http/context.h +++ b/yt/cpp/mapreduce/http/context.h @@ -23,7 +23,7 @@ struct TClientContext TConfigPtr Config = TConfig::Get(); TMaybe<TString> ProxyAddress; TMaybe<TString> RpcProxyRole; - TMaybe<TString> ProxyUnixDomainSocket; + bool UseProxyUnixDomainSocket = false; }; bool operator==(const TClientContext& lhs, const TClientContext& rhs); diff --git a/yt/cpp/mapreduce/interface/client_method_options.h b/yt/cpp/mapreduce/interface/client_method_options.h index 866f900571..d8024a7e73 100644 --- a/yt/cpp/mapreduce/interface/client_method_options.h +++ b/yt/cpp/mapreduce/interface/client_method_options.h @@ -1119,9 +1119,9 @@ struct TCreateClientOptions /// @brief Proxy Address to be used for connection FLUENT_FIELD_OPTION(TString, ProxyAddress); - /// @brief Specifies the Unix socket used for connection, - /// typically when the RPC proxy is enabled within the job proxy. - FLUENT_FIELD_OPTION(TString, ProxyUnixDomainSocket); + /// @brief Use unix domain socket for connection. + /// Typically you will need this option when the RPC proxy is enabled within the job proxy. + FLUENT_FIELD_DEFAULT(bool, UseProxyUnixDomainSocket, false); }; /// |