fix

progress

progress

progress

progress

9 files changed, 95 insertions, 79 deletions

diff --git a/ydb/core/persqueue/partition.cpp b/ydb/core/persqueue/partition.cpp
index eb250216446..eaab8534b86 100644
--- a/ydb/core/persqueue/partition.cpp
+++ b/ydb/core/persqueue/partition.cpp
@@ -1354,9 +1354,7 @@ void TPartition::CancelAllWritesOnIdle(const TActorContext& ctx) {
     }
 
     UpdateWriteBufferIsFullState(ctx.Now());
-
     Requests.clear();
-
     Y_VERIFY(Responses.empty());
 
     ProcessReserveRequests(ctx);
@@ -1380,7 +1378,6 @@ void TPartition::FailBadClient(const TActorContext& ctx) {
         }
     }
     UpdateWriteBufferIsFullState(ctx.Now());
-
     Requests.clear();
     for (const auto& w : Responses) {
         ReplyError(ctx, w.GetCookie(), NPersQueue::NErrorCode::BAD_REQUEST, "previous write request failed");
@@ -1859,11 +1856,9 @@ void TPartition::ProcessChangeOwnerRequest(TAutoPtr<TEvPQ::TEvChangeOwner> ev, c
         it->second.GenerateCookie(owner, ev->PipeClient, ev->Sender, TopicConverter->GetClientsideName(), Partition, ctx);//will change OwnerCookie
         //cookie is generated. but answer will be sent when all inflight writes will be done - they in the same queue 'Requests'
         Requests.emplace_back(TOwnershipMsg{ev->Cookie, it->second.OwnerCookie}, WriteQuota->GetQuotedTime(), ctx.Now().MilliSeconds(), 0);
-
         TabletCounters.Simple()[COUNTER_PQ_TABLET_RESERVED_BYTES_SIZE].Set(ReservedSize);
         UpdateWriteBufferIsFullState(ctx.Now());
         ProcessReserveRequests(ctx);
-
     } else {
         it->second.WaitToChangeOwner.push_back(THolder<TEvPQ::TEvChangeOwner>(ev.Release()));
     }
@@ -5556,6 +5551,7 @@ void TPartition::HandleWrites(const TActorContext& ctx) {
 
     bool haveData = false;
     bool haveCheckDisk = false;
+
     if (!Requests.empty() && DiskIsFull) {
         CancelAllWritesOnIdle(ctx);
         AddCheckDiskRequest(request.Get(), Config.GetPartitionConfig().GetNumChannels());
@@ -5566,7 +5562,6 @@ void TPartition::HandleWrites(const TActorContext& ctx) {
     bool haveDrop = CleanUp(request.Get(), haveData, ctx);
 
     ProcessReserveRequests(ctx);
-
     if (!haveData && !haveDrop && !haveCheckDisk) { //no data writed/deleted
         if (!Requests.empty()) { //there could be change ownership requests that
             bool res = ProcessWrites(request.Get(), ctx);
diff --git a/ydb/core/persqueue/ut/common/pq_ut_common.cpp b/ydb/core/persqueue/ut/common/pq_ut_common.cpp
index 9143a6bdd64..515f65ddb0c 100644
--- a/ydb/core/persqueue/ut/common/pq_ut_common.cpp
+++ b/ydb/core/persqueue/ut/common/pq_ut_common.cpp
@@ -68,6 +68,11 @@ void PQTabletPrepare(const TTabletPreparationParameters& parameters,
             tabletConfig->AddReadRules("user");
             tabletConfig->AddReadFromTimestampsMs(parameters.readFromTimestampsMs);
             auto config = tabletConfig->MutablePartitionConfig();
+            if (parameters.speed > 0) {
+                config->SetWriteSpeedInBytesPerSecond(parameters.speed);
+                config->SetBurstSize(parameters.speed);
+            }
+
             config->SetMaxCountInPartition(parameters.maxCountInPartition);
             config->SetMaxSizeInPartition(parameters.maxSizeInPartition);
             if (parameters.storageLimitBytes > 0) {
@@ -168,7 +173,6 @@ void CmdGetOffset(const ui32 partition, const TString& user, i64 offset, TTestCo
                     }
                 }
             }
-            Cerr << "CMDGETOFFSET partition " << partition << " waiting for offset " << offset << ": " << resp << "\n";
             UNIT_ASSERT((offset == -1 && !resp.HasOffset()) || (i64)resp.GetOffset() == offset);
             if (writeTime > 0) {
                 UNIT_ASSERT(resp.HasWriteTimestampEstimateMS());
@@ -409,6 +413,7 @@ std::pair<TString, TActorId> CmdSetOwner(const ui32 partition, TTestContext& tc,
             }
 
             UNIT_ASSERT_EQUAL(result->Record.GetErrorCode(), NPersQueue::NErrorCode::OK);
+
             UNIT_ASSERT(result->Record.HasPartitionResponse());
             UNIT_ASSERT(result->Record.GetPartitionResponse().HasCmdGetOwnershipResult());
             UNIT_ASSERT(result->Record.GetPartitionResponse().GetCmdGetOwnershipResult().HasOwnerCookie());
@@ -416,6 +421,7 @@ std::pair<TString, TActorId> CmdSetOwner(const ui32 partition, TTestContext& tc,
             UNIT_ASSERT(!cookie.empty());
             retriesLeft = 0;
         } catch (NActors::TSchedulingLimitReachedException) {
+            Cerr << "SCHEDULER LIMIT REACHED\n";
             UNIT_ASSERT_VALUES_EQUAL(retriesLeft, 2);
         }
     }
diff --git a/ydb/core/persqueue/ut/common/pq_ut_common.h b/ydb/core/persqueue/ut/common/pq_ut_common.h
index 0a13f936ad2..3f62e1183fb 100644
--- a/ydb/core/persqueue/ut/common/pq_ut_common.h
+++ b/ydb/core/persqueue/ut/common/pq_ut_common.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <ydb/core/persqueue/pq.h>
+#include <ydb/core/persqueue/events/internal.h>
 #include <ydb/core/persqueue/user_info.h>
 #include <ydb/core/testlib/actors/test_runtime.h>
 #include <ydb/core/testlib/basics/runtime.h>
@@ -20,7 +21,7 @@ inline constexpr static T PlainOrSoSlow(T plain, T slow) noexcept {
     );
 }
 
-constexpr ui32 NUM_WRITES = PlainOrSoSlow(100, 1);
+constexpr ui32 NUM_WRITES = PlainOrSoSlow(50, 1);
 
 void FillPQConfig(NKikimrPQ::TPQConfig& pqConfig, const TString& dbRoot, bool isFirstClass);
 
@@ -71,6 +72,7 @@ struct TTestContext {
         NActors::NLog::EPriority otherPriority = NLog::PRI_INFO;
 
         runtime.SetLogPriority(NKikimrServices::PERSQUEUE, pqPriority);
+
         runtime.SetLogPriority(NKikimrServices::SYSTEM_VIEWS, pqPriority);
         runtime.SetLogPriority(NKikimrServices::KEYVALUE, priority);
         runtime.SetLogPriority(NKikimrServices::BOOTSTRAPPER, priority);
@@ -99,9 +101,10 @@ struct TTestContext {
             }
         }
 
-        Y_UNUSED(deadline);
-        Y_UNUSED(duration);
-
+        if (event->GetTypeRewrite() == TEvPQ::EvUpdateAvailableSize) {
+            deadline = runtime.GetTimeProvider()->Now() + duration;
+            runtime.UpdateCurrentTime(deadline);
+        }
         return false;
     }
 
@@ -119,10 +122,11 @@ struct TTestContext {
                  bool enableMonitoring = false, bool enableDbCounters = false) {
         Y_UNUSED(dispatchName);
         outActiveZone = false;
-        TTestBasicRuntime* runtime = new TTestBasicRuntime;
+        TTestBasicRuntime* runtime = new TTestBasicRuntime();
         if (enableMonitoring) {
             runtime->SetupMonitoring();
         }
+
         Runtime.Reset(runtime);
         Runtime->SetScheduledLimit(200);
 
@@ -132,6 +136,8 @@ struct TTestContext {
         SetupLogging(*Runtime);
         SetupTabletServices(*Runtime, &appData);
         setup(*Runtime);
+
+
         CreateTestBootstrapper(*Runtime,
             CreateTestTabletInfo(TabletId, PQTabletType, TErasureType::ErasureNone),
             &CreatePersQueue);
@@ -215,6 +221,7 @@ struct TTabletPreparationParameters {
     ui64 readFromTimestampsMs{0};
     ui64 sidMaxCount{0};
     ui32 specVersion{0};
+    ui32 speed{0};
     i32 storageLimitBytes{0};
     TString folderId{"somefolder"};
     TString cloudId{"somecloud"};
diff --git a/ydb/core/persqueue/ut/counters_ut.cpp b/ydb/core/persqueue/ut/counters_ut.cpp
index 120d51ed918..0c351f5106b 100644
--- a/ydb/core/persqueue/ut/counters_ut.cpp
+++ b/ydb/core/persqueue/ut/counters_ut.cpp
@@ -90,6 +90,7 @@ Y_UNIT_TEST(Partition) {
         TStringStream countersStr;
         dbGroup->OutputHtml(countersStr);
         TString referenceCounters = NResource::Find(TStringBuf("counters_pqproxy.html"));
+
         UNIT_ASSERT_EQUAL(countersStr.Str() + "\n", referenceCounters);
     }
 
@@ -121,6 +122,7 @@ Y_UNIT_TEST(PartitionFirstClass) {
         TStringStream countersStr;
         dbGroup->OutputHtml(countersStr);
         TString referenceCounters = NResource::Find(TStringBuf("counters_pqproxy_firstclass.html"));
+
         UNIT_ASSERT_EQUAL(countersStr.Str() + "\n", referenceCounters);
     }
 
@@ -164,17 +166,14 @@ void CompareJsons(const TString& inputStr, const TString& referenceStr) {
             UNIT_ASSERT_GT(value, 4500);
             UNIT_ASSERT_LT(value, 5500);
             sensor.SetValueByPath("value", 5000);
-        }
-
-        if (getByPath(sensor, "kind") == "GAUGE" &&
+        } else if (getByPath(sensor, "kind") == "GAUGE" &&
             (getByPath(sensor, "labels.sensor") == "PQ/WriteTimeLagMsByLastRead" ||
             getByPath(sensor, "labels.sensor") == "PQ/WriteTimeLagMsByLastWrite")) {
             auto value = sensor["value"].GetIntegerSafe();
-            UNIT_ASSERT_GT(value, 25);
-            UNIT_ASSERT_LT(value, 35);
+            UNIT_ASSERT_GT_C(value, 100, "value is " << value);
+            UNIT_ASSERT_LT_C(value, 3000, "value is " << value);
             sensor.SetValueByPath("value", 30);
         }
-
     }
     UNIT_ASSERT_VALUES_EQUAL(referenceJson, inputJson);
 }
diff --git a/ydb/core/persqueue/ut/pq_ut.cpp b/ydb/core/persqueue/ut/pq_ut.cpp
index 51c2dc65090..ec85e940c66 100644
--- a/ydb/core/persqueue/ut/pq_ut.cpp
+++ b/ydb/core/persqueue/ut/pq_ut.cpp
@@ -1044,20 +1044,22 @@ Y_UNIT_TEST(TestWritePQBigMessage) {
 }
 
 
-Y_UNIT_TEST(TestWritePQ) {
+void TestWritePQImpl(bool fast) {
     TTestContext tc;
     RunTestWithReboots(tc.TabletIds, [&]() {
         return tc.InitialEventsFilter.Prepare();
     }, [&](const TString& dispatchName, std::function<void(TTestActorRuntime&)> setup, bool& activeZone) {
+
+        activeZone = false;
         TFinalizer finalizer(tc);
         tc.Prepare(dispatchName, setup, activeZone);
         tc.Runtime->SetScheduledLimit(100);
 
         // Important client, lifetimeseconds=0 - never delete
-        PQTabletPrepare({}, {{"user", true}}, tc);
+        PQTabletPrepare({.partitions = 2, .speed = 200000000}, {{"user", true}}, tc);
 
         TVector<std::pair<ui64, TString>> data, data1, data2;
-        activeZone = PlainOrSoSlow(true, false);
+        activeZone = PlainOrSoSlow(true, false) && fast;
 
         TString ss{1_MB, '_'};
         TString s1{128_KB, 'a'};
@@ -1065,7 +1067,7 @@ Y_UNIT_TEST(TestWritePQ) {
         TString s3{32, 'c'};
         ui32 pp = 4 + 8 + 2 + 9;
 
-        TString sb{15_MB + 512_KB, '_'};
+        TString sb{6_MB + 512_KB, '_'};
         data.push_back({1, sb.substr(pp)});
         CmdWrite(0,"sourceid0", data, tc, false, {}, true, "", -1, 100);
         activeZone = false;
@@ -1077,9 +1079,11 @@ Y_UNIT_TEST(TestWritePQ) {
         data2.push_back({1, s2.substr(pp)});
         data2.push_back({2, sb.substr(pp)});
         CmdWrite(0,"sourceid1", data1, tc);
+
         CmdWrite(0,"sourceid2", data2, tc);
 
         CmdWrite(0,"sourceid3", data1, tc);
+
         data.clear();
         data.push_back({1, s1.substr(pp)});
         data.push_back({2, ss.substr(pp)});
@@ -1108,7 +1112,7 @@ Y_UNIT_TEST(TestWritePQ) {
         CmdWrite(0,"sourceId9", data1, tc, false, {}, false, "", -1, 2000);
         PQGetPartInfo(100, 2002, tc);
 
-        activeZone = true;
+        activeZone = fast;
 
         data1.push_back(data1.back());
         data1[1].first = 3;
@@ -1116,6 +1120,7 @@ Y_UNIT_TEST(TestWritePQ) {
         PQGetPartInfo(100, 3003, tc);
 
         activeZone = false;
+        if (fast) return;
 
         CmdWrite(1,"sourceId9", data1, tc, false, {}, false, "", -1, 2000); //to other partition
 
@@ -1131,10 +1136,14 @@ Y_UNIT_TEST(TestWritePQ) {
 
         //read from gap
         CmdRead(0, 500, Max<i32>(), Max<i32>(), 6, false, tc, {1000,1001,2000,2001,3000,3002});
-
     });
 }
 
+Y_UNIT_TEST(TestWritePQ) {
+    TestWritePQImpl(true);
+    TestWritePQImpl(false);
+}
+
 
 Y_UNIT_TEST(TestSourceIdDropByUserWrites) {
     TTestContext tc;
diff --git a/ydb/core/persqueue/ut/resources/counters_datastreams.html b/ydb/core/persqueue/ut/resources/counters_datastreams.html
index bdf68ef1ac4..4293a0c49e4 100644
--- a/ydb/core/persqueue/ut/resources/counters_datastreams.html
+++ b/ydb/core/persqueue/ut/resources/counters_datastreams.html
@@ -41,14 +41,14 @@ topic=topic:
         bin=999999: 0
 
     name=topic.write.lag_milliseconds:
-        bin=100: 30
-        bin=1000: 0
+        bin=100: 0
+        bin=1000: 10
         bin=10000: 0
         bin=180000: 0
         bin=200: 0
         bin=2000: 0
         bin=30000: 0
-        bin=500: 0
+        bin=500: 20
         bin=5000: 0
         bin=60000: 0
         bin=999999: 0
diff --git a/ydb/core/persqueue/ut/resources/counters_labeled.json b/ydb/core/persqueue/ut/resources/counters_labeled.json
index ec378b2585e..28fd813977d 100644
--- a/ydb/core/persqueue/ut/resources/counters_labeled.json
+++ b/ydb/core/persqueue/ut/resources/counters_labeled.json
@@ -185,7 +185,7 @@
         "topic": "rt3.dc1--asdfgs--topic",
         "sensor": "PQ/SizeLagByCommitted"
       },
-      "value": 744
+      "value": 747
     },
     {
       "kind": "GAUGE",
@@ -196,7 +196,7 @@
         "topic": "rt3.dc1--asdfgs--topic",
         "sensor": "PQ/SizeLagByLastRead"
       },
-      "value": 744
+      "value": 747
     },
     {
       "kind": "GAUGE",
@@ -229,7 +229,7 @@
         "topic": "rt3.dc1--asdfgs--topic",
         "sensor": "PQ/TotalSizeLagByLastRead"
       },
-      "value": 744
+      "value": 747
     },
     {
       "kind": "GAUGE",
@@ -460,7 +460,7 @@
         "topic": "rt3.dc1--asdfgs--topic",
         "sensor": "PQ/SizeLagByCommitted"
       },
-      "value": 744
+      "value": 747
     },
     {
       "kind": "GAUGE",
@@ -471,7 +471,7 @@
         "topic": "rt3.dc1--asdfgs--topic",
         "sensor": "PQ/SizeLagByLastRead"
       },
-      "value": 744
+      "value": 747
     },
     {
       "kind": "GAUGE",
@@ -504,7 +504,7 @@
         "topic": "rt3.dc1--asdfgs--topic",
         "sensor": "PQ/TotalSizeLagByLastRead"
       },
-      "value": 744
+      "value": 747
     },
     {
       "kind": "GAUGE",
@@ -735,7 +735,7 @@
         "topic": "total",
         "sensor": "PQ/SizeLagByCommitted"
       },
-      "value": 744
+      "value": 747
     },
     {
       "kind": "GAUGE",
@@ -746,7 +746,7 @@
         "topic": "total",
         "sensor": "PQ/SizeLagByLastRead"
       },
-      "value": 744
+      "value": 747
     },
     {
       "kind": "GAUGE",
@@ -779,7 +779,7 @@
         "topic": "total",
         "sensor": "PQ/TotalSizeLagByLastRead"
       },
-      "value": 744
+      "value": 747
     },
     {
       "kind": "GAUGE",
@@ -1010,7 +1010,7 @@
         "topic": "rt3.dc1--asdfgs--topic",
         "sensor": "PQ/SizeLagByCommitted"
       },
-      "value": 744
+      "value": 747
     },
     {
       "kind": "GAUGE",
@@ -1021,7 +1021,7 @@
         "topic": "rt3.dc1--asdfgs--topic",
         "sensor": "PQ/SizeLagByLastRead"
       },
-      "value": 744
+      "value": 747
     },
     {
       "kind": "GAUGE",
@@ -1054,7 +1054,7 @@
         "topic": "rt3.dc1--asdfgs--topic",
         "sensor": "PQ/TotalSizeLagByLastRead"
       },
-      "value": 744
+      "value": 747
     },
     {
       "kind": "GAUGE",
@@ -1285,7 +1285,7 @@
         "topic": "total",
         "sensor": "PQ/SizeLagByCommitted"
       },
-      "value": 744
+      "value": 747
     },
     {
       "kind": "GAUGE",
@@ -1296,7 +1296,7 @@
         "topic": "total",
         "sensor": "PQ/SizeLagByLastRead"
       },
-      "value": 744
+      "value": 747
     },
     {
       "kind": "GAUGE",
@@ -1329,7 +1329,7 @@
         "topic": "total",
         "sensor": "PQ/TotalSizeLagByLastRead"
       },
-      "value": 744
+      "value": 747
     },
     {
       "kind": "GAUGE",
@@ -1560,7 +1560,7 @@
         "topic": "total",
         "sensor": "PQ/SizeLagByCommitted"
       },
-      "value": 744
+      "value": 747
     },
     {
       "kind": "GAUGE",
@@ -1571,7 +1571,7 @@
         "topic": "total",
         "sensor": "PQ/SizeLagByLastRead"
       },
-      "value": 744
+      "value": 747
     },
     {
       "kind": "GAUGE",
@@ -1604,7 +1604,7 @@
         "topic": "total",
         "sensor": "PQ/TotalSizeLagByLastRead"
       },
-      "value": 744
+      "value": 747
     },
     {
       "kind": "GAUGE",
@@ -1693,7 +1693,7 @@
         "topic": "rt3.dc1--asdfgs--topic",
         "sensor": "PQ/MaxPartSize"
       },
-      "value": 744
+      "value": 747
     },
     {
       "kind": "GAUGE",
@@ -1846,7 +1846,7 @@
         "topic": "rt3.dc1--asdfgs--topic",
         "sensor": "PQ/TotalPartSize"
       },
-      "value": 744
+      "value": 747
     },
     {
       "kind": "GAUGE",
@@ -1855,7 +1855,7 @@
         "topic": "rt3.dc1--asdfgs--topic",
         "sensor": "PQ/WriteBytesAvailAvgMin"
       },
-      "value": 49999998
+      "value": 49999994
     },
     {
       "kind": "GAUGE",
@@ -1999,7 +1999,7 @@
         "topic": "total",
         "sensor": "PQ/MaxPartSize"
       },
-      "value": 744
+      "value": 747
     },
     {
       "kind": "GAUGE",
@@ -2152,7 +2152,7 @@
         "topic": "total",
         "sensor": "PQ/TotalPartSize"
       },
-      "value": 744
+      "value": 747
     },
     {
       "kind": "GAUGE",
@@ -2161,7 +2161,7 @@
         "topic": "total",
         "sensor": "PQ/WriteBytesAvailAvgMin"
       },
-      "value": 49999998
+      "value": 49999994
     },
     {
       "kind": "GAUGE",
diff --git a/ydb/core/persqueue/ut/resources/counters_pqproxy.html b/ydb/core/persqueue/ut/resources/counters_pqproxy.html
index 2f390ee8edc..de2bdae3289 100644
--- a/ydb/core/persqueue/ut/resources/counters_pqproxy.html
+++ b/ydb/core/persqueue/ut/resources/counters_pqproxy.html
@@ -14,26 +14,26 @@ subsystem=SLI:
         Account=asdfgs:
             Duration=10000ms: 0
             Duration=1000ms: 0
-            Duration=100ms: 3
+            Duration=100ms: 0
             Duration=1500ms: 0
             Duration=2000ms: 0
             Duration=200ms: 0
             Duration=30000ms: 0
             Duration=5000ms: 0
-            Duration=500ms: 0
+            Duration=500ms: 3
             Duration=550ms: 0
             Duration=99999999ms: 0
 
         Account=total:
             Duration=10000ms: 0
             Duration=1000ms: 0
-            Duration=100ms: 3
+            Duration=100ms: 0
             Duration=1500ms: 0
             Duration=2000ms: 0
             Duration=200ms: 0
             Duration=30000ms: 0
             Duration=5000ms: 0
-            Duration=500ms: 0
+            Duration=500ms: 3
             Duration=550ms: 0
             Duration=99999999ms: 0
 
@@ -474,13 +474,13 @@ subsystem=writeSession:
 
                     OriginDC=Dc1:
                         sensor=BytesWrittenOriginal: 540
-                        sensor=CompactedBytesWrittenOriginal: 744
+                        sensor=CompactedBytesWrittenOriginal: 747
                         sensor=MessagesWrittenOriginal: 30
                         sensor=UncompressedBytesWrittenOriginal: 270
 
                     OriginDC=cluster:
                         sensor=BytesWrittenOriginal: 540
-                        sensor=CompactedBytesWrittenOriginal: 744
+                        sensor=CompactedBytesWrittenOriginal: 747
                         sensor=MessagesWrittenOriginal: 30
                         sensor=UncompressedBytesWrittenOriginal: 270
 
@@ -493,7 +493,7 @@ subsystem=writeSession:
 
                     OriginDC=cluster:
                         sensor=BytesWrittenOriginal: 540
-                        sensor=CompactedBytesWrittenOriginal: 744
+                        sensor=CompactedBytesWrittenOriginal: 747
                         sensor=MessagesWrittenOriginal: 30
                         sensor=UncompressedBytesWrittenOriginal: 270
 
@@ -508,7 +508,7 @@ subsystem=writeSession:
 
                     OriginDC=cluster:
                         sensor=BytesWrittenOriginal: 540
-                        sensor=CompactedBytesWrittenOriginal: 744
+                        sensor=CompactedBytesWrittenOriginal: 747
                         sensor=MessagesWrittenOriginal: 30
                         sensor=UncompressedBytesWrittenOriginal: 270
 
@@ -525,7 +525,7 @@ subsystem=writeSession:
 
                     OriginDC=cluster:
                         sensor=BytesWrittenOriginal: 540
-                        sensor=CompactedBytesWrittenOriginal: 744
+                        sensor=CompactedBytesWrittenOriginal: 747
                         sensor=MessagesWrittenOriginal: 30
                         sensor=UncompressedBytesWrittenOriginal: 270
 
@@ -543,14 +543,14 @@ subsystem=writeTimeLag:
 
                         sensor=TimeLagsOriginal:
                             Interval=10000ms: 0
-                            Interval=1000ms: 0
-                            Interval=100ms: 30
+                            Interval=1000ms: 10
+                            Interval=100ms: 0
                             Interval=180000ms: 0
                             Interval=2000ms: 0
                             Interval=200ms: 0
                             Interval=30000ms: 0
                             Interval=5000ms: 0
-                            Interval=500ms: 0
+                            Interval=500ms: 20
                             Interval=60000ms: 0
                             Interval=999999ms: 0
 
@@ -558,14 +558,14 @@ subsystem=writeTimeLag:
 
                         sensor=TimeLagsOriginal:
                             Interval=10000ms: 0
-                            Interval=1000ms: 0
-                            Interval=100ms: 30
+                            Interval=1000ms: 10
+                            Interval=100ms: 0
                             Interval=180000ms: 0
                             Interval=2000ms: 0
                             Interval=200ms: 0
                             Interval=30000ms: 0
                             Interval=5000ms: 0
-                            Interval=500ms: 0
+                            Interval=500ms: 20
                             Interval=60000ms: 0
                             Interval=999999ms: 0
 
@@ -577,14 +577,14 @@ subsystem=writeTimeLag:
 
                         sensor=TimeLagsOriginal:
                             Interval=10000ms: 0
-                            Interval=1000ms: 0
-                            Interval=100ms: 30
+                            Interval=1000ms: 10
+                            Interval=100ms: 0
                             Interval=180000ms: 0
                             Interval=2000ms: 0
                             Interval=200ms: 0
                             Interval=30000ms: 0
                             Interval=5000ms: 0
-                            Interval=500ms: 0
+                            Interval=500ms: 20
                             Interval=60000ms: 0
                             Interval=999999ms: 0
 
@@ -598,14 +598,14 @@ subsystem=writeTimeLag:
 
                         sensor=TimeLagsOriginal:
                             Interval=10000ms: 0
-                            Interval=1000ms: 0
-                            Interval=100ms: 30
+                            Interval=1000ms: 10
+                            Interval=100ms: 0
                             Interval=180000ms: 0
                             Interval=2000ms: 0
                             Interval=200ms: 0
                             Interval=30000ms: 0
                             Interval=5000ms: 0
-                            Interval=500ms: 0
+                            Interval=500ms: 20
                             Interval=60000ms: 0
                             Interval=999999ms: 0
 
@@ -621,14 +621,14 @@ subsystem=writeTimeLag:
 
                         sensor=TimeLagsOriginal:
                             Interval=10000ms: 0
-                            Interval=1000ms: 0
-                            Interval=100ms: 30
+                            Interval=1000ms: 10
+                            Interval=100ms: 0
                             Interval=180000ms: 0
                             Interval=2000ms: 0
                             Interval=200ms: 0
                             Interval=30000ms: 0
                             Interval=5000ms: 0
-                            Interval=500ms: 0
+                            Interval=500ms: 20
                             Interval=60000ms: 0
                             Interval=999999ms: 0
 
diff --git a/ydb/core/persqueue/ut/resources/counters_pqproxy_firstclass.html b/ydb/core/persqueue/ut/resources/counters_pqproxy_firstclass.html
index 6fbbfec01a6..9ad3c45a168 100644
--- a/ydb/core/persqueue/ut/resources/counters_pqproxy_firstclass.html
+++ b/ydb/core/persqueue/ut/resources/counters_pqproxy_firstclass.html
@@ -14,26 +14,26 @@ subsystem=SLI:
         Account=federationAccount:
             Duration=10000ms: 0
             Duration=1000ms: 0
-            Duration=100ms: 3
+            Duration=100ms: 0
             Duration=1500ms: 0
             Duration=2000ms: 0
             Duration=200ms: 0
             Duration=30000ms: 0
             Duration=5000ms: 0
-            Duration=500ms: 0
+            Duration=500ms: 3
             Duration=550ms: 0
             Duration=99999999ms: 0
 
         Account=total:
             Duration=10000ms: 0
             Duration=1000ms: 0
-            Duration=100ms: 3
+            Duration=100ms: 0
             Duration=1500ms: 0
             Duration=2000ms: 0
             Duration=200ms: 0
             Duration=30000ms: 0
             Duration=5000ms: 0
-            Duration=500ms: 0
+            Duration=500ms: 3
             Duration=550ms: 0
             Duration=99999999ms: 0
 </pre>