Merge 1b31eae into 156cc9c

Author: molotkov-and

ydb/core/tx/schemeshard/schemeshard__root_data_erasure_manager.cpp

@@ -62,7 +62,7 @@ void TRootDataErasureManager::UpdateConfig(const NKikimrConfig::TDataErasureConf
 void TRootDataErasureManager::Start() {
     TDataErasureManager::Start();
     const auto ctx = SchemeShard->ActorContext();
-    LOG_TRACE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD,
+    LOG_NOTICE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD,
         "[RootDataErasureManager] Start: Status# " << static_cast<ui32>(Status));
 
     Queue->Start();
@@ -80,7 +80,7 @@ void TRootDataErasureManager::Start() {
 void TRootDataErasureManager::Stop() {
     TDataErasureManager::Stop();
     const auto ctx = SchemeShard->ActorContext();
-    LOG_TRACE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD,
+    LOG_NOTICE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD,
         "[RootDataErasureManager] Stop");
 
     Queue->Stop();
@@ -134,7 +134,7 @@ void TRootDataErasureManager::Run(NIceDb::TNiceDb& db) {
                                                                      Schema::DataErasureGenerations::StartTime>(Status, StartTime.MicroSeconds());
 
     const auto ctx = SchemeShard->ActorContext();
-    LOG_TRACE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD,
+    LOG_NOTICE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD,
         "[RootDataErasureManager] Run: Queue.Size# " << Queue->Size()
         << ", WaitingDataErasureTenants.size# " << WaitingDataErasureTenants.size()
         << ", Status# " << static_cast<ui32>(Status));
@@ -152,7 +152,7 @@ void TRootDataErasureManager::Continue() {
     }
 
     const auto ctx = SchemeShard->ActorContext();
-    LOG_TRACE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD,
+    LOG_NOTICE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD,
         "[RootDataErasureManager] Continue: Queue.Size# " << Queue->Size()
         << ", Status# " << static_cast<ui32>(Status));
 }
@@ -166,7 +166,7 @@ void TRootDataErasureManager::ScheduleDataErasureWakeup() {
     ctx.Schedule(CurrentWakeupInterval, new TEvSchemeShard::TEvWakeupToRunDataErasure);
     IsDataErasureWakeupScheduled = true;
 
-    LOG_DEBUG_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD,
+    LOG_NOTICE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD,
         "[RootDataErasureManager] ScheduleDataErasureWakeup: Interval# " << CurrentWakeupInterval << ", Timestamp# " << AppData(ctx)->TimeProvider->Now());
 }
 
@@ -193,7 +193,7 @@ NOperationQueue::EStartStatus TRootDataErasureManager::StartDataErasure(const TP
 
     const auto& tenantSchemeShardId = it->second->GetTenantSchemeShardID();
 
-    LOG_INFO_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "[RootDataErasureManager] [Start] Data erasure "
+    LOG_NOTICE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "[RootDataErasureManager] [Start] Data erasure "
         "for pathId# " << pathId
         << ", tenant schemeshard# " << tenantSchemeShardId
         << ", next wakeup# " << Queue->GetWakeupDelta()
@@ -344,13 +344,13 @@ void TRootDataErasureManager::ScheduleRequestToBSC() {
     ctx.Schedule(DataErasureBSCInterval, new TEvSchemeShard::TEvWakeupToRunDataErasureBSC);
     IsRequestToBSCScheduled = true;
 
-    LOG_DEBUG_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD,
+    LOG_NOTICE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD,
         "[RootDataErasureManager] ScheduleRequestToBSC: Interval# " << DataErasureBSCInterval);
 }
 
 void TRootDataErasureManager::SendRequestToBSC() {
     auto ctx = SchemeShard->ActorContext();
-    LOG_INFO_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD,
+    LOG_NOTICE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD,
         "[RootDataErasureManager] SendRequestToBSC: Generation# " << Generation);
 
     IsRequestToBSCScheduled = false;
@@ -373,7 +373,7 @@ void TRootDataErasureManager::Complete() {
         ScheduleDataErasureWakeup();
     }
 
-    LOG_INFO_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD,
+    LOG_NOTICE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD,
         "[RootDataErasureManager] Complete: Generation# " << Generation
         << ", duration# " << dataErasureDuration.Seconds() << " s");
 }
@@ -641,11 +641,11 @@ struct TSchemeShard::TTxCompleteDataErasureBSC : public TSchemeShard::TRwTxBase
 
         NIceDb::TNiceDb db(txc.DB);
         if (record.GetCompleted()) {
-            LOG_INFO_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "TTxCompleteDataErasureBSC: Data shred in BSC is completed");
+            LOG_NOTICE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "TTxCompleteDataErasureBSC: Data shred in BSC is completed");
             manager->Complete();
             db.Table<Schema::DataErasureGenerations>().Key(Self->DataErasureManager->GetGeneration()).Update<Schema::DataErasureGenerations::Status>(Self->DataErasureManager->GetStatus());
         } else {
-            LOG_INFO_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "TTxCompleteDataErasureBSC: Progress data shred in BSC " << static_cast<double>(record.GetProgress10k()) / 100 << "%");
+            LOG_NOTICE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "TTxCompleteDataErasureBSC: Progress data shred in BSC " << static_cast<double>(record.GetProgress10k()) / 100 << "%");
             NeedScheduleRequestToBSC = true;
         }
     }

ydb/core/tx/schemeshard/schemeshard__tenant_data_erasure_manager.cpp

@@ -61,7 +61,7 @@ void TTenantDataErasureManager::UpdateConfig(const NKikimrConfig::TDataErasureCo
 void TTenantDataErasureManager::Start() {
     TDataErasureManager::Start();
     const auto ctx = SchemeShard->ActorContext();
-    LOG_TRACE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD,
+    LOG_NOTICE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD,
         "[TenantDataErasureManager] Start: Status# " << static_cast<ui32>(Status));
 
     Queue->Start();
@@ -76,7 +76,7 @@ void TTenantDataErasureManager::Start() {
 void TTenantDataErasureManager::Stop() {
     TDataErasureManager::Stop();
     const auto ctx = SchemeShard->ActorContext();
-    LOG_TRACE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD,
+    LOG_NOTICE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD,
         "[TenantDataErasureManager] Stop");
 
     Queue->Stop();
@@ -134,7 +134,7 @@ void TTenantDataErasureManager::Run(NIceDb::TNiceDb& db) {
     db.Table<Schema::TenantDataErasureGenerations>().Key(Generation).Update<Schema::TenantDataErasureGenerations::Status>(Status);
 
     const auto ctx = SchemeShard->ActorContext();
-    LOG_TRACE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD,
+    LOG_NOTICE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD,
         "[TenantDataErasureManager] Run: Queue.Size# " << Queue->Size()
         << ", WaitingDataErasureShards.size# " << WaitingDataErasureShards.size()
         << ", Status# " << static_cast<ui32>(Status));
@@ -322,7 +322,7 @@ void TTenantDataErasureManager::OnDone(const TTabletId& tabletId, NIceDb::TNiceD
     UpdateMetrics();
 
     if (WaitingDataErasureShards.empty()) {
-        LOG_INFO_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD,
+        LOG_NOTICE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD,
             "[TenantDataErasureManager] Data erasure in shards is completed. Send response to root schemeshard");
         Complete();
         db.Table<Schema::TenantDataErasureGenerations>().Key(Generation).Update<Schema::TenantDataErasureGenerations::Status>(Status);
@@ -345,7 +345,7 @@ void TTenantDataErasureManager::Complete() {
     Status = EDataErasureStatus::COMPLETED;
 
     auto ctx = SchemeShard->ActorContext();
-    LOG_INFO_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD,
+    LOG_NOTICE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD,
         "[TenantDataErasureManager] Complete: Generation# " << Generation);
 }