From 5bd887da46a5747c03ec7066158d0cfa8e85aef4 Mon Sep 17 00:00:00 2001 From: Andrei Berlin Date: Tue, 14 May 2024 11:13:08 +0000 Subject: [PATCH] Use default minHugeBlobSize to migrate the heap --- ydb/core/blobstorage/vdisk/common/vdisk_config.cpp | 5 +++-- ydb/core/blobstorage/vdisk/common/vdisk_config.h | 1 + .../blobstorage/vdisk/localrecovery/localrecovery_public.cpp | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ydb/core/blobstorage/vdisk/common/vdisk_config.cpp b/ydb/core/blobstorage/vdisk/common/vdisk_config.cpp index 5237b73bbcf7..f4a2113a5b3f 100644 --- a/ydb/core/blobstorage/vdisk/common/vdisk_config.cpp +++ b/ydb/core/blobstorage/vdisk/common/vdisk_config.cpp @@ -136,8 +136,9 @@ namespace NKikimr { MinHugeBlobInBytes = 512u << 10u; break; } - // for compatibility reasons it must be 512KB - MilestoneHugeBlobInBytes = 512u << 10u; + OldMinHugeBlobInBytes = MinHugeBlobInBytes; // preserved to migrate entry point state correctly + MilestoneHugeBlobInBytes = 512u << 10u; // for compatibility reasons it must be 512KB + } void TVDiskConfig::Merge(const NKikimrBlobStorage::TVDiskConfig &update) { diff --git a/ydb/core/blobstorage/vdisk/common/vdisk_config.h b/ydb/core/blobstorage/vdisk/common/vdisk_config.h index 04b10d887796..a2335182c48d 100644 --- a/ydb/core/blobstorage/vdisk/common/vdisk_config.h +++ b/ydb/core/blobstorage/vdisk/common/vdisk_config.h @@ -116,6 +116,7 @@ namespace NKikimr { ui32 HullSstSizeInChunksLevel; ui32 HugeBlobsFreeChunkReservation; ui32 MinHugeBlobInBytes; + ui32 OldMinHugeBlobInBytes; ui32 MilestoneHugeBlobInBytes; ui32 HugeBlobOverhead; ui32 HullCompLevel0MaxSstsAtOnce; diff --git a/ydb/core/blobstorage/vdisk/localrecovery/localrecovery_public.cpp b/ydb/core/blobstorage/vdisk/localrecovery/localrecovery_public.cpp index 0aa301c7e3e2..6a9dfb41a58b 100644 --- a/ydb/core/blobstorage/vdisk/localrecovery/localrecovery_public.cpp +++ b/ydb/core/blobstorage/vdisk/localrecovery/localrecovery_public.cpp @@ -418,7 +418,7 @@ namespace NKikimr { LocRecCtx->PDiskCtx->Dsk->ChunkSize, LocRecCtx->PDiskCtx->Dsk->AppendBlockSize, LocRecCtx->PDiskCtx->Dsk->AppendBlockSize, - Config->MinHugeBlobInBytes, + Config->OldMinHugeBlobInBytes, Config->MilestoneHugeBlobInBytes, Config->MaxLogoBlobDataSize, Config->HugeBlobOverhead, @@ -440,7 +440,7 @@ namespace NKikimr { LocRecCtx->PDiskCtx->Dsk->ChunkSize, LocRecCtx->PDiskCtx->Dsk->AppendBlockSize, LocRecCtx->PDiskCtx->Dsk->AppendBlockSize, - Config->MinHugeBlobInBytes, + Config->OldMinHugeBlobInBytes, Config->MilestoneHugeBlobInBytes, Config->MaxLogoBlobDataSize, Config->HugeBlobOverhead,