Removed field AuthInfo

Author: GrigoriyPA

ydb/library/yql/providers/s3/actors/yql_s3_write_actor.cpp

@@ -148,29 +148,37 @@ class TS3FileWriteActor : public TActorBootstrapped<TS3FileWriteActor> {
         , Parts(MakeCompressorQueue(compression))
         , DirtyWrite(dirtyWrite)
         , Token(token)
-        , AuthInfo(Credentials.GetAuthInfo())
     {
         YQL_ENSURE(Parts, "Compression '" << compression << "' is not supported.");
     }
 
     void Bootstrap(const TActorId& parentId) {
         ParentId = parentId;
         LOG_D("TS3FileWriteActor", "Bootstrap by " << ParentId << " for Key: [" << Key << "], Url: [" << Url << "], request id: [" << RequestId << "]");
+        try {
+            BeginPartsUpload(Credentials.GetAuthInfo());
+        }
+        catch (const yexception& ex) {
+            FailOnException();
+        }
+    }
+
+    void BeginPartsUpload(const TS3Credentials::TAuthInfo& authInfo) {
         if (DirtyWrite && Parts->IsSealed() && Parts->Size() <= 1) {
-            Become(&TS3FileWriteActor::SinglepartWorkingStateFunc);
+            Become(&TS3FileWriteActor::StateFuncWrapper<&TS3FileWriteActor::SinglepartWorkingStateFunc>);
             const size_t size = Max<size_t>(Parts->Volume(), 1);
             InFlight += size;
             SentSize += size;
             Gateway->Upload(Url,
-                IHTTPGateway::MakeYcHeaders(RequestId, AuthInfo.GetToken(), {}, AuthInfo.GetAwsUserPwd(), AuthInfo.GetAwsSigV4()),
+                IHTTPGateway::MakeYcHeaders(RequestId, authInfo.GetToken(), {}, authInfo.GetAwsUserPwd(), authInfo.GetAwsSigV4()),
                 Parts->Pop(),
                 std::bind(&TS3FileWriteActor::OnUploadFinish, ActorSystem, SelfId(), ParentId, Key, Url, RequestId, size, std::placeholders::_1),
                 true,
                 RetryPolicy);
         } else {
-            Become(&TS3FileWriteActor::MultipartInitialStateFunc);
+            Become(&TS3FileWriteActor::StateFuncWrapper<&TS3FileWriteActor::MultipartInitialStateFunc>);
             Gateway->Upload(Url + "?uploads",
-                IHTTPGateway::MakeYcHeaders(RequestId, AuthInfo.GetToken(), {}, AuthInfo.GetAwsUserPwd(), AuthInfo.GetAwsSigV4()),
+                IHTTPGateway::MakeYcHeaders(RequestId, authInfo.GetToken(), {}, authInfo.GetAwsUserPwd(), authInfo.GetAwsSigV4()),
                 0,
                 std::bind(&TS3FileWriteActor::OnUploadsCreated, ActorSystem, SelfId(), ParentId, RequestId, std::placeholders::_1),
                 false,
@@ -186,7 +194,7 @@ class TS3FileWriteActor : public TActorBootstrapped<TS3FileWriteActor> {
 
     void PassAway() override {
         if (InFlight || !Parts->Empty()) {
-            AbortMultipartUpload();
+            SafeAbortMultipartUpload();
             LOG_W("TS3FileWriteActor", "PassAway: but NOT finished, InFlight: " << InFlight << ", Parts: " << Parts->Size() << ", Sealed: " << Parts->IsSealed() << ", request id: [" << RequestId << "]");
         } else {
             LOG_D("TS3FileWriteActor", "PassAway: request id: [" << RequestId << "]");
@@ -236,6 +244,15 @@ class TS3FileWriteActor : public TActorBootstrapped<TS3FileWriteActor> {
         return InFlight + Parts->Volume();
     }
 private:
+    template <void (TS3FileWriteActor::* DelegatedStateFunc)(STFUNC_SIG)>
+    STFUNC(StateFuncWrapper) {
+        try {
+            (this->*DelegatedStateFunc)(ev);
+        } catch (...) {
+            FailOnException();
+        }
+    }
+
     STRICT_STFUNC(MultipartInitialStateFunc,
         hFunc(TEvPrivate::TEvUploadStarted, Handle);
     )
@@ -347,7 +364,7 @@ class TS3FileWriteActor : public TActorBootstrapped<TS3FileWriteActor> {
 
     void Handle(TEvPrivate::TEvUploadStarted::TPtr& result) {
         UploadId = result->Get()->UploadId;
-        Become(&TS3FileWriteActor::MultipartWorkingStateFunc);
+        Become(&TS3FileWriteActor::StateFuncWrapper<&TS3FileWriteActor::MultipartWorkingStateFunc>);
         StartUploadParts();
     }
 
@@ -360,29 +377,16 @@ class TS3FileWriteActor : public TActorBootstrapped<TS3FileWriteActor> {
         }
     }
 
-    bool UpdateAuthInfo() {
-        try {
-            AuthInfo = Credentials.GetAuthInfo();
-            return true;
-        }
-        catch (const yexception& ex) {
-            Send(ParentId, new TEvPrivate::TEvUploadError(NYql::NDqProto::StatusIds::BAD_REQUEST, TStringBuilder() << "Failed to get auth info: " << ex.what()));
-            return false;
-        }
-    }
-
     void StartUploadParts() {
         while (auto part = Parts->Pop()) {
             const auto size = part.size();
             const auto index = Tags.size();
             Tags.emplace_back();
             InFlight += size;
             SentSize += size;
-            if (!UpdateAuthInfo()) {
-                return;
-            }
+            auto authInfo = Credentials.GetAuthInfo();
             Gateway->Upload(Url + "?partNumber=" + std::to_string(index + 1) + "&uploadId=" + UploadId,
-                IHTTPGateway::MakeYcHeaders(RequestId, AuthInfo.GetToken(), {}, AuthInfo.GetAwsUserPwd(), AuthInfo.GetAwsSigV4()),
+                IHTTPGateway::MakeYcHeaders(RequestId, authInfo.GetToken(), {}, authInfo.GetAwsUserPwd(), authInfo.GetAwsSigV4()),
                 std::move(part),
                 std::bind(&TS3FileWriteActor::OnPartUploadFinish, ActorSystem, SelfId(), ParentId, size, index, RequestId, std::placeholders::_1),
                 true,
@@ -408,35 +412,44 @@ class TS3FileWriteActor : public TActorBootstrapped<TS3FileWriteActor> {
         for (const auto& tag : Tags)
             xml << "<Part><PartNumber>" << ++i << "</PartNumber><ETag>" << tag << "</ETag></Part>" << Endl;
         xml << "</CompleteMultipartUpload>" << Endl;
-        if (!UpdateAuthInfo()) {
-            return;
-        }
+        auto authInfo = Credentials.GetAuthInfo();
         Gateway->Upload(Url + "?uploadId=" + UploadId,
-            IHTTPGateway::MakeYcHeaders(RequestId, AuthInfo.GetToken(), "application/xml", AuthInfo.GetAwsUserPwd(), AuthInfo.GetAwsSigV4()),
+            IHTTPGateway::MakeYcHeaders(RequestId, authInfo.GetToken(), "application/xml", authInfo.GetAwsUserPwd(), authInfo.GetAwsSigV4()),
             xml,
             std::bind(&TS3FileWriteActor::OnMultipartUploadFinish, ActorSystem, SelfId(), ParentId, Key, Url, RequestId, SentSize, std::placeholders::_1),
             false,
             RetryPolicy);
     }
 
-    void AbortMultipartUpload() {
+    void SafeAbortMultipartUpload() {
+        try {
+            AbortMultipartUpload(Credentials.GetAuthInfo());
+        }
+        catch (const yexception& ex) {
+            LOG_W("TS3FileWriteActor", "Failed to abort multipart upload, error: " << CurrentExceptionMessage());
+        }
+    }
+
+    void AbortMultipartUpload(const TS3Credentials::TAuthInfo& authInfo) {
         // Try to abort multipart upload in case of unexpected termination.
         // In case of error just logs warning.
 
         if (!UploadId) {
             return;
         }
 
-        if (!UpdateAuthInfo()) {
-            return;
-        }
         Gateway->Delete(Url + "?uploadId=" + UploadId,
-            IHTTPGateway::MakeYcHeaders(RequestId, AuthInfo.GetToken(), "application/xml", AuthInfo.GetAwsUserPwd(), AuthInfo.GetAwsSigV4()),
+            IHTTPGateway::MakeYcHeaders(RequestId, authInfo.GetToken(), "application/xml", authInfo.GetAwsUserPwd(), authInfo.GetAwsSigV4()),
             std::bind(&TS3FileWriteActor::OnMultipartUploadAbort, ActorSystem, SelfId(), TxId, RequestId, std::placeholders::_1),
             RetryPolicy);
         UploadId.clear();
     }
 
+    void FailOnException() {
+        Send(ParentId, new TEvPrivate::TEvUploadError(NYql::NDqProto::StatusIds::BAD_REQUEST, CurrentExceptionMessage()));
+        SafeAbortMultipartUpload();
+    }
+
     size_t InFlight = 0ULL;
     size_t SentSize = 0ULL;
 
@@ -458,7 +471,6 @@ class TS3FileWriteActor : public TActorBootstrapped<TS3FileWriteActor> {
     TString UploadId;
     bool DirtyWrite;
     TString Token;
-    TS3Credentials::TAuthInfo AuthInfo;
 };
 
 class TS3WriteActor : public TActorBootstrapped<TS3WriteActor>, public IDqComputeActorAsyncOutput {