Merge 5dbd1bf into a119eea

Author: FloatingCrowbar

ydb/core/persqueue/partition_write.cpp

@@ -472,20 +472,14 @@ void TPartition::UpdateAfterWriteCounters(bool writeComplete) {
         // If supportive - update counters only prior to write, otherwise - only after writes;
         return;
     }
-    if (BytesWrittenGrpc)
-        BytesWrittenGrpc.Inc(WriteNewSizeInternal);
-    if (BytesWrittenTotal)
-        BytesWrittenTotal.Inc(WriteNewSize);
-
-    if (BytesWrittenUncompressed)
-        BytesWrittenUncompressed.Inc(WriteNewSizeUncompressed);
+    BytesWrittenGrpc.Inc(WriteNewSizeInternal);
+    BytesWrittenTotal.Inc(WriteNewSize);
+    BytesWrittenUncompressed.Inc(WriteNewSizeUncompressed);
     if (BytesWrittenComp)
         BytesWrittenComp.Inc(WriteCycleSize);
-    if (MsgsWrittenGrpc)
-        MsgsWrittenGrpc.Inc(WriteNewMessagesInternal);
-    if (MsgsWrittenTotal) {
-        MsgsWrittenTotal.Inc(WriteNewMessages);
-    }
+
+    MsgsWrittenGrpc.Inc(WriteNewMessagesInternal);
+    MsgsWrittenTotal.Inc(WriteNewMessages);
 }
 
 void TPartition::HandleWriteResponse(const TActorContext& ctx) {

ydb/core/persqueue/percentile_counter.cpp

@@ -131,6 +131,12 @@ NKikimr::NPQ::TPercentileCounter CreateSLIDurationCounter(
     return NKikimr::NPQ::TPercentileCounter(counters->GetSubgroup("sensor", name), aggr, {}, "Duration", buckets, true, false);
 }
 
+TPartitionCounterWrapper::TPartitionCounterWrapper()
+    : DoSave(false)
+    , DoReport(false)
+{
+}
+
 TPartitionCounterWrapper::TPartitionCounterWrapper(NKikimr::NPQ::TMultiCounter&& counter, bool isSupportivePartition, bool doReport) {
     Setup(isSupportivePartition, doReport, std::move(counter));
 }
@@ -177,6 +183,9 @@ void TPartitionHistogramWrapper::Setup(bool isSupportivePartition, std::unique_p
     }
 }
 void TPartitionHistogramWrapper::IncFor(ui64 key, ui64 value) {
+    if (!Inited)
+        return;
+
     if (!IsSupportivePartition) {
         return Histogram->IncFor(key, value);
     }

ydb/core/persqueue/percentile_counter.h

@@ -66,7 +66,7 @@ class TPartitionCounterWrapper {
     bool Inited = false;
 
 public:
-    TPartitionCounterWrapper() = default;
+    TPartitionCounterWrapper();
     explicit TPartitionCounterWrapper(NKikimr::NPQ::TMultiCounter&& counter, bool isSupportivePartition, bool doReport = true);
     void Setup(bool isSupportivePartition, bool doReport, NKikimr::NPQ::TMultiCounter&& counter);
     void Inc(ui64 value);