operation_preparer uses IClient methods instead of IRawClient to enable retries

commit_hash:067376925c20e9ab7e1bf25d91ebb5e17b692c51

1 files changed, 8 insertions, 12 deletions

diff --git a/yt/cpp/mapreduce/client/operation_preparer.cpp b/yt/cpp/mapreduce/client/operation_preparer.cpp
index fc728b3b9f6..d3f9e5d8028 100644
--- a/yt/cpp/mapreduce/client/operation_preparer.cpp
+++ b/yt/cpp/mapreduce/client/operation_preparer.cpp
@@ -210,22 +210,19 @@ TRichYPath TOperationPreparer::LockFile(const TRichYPath& path)
 {
     CheckValidity();
 
-    auto lockRequest = Client_->GetRawClient()->CreateRawBatchRequest();
-    auto lockIdFuture = lockRequest->Lock(
+    auto fileTx = Client_->AttachTransaction(
         FileTransaction_->GetId(),
-        path.Path_,
-        ELockMode::LM_SNAPSHOT,
-        TLockOptions().Waitable(true));
+        TAttachTransactionOptions()
+            .AbortOnTermination(false)
+            .AutoPingable(false));
 
-    lockRequest->ExecuteBatch();
+    auto lock = fileTx->Lock(path.Path_, ELockMode::LM_SNAPSHOT);
 
-    auto nodeIdFuture = Client_->GetRawClient()->Get(
-        FileTransaction_->GetId(),
-        ::TStringBuilder() << '#' << GetGuidAsString(lockIdFuture.GetValue()) << "/@node_id");
+    auto nodeId = lock->GetLockedNodeId();
 
     auto result = path;
     result.OriginalPath(path.Path_);
-    result.Path("#" + nodeIdFuture.AsString());
+    result.Path("#" + nodeId.AsGuidString());
 
     YT_LOG_DEBUG("Locked file %v, new path is %v",
         *result.OriginalPath_,
@@ -380,8 +377,7 @@ const TVector<TRichYPath>& TJobPreparer::TEagerLockingFileCache::GetFiles() cons
 
 void TJobPreparer::TEagerLockingFileCache::InsertFile(const TRichYPath& path)
 {
-    LockedFiles_.emplace_back(
-        OperationPreparer_.LockFile(path));
+    LockedFiles_.emplace_back(OperationPreparer_.LockFile(path));
 }
 
 ////////////////////////////////////////////////////////////////////////////////