Some BlobDepot-related fixes

3 files changed, 5 insertions, 5 deletions

diff --git a/ydb/core/blob_depot/agent/agent_impl.h b/ydb/core/blob_depot/agent/agent_impl.h
index 14b364cbeb..7b9c9c8b98 100644
--- a/ydb/core/blob_depot/agent/agent_impl.h
+++ b/ydb/core/blob_depot/agent/agent_impl.h
@@ -219,6 +219,7 @@ namespace NKikimr::NBlobDepot {
 #undef FORWARD_STORAGE_PROXY
 
         void PassAway() override {
+            ClearPendingEventQueue("BlobDepot agent destroyed");
             NTabletPipe::CloseAndForgetClient(SelfId(), PipeId);
             TActor::PassAway();
         }
diff --git a/ydb/core/blob_depot/agent/proxy.cpp b/ydb/core/blob_depot/agent/proxy.cpp
index e472b3d791..2fc971680f 100644
--- a/ydb/core/blob_depot/agent/proxy.cpp
+++ b/ydb/core/blob_depot/agent/proxy.cpp
@@ -31,14 +31,13 @@ namespace NKikimr::NBlobDepot {
             std::unique_ptr<IEventBase> response;
             switch (const ui32 type = event->Type()) {
                 case TEvBlobStorage::EvGet: {
-                    response = static_cast<TEvBlobStorage::TEvGet&>(*event).MakeErrorResponse(NKikimrProto::OK,
-                        "proxy has vanished", groupId);
-                    event.reset(); // drop origin event to prevent extra refcounts on ExecutionRelay
+                    auto& get = static_cast<TEvBlobStorage::TEvGet&>(*event);
+                    response = get.MakeErrorResponse(NKikimrProto::OK, "proxy has vanished", groupId);
                     auto& r = static_cast<TEvBlobStorage::TEvGetResult&>(*response);
                     for (size_t i = 0; i < r.ResponseSz; ++i) {
                         r.Responses[i].Status = NKikimrProto::NODATA;
                     }
-                    r.ExecutionRelay = executionRelay;
+                    r.ExecutionRelay = std::move(get.ExecutionRelay);
                     break;
                 }
 
diff --git a/ydb/core/mind/bscontroller/virtual_group.cpp b/ydb/core/mind/bscontroller/virtual_group.cpp
index 80de996e32..7a4a38f55a 100644
--- a/ydb/core/mind/bscontroller/virtual_group.cpp
+++ b/ydb/core/mind/bscontroller/virtual_group.cpp
@@ -166,7 +166,7 @@ namespace NKikimr::NBsController {
                 auto *data = profiles->Add();
                 data->SetStoragePoolName(storagePoolName);
                 data->SetChannelKind(NKikimrBlobDepot::TChannelKind::Data);
-                data->SetCount(numPhysicalGroups);
+                data->SetCount(Min<ui32>(250, numPhysicalGroups));
             }
 
             const bool success = config.SerializeToString(&group->BlobDepotConfig.ConstructInPlace());