Revert noop scheduler related commits (ydb-platform#10600)

shnikd · Oct 18, 2024 · 86fa578 · 86fa578
1 parent cd9d196
commit 86fa578
Show file tree

Hide file tree

Showing 11 changed files with 205 additions and 343 deletions.
diff --git a/ydb/core/blobstorage/lwtrace_probes/blobstorage_probes.h b/ydb/core/blobstorage/lwtrace_probes/blobstorage_probes.h
@@ -156,9 +156,6 @@ struct TEventTypeField {
     PROBE(PDiskAddToScheduler, GROUPS("PDisk", "PDiskRequest"), \
       TYPES(TPDiskIdField, ui64, double, ui64, bool, ui64), \
       NAMES("pdisk", "reqId", "creationTimeSec", "owner", "isFast", "priorityClass")) \
-    PROBE(PDiskAddToNoopScheduler, GROUPS("PDisk", "PDiskRequest"), \
-      TYPES(TPDiskIdField, ui64, double, ui64, bool, ui64), \
-      NAMES("pdisk", "reqId", "creationTimeSec", "owner", "isFast", "priorityClass")) \
     PROBE(PDiskRouteRequest, GROUPS("PDisk", "PDiskRequest"), \
       TYPES(TPDiskIdField, ui64, double, ui64, bool, ui64), \
       NAMES("pdisk", "reqId", "creationTimeSec", "owner", "isFast", "priorityClass")) \
@@ -268,16 +265,11 @@ struct TEventTypeField {
       NAMES("pdisk", "entireUpdateMs", "inputQueueMs", "schedulingMs", "processingMs", "waitingMs")) \
     PROBE(PDiskEnqueueAllDetails, GROUPS("PDisk"), \
       TYPES(ui64, size_t, size_t, size_t, double), \
-      NAMES("pdisk", "initialQueueSize", "processedReqs", "pushedToSchedulerReqs", "spentTimeMs")) \
+      NAMES("pdisk", "initialQueueSize", "processedReqs", "pushedToForsetiReqs", "spentTimeMs")) \
     PROBE(PDiskUpdateStarted, GROUPS("PDisk"), TYPES(ui64), NAMES("pdisk")) \
-    PROBE(PDiskProcessLogWriteQueue, GROUPS("PDisk"), TYPES(ui64, size_t, size_t, size_t), NAMES("pdisk", "remainingLogWritesSize", "logWritesSize", "commitsSize")) \
-    PROBE(PDiskProcessLogWriteBatch, GROUPS("PDisk"), TYPES(ui64, size_t, size_t), NAMES("pdisk", "logQueueSize", "commitQueueSize")) \
-    PROBE(PDiskProcessChunkReadQueue, GROUPS("PDisk"), \
-      TYPES(ui64, size_t, size_t, size_t, double), \
-      NAMES("pdisk", "initialQueueSize", "processed", "processedBytes", "processedCostMs")) \
-    PROBE(PDiskProcessChunkWriteQueue, GROUPS("PDisk"), \
-      TYPES(ui64, size_t, size_t, size_t, double), \
-      NAMES("pdisk", "initialQueueSize", "processed", "processedBytes", "processedCostMs")) \
+    PROBE(PDiskProcessLogWriteQueue, GROUPS("PDisk"), TYPES(ui64, size_t, size_t), NAMES("pdisk", "logQueueSize", "commitQueueSize")) \
+    PROBE(PDiskProcessChunkReadQueue, GROUPS("PDisk"), TYPES(ui64, size_t), NAMES("pdisk", "queueSize")) \
+    PROBE(PDiskProcessChunkWriteQueue, GROUPS("PDisk"), TYPES(ui64, size_t), NAMES("pdisk", "queueSize")) \
     PROBE(PDiskStartWaiting, GROUPS("PDisk"), TYPES(ui64), NAMES("pdisk")) \
     PROBE(PDiskUpdateEnded, GROUPS("PDisk"), TYPES(ui64, float), NAMES("pdisk", "entireUpdateMs")) \
     PROBE(DSProxyGetEnqueue, GROUPS("DSProxy", "LWTrackStart"), TYPES(), NAMES()) \

diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_completion_impl.cpp b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_completion_impl.cpp
@@ -42,7 +42,6 @@ void TCompletionLogWrite::Exec(TActorSystem *actorSystem) {
     NHPTimer::STime now = HPNow();
     for (auto it = LogWriteQueue.begin(); it != LogWriteQueue.end(); ++it) {
         TLogWrite &evLog = *(*it);
-        evLog.Replied = true;
         TLogWrite *&batch = batchMap[evLog.Owner];
         LOG_DEBUG_S(*actorSystem, NKikimrServices::BS_PDISK, "PDiskId# " << PDisk->PCtx->PDiskId
                 << " ReqId# " << evLog.ReqId.Id << " TEvLogResult Sender# " << evLog.Sender.LocalId()
@@ -99,12 +98,17 @@ void TCompletionLogWrite::Exec(TActorSystem *actorSystem) {
 }
 
 void TCompletionLogWrite::Release(TActorSystem *actorSystem) {
-    for (TLogWrite *logWrite : LogWriteQueue) {
-        auto res = MakeHolder<TEvLogResult>(NKikimrProto::CORRUPTED, NKikimrBlobStorage::StatusIsValid,
-                ErrorReason);
-        logWrite->Replied = true;
-        actorSystem->Send(logWrite->Sender, res.Release());
-        PDisk->Mon.WriteLog.CountResponse();
+    switch (Result) {
+    case EIoResult::Ok:
+    case EIoResult::Unknown:
+        break;
+    default:
+        for (TLogWrite *logWrite : LogWriteQueue) {
+            auto res = MakeHolder<TEvLogResult>(NKikimrProto::CORRUPTED, NKikimrBlobStorage::StatusIsValid,
+                    ErrorReason);
+            actorSystem->Send(logWrite->Sender, res.Release());
+            PDisk->Mon.WriteLog.CountResponse();
+        }
     }
 
     delete this;

diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_config.h b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_config.h
@@ -30,11 +30,6 @@ struct TPDiskSchedulerConfig {
     ui64 LoadWeight = LoadWeightDefault;
     ui64 LowReadWeight = LowWeightDefault;
 
-    size_t MaxChunkReadsPerCycle = 16;
-    double MaxChunkReadsDurationPerCycleMs = 0.25;
-    size_t MaxChunkWritesPerCycle = 8;
-    double MaxChunkWritesDurationPerCycleMs = 1;
-
     TString ToString(bool isMultiline) const {
         const char *x = isMultiline ? "\n" : "";
         TStringStream str;
@@ -49,10 +44,6 @@ struct TPDiskSchedulerConfig {
         str << " OtherReadWeight# " << OtherReadWeight << x;
         str << " LoadWeight# " << LoadWeight << x;
         str << " LowReadWeight# " << LowReadWeight << x;
-        str << " MaxChunkReadsPerCycle# " << MaxChunkReadsPerCycle << x;
-        str << " MaxChunkReadsDurationPerCycleMs# " << MaxChunkReadsDurationPerCycleMs << x;
-        str << " MaxChunkWritesPerCycle# " << MaxChunkWritesPerCycle << x;
-        str << " MaxChunkWritesDurationPerCycleMs# " << MaxChunkWritesDurationPerCycleMs << x;
         str << "}" << x;
         return str.Str();
     }
@@ -165,7 +156,6 @@ struct TPDiskConfig : public TThrRefBase {
     NKikimrBlobStorage::TPDiskSpaceColor::E SpaceColorBorder = NKikimrBlobStorage::TPDiskSpaceColor::GREEN;
 
     ui32 CompletionThreadsCount = 1;
-    bool UseNoopScheduler = false;
 
     bool MetadataOnly = false;
 
@@ -322,7 +312,6 @@ struct TPDiskConfig : public TThrRefBase {
         str << " MaxMetadataMegabytes# " << MaxMetadataMegabytes << x;
         str << " SpaceColorBorder# " << SpaceColorBorder << x;
         str << " CompletionThreadsCount# " << CompletionThreadsCount << x;
-        str << " UseNoopScheduler# " << (UseNoopScheduler ? "true" : "false") << x;
         str << "}";
         return str.Str();
     }
@@ -411,10 +400,6 @@ struct TPDiskConfig : public TThrRefBase {
         if (cfg->HasCompletionThreadsCount()) {
             CompletionThreadsCount = cfg->GetCompletionThreadsCount();
         }
-
-        if (cfg->HasUseNoopScheduler()) {
-            UseNoopScheduler = cfg->GetUseNoopScheduler();
-        }
     }
 };