KIKIMR-19175 restore S3_WRAPPER logging level

8 files changed, 36 insertions, 19 deletions

diff --git a/ydb/core/tx/tiering/s3_actor.cpp b/ydb/core/tx/tiering/s3_actor.cpp
index 21a9917a72..2dc36603e9 100644
--- a/ydb/core/tx/tiering/s3_actor.cpp
+++ b/ydb/core/tx/tiering/s3_actor.cpp
@@ -129,7 +129,8 @@ public:
             Send(ExternalStorageActorId, new TEvents::TEvPoisonPill);
             ExternalStorageActorId = {};
         }
-        ExternalStorageActorId = this->RegisterWithSameMailbox(NWrappers::CreateS3Wrapper(ExternalStorageConfig->ConstructStorageOperator()));
+        ExternalStorageActorId = this->RegisterWithSameMailbox(
+            NWrappers::CreateS3Wrapper(ExternalStorageConfig->ConstructStorageOperator(false)));
     }
 
     void Handle(TEvPrivate::TEvExport::TPtr& ev) {
diff --git a/ydb/core/wrappers/abstract.cpp b/ydb/core/wrappers/abstract.cpp
index c13430b7e8..41b6e67636 100644
--- a/ydb/core/wrappers/abstract.cpp
+++ b/ydb/core/wrappers/abstract.cpp
@@ -6,8 +6,8 @@
 
 namespace NKikimr::NWrappers::NExternalStorage {
 
-IExternalStorageOperator::TPtr IExternalStorageConfig::ConstructStorageOperator() const {
-    return DoConstructStorageOperator();
+IExternalStorageOperator::TPtr IExternalStorageConfig::ConstructStorageOperator(bool verbose) const {
+    return DoConstructStorageOperator(verbose);
 }
 
 IExternalStorageConfig::TPtr IExternalStorageConfig::Construct(const NKikimrSchemeOp::TS3Settings& settings) {
diff --git a/ydb/core/wrappers/abstract.h b/ydb/core/wrappers/abstract.h
index 8e9d33a6d1..d954c5b865 100644
--- a/ydb/core/wrappers/abstract.h
+++ b/ydb/core/wrappers/abstract.h
@@ -62,7 +62,7 @@ private:
     class TStoragesCollection;
 
 protected:
-    virtual IExternalStorageOperator::TPtr DoConstructStorageOperator() const = 0;
+    virtual IExternalStorageOperator::TPtr DoConstructStorageOperator(bool verbose) const = 0;
     virtual TString DoGetStorageId() const = 0;
 
     TString GetStorageId() const {
@@ -71,7 +71,7 @@ protected:
 public:
     using TPtr = std::shared_ptr<IExternalStorageConfig>;
     virtual ~IExternalStorageConfig() = default;
-    IExternalStorageOperator::TPtr ConstructStorageOperator() const;
+    IExternalStorageOperator::TPtr ConstructStorageOperator(bool verbose = true) const;
     static IExternalStorageConfig::TPtr Construct(const NKikimrSchemeOp::TS3Settings& settings);
 };
 } // NExternalStorage
diff --git a/ydb/core/wrappers/fake_storage_config.cpp b/ydb/core/wrappers/fake_storage_config.cpp
index 5cfd33e029..70f39aab25 100644
--- a/ydb/core/wrappers/fake_storage_config.cpp
+++ b/ydb/core/wrappers/fake_storage_config.cpp
@@ -9,7 +9,8 @@ TString TFakeExternalStorageConfig::DoGetStorageId() const {
     return "fake";
 }
 
-IExternalStorageOperator::TPtr TFakeExternalStorageConfig::DoConstructStorageOperator() const {
+IExternalStorageOperator::TPtr TFakeExternalStorageConfig::DoConstructStorageOperator(bool verbose) const {
+    Y_UNUSED(verbose);
     return std::make_shared<TFakeExternalStorageOperator>(Bucket, SecretKey);
 }
 }
diff --git a/ydb/core/wrappers/fake_storage_config.h b/ydb/core/wrappers/fake_storage_config.h
index 1b3154de18..0c1b66122d 100644
--- a/ydb/core/wrappers/fake_storage_config.h
+++ b/ydb/core/wrappers/fake_storage_config.h
@@ -17,13 +17,12 @@ private:
     const TString SecretKey;
 protected:
     virtual TString DoGetStorageId() const override;
-    virtual IExternalStorageOperator::TPtr DoConstructStorageOperator() const override;
+    virtual IExternalStorageOperator::TPtr DoConstructStorageOperator(bool verbose) const override;
 public:
     TFakeExternalStorageConfig(const TString& bucket, const TString& secretKey)
         : Bucket(bucket)
         , SecretKey(secretKey)
     {
-
     }
 };
 } // NKikimr::NWrappers::NExternalStorage
diff --git a/ydb/core/wrappers/s3_storage.h b/ydb/core/wrappers/s3_storage.h
index aaace5a490..dc3f89946a 100644
--- a/ydb/core/wrappers/s3_storage.h
+++ b/ydb/core/wrappers/s3_storage.h
@@ -35,6 +35,7 @@ private:
     const Aws::Auth::AWSCredentials Credentials;
     const TString Bucket;
     const Aws::S3::Model::StorageClass StorageClass = Aws::S3::Model::StorageClass::STANDARD;
+    bool Verbose = true;
 
     template <typename TRequest, typename TOutcome>
     using THandler = std::function<void(const Aws::S3::S3Client*, const TRequest&, const TOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&)>;
@@ -48,34 +49,49 @@ private:
         ev->Get()->MutableRequest().WithBucket(Bucket);
 
         auto ctx = std::make_shared<TCtx>(TlsActivationContext->ActorSystem(), ev->Sender, ev->Get()->GetRequestContext(), StorageClass);
-        auto callback = [](
+        bool verbose = Verbose;
+        auto callback = [verbose](
             const Aws::S3::S3Client*,
             const typename TEvRequest::TRequest& request,
             const typename TEvResponse::TOutcome& outcome,
             const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) {
                 const auto* ctx = static_cast<const TCtx*>(context.get());
 
-                LOG_INFO_S(*ctx->GetActorSystem(), NKikimrServices::S3_WRAPPER, "Response"
-                    << ": uuid# " << ctx->GetUUID()
-                    << ", response# " << outcome);
+                if (verbose) {
+                    LOG_NOTICE_S(*ctx->GetActorSystem(), NKikimrServices::S3_WRAPPER, "Response"
+                        << ": uuid# " << ctx->GetUUID()
+                        << ", response# " << outcome);
+                } else {
+                    LOG_INFO_S(*ctx->GetActorSystem(), NKikimrServices::S3_WRAPPER, "Response"
+                        << ": uuid# " << ctx->GetUUID()
+                        << ", response# " << outcome);
+                }
                 ctx->Reply(request, outcome);
         };
 
-        LOG_INFO_S(*TlsActivationContext, NKikimrServices::S3_WRAPPER, "Request"
-            << ": uuid# " << ctx->GetUUID()
-            << ", request# " << ev->Get()->GetRequest());
+        if (Verbose) {
+            LOG_NOTICE_S(*TlsActivationContext, NKikimrServices::S3_WRAPPER, "Request"
+                << ": uuid# " << ctx->GetUUID()
+                << ", request# " << ev->Get()->GetRequest());
+        } else {
+            LOG_INFO_S(*TlsActivationContext, NKikimrServices::S3_WRAPPER, "Request"
+                << ": uuid# " << ctx->GetUUID()
+                << ", request# " << ev->Get()->GetRequest());
+        }
         func(Client.Get(), ctx->PrepareRequest(ev), callback, ctx);
     }
 
 public:
     TS3ExternalStorage(const Aws::Client::ClientConfiguration& config,
         const Aws::Auth::AWSCredentials& credentials,
-        const TString& bucket, const Aws::S3::Model::StorageClass storageClass)
+        const TString& bucket, const Aws::S3::Model::StorageClass storageClass,
+        bool verbose = true)
         : Client(new Aws::S3::S3Client(credentials, config))
         , Config(config)
         , Credentials(credentials)
         , Bucket(bucket)
         , StorageClass(storageClass)
+        , Verbose(verbose)
     {
     }
 
diff --git a/ydb/core/wrappers/s3_storage_config.cpp b/ydb/core/wrappers/s3_storage_config.cpp
index 3a1926026b..6620d1054c 100644
--- a/ydb/core/wrappers/s3_storage_config.cpp
+++ b/ydb/core/wrappers/s3_storage_config.cpp
@@ -182,8 +182,8 @@ TString TS3ExternalStorageConfig::DoGetStorageId() const {
     return TString(Config.endpointOverride.data(), Config.endpointOverride.size());
 }
 
-IExternalStorageOperator::TPtr TS3ExternalStorageConfig::DoConstructStorageOperator() const {
-    return std::make_shared<TS3ExternalStorage>(Config, Credentials, Bucket, StorageClass);
+IExternalStorageOperator::TPtr TS3ExternalStorageConfig::DoConstructStorageOperator(bool verbose) const {
+    return std::make_shared<TS3ExternalStorage>(Config, Credentials, Bucket, StorageClass, verbose);
 }
 
 TS3ExternalStorageConfig::TS3ExternalStorageConfig(const Ydb::Import::ImportFromS3Settings& settings): Config(ConfigFromSettings(settings))
diff --git a/ydb/core/wrappers/s3_storage_config.h b/ydb/core/wrappers/s3_storage_config.h
index c78ea13aa5..85a15a4eb8 100644
--- a/ydb/core/wrappers/s3_storage_config.h
+++ b/ydb/core/wrappers/s3_storage_config.h
@@ -36,7 +36,7 @@ private:
     static Aws::Auth::AWSCredentials CredentialsFromSettings(const Ydb::Import::ImportFromS3Settings& settings);
 protected:
     virtual TString DoGetStorageId() const override;
-    virtual IExternalStorageOperator::TPtr DoConstructStorageOperator() const override;
+    virtual IExternalStorageOperator::TPtr DoConstructStorageOperator(bool verbose) const override;
 public:
     static Aws::S3::Model::StorageClass ConvertStorageClass(const Ydb::Export::ExportToS3Settings::StorageClass storage);