Improve test tablet a bit

3 files changed, 7 insertions, 2 deletions

diff --git a/ydb/core/protos/counters_testshard.proto b/ydb/core/protos/counters_testshard.proto
index 9940b5b84fa..2d27e4f39d9 100644
--- a/ydb/core/protos/counters_testshard.proto
+++ b/ydb/core/protos/counters_testshard.proto
@@ -14,6 +14,7 @@ enum ESimpleCounters {
     COUNTER_MODE_WRITE = 0 [(CounterOpts) = {Name: "ModeWrite"}];
     COUNTER_MODE_READ_VALIDATE = 1 [(CounterOpts) = {Name: "ModeReadValidate"}];
     COUNTER_MODE_STATE_SERVER_CONNECT = 2 [(CounterOpts) = {Name: "StateServerConnect"}];
+    COUNTER_MODE_INITIAL = 3 [(CounterOpts) = {Name: "Initial"}];
 }
 
 enum EPercentileCounters {
diff --git a/ydb/core/test_tablet/load_actor_read_validate.cpp b/ydb/core/test_tablet/load_actor_read_validate.cpp
index aeb50277d64..71634ba4bc6 100644
--- a/ydb/core/test_tablet/load_actor_read_validate.cpp
+++ b/ydb/core/test_tablet/load_actor_read_validate.cpp
@@ -198,13 +198,14 @@ namespace NKikimr::NTestShard {
                 return IssueRead(key);
             }
 
-            if (outcome == EReadOutcome::RETRY && RetryCount < 10) {
+            if (outcome == EReadOutcome::RETRY && RetryCount < 32) {
                 const bool inserted = KeyReadsWaitingForRetry.insert(key).second;
                 Y_VERIFY(inserted);
                 STLOG(PRI_ERROR, TEST_SHARD, TS24, "read key failed -- going to retry", (TabletId, TabletId),
                     (Key, key), (Message, message));
             } else {
-                Y_VERIFY_S(outcome == EReadOutcome::OK, "Message# " << message << " Key# " << key);
+                Y_VERIFY_S(outcome == EReadOutcome::OK, "Message# " << message << " Key# " << key << " Outcome# "
+                    << (int)outcome << " RetryCount# " << RetryCount);
 
                 const bool inserted = Keys.try_emplace(key, value.size()).second;
                 Y_VERIFY(inserted);
diff --git a/ydb/core/test_tablet/test_shard_impl.h b/ydb/core/test_tablet/test_shard_impl.h
index 06d85037e0e..d6f68b43786 100644
--- a/ydb/core/test_tablet/test_shard_impl.h
+++ b/ydb/core/test_tablet/test_shard_impl.h
@@ -20,6 +20,7 @@ namespace NKikimr::NTestShard {
             WRITE,
             READ_VALIDATE,
             STATE_SERVER_CONNECT,
+            INITIAL,
         };
 
         enum {
@@ -49,6 +50,7 @@ namespace NKikimr::NTestShard {
             TProtobufTabletCountersPair<TKeyValueCounters, TTestShardCounters> pair;
             State.SetupTabletCounters(pair.GetFirstTabletCounters().Release());
             Counters.reset(pair.GetSecondTabletCounters().Release());
+            Counters->Simple()[NTestShard::COUNTER_MODE_INITIAL] = 1;
         }
 
         static constexpr NKikimrServices::TActivity::EType ActorActivityType() {
@@ -88,6 +90,7 @@ namespace NKikimr::NTestShard {
             s[NTestShard::COUNTER_MODE_WRITE] = mode == EMode::WRITE;
             s[NTestShard::COUNTER_MODE_READ_VALIDATE] = mode == EMode::READ_VALIDATE;
             s[NTestShard::COUNTER_MODE_STATE_SERVER_CONNECT] = mode == EMode::STATE_SERVER_CONNECT;
+            s[NTestShard::COUNTER_MODE_INITIAL] = mode == EMode::INITIAL;
         }
 
         void OnLoadComplete() {