correct hard verification (ydb-platform#3480)

ydb/core/tx/columnshard/background_controller.cpp

@@ -47,13 +47,4 @@ TString TBackgroundController::DebugStringIndexation() const {
     return sb;
 }
 
-TString TBackgroundActivity::DebugString() const {
-    return TStringBuilder()
-        << "indexation:" << HasIndexation() << ";"
-        << "compaction:" << HasCompaction() << ";"
-        << "cleanup:" << HasCleanup() << ";"
-        << "ttl:" << HasTtl() << ";"
-        ;
-}
-
 }

ydb/core/tx/columnshard/background_controller.h

@@ -8,42 +8,6 @@ class TColumnEngineChanges;
 
 namespace NKikimr::NColumnShard {
 
-class TBackgroundActivity {
-public:
-    enum EBackActivity : ui32 {
-        NONE = 0x00,
-        INDEX = 0x01,
-        COMPACT = 0x02,
-        CLEAN  = 0x04,
-        TTL = 0x08,
-        ALL = 0xffff
-    };
-
-    static TBackgroundActivity Indexation() { return TBackgroundActivity(INDEX); }
-    static TBackgroundActivity Compaction() { return TBackgroundActivity(COMPACT); }
-    static TBackgroundActivity Cleanup() { return TBackgroundActivity(CLEAN); }
-    static TBackgroundActivity Ttl() { return TBackgroundActivity(TTL); }
-    static TBackgroundActivity All() { return TBackgroundActivity(ALL); }
-    static TBackgroundActivity None() { return TBackgroundActivity(NONE); }
-
-    TBackgroundActivity() = default;
-
-    bool HasIndexation() const { return Activity & INDEX; }
-    bool HasCompaction() const { return Activity & COMPACT; }
-    bool HasCleanup() const { return Activity & CLEAN; }
-    bool HasTtl() const { return Activity & TTL; }
-    bool HasAll() const { return Activity == ALL; }
-
-    TString DebugString() const;
-
-private:
-    EBackActivity Activity = NONE;
-
-    TBackgroundActivity(EBackActivity activity)
-        : Activity(activity)
-    {}
-};
-
 class TBackgroundController {
 private:
     THashMap<TString, TMonotonic> ActiveIndexationTasks;

ydb/core/tx/columnshard/blobs_action/transaction/tx_write_index.cpp

@@ -57,11 +57,11 @@ void TTxWriteIndex::Complete(const TActorContext& ctx) {
     const ui64 bytesWritten = changes->GetBlobsAction().GetWritingTotalSize();
 
     if (!Ev->Get()->IndexChanges->IsAborted()) {
-        NOlap::TWriteIndexCompleteContext context(ctx, blobsWritten, bytesWritten, Ev->Get()->Duration, TriggerActivity, Self->MutableIndexAs<NOlap::TColumnEngineForLogs>());
+        NOlap::TWriteIndexCompleteContext context(ctx, blobsWritten, bytesWritten, Ev->Get()->Duration, Self->MutableIndexAs<NOlap::TColumnEngineForLogs>());
         Ev->Get()->IndexChanges->WriteIndexOnComplete(Self, context);
     }
 
-    Self->EnqueueBackgroundActivities(false, TriggerActivity);
+    Self->EnqueueBackgroundActivities(false);
     changes->MutableBlobsAction().OnCompleteTxAfterAction(*Self, Ev->Get()->GetPutStatus() == NKikimrProto::OK);
     NYDBTest::TControllers::GetColumnShardController()->OnWriteIndexComplete(*changes, *Self);
 }

ydb/core/tx/columnshard/blobs_action/transaction/tx_write_index.h

@@ -22,7 +22,6 @@ class TTxWriteIndex: public TTransactionBase<TColumnShard> {
 
     TEvPrivate::TEvWriteIndex::TPtr Ev;
     const ui32 TabletTxNo;
-    TBackgroundActivity TriggerActivity = TBackgroundActivity::All();
     bool CompleteReady = false;
 
     TStringBuilder TxPrefix() const {

ydb/core/tx/columnshard/columnshard_impl.cpp

@@ -512,9 +512,9 @@ void TColumnShard::RunAlterStore(const NKikimrTxColumnShard::TAlterStore& proto,
     }
 }
 
-void TColumnShard::EnqueueBackgroundActivities(bool periodic, TBackgroundActivity activity) {
+void TColumnShard::EnqueueBackgroundActivities(const bool periodic) {
     TLogContextGuard gLogging(NActors::TLogContextBuilder::Build(NKikimrServices::TX_COLUMNSHARD)("tablet_id", TabletID()));
-    ACFL_DEBUG("event", "EnqueueBackgroundActivities")("periodic", periodic)("activity", activity.DebugString());
+    ACFL_DEBUG("event", "EnqueueBackgroundActivities")("periodic", periodic);
     StoragesManager->GetOperatorVerified(NOlap::IStoragesManager::DefaultStorageId);
     StoragesManager->GetSharedBlobsManager()->GetStorageManagerVerified(NOlap::IStoragesManager::DefaultStorageId);
     CSCounters.OnStartBackground();
@@ -596,9 +596,10 @@ class TChangesReadTask: public NOlap::NBlobOperations::NRead::ITask {
     }
     virtual bool DoOnError(const TString& storageId, const NOlap::TBlobRange& range, const NOlap::IBlobsReadingAction::TErrorStatus& status) override {
         AFL_ERROR(NKikimrServices::TX_COLUMNSHARD)("event", "DoOnError")("storage_id", storageId)("blob_id", range)("status", status.GetErrorMessage())("status_code", status.GetStatus());
-        AFL_VERIFY(false)("blob_id", range)("status", status.GetStatus())("error", status.GetErrorMessage())("type", TxEvent->IndexChanges->TypeString())("task_id", TxEvent->IndexChanges->GetTaskIdentifier())
+        AFL_VERIFY(status.GetStatus() != NKikimrProto::EReplyStatus::NODATA)("blob_id", range)("status", status.GetStatus())("error", status.GetErrorMessage())("type", TxEvent->IndexChanges->TypeString())("task_id", TxEvent->IndexChanges->GetTaskIdentifier())
             ("debug", TxEvent->IndexChanges->DebugString());
         TxEvent->SetPutStatus(NKikimrProto::ERROR);
+        Counters.ReadErrors->Add(1);
         TActorContext::AsActorContext().Send(ParentActorId, std::move(TxEvent));
         return false;
     }

ydb/core/tx/columnshard/columnshard_impl.h

@@ -535,7 +535,7 @@ class TColumnShard
     TWriteId BuildNextWriteId(NIceDb::TNiceDb& db);
 
     void EnqueueProgressTx(const TActorContext& ctx);
-    void EnqueueBackgroundActivities(bool periodic = false, TBackgroundActivity activity = TBackgroundActivity::All());
+    void EnqueueBackgroundActivities(const bool periodic = false);
     virtual void Enqueue(STFUNC_SIG) override;
 
     void UpdateSchemaSeqNo(const TMessageSeqNo& seqNo, NTabletFlatExecutor::TTransactionContext& txc);

ydb/core/tx/columnshard/counters/indexation.cpp

@@ -8,6 +8,7 @@ TIndexationCounters::TIndexationCounters(const TString& module)
     : TBase(module)
 {
     ReadBytes = TBase::GetDeriviative("Read/Bytes");
+    ReadErrors = TBase::GetDeriviative("Read/Errors/Count");
     AnalizeInsertedPortions = TBase::GetDeriviative("AnalizeInsertion/Portions");
     AnalizeInsertedBytes = TBase::GetDeriviative("AnalizeInsertion/Bytes");
     RepackedInsertedPortions = TBase::GetDeriviative("RepackedInsertion/Portions");

ydb/core/tx/columnshard/counters/indexation.h

@@ -13,6 +13,7 @@ class TIndexationCounters: public TCommonCountersOwner {
 public:
     NMonitoring::TDynamicCounters::TCounterPtr CompactionInputBytes;
 
+    NMonitoring::TDynamicCounters::TCounterPtr ReadErrors;
     NMonitoring::TDynamicCounters::TCounterPtr ReadBytes;
     NMonitoring::TDynamicCounters::TCounterPtr AnalizeCompactedPortions;
     NMonitoring::TDynamicCounters::TCounterPtr AnalizeInsertedPortions;

ydb/core/tx/columnshard/engines/changes/abstract/abstract.h

@@ -30,7 +30,6 @@ class TTransactionContext;
 namespace NKikimr::NColumnShard {
 class TBlobManagerDb;
 class TColumnShard;
-class TBackgroundActivity;
 }
 
 namespace NKikimr::NOlap {
@@ -156,15 +155,13 @@ class TWriteIndexCompleteContext: TNonCopyable, public TChangesFinishContext {
     const ui32 BlobsWritten;
     const ui64 BytesWritten;
     const TDuration Duration;
-    NColumnShard::TBackgroundActivity& TriggerActivity;
     TColumnEngineForLogs& EngineLogs;
     TWriteIndexCompleteContext(const TActorContext& actorContext, const ui32 blobsWritten, const ui64 bytesWritten
-        , const TDuration d, NColumnShard::TBackgroundActivity& triggerActivity, TColumnEngineForLogs& engineLogs)
+        , const TDuration d, TColumnEngineForLogs& engineLogs)
         : ActorContext(actorContext)
         , BlobsWritten(blobsWritten)
         , BytesWritten(bytesWritten)
         , Duration(d)
-        , TriggerActivity(triggerActivity)
         , EngineLogs(engineLogs)
     {
 

ydb/core/tx/columnshard/engines/storage/granule.cpp

@@ -169,7 +169,7 @@ bool TGranuleMeta::InCompaction() const {
     return Activity.contains(EActivity::GeneralCompaction);
 }
 
-std::shared_ptr<NKikimr::NOlap::TPortionInfo> TGranuleMeta::UpsertPortionOnLoad(const TPortionInfo& portion) {
+std::shared_ptr<TPortionInfo> TGranuleMeta::UpsertPortionOnLoad(const TPortionInfo& portion) {
     auto it = Portions.find(portion.GetPortion());
     AFL_TRACE(NKikimrServices::TX_COLUMNSHARD)("event", "UpsertPortionOnLoad")("portion_info", portion.DebugString());
     if (it == Portions.end()) {

ydb/core/tx/columnshard/engines/ut/ut_logs_engine.cpp

@@ -297,8 +297,7 @@ bool Insert(TColumnEngineForLogs& engine, TTestDbWrapper& db, TSnapshot snap,
 
     NOlap::TWriteIndexContext contextExecute(nullptr, db, engine);
     changes->WriteIndexOnExecute(nullptr, contextExecute);
-    NColumnShard::TBackgroundActivity triggered;
-    NOlap::TWriteIndexCompleteContext contextComplete(NActors::TActivationContext::AsActorContext(), 0, 0, TDuration::Zero(), triggered, engine);
+    NOlap::TWriteIndexCompleteContext contextComplete(NActors::TActivationContext::AsActorContext(), 0, 0, TDuration::Zero(), engine);
     changes->WriteIndexOnComplete(nullptr, contextComplete);
     changes->AbortEmergency();
     return result;
@@ -328,8 +327,7 @@ bool Compact(TColumnEngineForLogs& engine, TTestDbWrapper& db, TSnapshot snap, N
     const bool result = engine.ApplyChanges(db, changes, snap);
     NOlap::TWriteIndexContext contextExecute(nullptr, db, engine);
     changes->WriteIndexOnExecute(nullptr, contextExecute);
-    NColumnShard::TBackgroundActivity triggered;
-    NOlap::TWriteIndexCompleteContext contextComplete(NActors::TActivationContext::AsActorContext(), 0, 0, TDuration::Zero(), triggered, engine);
+    NOlap::TWriteIndexCompleteContext contextComplete(NActors::TActivationContext::AsActorContext(), 0, 0, TDuration::Zero(), engine);
     changes->WriteIndexOnComplete(nullptr, contextComplete);
     if (blobsPool) {
         for (auto&& i : changes->AppendedPortions) {
@@ -356,8 +354,7 @@ bool Cleanup(TColumnEngineForLogs& engine, TTestDbWrapper& db, TSnapshot snap, u
     const bool result = engine.ApplyChanges(db, changes, snap);
     NOlap::TWriteIndexContext contextExecute(nullptr, db, engine);
     changes->WriteIndexOnExecute(nullptr, contextExecute);
-    NColumnShard::TBackgroundActivity triggered;
-    NOlap::TWriteIndexCompleteContext contextComplete(NActors::TActivationContext::AsActorContext(), 0, 0, TDuration::Zero(), triggered, engine);
+    NOlap::TWriteIndexCompleteContext contextComplete(NActors::TActivationContext::AsActorContext(), 0, 0, TDuration::Zero(), engine);
     changes->WriteIndexOnComplete(nullptr, contextComplete);
     changes->AbortEmergency();
     return result;
@@ -375,8 +372,7 @@ bool Ttl(TColumnEngineForLogs& engine, TTestDbWrapper& db,
     const bool result = engine.ApplyChanges(db, changes, TSnapshot(1,1));
     NOlap::TWriteIndexContext contextExecute(nullptr, db, engine);
     changes->WriteIndexOnExecute(nullptr, contextExecute);
-    NColumnShard::TBackgroundActivity triggered;
-    NOlap::TWriteIndexCompleteContext contextComplete(NActors::TActivationContext::AsActorContext(), 0, 0, TDuration::Zero(), triggered, engine);
+    NOlap::TWriteIndexCompleteContext contextComplete(NActors::TActivationContext::AsActorContext(), 0, 0, TDuration::Zero(), engine);
     changes->WriteIndexOnComplete(nullptr, contextComplete);
     changes->AbortEmergency();
     return result;