From f5fe39c446b5b69c37dbd506df405487f05eee15 Mon Sep 17 00:00:00 2001 From: Nikita Saveliev Date: Tue, 5 Mar 2024 10:00:45 +0000 Subject: [PATCH 1/2] Revert "Fix" This reverts commit 39408eaeca63bdab7ba8d2c6729e49d8515336a5. --- ydb/core/persqueue/ut/counters_ut.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ydb/core/persqueue/ut/counters_ut.cpp b/ydb/core/persqueue/ut/counters_ut.cpp index d634bbd66842..74c5ed95981b 100644 --- a/ydb/core/persqueue/ut/counters_ut.cpp +++ b/ydb/core/persqueue/ut/counters_ut.cpp @@ -138,8 +138,8 @@ Y_UNIT_TEST(PartitionWriteQuota) { TStringStream histogramStr; histogram->OutputHtml(histogramStr); Cerr << "**** Total histogram: **** \n " << histogramStr.Str() << "**** **** **** ****" << Endl; - UNIT_ASSERT_VALUES_EQUAL(histogram->FindNamedCounter("Interval", "1000ms")->Val(), 3); - UNIT_ASSERT_VALUES_EQUAL(histogram->FindNamedCounter("Interval", "2500ms")->Val(), 1); + UNIT_ASSERT_VALUES_EQUAL(histogram->FindNamedCounter("Interval", "0ms")->Val(),2); + UNIT_ASSERT_VALUES_EQUAL(histogram->FindNamedCounter("Interval", "2500ms")->Val(), 5); } } From 276d369af48166fb8b5935071515f5747c64d24d Mon Sep 17 00:00:00 2001 From: Nikita Saveliev Date: Tue, 5 Mar 2024 10:01:37 +0000 Subject: [PATCH 2/2] Revert "Revert counters" This reverts commit 3e65c2d15a6a62aa87d9b73f76852b8719b0062d. --- .../ut/resources/counters_datastreams.html | 4 +-- .../ut/resources/counters_pqproxy.html | 28 +++++++++---------- .../counters_pqproxy_firstclass.html | 8 +++--- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/ydb/core/persqueue/ut/resources/counters_datastreams.html b/ydb/core/persqueue/ut/resources/counters_datastreams.html index 6f7e35c67c88..9de064cfaf99 100644 --- a/ydb/core/persqueue/ut/resources/counters_datastreams.html +++ b/ydb/core/persqueue/ut/resources/counters_datastreams.html @@ -27,13 +27,13 @@ name=topic.write.lag_milliseconds: bin=100: 0 - bin=1000: 10 + bin=1000: 0 bin=10000: 0 bin=180000: 0 bin=200: 0 bin=2000: 0 bin=30000: 0 - bin=500: 20 + bin=500: 30 bin=5000: 0 bin=60000: 0 bin=999999: 0 diff --git a/ydb/core/persqueue/ut/resources/counters_pqproxy.html b/ydb/core/persqueue/ut/resources/counters_pqproxy.html index de2bdae32895..530620620daa 100644 --- a/ydb/core/persqueue/ut/resources/counters_pqproxy.html +++ b/ydb/core/persqueue/ut/resources/counters_pqproxy.html @@ -14,26 +14,26 @@ Account=asdfgs: Duration=10000ms: 0 Duration=1000ms: 0 - Duration=100ms: 0 + Duration=100ms: 3 Duration=1500ms: 0 Duration=2000ms: 0 Duration=200ms: 0 Duration=30000ms: 0 Duration=5000ms: 0 - Duration=500ms: 3 + Duration=500ms: 0 Duration=550ms: 0 Duration=99999999ms: 0 Account=total: Duration=10000ms: 0 Duration=1000ms: 0 - Duration=100ms: 0 + Duration=100ms: 3 Duration=1500ms: 0 Duration=2000ms: 0 Duration=200ms: 0 Duration=30000ms: 0 Duration=5000ms: 0 - Duration=500ms: 3 + Duration=500ms: 0 Duration=550ms: 0 Duration=99999999ms: 0 @@ -543,14 +543,14 @@ sensor=TimeLagsOriginal: Interval=10000ms: 0 - Interval=1000ms: 10 + Interval=1000ms: 0 Interval=100ms: 0 Interval=180000ms: 0 Interval=2000ms: 0 Interval=200ms: 0 Interval=30000ms: 0 Interval=5000ms: 0 - Interval=500ms: 20 + Interval=500ms: 30 Interval=60000ms: 0 Interval=999999ms: 0 @@ -558,14 +558,14 @@ sensor=TimeLagsOriginal: Interval=10000ms: 0 - Interval=1000ms: 10 + Interval=1000ms: 0 Interval=100ms: 0 Interval=180000ms: 0 Interval=2000ms: 0 Interval=200ms: 0 Interval=30000ms: 0 Interval=5000ms: 0 - Interval=500ms: 20 + Interval=500ms: 30 Interval=60000ms: 0 Interval=999999ms: 0 @@ -577,14 +577,14 @@ sensor=TimeLagsOriginal: Interval=10000ms: 0 - Interval=1000ms: 10 + Interval=1000ms: 0 Interval=100ms: 0 Interval=180000ms: 0 Interval=2000ms: 0 Interval=200ms: 0 Interval=30000ms: 0 Interval=5000ms: 0 - Interval=500ms: 20 + Interval=500ms: 30 Interval=60000ms: 0 Interval=999999ms: 0 @@ -598,14 +598,14 @@ sensor=TimeLagsOriginal: Interval=10000ms: 0 - Interval=1000ms: 10 + Interval=1000ms: 0 Interval=100ms: 0 Interval=180000ms: 0 Interval=2000ms: 0 Interval=200ms: 0 Interval=30000ms: 0 Interval=5000ms: 0 - Interval=500ms: 20 + Interval=500ms: 30 Interval=60000ms: 0 Interval=999999ms: 0 @@ -621,14 +621,14 @@ sensor=TimeLagsOriginal: Interval=10000ms: 0 - Interval=1000ms: 10 + Interval=1000ms: 0 Interval=100ms: 0 Interval=180000ms: 0 Interval=2000ms: 0 Interval=200ms: 0 Interval=30000ms: 0 Interval=5000ms: 0 - Interval=500ms: 20 + Interval=500ms: 30 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 9ad3c45a168b..6fbbfec01a67 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 @@ Account=federationAccount: Duration=10000ms: 0 Duration=1000ms: 0 - Duration=100ms: 0 + Duration=100ms: 3 Duration=1500ms: 0 Duration=2000ms: 0 Duration=200ms: 0 Duration=30000ms: 0 Duration=5000ms: 0 - Duration=500ms: 3 + Duration=500ms: 0 Duration=550ms: 0 Duration=99999999ms: 0 Account=total: Duration=10000ms: 0 Duration=1000ms: 0 - Duration=100ms: 0 + Duration=100ms: 3 Duration=1500ms: 0 Duration=2000ms: 0 Duration=200ms: 0 Duration=30000ms: 0 Duration=5000ms: 0 - Duration=500ms: 3 + Duration=500ms: 0 Duration=550ms: 0 Duration=99999999ms: 0