Fix race in client

2 files changed, 4 insertions, 3 deletions

diff --git a/yt/cpp/mapreduce/client/client.cpp b/yt/cpp/mapreduce/client/client.cpp
index ca979c5588..a395174f79 100644
--- a/yt/cpp/mapreduce/client/client.cpp
+++ b/yt/cpp/mapreduce/client/client.cpp
@@ -1224,7 +1224,7 @@ void TClient::ResumeOperation(
 
 TYtPoller& TClient::GetYtPoller()
 {
-    auto g = Guard(YtPollerLock_);
+    auto g = Guard(Lock_);
     if (!YtPoller_) {
         CheckShutdown();
         // We don't use current client and create new client because YtPoller_ might use
@@ -1237,7 +1237,7 @@ TYtPoller& TClient::GetYtPoller()
 
 void TClient::Shutdown()
 {
-    auto g = Guard(YtPollerLock_);
+    auto g = Guard(Lock_);
 
     if (!Shutdown_.exchange(true) && YtPoller_) {
         YtPoller_->Stop();
@@ -1246,6 +1246,7 @@ void TClient::Shutdown()
 
 ITransactionPingerPtr TClient::GetTransactionPinger()
 {
+    auto g = Guard(Lock_);
     if (!TransactionPinger_) {
         TransactionPinger_ = CreateTransactionPinger(Context_.Config);
     }
diff --git a/yt/cpp/mapreduce/client/client.h b/yt/cpp/mapreduce/client/client.h
index 0f4df09d0b..453b79f2a7 100644
--- a/yt/cpp/mapreduce/client/client.h
+++ b/yt/cpp/mapreduce/client/client.h
@@ -490,7 +490,7 @@ private:
     ITransactionPingerPtr TransactionPinger_;
 
     std::atomic<bool> Shutdown_ = false;
-    TMutex YtPollerLock_;
+    TMutex Lock_;
     THolder<TYtPoller> YtPoller_;
 };