diff options
| author | yuryalekseev <yuryalekseev@yandex-team.com> | 2022-10-21 11:16:45 +0300 |
|---|---|---|
| committer | yuryalekseev <yuryalekseev@yandex-team.com> | 2022-10-21 11:16:45 +0300 |
| commit | da6b80efbb16a0dffe6c3ef42e67b8ae6ce0e922 (patch) | |
| tree | 21e15ef1a07385a4cb8292c82d0ace0f8995c901 | |
| parent | 3f8669c7912216342f0b18371ec2be56cb4b9c55 (diff) | |
| download | ydb-da6b80efbb16a0dffe6c3ef42e67b8ae6ce0e922.tar.gz | |
Update VBLOCK_DEFAULT_DEADLINE_SECONDS and correct some code.
4 files changed, 4 insertions, 4 deletions
diff --git a/ydb/core/blobstorage/dsproxy/dsproxy_discover_m3dc.cpp b/ydb/core/blobstorage/dsproxy/dsproxy_discover_m3dc.cpp index 60498e08f28..9a5c04380ef 100644 --- a/ydb/core/blobstorage/dsproxy/dsproxy_discover_m3dc.cpp +++ b/ydb/core/blobstorage/dsproxy/dsproxy_discover_m3dc.cpp @@ -567,7 +567,7 @@ public: GetInFlight = true; Y_VERIFY(ResultBlobId.PartId() == 0); auto query = std::make_unique<TEvBlobStorage::TEvGet>(ResultBlobId, 0U, 0U, Deadline, - NKikimrBlobStorage::Discover, true, !ReadBody); + NKikimrBlobStorage::Discover, true, !ReadBody, TEvBlobStorage::TEvGet::TForceBlockTabletData(TabletId, ForceBlockedGeneration)); query->IsInternal = true; A_LOG_DEBUG_S("DSPDM17", "sending TEvGet# " << query->ToString()); diff --git a/ydb/core/blobstorage/dsproxy/ut/dsproxy_fault_tolerance_ut_get.h b/ydb/core/blobstorage/dsproxy/ut/dsproxy_fault_tolerance_ut_get.h index da1b719b036..37ab047e12b 100644 --- a/ydb/core/blobstorage/dsproxy/ut/dsproxy_fault_tolerance_ut_get.h +++ b/ydb/core/blobstorage/dsproxy/ut/dsproxy_fault_tolerance_ut_get.h @@ -56,7 +56,7 @@ public: } SendToBSProxy(GetActorContext(), Info->GroupID, new TEvBlobStorage::TEvGet(items, ids.size(), TInstant::Max(), - NKikimrBlobStorage::FastRead, true, true)); + NKikimrBlobStorage::FastRead, true, true, TEvBlobStorage::TEvGet::TForceBlockTabletData(1, index))); auto resp = WaitForSpecificEvent<TEvBlobStorage::TEvGetResult>(); TEvBlobStorage::TEvGetResult *msg = resp->Get(); UNIT_ASSERT_VALUES_EQUAL(msg->Status, NKikimrProto::OK); diff --git a/ydb/core/blobstorage/ut_blobstorage/get.cpp b/ydb/core/blobstorage/ut_blobstorage/get.cpp index 0cf5722ca2a..3d3b101dc0b 100644 --- a/ydb/core/blobstorage/ut_blobstorage/get.cpp +++ b/ydb/core/blobstorage/ut_blobstorage/get.cpp @@ -83,7 +83,7 @@ Y_UNIT_TEST_SUITE(Get) { SendGet(test, originalBlobId, data, NKikimrProto::BLOCKED, TEvBlobStorage::TEvGet::TReaderTabletData(tabletId, tabletGeneration)); } - Y_UNIT_TEST(TestForceBlockedGenerationIndexRestoreGetRequest) { + Y_UNIT_TEST(TestForceBlockTabletDataWithIndexRestoreGetRequest) { TEnvironmentSetup env(true); TTestInfo test = InitTest(env); diff --git a/ydb/core/blobstorage/vdisk/skeleton/skeleton_block_and_get.cpp b/ydb/core/blobstorage/vdisk/skeleton/skeleton_block_and_get.cpp index e7b154b70f7..de91b20ee1c 100644 --- a/ydb/core/blobstorage/vdisk/skeleton/skeleton_block_and_get.cpp +++ b/ydb/core/blobstorage/vdisk/skeleton/skeleton_block_and_get.cpp @@ -13,7 +13,7 @@ namespace NKikimr { class TBlockAndGetActor : public TActorBootstrapped<TBlockAndGetActor> { private: - static constexpr auto VBLOCK_DEFAULT_DEADLINE_SECONDS = 120; + static constexpr auto VBLOCK_DEFAULT_DEADLINE_SECONDS = 50; public: TBlockAndGetActor() = delete; explicit TBlockAndGetActor( |