diff options
| author | alexvru <alexvru@ydb.tech> | 2023-02-20 16:56:53 +0300 |
|---|---|---|
| committer | alexvru <alexvru@ydb.tech> | 2023-02-20 16:56:53 +0300 |
| commit | 8ddd1b83f29900589eacf820301b74b92f471a1a (patch) | |
| tree | 091e57ec6035f836a0a28000ce502c0554ccc309 | |
| parent | faf0be80dec4f4a8c9a1364612fc6bbbca5b5ba3 (diff) | |
| download | ydb-8ddd1b83f29900589eacf820301b74b92f471a1a.tar.gz | |
Fix BlobDepot-related bugs
| -rw-r--r-- | ydb/core/blob_depot/agent/read.cpp | 2 | ||||
| -rw-r--r-- | ydb/core/blobstorage/dsproxy/dsproxy.h | 2 | ||||
| -rw-r--r-- | ydb/core/blobstorage/nodewarden/node_warden_proxy.cpp | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/ydb/core/blob_depot/agent/read.cpp b/ydb/core/blob_depot/agent/read.cpp index 1f9816379e..0c682e105b 100644 --- a/ydb/core/blob_depot/agent/read.cpp +++ b/ydb/core/blob_depot/agent/read.cpp @@ -177,7 +177,7 @@ namespace NKikimr::NBlobDepot { auto *item = resolve.AddItems(); item->SetExactKey(readContext.ReadArg.Key); item->SetMustRestoreFirst(readContext.ReadArg.MustRestoreFirst); - STLOG(PRI_DEBUG, BLOB_DEPOT_AGENT, BDAxx, "issuing extra resolve", (Agent, Agent.LogId), (QueryId, GetQueryId()), + STLOG(PRI_DEBUG, BLOB_DEPOT_AGENT, BDA48, "issuing extra resolve", (Agent, Agent.LogId), (QueryId, GetQueryId()), (ReadId, readContext.GetTag()), (Key, Agent.PrettyKey(readContext.ReadArg.Key)), (Msg, resolve)); Agent.Issue(std::move(resolve), this, readContext.shared_from_this()); readContext.StopProcessingParts = true; diff --git a/ydb/core/blobstorage/dsproxy/dsproxy.h b/ydb/core/blobstorage/dsproxy/dsproxy.h index c40dc75061..365f7950c9 100644 --- a/ydb/core/blobstorage/dsproxy/dsproxy.h +++ b/ydb/core/blobstorage/dsproxy/dsproxy.h @@ -250,7 +250,7 @@ public: // sanity check for correct VDisk generation ??? possible race Y_VERIFY_S(status == NKikimrProto::RACE || vdiskId.GroupGeneration <= Info->GroupGeneration || - TEvent::EventType == TEvBlobStorage::EvVStatusResult, + TEvent::EventType == TEvBlobStorage::EvVStatusResult || TEvent::EventType == TEvBlobStorage::EvVAssimilateResult, "status# " << NKikimrProto::EReplyStatus_Name(status) << " vdiskId.GroupGeneration# " << vdiskId.GroupGeneration << " Info->GroupGeneration# " << Info->GroupGeneration << " Response# " << ev->Get()->ToString()); diff --git a/ydb/core/blobstorage/nodewarden/node_warden_proxy.cpp b/ydb/core/blobstorage/nodewarden/node_warden_proxy.cpp index 46ba7f1102..3fc7d9287b 100644 --- a/ydb/core/blobstorage/nodewarden/node_warden_proxy.cpp +++ b/ydb/core/blobstorage/nodewarden/node_warden_proxy.cpp @@ -41,6 +41,7 @@ void TNodeWarden::StartLocalProxy(ui32 groupId) { [[fallthrough]]; case NKikimrBlobStorage::TGroupDecommitStatus::DONE: proxy.reset(NBlobDepot::CreateBlobDepotAgent(groupId, info, proxyActorId)); + group.AgentProxy = true; break; } } else { |