13 files changed, 39 insertions, 33 deletions
diff --git a/ydb/core/tx/columnshard/blobs_action/tier/storage.cpp b/ydb/core/tx/columnshard/blobs_action/tier/storage.cpp
index a709efc152..a65dfbb7c2 100644
--- a/ydb/core/tx/columnshard/blobs_action/tier/storage.cpp
+++ b/ydb/core/tx/columnshard/blobs_action/tier/storage.cpp
@@ -41,8 +41,14 @@ std::shared_ptr<IBlobsGCAction> TOperator::DoStartGCAction() const {
     return gcTask;
 }
 
-void TOperator::InitNewExternalOperator(const NColumnShard::NTiers::TManager& tierManager) {
-    auto extStorageConfig = NWrappers::NExternalStorage::IExternalStorageConfig::Construct(tierManager.GetS3Settings());
+void TOperator::InitNewExternalOperator(const NColumnShard::NTiers::TManager* tierManager) {
+    NKikimrSchemeOp::TS3Settings settings;
+    if (tierManager) {
+        settings = tierManager->GetS3Settings();
+    } else {
+        settings.SetEndpoint("nowhere");
+    }
+    auto extStorageConfig = NWrappers::NExternalStorage::IExternalStorageConfig::Construct(settings);
     AFL_VERIFY(extStorageConfig);
     auto extStorageOperator = extStorageConfig->ConstructStorageOperator(false);
     extStorageOperator->InitReplyAdapter(std::make_shared<NOlap::NBlobOperations::NTier::TRepliesAdapter>());
@@ -57,7 +63,7 @@ TOperator::TOperator(const TString& storageId, const NColumnShard::TColumnShard&
     , TabletId(shard.TabletID())
     , TabletActorId(shard.SelfId())
 {
-    InitNewExternalOperator(shard.GetTierManagerVerified(storageId));
+    InitNewExternalOperator(shard.GetTierManagerPointer(storageId));
 }
 
 void TOperator::DoOnTieringModified(const std::shared_ptr<NColumnShard::TTiersManager>& tiers) {
@@ -65,7 +71,7 @@ void TOperator::DoOnTieringModified(const std::shared_ptr<NColumnShard::TTiersMa
     auto* tierManager = tiers->GetManagerOptional(TBase::GetStorageId());
     ui32 cleanCount = ExternalStorageOperators.size() - 1;
     if (tierManager) {
-        InitNewExternalOperator(*tierManager);
+        InitNewExternalOperator(tierManager);
     } else {
         cleanCount = ExternalStorageOperators.size();
     }
diff --git a/ydb/core/tx/columnshard/blobs_action/tier/storage.h b/ydb/core/tx/columnshard/blobs_action/tier/storage.h
index 8f138d5041..b79986f999 100644
--- a/ydb/core/tx/columnshard/blobs_action/tier/storage.h
+++ b/ydb/core/tx/columnshard/blobs_action/tier/storage.h
@@ -21,7 +21,7 @@ private:
     NWrappers::NExternalStorage::IExternalStorageOperator::TPtr ExternalStorageOperator;
 
     NWrappers::NExternalStorage::IExternalStorageOperator::TPtr GetCurrentOperator() const;
-    void InitNewExternalOperator(const NColumnShard::NTiers::TManager& tierManager);
+    void InitNewExternalOperator(const NColumnShard::NTiers::TManager* tierManager);
 
     virtual TString DoDebugString() const override {
         return GetCurrentOperator()->DebugString();
diff --git a/ydb/core/tx/columnshard/blobs_reader/task.cpp b/ydb/core/tx/columnshard/blobs_reader/task.cpp
index 9cb84a7e93..53b0058ee7 100644
--- a/ydb/core/tx/columnshard/blobs_reader/task.cpp
+++ b/ydb/core/tx/columnshard/blobs_reader/task.cpp
@@ -12,11 +12,11 @@ const std::vector<std::shared_ptr<IBlobsReadingAction>>& ITask::GetAgents() cons
 bool ITask::AddError(const TBlobRange& range, const IBlobsReadingAction::TErrorStatus& status) {
     ++BlobErrorsCount;
     if (TaskFinishedWithError || AbortFlag) {
-        ACFL_WARN("event", "SkipError")("blob_range", range)("message", status.GetErrorMessage())("status", status.GetStatus())("external_task_id", ExternalTaskId)
+        ACFL_WARN("event", "SkipError")("blob_range", range)("message", status.GetErrorMessage())("status", status.GetStatus())("external_task_id", ExternalTaskId)("consumer", TaskCustomer)
             ("abort", AbortFlag)("finished_with_error", TaskFinishedWithError);
         return false;
     } else {
-        ACFL_ERROR("event", "NewError")("blob_range", range)("message", status.GetErrorMessage())("status", status.GetStatus())("external_task_id", ExternalTaskId);
+        ACFL_ERROR("event", "NewError")("blob_range", range)("message", status.GetErrorMessage())("status", status.GetStatus())("external_task_id", ExternalTaskId)("consumer", TaskCustomer);
     }
     {
         auto it = BlobsWaiting.find(range);
diff --git a/ydb/core/tx/columnshard/columnshard.cpp b/ydb/core/tx/columnshard/columnshard.cpp
index 1d6e9bf911..2c3b5392fc 100644
--- a/ydb/core/tx/columnshard/columnshard.cpp
+++ b/ydb/core/tx/columnshard/columnshard.cpp
@@ -45,7 +45,7 @@ void TColumnShard::SwitchToWork(const TActorContext& ctx) {
     SignalTabletActive(ctx);
 }
 
-void TColumnShard::OnActivateExecutor(const TActorContext&) {
+void TColumnShard::OnActivateExecutor(const TActorContext& ctx) {
     const TLogContextGuard gLogging = NActors::TLogContextBuilder::Build(NKikimrServices::TX_COLUMNSHARD)("tablet_id", TabletID())("self_id", SelfId());
     AFL_INFO(NKikimrServices::TX_COLUMNSHARD)("event", "initialize_shard")("step", "OnActivateExecutor");
 
@@ -54,25 +54,24 @@ void TColumnShard::OnActivateExecutor(const TActorContext&) {
     const auto selfActorId = SelfId();
     Tiers = std::make_shared<TTiersManager>(TabletID(), SelfId(),
         [selfActorId](const TActorContext& ctx) {
+        AFL_DEBUG(NKikimrServices::TX_COLUMNSHARD)("event", "tiering_new_event");
         ctx.Send(selfActorId, new TEvPrivate::TEvTieringModified);
     });
     Tiers->Start(Tiers);
     if (!NMetadata::NProvider::TServiceOperator::IsEnabled()) {
         Tiers->TakeConfigs(NYDBTest::TControllers::GetColumnShardController()->GetFallbackTiersSnapshot(), nullptr);
     }
+
+    AFL_INFO(NKikimrServices::TX_COLUMNSHARD)("event", "initialize_shard")("step", "initialize_tiring_finished");
+    auto& icb = *AppData(ctx)->Icb;
+    Limits.RegisterControls(icb);
+    CompactionLimits.RegisterControls(icb);
+    Settings.RegisterControls(icb);
+    Execute(CreateTxInitSchema(), ctx);
 }
 
-void TColumnShard::Handle(TEvPrivate::TEvTieringModified::TPtr& /*ev*/, const TActorContext& ctx) {
+void TColumnShard::Handle(TEvPrivate::TEvTieringModified::TPtr& /*ev*/, const TActorContext& /*ctx*/) {
     OnTieringModified();
-    if (!TiersInitializedFlag) {
-        AFL_INFO(NKikimrServices::TX_COLUMNSHARD)("event", "initialize_shard")("step", "initialize_tiring_finished");
-        TiersInitializedFlag = true;
-        auto& icb = *AppData(ctx)->Icb;
-        Limits.RegisterControls(icb);
-        CompactionLimits.RegisterControls(icb);
-        Settings.RegisterControls(icb);
-        Execute(CreateTxInitSchema(), ctx);
-    }
     NYDBTest::TControllers::GetColumnShardController()->OnTieringModified(Tiers);
 }
 
diff --git a/ydb/core/tx/columnshard/columnshard__scan.cpp b/ydb/core/tx/columnshard/columnshard__scan.cpp
index 5d90c940ad..1ba44cc6d5 100644
--- a/ydb/core/tx/columnshard/columnshard__scan.cpp
+++ b/ydb/core/tx/columnshard/columnshard__scan.cpp
@@ -143,7 +143,7 @@ private:
         --InFlightReads;
         auto g = Stats.MakeGuard("task_result");
         if (ev->Get()->GetErrorMessage()) {
-            ACFL_DEBUG("event", "TEvTaskProcessedResult")("error", ev->Get()->GetErrorMessage());
+            ACFL_ERROR("event", "TEvTaskProcessedResult")("error", ev->Get()->GetErrorMessage());
             SendScanError(ev->Get()->GetErrorMessage());
             Finish();
         } else {
diff --git a/ydb/core/tx/columnshard/columnshard_impl.cpp b/ydb/core/tx/columnshard/columnshard_impl.cpp
index 22eba69c0e..02440466d5 100644
--- a/ydb/core/tx/columnshard/columnshard_impl.cpp
+++ b/ydb/core/tx/columnshard/columnshard_impl.cpp
@@ -925,8 +925,7 @@ void TColumnShard::Die(const TActorContext& ctx) {
 
 void TColumnShard::Handle(NMetadata::NProvider::TEvRefreshSubscriberData::TPtr& ev) {
     Y_ABORT_UNLESS(Tiers);
-    ALS_INFO(NKikimrServices::TX_COLUMNSHARD) << "test handle NMetadata::NProvider::TEvRefreshSubscriberData"
-        << ev->Get()->GetSnapshot()->SerializeToString();
+    AFL_INFO(NKikimrServices::TX_COLUMNSHARD)("event", "TEvRefreshSubscriberData")("snapshot", ev->Get()->GetSnapshot()->SerializeToString());
     Tiers->TakeConfigs(ev->Get()->GetSnapshot(), nullptr);
 }
 
@@ -952,6 +951,7 @@ void TColumnShard::Enqueue(STFUNC_SIG) {
 }
 
 void TColumnShard::OnTieringModified() {
+    AFL_DEBUG(NKikimrServices::TX_COLUMNSHARD)("event", "OnTieringModified");
     StoragesManager->OnTieringModified(Tiers);
     if (TablesManager.HasPrimaryIndex()) {
         TablesManager.MutablePrimaryIndex().OnTieringModified(Tiers, TablesManager.GetTtl());
diff --git a/ydb/core/tx/columnshard/columnshard_impl.h b/ydb/core/tx/columnshard/columnshard_impl.h
index 219cf27f95..51dbc9460d 100644
--- a/ydb/core/tx/columnshard/columnshard_impl.h
+++ b/ydb/core/tx/columnshard/columnshard_impl.h
@@ -170,9 +170,9 @@ class TColumnShard
         Y_UNUSED(ctx);
     }
 
-    const NTiers::TManager& GetTierManagerVerified(const TString& tierId) const {
+    const NTiers::TManager* GetTierManagerPointer(const TString& tierId) const {
         Y_ABORT_UNLESS(!!Tiers);
-        return Tiers->GetManagerVerified(tierId);
+        return Tiers->GetManagerOptional(tierId);
     }
 
     void Die(const TActorContext& ctx) override;
@@ -396,7 +396,6 @@ private:
     std::shared_ptr<NOlap::IStoragesManager> StoragesManager;
     TInFlightReadsTracker InFlightReadsTracker;
     TTablesManager TablesManager;
-    bool TiersInitializedFlag = false;
     std::shared_ptr<TTiersManager> Tiers;
     std::unique_ptr<TTabletCountersBase> TabletCountersPtr;
     TTabletCountersBase* TabletCounters;
@@ -422,7 +421,6 @@ private:
     THashMap<TULID, TPartsForLTXShard> LongTxWritesByUniqueId;
     TMultiMap<TRowVersion, TEvColumnShard::TEvRead::TPtr> WaitingReads;
     TMultiMap<TRowVersion, TEvColumnShard::TEvScan::TPtr> WaitingScans;
-    ui32 ActiveEvictions = 0;
     TBackgroundController BackgroundController;
     TSettings Settings;
     TLimits Limits;
diff --git a/ydb/core/tx/columnshard/engines/reader/plain_reader/constructor.cpp b/ydb/core/tx/columnshard/engines/reader/plain_reader/constructor.cpp
index 462eb0bbec..64d0c6a34d 100644
--- a/ydb/core/tx/columnshard/engines/reader/plain_reader/constructor.cpp
+++ b/ydb/core/tx/columnshard/engines/reader/plain_reader/constructor.cpp
@@ -49,6 +49,7 @@ void TCommittedColumnsTaskConstructor::DoOnDataReady(const std::shared_ptr<NReso
 }
 
 bool IFetchTaskConstructor::DoOnError(const TBlobRange& range) {
+    AFL_ERROR(NKikimrServices::TX_COLUMNSHARD)("error_on_blob_reading", range.ToString())("scan_actor_id", ScanActorId);
     NActors::TActorContext::AsActorContext().Send(ScanActorId, std::make_unique<NConveyor::TEvExecution::TEvTaskProcessedResult>(TConclusionStatus::Fail("cannot read blob range " + range.ToString())));
     return false;
 }
diff --git a/ydb/core/tx/columnshard/tables_manager.cpp b/ydb/core/tx/columnshard/tables_manager.cpp
index 62dd2efcf8..6e00f97f39 100644
--- a/ydb/core/tx/columnshard/tables_manager.cpp
+++ b/ydb/core/tx/columnshard/tables_manager.cpp
@@ -78,7 +78,7 @@ bool TTablesManager::InitFromDB(NIceDb::TNiceDb& db, const ui64 tabletId) {
             auto& table = Tables.at(pathId);
             TTableInfo::TTableVersionInfo versionInfo;
             Y_ABORT_UNLESS(versionInfo.ParseFromString(rowset.GetValue<Schema::TableVersionInfo::InfoProto>()));
-            AFL_INFO(NKikimrServices::TX_COLUMNSHARD)("event", "load_table_version")("path_id", pathId)("snapshot", version)("version", versionInfo.HasSchema() ? versionInfo.GetSchema().GetVersion() : -1);
+            AFL_DEBUG(NKikimrServices::TX_COLUMNSHARD)("event", "load_table_version")("path_id", pathId)("snapshot", version)("version", versionInfo.HasSchema() ? versionInfo.GetSchema().GetVersion() : -1);
             Y_ABORT_UNLESS(SchemaPresets.contains(versionInfo.GetSchemaPresetId()));
 
             if (!table.IsDropped()) {
diff --git a/ydb/core/tx/columnshard/write_actor.cpp b/ydb/core/tx/columnshard/write_actor.cpp
index 6879d1bb59..0c8e7c6105 100644
--- a/ydb/core/tx/columnshard/write_actor.cpp
+++ b/ydb/core/tx/columnshard/write_actor.cpp
@@ -37,21 +37,19 @@ public:
         }
 
         if (status != NKikimrProto::OK) {
-            LOG_S_ERROR("Unsuccessful TEvPutResult for blob " << msg->Id.ToString() << " status: " << status << " reason: " << msg->ErrorReason);
+            ACFL_ERROR("event", "TEvPutResult")("blob_id", msg->Id.ToString())("status", status)("error", msg->ErrorReason);
             WriteController->Abort();
             return SendResultAndDie(ctx, status);
         }
 
-        LOG_S_TRACE("TEvPutResult for blob " << msg->Id.ToString());
         WriteController->OnBlobWriteResult(*msg);
         if (WriteController->IsBlobActionsReady()) {
             return SendResultAndDie(ctx, NKikimrProto::OK);
         }
     }
 
-    void Handle(TEvents::TEvWakeup::TPtr& ev, const TActorContext& ctx) {
-        Y_UNUSED(ev);
-        LOG_S_WARN("TEvWakeup: write timeout at tablet " << TabletId << " (write)");
+    void Handle(TEvents::TEvWakeup::TPtr& /*ev*/, const TActorContext& ctx) {
+        ACFL_WARN("event", "wakeup");
         SendResultAndDie(ctx, NKikimrProto::TIMEOUT);
     }
 
@@ -97,6 +95,7 @@ public:
     }
 
     STFUNC(StateWait) {
+        NActors::TLogContextGuard logGuard = NActors::TLogContextBuilder::Build(NKikimrServices::TX_COLUMNSHARD)("tablet_id", TabletId);
         switch (ev->GetTypeRewrite()) {
             HFunc(TEvBlobStorage::TEvPutResult, Handle);
             HFunc(TEvents::TEvWakeup, Handle);
diff --git a/ydb/core/tx/tiering/manager.cpp b/ydb/core/tx/tiering/manager.cpp
index 39c1f33f8b..583d06149f 100644
--- a/ydb/core/tx/tiering/manager.cpp
+++ b/ydb/core/tx/tiering/manager.cpp
@@ -38,6 +38,7 @@ public:
 
     void Bootstrap() {
         Become(&TThis::StateMain);
+        AFL_INFO(NKikimrServices::TX_TIERING)("event", "start_subscribing_metadata");
         Send(GetExternalDataActorId(), new NMetadata::NProvider::TEvSubscribeExternal(Owner->GetExternalDataManipulation()));
         Send(GetExternalDataActorId(), new NMetadata::NProvider::TEvSubscribeExternal(SecretsFetcher));
     }
@@ -45,6 +46,7 @@ public:
     void Handle(NMetadata::NProvider::TEvRefreshSubscriberData::TPtr& ev) {
         auto snapshot = ev->Get()->GetSnapshot();
         if (auto configs = std::dynamic_pointer_cast<NTiers::TConfigsSnapshot>(snapshot)) {
+            AFL_DEBUG(NKikimrServices::TX_TIERING)("event", "TEvRefreshSubscriberData")("snapshot", "configs");
             ConfigsSnapshot = configs;
             if (SecretsSnapshot) {
                 Owner->TakeConfigs(ConfigsSnapshot, SecretsSnapshot);
@@ -52,6 +54,7 @@ public:
                 ALS_DEBUG(NKikimrServices::TX_TIERING) << "Waiting secrets for update at tablet " << Owner->TabletId;
             }
         } else if (auto secrets = std::dynamic_pointer_cast<NMetadata::NSecret::TSnapshot>(snapshot)) {
+            AFL_DEBUG(NKikimrServices::TX_TIERING)("event", "TEvRefreshSubscriberData")("snapshot", "secrets");
             SecretsSnapshot = secrets;
             if (ConfigsSnapshot) {
                 Owner->TakeConfigs(ConfigsSnapshot, SecretsSnapshot);
diff --git a/ydb/core/tx/tiering/manager.h b/ydb/core/tx/tiering/manager.h
index fb1964effe..7268e4558e 100644
--- a/ydb/core/tx/tiering/manager.h
+++ b/ydb/core/tx/tiering/manager.h
@@ -81,7 +81,7 @@ public:
 
     TTiersManager& Start(std::shared_ptr<TTiersManager> ownerPtr);
     TTiersManager& Stop();
-    const NTiers::TManager& GetManagerVerified(const TString & tierId) const;
+    const NTiers::TManager& GetManagerVerified(const TString& tierId) const;
     const NTiers::TManager* GetManagerOptional(const TString& tierId) const;
     NMetadata::NFetcher::ISnapshotsFetcher::TPtr GetExternalDataManipulation() const;
 
diff --git a/ydb/core/tx/tiering/tier/manager.cpp b/ydb/core/tx/tiering/tier/manager.cpp
index 69bd962233..d9e9834f97 100644
--- a/ydb/core/tx/tiering/tier/manager.cpp
+++ b/ydb/core/tx/tiering/tier/manager.cpp
@@ -31,7 +31,7 @@ NMetadata::NModifications::TOperationParsingResult TTiersManager::DoBuildPatchFr
                 } else if (proto.GetObjectStorage().HasAccessKey()) {
                     auto accessKey = NMetadata::NSecret::TSecretIdOrValue::DeserializeFromString(proto.GetObjectStorage().GetAccessKey(), defaultUserId);
                     if (!accessKey) {
-                        return TConclusionStatus::Fail("AccessKey is incorrect");
+                        return TConclusionStatus::Fail("AccessKey is incorrect: " + proto.GetObjectStorage().GetAccessKey() + " for userId: " + defaultUserId);
                     }
                     *proto.MutableObjectStorage()->MutableAccessKey() = accessKey->SerializeToString();
                 } else {