BlobDepot work in progress

3 files changed, 7 insertions, 6 deletions

diff --git a/ydb/core/blob_depot/agent/storage_discover.cpp b/ydb/core/blob_depot/agent/storage_discover.cpp
index 0ec66d5910..c50a8a5775 100644
--- a/ydb/core/blob_depot/agent/storage_discover.cpp
+++ b/ydb/core/blob_depot/agent/storage_discover.cpp
@@ -115,9 +115,9 @@ namespace NKikimr::NBlobDepot {
                         }
                     }
 
-                    if (!ReadBody) {
+                    if (!ReadBody || !Id) {
                         DoneWithData = true;
-                        CheckIfDone();
+                        return CheckIfDone();
                     }
                 } else {
                     Y_FAIL(); // do not expect to return single key in few messages
diff --git a/ydb/core/test_tablet/load_actor_impl.cpp b/ydb/core/test_tablet/load_actor_impl.cpp
index 13857d4a39..9e28a3f347 100644
--- a/ydb/core/test_tablet/load_actor_impl.cpp
+++ b/ydb/core/test_tablet/load_actor_impl.cpp
@@ -96,13 +96,13 @@ namespace NKikimr::NTestShard {
         Y_VERIFY(!ValidationActorId); // no requests during validation
         auto& record = ev->Get()->Record;
         if (record.GetStatus() != NMsgBusProxy::MSTATUS_OK) {
-            STLOG(PRI_ERROR, TEST_SHARD, TS18, "TEvKeyValue::TEvRequest failed", (TabletId, TabletId),
+            STLOG(PRI_ERROR, TEST_SHARD, TS26, "TEvKeyValue::TEvRequest failed", (TabletId, TabletId),
                 (Status, record.GetStatus()), (ErrorReason, record.GetErrorReason()));
             if (const auto it = WritesInFlight.find(record.GetCookie()); it != WritesInFlight.end()) {
                 for (const TString& key : it->second.KeysInQuery) {
                     const auto it = Keys.find(key);
                     Y_VERIFY_S(it != Keys.end(), "Key# " << key << " not found in Keys dict");
-                    STLOG(PRI_WARN, TEST_SHARD, TS19, "write failed", (TabletId, TabletId), (Key, key));
+                    STLOG(PRI_WARN, TEST_SHARD, TS27, "write failed", (TabletId, TabletId), (Key, key));
                     RegisterTransition(*it, ::NTestShard::TStateServer::WRITE_PENDING, ::NTestShard::TStateServer::DELETED);
                 }
                 WritesInFlight.erase(it);
@@ -111,7 +111,7 @@ namespace NKikimr::NTestShard {
                 for (const TString& key : it->second.KeysInQuery) {
                     const auto it = Keys.find(key);
                     Y_VERIFY_S(it != Keys.end(), "Key# " << key << " not found in Keys dict");
-                    STLOG(PRI_WARN, TEST_SHARD, TS20, "delete failed", (TabletId, TabletId), (Key, key));
+                    STLOG(PRI_WARN, TEST_SHARD, TS28, "delete failed", (TabletId, TabletId), (Key, key));
                     RegisterTransition(*it, ::NTestShard::TStateServer::DELETE_PENDING, ::NTestShard::TStateServer::CONFIRMED);
                     BytesOfData += it->second.Len;
                 }
diff --git a/ydb/core/test_tablet/load_actor_read_validate.cpp b/ydb/core/test_tablet/load_actor_read_validate.cpp
index cfeaf00b0d..956c62e515 100644
--- a/ydb/core/test_tablet/load_actor_read_validate.cpp
+++ b/ydb/core/test_tablet/load_actor_read_validate.cpp
@@ -72,6 +72,7 @@ namespace NKikimr::NTestShard {
             if (ev->Get()->Connected) {
                 IssueNextStateServerQuery();
             } else {
+                STLOG(PRI_ERROR, TEST_SHARD, TS05, "state server disconnected", (TabletId, TabletId));
                 TActivationContext::Send(new IEventHandle(TEvents::TSystem::Poison, 0, TabletActorId, SelfId(), nullptr, 0));
                 PassAway();
             }
@@ -211,7 +212,7 @@ namespace NKikimr::NTestShard {
             Y_VERIFY(inserted);
             Y_VERIFY_S(MD5::Calc(value) == key, "TabletId# " << TabletId << " Key# " << key << " digest mismatch"
                 " actual# " << MD5::Calc(value) << " len# " << value.size());
-            STLOG(PRI_DEBUG, TEST_SHARD, TS16, "read key", (TabletId, TabletId), (Key, key));
+            STLOG(PRI_DEBUG, TEST_SHARD, TS25, "read key", (TabletId, TabletId), (Key, key));
             FinishIfPossible();
         }