diff options
| author | Alexander Rutkovsky <alexvru@ydb.tech> | 2023-12-13 16:26:39 +0300 |
|---|---|---|
| committer | alexvru <alexvru@ydb.tech> | 2023-12-13 19:11:32 +0300 |
| commit | 178253acce2f564419af08381032dc95eaf0a39d (patch) | |
| tree | a7cb1f1fcb9f9f278c5637229316ee262fc96ca5 | |
| parent | ec177c4b1bcf529c7390bb53815dd60784c30f36 (diff) | |
| download | ydb-178253acce2f564419af08381032dc95eaf0a39d.tar.gz | |
Remove excessive EOL spaces in blobstorage code
Remove excessive EOL spaces in blobstorage code
Pull Request resolved: https://github.com/ydb-platform/ydb/pull/468
45 files changed, 123 insertions, 123 deletions
diff --git a/ydb/core/blobstorage/base/bufferwithgaps.h b/ydb/core/blobstorage/base/bufferwithgaps.h index 8a2897083d..2b57a3e59c 100644 --- a/ydb/core/blobstorage/base/bufferwithgaps.h +++ b/ydb/core/blobstorage/base/bufferwithgaps.h @@ -187,7 +187,7 @@ namespace NKikimr { str << "Offset# " << Offset; str << " Gaps# { "; for (auto [begin, size] : Gaps) { - str << "{ Begin# " << begin << " Size# " << size << " } "; + str << "{ Begin# " << begin << " Size# " << size << " } "; } str << "}"; str << " IsCommitted# " << IsCommited; diff --git a/ydb/core/blobstorage/docs/blob_encryption_v1.graphml b/ydb/core/blobstorage/docs/blob_encryption_v1.graphml index e321e25fa3..c01f6266df 100644 --- a/ydb/core/blobstorage/docs/blob_encryption_v1.graphml +++ b/ydb/core/blobstorage/docs/blob_encryption_v1.graphml @@ -230,7 +230,7 @@ Ktenant=H(KtenantLeader)<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y <y:BorderStyle color="#000000" type="line" width="1.0"/> <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="60.53125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="113.517578125" x="12.2412109375" xml:space="preserve" y="4.734375">Предложить шифрованый -ключ группы +ключ группы E(Ktenant, Kgroup)<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel> </y:GenericNode> </data> @@ -272,7 +272,7 @@ E(Ktenant, Kgroup)<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:Label <y:BorderStyle color="#000000" type="line" width="1.0"/> <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="60.53125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="131.359375" x="27.3203125" xml:space="preserve" y="4.734375">Отправить шифрованый -ключ группы +ключ группы C=E(Ktenant, Kgroup)<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel> </y:GenericNode> </data> @@ -293,7 +293,7 @@ C=E(Ktenant, Kgroup)<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:Lab <y:Geometry height="40.0" width="112.0" x="5.0" y="348.33333333333326"/> <y:Fill color="#FFFF99" color2="#FFFF99" transparent="false"/> <y:BorderStyle color="#000000" type="line" width="1.0"/> - <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="32.265625" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="102.115234375" x="4.9423828125" xml:space="preserve" y="3.8671875">Взять из памяти + <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="32.265625" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="102.115234375" x="4.9423828125" xml:space="preserve" y="3.8671875">Взять из памяти Kgroup<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel> </y:GenericNode> </data> @@ -685,7 +685,7 @@ nonce 64 бита из BlobId </y:Path> <y:LineStyle color="#000000" type="line" width="1.0"/> <y:Arrows source="none" target="plain"/> - <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="46.3984375" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="66.30859375" x="-1.17724609375" xml:space="preserve" y="-53.199208577473996"> + <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="46.3984375" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="66.30859375" x="-1.17724609375" xml:space="preserve" y="-53.199208577473996"> [есть ключ группы]<y:LabelModel><y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/></y:LabelModel><y:ModelParameter><y:SmartEdgeLabelModelParameter angle="0.0" distance="30.0" distanceToCenter="true" position="left" ratio="0.0" segment="0"/></y:ModelParameter><y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/></y:EdgeLabel> <y:BendStyle smoothed="false"/> diff --git a/ydb/core/blobstorage/docs/blob_encryption_v2.graphml b/ydb/core/blobstorage/docs/blob_encryption_v2.graphml index 2b01d5c88f..e6736817ca 100644 --- a/ydb/core/blobstorage/docs/blob_encryption_v2.graphml +++ b/ydb/core/blobstorage/docs/blob_encryption_v2.graphml @@ -212,7 +212,7 @@ CypherText=E(Kblob, PlainText)<y:LabelModel><y:SmartNodeLabelModel distance="4.0 <y:Fill color="#FFFF99" color2="#FFFF99" transparent="false"/> <y:BorderStyle color="#000000" type="line" width="1.0"/> <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="46.3984375" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="153.80078125" x="12.099609375" xml:space="preserve" y="11.80078125">Предложить -шифрованый ключ +шифрованый ключ E(Ktenant, KgroupTenant)<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel> </y:GenericNode> </data> @@ -278,7 +278,7 @@ C=E(Ktenant, KgroupTenant)<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/>< <y:Geometry height="40.0" width="112.0" x="438.16613532887834" y="619.1034607875072"/> <y:Fill color="#FFFF99" color2="#FFFF99" transparent="false"/> <y:BorderStyle color="#000000" type="line" width="1.0"/> - <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="32.265625" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="102.115234375" x="4.9423828125" xml:space="preserve" y="3.8671875">Взять из памяти + <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="32.265625" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="102.115234375" x="4.9423828125" xml:space="preserve" y="3.8671875">Взять из памяти KgroupTenant<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel> </y:GenericNode> </data> @@ -878,7 +878,7 @@ N - нод </y:Path> <y:LineStyle color="#000000" type="line" width="1.0"/> <y:Arrows source="none" target="plain"/> - <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="46.3984375" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="109.087890625" x="1.2667735212444313" xml:space="preserve" y="-53.199212552336576"> + <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="46.3984375" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="109.087890625" x="1.2667735212444313" xml:space="preserve" y="-53.199212552336576"> [есть ключ группы-тенанта]<y:LabelModel><y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/></y:LabelModel><y:ModelParameter><y:SmartEdgeLabelModelParameter angle="0.0" distance="30.0" distanceToCenter="true" position="left" ratio="0.0" segment="0"/></y:ModelParameter><y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/></y:EdgeLabel> <y:BendStyle smoothed="false"/> diff --git a/ydb/core/blobstorage/dsproxy/dsproxy_assimilate.cpp b/ydb/core/blobstorage/dsproxy/dsproxy_assimilate.cpp index 49950b57c7..fec3d68c07 100644 --- a/ydb/core/blobstorage/dsproxy/dsproxy_assimilate.cpp +++ b/ydb/core/blobstorage/dsproxy/dsproxy_assimilate.cpp @@ -102,7 +102,7 @@ class TBlobStorageGroupAssimilateRequest : public TBlobStorageGroupRequestActor< }; using TItemVariant = std::variant<TBlock, TBarrier, TBlob>; - + struct TPerVDiskInfo { std::optional<TString> ErrorReason; diff --git a/ydb/core/blobstorage/dsproxy/mock/model.h b/ydb/core/blobstorage/dsproxy/mock/model.h index 3c65b79d7c..a3f5455787 100644 --- a/ydb/core/blobstorage/dsproxy/mock/model.h +++ b/ydb/core/blobstorage/dsproxy/mock/model.h @@ -339,7 +339,7 @@ namespace NFake { void SetStorageStatusFlagsByColor(NKikimrBlobStorage::TPDiskSpaceColor::E color) { StorageStatusFlags = TStorageStatusFlags(SpaceColorToStatusFlag(color)); } - + void SetStorageStatusFlags(TStorageStatusFlags flags) { StorageStatusFlags = flags; } diff --git a/ydb/core/blobstorage/groupinfo/blobstorage_groupinfo.cpp b/ydb/core/blobstorage/groupinfo/blobstorage_groupinfo.cpp index 73f36736e2..1f14bcb316 100644 --- a/ydb/core/blobstorage/groupinfo/blobstorage_groupinfo.cpp +++ b/ydb/core/blobstorage/groupinfo/blobstorage_groupinfo.cpp @@ -932,15 +932,15 @@ TVDiskID VDiskIDFromString(TString str, bool* isGenerationSet) { TVector<TString> parts = SplitString(str, ":"); if (parts.size() != 5) { return TVDiskID::InvalidId; - } + } ui32 groupGeneration = 0; - if (!IsHexNumber(parts[0]) || !IsNumber(parts[2]) || !IsNumber(parts[3]) || !IsNumber(parts[4]) + if (!IsHexNumber(parts[0]) || !IsNumber(parts[2]) || !IsNumber(parts[3]) || !IsNumber(parts[4]) || !(IsNumber(parts[1]) || parts[1] == "_")) { return TVDiskID::InvalidId; } - + if (parts[1] == "_") { if (isGenerationSet) { *isGenerationSet = false; @@ -952,10 +952,10 @@ TVDiskID VDiskIDFromString(TString str, bool* isGenerationSet) { groupGeneration = IntFromString<ui32, 10>(parts[1]); } - return TVDiskID(IntFromString<ui32, 16>(parts[0]), - groupGeneration, - IntFromString<ui8, 10>(parts[2]), - IntFromString<ui8, 10>(parts[3]), + return TVDiskID(IntFromString<ui32, 16>(parts[0]), + groupGeneration, + IntFromString<ui8, 10>(parts[2]), + IntFromString<ui8, 10>(parts[3]), IntFromString<ui8, 10>(parts[4])); } diff --git a/ydb/core/blobstorage/nodewarden/blobstorage_node_warden_ut.cpp b/ydb/core/blobstorage/nodewarden/blobstorage_node_warden_ut.cpp index 25ce6ab4de..ae196d24b5 100644 --- a/ydb/core/blobstorage/nodewarden/blobstorage_node_warden_ut.cpp +++ b/ydb/core/blobstorage/nodewarden/blobstorage_node_warden_ut.cpp @@ -549,7 +549,7 @@ Y_UNIT_TEST_SUITE(TBlobStorageWardenTest) { UNIT_ASSERT_EQUAL(0, drives.size()); UNIT_ASSERT_EQUAL(0, warden.DrivePathCounterKeys().size()); } - + // If a drive is not present in a subsequent call, then it is removed from a counters map. // We check both serial number validator and also that counters are removed for missing drives. { diff --git a/ydb/core/blobstorage/nodewarden/node_warden_impl.cpp b/ydb/core/blobstorage/nodewarden/node_warden_impl.cpp index 188095bf28..c1ed9babac 100644 --- a/ydb/core/blobstorage/nodewarden/node_warden_impl.cpp +++ b/ydb/core/blobstorage/nodewarden/node_warden_impl.cpp @@ -80,7 +80,7 @@ void TNodeWarden::RemoveDrivesWithBadSerialsAndReport(TVector<NPDisk::TDriveData // Output bad serial number in base64 encoding. STLOG(PRI_WARN, BS_NODE, NW03, "Bad serial number", (Path, path), (SerialBase64, encoded.Quote()), (Details, details.Str())); - + mapIt->second.BadSerialsRead->Inc(); } diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk.h b/ydb/core/blobstorage/pdisk/blobstorage_pdisk.h index 86868a04e5..9dd0609ce0 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk.h +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk.h @@ -608,7 +608,7 @@ struct TEvChunkUnlock : public TEventLocal<TEvChunkUnlock, TEvBlobStorage::EvChu TOwner Owner = 0; TVDiskID VDiskId = TVDiskID::InvalidId; bool IsGenerationSet = true; - + TEvChunkUnlock(TEvChunkLock::ELockFrom lockFrom) : LockFrom(lockFrom) { @@ -643,7 +643,7 @@ struct TEvChunkUnlock : public TEventLocal<TEvChunkUnlock, TEvBlobStorage::EvChu str << "{EvChunkLock LockFrom# " << TEvChunkLock::ELockFrom_Name(record.LockFrom); if (record.Owner) { str << " Owner# " << record.Owner; - } + } if (record.ByVDiskId) { if (record.IsGenerationSet) { str << " VDiskId# " << record.VDiskId.ToString(); diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_blockdevice_async.cpp b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_blockdevice_async.cpp index 230280e248..fc9fafbd85 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_blockdevice_async.cpp +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_blockdevice_async.cpp @@ -1359,7 +1359,7 @@ public: for (auto it = range.first; it != range.second; ++it) { TRead &read = it->second; - + Y_ABORT_UNLESS(read.CompletionAction); read.CompletionAction->SetResult(completion->Result); diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_chunk_tracker.h b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_chunk_tracker.h index 5a21ae8ad8..43fe42c0d3 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_chunk_tracker.h +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_chunk_tracker.h @@ -503,7 +503,7 @@ public: } else { switch (owner) { case OwnerCommonStaticLog: - case OwnerSystem: + case OwnerSystem: { // Chunk release for common log (fill bonus pool first, then fill the common pool) i64 usedBonus = GlobalQuota->GetUsed(OwnerCommonStaticLog); diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl.cpp b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl.cpp index d4cf989783..80386b1bca 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl.cpp +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl.cpp @@ -737,7 +737,7 @@ void TPDisk::AskVDisksToCutLogs(TOwner ownerFilter, bool doForce) { for (auto it = cutLogInfoForOwner.begin(); it != cutLogInfoForOwner.end(); ++it) { TOwner chunkOwner = it->first; auto &cutLogInfo = it->second; - + if (cutLogInfo.Lsn == 0) { // Prevent cuts with lsn = 0. continue; diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl.h b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl.h index e1f937d320..cc6cac3a2f 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl.h +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl.h @@ -187,7 +187,7 @@ public: TAtomic SlowDeviceMs = 0; const bool UseHugePages; - + // Chunk locking TMap<TOwner, ui32> OwnerLocks; diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl_http.cpp b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl_http.cpp index 6e7cdd65ca..2526e1fcdb 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl_http.cpp +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl_http.cpp @@ -237,7 +237,7 @@ void TPDisk::OutputHtmlOwners(TStringStream &str) { TABLED() { ui32 logSize = OwnerData[owner].OperationLog.Size(); str << "<button type='button' class='btn btn-default' data-toggle='collapse' style='margin:5px' \ - data-target='#operationLogCollapse" << owner << + data-target='#operationLogCollapse" << owner << "'>Show last " << logSize << " operations</button>"; str << "<div id='operationLogCollapse" << owner << "' class='collapse'>"; @@ -335,7 +335,7 @@ void TPDisk::OutputHtmlChunkLockUnlockInfo(TStringStream &str) { auto commonParams = [&] (TStringStream &str, TString requestName) { for (TEvChunkLock::ELockFrom from : { TEvChunkLock::ELockFrom::LOG, TEvChunkLock::ELockFrom::PERSONAL_QUOTA } ) { - str << "<input id='" << requestName << "LockFrom_" << TEvChunkLock::ELockFrom_Name(from) << + str << "<input id='" << requestName << "LockFrom_" << TEvChunkLock::ELockFrom_Name(from) << "' name='lockFrom' type='radio' value='" << TEvChunkLock::ELockFrom_Name(from) << "'"; if (from == TEvChunkLock::ELockFrom::PERSONAL_QUOTA) { str << " checked"; @@ -370,7 +370,7 @@ void TPDisk::OutputHtmlChunkLockUnlockInfo(TStringStream &str) { LABEL_CLASS_FOR("control-label", "color") { str << "Color"; } for (TColor::E color : { TColor::CYAN, TColor::LIGHT_YELLOW, TColor::YELLOW, TColor::LIGHT_ORANGE, TColor::ORANGE, TColor::RED, TColor::BLACK} ) { - str << "<input id='inputColor_" << TPDiskSpaceColor_Name(color) << "' name='spaceColor' type='radio' value='" + str << "<input id='inputColor_" << TPDiskSpaceColor_Name(color) << "' name='spaceColor' type='radio' value='" << TPDiskSpaceColor_Name(color) << "'"; if (color == TColor::CYAN) { str << " checked"; diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl_log.cpp b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl_log.cpp index 52e7827f28..a417835a8d 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl_log.cpp +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl_log.cpp @@ -220,7 +220,7 @@ bool TPDisk::ProcessChunk0(const NPDisk::TEvReadLogResult &readLogResult, TStrin LOG_ERROR_S(*ActorSystem, NKikimrServices::BS_PDISK, "PDiskId# " << (ui32)PDiskId << " ErrorReason# " << errorReason << " Marker# BPD47"); - + return false; } ui64 remainingSize = lastSysLogRecord.size(); @@ -431,7 +431,7 @@ bool TPDisk::ProcessChunk0(const NPDisk::TEvReadLogResult &readLogResult, TStrin if (!suppressCompatibilityCheck) { auto storedCompatibilityInfo = NKikimrConfig::TStoredCompatibilityInfo(); - + bool success = storedCompatibilityInfo.ParseFromArray(compatibilityInfo, protoSize); Y_ABORT_UNLESS(success); @@ -452,7 +452,7 @@ bool TPDisk::ProcessChunk0(const NPDisk::TEvReadLogResult &readLogResult, TStrin if (!isCompatible) { LOG_ERROR_S(*ActorSystem, NKikimrServices::BS_PDISK, "PDiskId# " << (ui32)PDiskId - << " Stored compatibility info is absent, current version is incompatible with the default stored version of PDisk," + << " Stored compatibility info is absent, current version is incompatible with the default stored version of PDisk," << " ErrorReason# " << errorReason); return false; } @@ -576,7 +576,7 @@ void TPDisk::ProcessLogReadQueue() { endLogChunkIdx = logEndPos.ChunkIdx; endLogSectorIdx = logEndPos.SectorIdx; } - + ownerData.LogReader = new TLogReader(false, this, ActorSystem, logRead.Sender, logRead.Owner, logStartPosition, logRead.OwnerGroupType,logRead.Position, @@ -1270,7 +1270,7 @@ void TPDisk::MarkChunksAsReleased(TReleaseChunks& req) { for (const auto& chunkIdx : req.ChunksToRelease) { BlockDevice->EraseCacheRange( - Format.Offset(chunkIdx, 0), + Format.Offset(chunkIdx, 0), Format.Offset(chunkIdx + 1, 0)); } diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_log_cache.cpp b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_log_cache.cpp index f1f69dace1..dd97e316e6 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_log_cache.cpp +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_log_cache.cpp @@ -15,7 +15,7 @@ TLogCache::TCacheRecord::TCacheRecord(TCacheRecord&& other) , BadOffsets(std::move(other.BadOffsets)) {} -TLogCache::TItem::TItem(TItem&& other) +TLogCache::TItem::TItem(TItem&& other) : Value(std::move(other.Value)) {} @@ -42,7 +42,7 @@ const TLogCache::TCacheRecord* TLogCache::FindWithoutPromote(ui64 offset) const if (indexIt == Index.end()) { return nullptr; } - + return &indexIt->second.Value; } @@ -57,7 +57,7 @@ bool TLogCache::Pop() { bool TLogCache::Insert(TCacheRecord&& value) { auto [it, inserted] = Index.try_emplace(value.Offset, std::move(value)); - List.PushFront(&it->second); + List.PushFront(&it->second); return inserted; } diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_logreader.cpp b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_logreader.cpp index 7f3ca816f7..480a46dded 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_logreader.cpp +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_logreader.cpp @@ -550,7 +550,7 @@ void TLogReader::NotifyError(ui64 offsetRead, TString& errorReason) { LOG_ERROR(*ActorSystem, NKikimrServices::BS_PDISK, "PDiskId# %" PRIu32 " Error reading log with offset %" PRIu64, (ui32)PDisk->PDiskId, offsetRead); - + ReplyError(); } diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_quota_record.h b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_quota_record.h index 0b480aa561..2ac6362e2e 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_quota_record.h +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_quota_record.h @@ -184,7 +184,7 @@ public: return AtomicGet(HardLimit) - AtomicGet(Black); default: return 0; - } + } } }; diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_requestimpl.h b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_requestimpl.h index 8191674faf..1029057ecd 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_requestimpl.h +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_requestimpl.h @@ -673,7 +673,7 @@ public: TOwner Owner; TVDiskID VDiskId; bool IsGenerationSet; - + TChunkUnlock(const NPDisk::TEvChunkUnlock &ev, const TActorId &sender, TAtomicBase reqIdx) : TRequestBase(sender, TReqId(TReqId::ChunkUnlock, reqIdx), 0, 0, NPriInternal::Other) , LockFrom(ev.LockFrom) diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_state.h b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_state.h index fcc3e749a4..5dc1eba7a6 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_state.h +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_state.h @@ -60,7 +60,7 @@ struct TOwnerData { struct TLogEndPosition { ui32 ChunkIdx; ui32 SectorIdx; - + explicit TLogEndPosition(ui32 chunkIdx, ui32 sectorIdx) : ChunkIdx(chunkIdx), SectorIdx(sectorIdx) {} }; TMap<TLogSignature, NPDisk::TLogRecord> StartingPoints; diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_tools.cpp b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_tools.cpp index 17d5c37520..e9f25da4e8 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_tools.cpp +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_tools.cpp @@ -75,7 +75,7 @@ void FormatPDisk(TString path, ui64 diskSizeBytes, ui32 sectorSizeBytes, ui32 us ->DetectFileParameters(path, diskSizeBytes, isBlockDevice); } } - if (enableSmallDiskOptimization && diskSizeBytes > 0 && diskSizeBytes < NPDisk::FullSizeDiskMinimumSize && + if (enableSmallDiskOptimization && diskSizeBytes > 0 && diskSizeBytes < NPDisk::FullSizeDiskMinimumSize && userAccessibleChunkSizeBytes > NPDisk::SmallDiskMaximumChunkSize) { throw NPDisk::TPDiskFormatBigChunkException() << "diskSizeBytes# " << diskSizeBytes << " userAccessibleChunkSizeBytes# " << userAccessibleChunkSizeBytes << @@ -154,7 +154,7 @@ bool ReadPDiskFormatInfo(const TString &path, const NPDisk::TMainKey &mainKey, T blockDevice->PreadSync(formatRaw->Data(), formatSectorsSize, 0, NPDisk::TReqId(NPDisk::TReqId::ReadFormatInfo, 0), {}); - for (auto& key : mainKey.Keys) { + for (auto& key : mainKey.Keys) { NPDisk::TPDiskStreamCypher cypher(true); // Format record is always encrypted cypher.SetKey(key); bool isOk = false; diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut.cpp b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut.cpp index b044b72cc1..59563b9310 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut.cpp +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut.cpp @@ -912,7 +912,7 @@ Y_UNIT_TEST_SUITE(TPDiskTest) { using TCurrent = NKikimrConfig::TCurrentCompatibilityInfo; void TestRestartWithDifferentVersion(TCurrent oldInfo, TCurrent newInfo, bool isCompatible, bool suppressCompatibilityCheck = false) { TCompatibilityInfoTest::Reset(&oldInfo); - + TActorTestContext testCtx({ .IsBad = false, .SuppressCompatibilityCheck = suppressCompatibilityCheck, diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut_actions.cpp b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut_actions.cpp index f864150b43..63abafbccc 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut_actions.cpp +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut_actions.cpp @@ -974,7 +974,7 @@ void TTestChunkLock::TestFSM(const TActorContext &ctx) { break; case 30: TEST_RESPONSE(EvChunkLockResult, OK); - ASSERT_YTHROW(LastResponse.ChunkIds.size() == 5, + ASSERT_YTHROW(LastResponse.ChunkIds.size() == 5, "Unexpected LockedChunks.size() == " << LastResponse.ChunkIds.size()); VERBOSE_COUT(" Sending TEvChunkLock from PERSONAL_QUOTA"); ctx.Send(Yard, new NPDisk::TEvChunkLock(EFrom::PERSONAL_QUOTA, Owner, 0, TColor::RED)); @@ -1029,13 +1029,13 @@ void TTestChunkUnlock::TestFSM(const TActorContext &ctx) { break; case 40: TEST_RESPONSE(EvChunkUnlockResult, OK); - ASSERT_YTHROW(LastResponse.UnlockedChunks == LockedNumLog, "Expected" << LockedNumLog << + ASSERT_YTHROW(LastResponse.UnlockedChunks == LockedNumLog, "Expected" << LockedNumLog << " unlocked chunks, got " << LastResponse.UnlockedChunks); ctx.Send(Yard, new NPDisk::TEvChunkUnlock(EFrom::PERSONAL_QUOTA, Owner)); break; case 50: TEST_RESPONSE(EvChunkUnlockResult, OK); - ASSERT_YTHROW(LastResponse.UnlockedChunks == LockedNumPersonal, "Expected" << LockedNumPersonal << + ASSERT_YTHROW(LastResponse.UnlockedChunks == LockedNumPersonal, "Expected" << LockedNumPersonal << " unlocked chunks, got " << LastResponse.UnlockedChunks); ctx.Send(Yard, new NPDisk::TEvChunkReserve(Owner, OwnerRound, 10)); break; diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut_helpers.cpp b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut_helpers.cpp index aa468d3f50..20a69320a5 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut_helpers.cpp +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut_helpers.cpp @@ -51,7 +51,7 @@ void FormatPDiskForTest(TString path, ui64 guid, ui32& chunkSize, ui64 diskSize, FormatPDisk(path, diskSize, 4 << 10, chunkSize, guid, chunkKey, logKey, sysLogKey, NPDisk::YdbDefaultPDiskSequence, "Info", isErasureEncodeUserLog, false, sectorMap, enableSmallDiskOptimization); - } catch (NPDisk::TPDiskFormatBigChunkException) { + } catch (NPDisk::TPDiskFormatBigChunkException) { FormatPDisk(path, diskSize, 4 << 10, NPDisk::SmallDiskMaximumChunkSize, guid, chunkKey, logKey, sysLogKey, NPDisk::YdbDefaultPDiskSequence, "Info", isErasureEncodeUserLog, false, sectorMap, enableSmallDiskOptimization); diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut_races.cpp b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut_races.cpp index 169802a2ee..d5ed7b031a 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut_races.cpp +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut_races.cpp @@ -67,7 +67,7 @@ Y_UNIT_TEST_SUITE(TPDiskRaces) { const ui32 reservedChunk = evRes->ChunkIds.front(); auto& reservedChunks = mocks[c].Chunks[EChunkState::RESERVED]; reservedChunks.emplace(reservedChunk); - + NPDisk::TCommitRecord rec; rec.CommitChunks.push_back(*reservedChunks.begin()); logNoTest(mocks[c], rec); @@ -88,7 +88,7 @@ Y_UNIT_TEST_SUITE(TPDiskRaces) { Y_UNIT_TEST(KillOwnerWhileDeletingChunkWithInflightMock) { TestKillOwnerWhileDeletingChunk(true, 20, 50, 10, 100); } - + void TestDecommit(bool usePDiskMock, ui32 timeLimit, ui32 inflight, ui32 reservedChunks) { THPTimer timer; while (timer.Passed() < timeLimit) { @@ -109,7 +109,7 @@ Y_UNIT_TEST_SUITE(TPDiskRaces) { chunk, 0, data.size(), 0, (void*)(cookie++))); } }; - + auto sendManyWrites = [&](TVDiskMock& mock, TChunkIdx chunk, ui32 number, ui64& cookie) { for (ui32 i = 0; i < number; ++i) { TString dataCopy = data; @@ -164,7 +164,7 @@ Y_UNIT_TEST_SUITE(TPDiskRaces) { auto res = testCtx.Recv<NPDisk::TEvChunkWriteResult>(); UNIT_ASSERT_VALUES_EQUAL_C(res->Status, NKikimrProto::OK, res->ToString()); } - } + } for (ui32 i = 0; i < reservedChunks; ++i) { testCtx.TestResponse<NPDisk::TEvChunkForgetResult>(new NPDisk::TEvChunkForget(mock.PDiskParams->Owner, mock.PDiskParams->OwnerRound), NKikimrProto::OK); @@ -212,7 +212,7 @@ Y_UNIT_TEST_SUITE(TPDiskRaces) { } mock.CommitReservedChunks(); TVector<TChunkIdx> chunkIds(mock.Chunks[EChunkState::COMMITTED].begin(), mock.Chunks[EChunkState::COMMITTED].end()); - + while (mock.Chunks[EChunkState::COMMITTED].size() > 0) { auto it = mock.Chunks[EChunkState::COMMITTED].begin(); for (ui32 i = 0; i < inflight; ++i) { @@ -239,12 +239,12 @@ Y_UNIT_TEST_SUITE(TPDiskRaces) { const ui32 reservedChunk = evRes->ChunkIds.front(); auto& reservedChunks = mocks[c].Chunks[EChunkState::RESERVED]; reservedChunks.emplace(reservedChunk); - + NPDisk::TCommitRecord rec; rec.CommitChunks.push_back(*reservedChunks.begin()); logNoTest(mocks[c], rec); reservedChunks.clear(); - } + } testCtx.Recv<NPDisk::TEvHarakiriResult>(); } } @@ -267,7 +267,7 @@ Y_UNIT_TEST_SUITE(TPDiskRaces) { std::vector<TVDiskMock> mocks; enum EMockState { Empty, - InitStarted, + InitStarted, InitFinished, KillStarted, KillFinished diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut_sectormap.cpp b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut_sectormap.cpp index c32f4cb9f8..a80ba3af77 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut_sectormap.cpp +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut_sectormap.cpp @@ -22,10 +22,10 @@ Y_UNIT_TEST_SUITE(TSectorMap) { auto deviceType = NPDisk::NSectorMap::DiskModeToDeviceType(diskMode); ui64 diskRate; if (testRead) { - diskRate = toFirstSector ? NPDisk::DevicePerformance.at(deviceType).FirstSectorReadBytesPerSec : + diskRate = toFirstSector ? NPDisk::DevicePerformance.at(deviceType).FirstSectorReadBytesPerSec : NPDisk::DevicePerformance.at(deviceType).LastSectorReadBytesPerSec; } else { - diskRate = toFirstSector ? NPDisk::DevicePerformance.at(deviceType).FirstSectorWriteBytesPerSec : + diskRate = toFirstSector ? NPDisk::DevicePerformance.at(deviceType).FirstSectorWriteBytesPerSec : NPDisk::DevicePerformance.at(deviceType).LastSectorWriteBytesPerSec; } @@ -68,8 +68,8 @@ Y_UNIT_TEST_SUITE(TSectorMap) { using EDiskMode = NPDisk::NSectorMap::EDiskMode; auto test = [&](EDiskMode diskMode, ui32 diskSizeGb, ui32 dataSizeMb, bool toFirstSector, bool testRead, ui32 tries) { if (!TestSectorMapPerformance(diskMode, diskSizeGb, dataSizeMb, toFirstSector, testRead, tries, 0.1, &time)) { - failedTests.push_back(TStringBuilder() << diskSizeGb << "GB " << NPDisk::NSectorMap::DiskModeToString(diskMode) << - (testRead ? " read " : " write ") << dataSizeMb << " MB to" << (toFirstSector ? " first " : " last ") << + failedTests.push_back(TStringBuilder() << diskSizeGb << "GB " << NPDisk::NSectorMap::DiskModeToString(diskMode) << + (testRead ? " read " : " write ") << dataSizeMb << " MB to" << (toFirstSector ? " first " : " last ") << "sector, timeExpected=" << time.first << ", timeAverage=" << time.second); } }; diff --git a/ydb/core/blobstorage/ut_blobstorage/blob_depot.cpp b/ydb/core/blobstorage/ut_blobstorage/blob_depot.cpp index 8fa631b0ad..60aab8b8f1 100644 --- a/ydb/core/blobstorage/ut_blobstorage/blob_depot.cpp +++ b/ydb/core/blobstorage/ut_blobstorage/blob_depot.cpp @@ -19,7 +19,7 @@ Y_UNIT_TEST_SUITE(BlobDepot) { ui32 seed; LoadSeed(seed); TBlobDepotTestEnvironment tenv(seed); - + TestBasicPutAndGet(tenv, 1, tenv.RegularGroups[0]); TestBasicPutAndGet(tenv, 11, tenv.BlobDepot); } @@ -48,7 +48,7 @@ Y_UNIT_TEST_SUITE(BlobDepot) { // block all tablet generations <= tabletGeneration VerifiedBlock(env, nodeId, groupId, tabletId, tabletGeneration, state); - // do TEvGet with Reader* params + // do TEvGet with Reader* params auto mustRestoreFirst = false; auto isIndexOnly = false; @@ -78,7 +78,7 @@ Y_UNIT_TEST_SUITE(BlobDepot) { ui32 seed; LoadSeed(seed); TBlobDepotTestEnvironment tenv(seed); - + TestBasicRange(tenv, 1, tenv.RegularGroups[0]); TestBasicRange(tenv, 100, tenv.BlobDepot); } @@ -87,7 +87,7 @@ Y_UNIT_TEST_SUITE(BlobDepot) { ui32 seed; LoadSeed(seed); TBlobDepotTestEnvironment tenv(seed); - + TestBasicDiscover(tenv, 1000, tenv.RegularGroups[0]); TestBasicDiscover(tenv, 100, tenv.BlobDepot); } @@ -96,7 +96,7 @@ Y_UNIT_TEST_SUITE(BlobDepot) { ui32 seed; LoadSeed(seed); TBlobDepotTestEnvironment tenv(seed); - + TestBasicBlock(tenv, 15, tenv.RegularGroups[0]); TestBasicBlock(tenv, 100, tenv.BlobDepot); } @@ -105,7 +105,7 @@ Y_UNIT_TEST_SUITE(BlobDepot) { ui32 seed; LoadSeed(seed); TBlobDepotTestEnvironment tenv(seed); - + TestBasicCollectGarbage(tenv, 15, tenv.RegularGroups[0]); TestBasicCollectGarbage(tenv, 100, tenv.BlobDepot); } @@ -114,7 +114,7 @@ Y_UNIT_TEST_SUITE(BlobDepot) { ui32 seed; LoadSeed(seed); TBlobDepotTestEnvironment tenv(seed); - + // TestVerifiedRandom(tenv, 8, 15, tenv.RegularGroups[0], 1000); TestVerifiedRandom(tenv, 8, 100, tenv.BlobDepot, 1000); } @@ -123,7 +123,7 @@ Y_UNIT_TEST_SUITE(BlobDepot) { ui32 seed; LoadSeed(seed); TBlobDepotTestEnvironment tenv(seed); - + // TestLoadPutAndGet(tenv, 100, tenv.BlobDepot, 1 << 10, 1 << 15, 500); TestLoadPutAndGet(tenv, 100, tenv.BlobDepot, 100, 1 << 10, 500); } @@ -132,7 +132,7 @@ Y_UNIT_TEST_SUITE(BlobDepot) { ui32 seed; LoadSeed(seed); TBlobDepotTestEnvironment tenv(seed); - + TestLoadPutAndGet(tenv, 15, tenv.RegularGroups[0], 100, 1 << 10, 500, true, 10, { 5, 1, 5, 1, 1, 0 }); // no blob depot restarts performed } @@ -141,7 +141,7 @@ Y_UNIT_TEST_SUITE(BlobDepot) { ui32 seed; LoadSeed(seed); TBlobDepotTestEnvironment tenv(seed); - + TestVerifiedRandom(tenv, 8, 15, tenv.RegularGroups[0], 1000, 500, 10, { 10, 10, 3, 3, 2, 1, 1, 3, 3, 0 }); // no blob depot restarts performed } diff --git a/ydb/core/blobstorage/ut_blobstorage/blob_depot_fat.cpp b/ydb/core/blobstorage/ut_blobstorage/blob_depot_fat.cpp index e5a8832090..a5a089fb96 100644 --- a/ydb/core/blobstorage/ut_blobstorage/blob_depot_fat.cpp +++ b/ydb/core/blobstorage/ut_blobstorage/blob_depot_fat.cpp @@ -21,7 +21,7 @@ Y_UNIT_TEST_SUITE(BlobDepotFat) { ui32 seed; LoadSeed(seed); TBlobDepotTestEnvironment tenv(seed, 1, 8, TBlobStorageGroupType::ErasureMirror3of4); - + TestVerifiedRandom(tenv, 8, 100, tenv.BlobDepot, 1e9, 1e9, 1500); } @@ -29,7 +29,7 @@ Y_UNIT_TEST_SUITE(BlobDepotFat) { ui32 seed; LoadSeed(seed); TBlobDepotTestEnvironment tenv(seed, 1, 8, TBlobStorageGroupType::ErasureMirror3of4); - + TestVerifiedRandom(tenv, 8, 100, tenv.RegularGroups[0], 1e9, 1000, 1500); } @@ -39,7 +39,7 @@ Y_UNIT_TEST_SUITE(BlobDepotFat) { Seed().LoadOrFail(&seed, sizeof(seed)); TBlobDepotTestEnvironment tenv(seed); auto vdisksRegular = tenv.Env->GetGroupInfo(tenv.RegularGroups[0])->GetDynamicInfo().ServiceIdForOrderNumber; - + TestRestoreGet(tenv, 15, tenv.RegularGroups[0], 10, &vdisksRegular); TestRestoreGet(tenv, 100, tenv.BlobDepot, 10, &vdisksBlobDepot); } @@ -49,7 +49,7 @@ Y_UNIT_TEST_SUITE(BlobDepotFat) { Seed().LoadOrFail(&seed, sizeof(seed)); TBlobDepotTestEnvironment tenv(seed); auto vdisksRegular = tenv.Env->GetGroupInfo(tenv.RegularGroups[0])->GetDynamicInfo().ServiceIdForOrderNumber; - + TestRestoreDiscover(tenv, 15, tenv.RegularGroups[0], 10, &vdisksRegular); TestRestoreDiscover(tenv, 100, tenv.BlobDepot, 10, &vdisksBlobDepot); } @@ -59,7 +59,7 @@ Y_UNIT_TEST_SUITE(BlobDepotFat) { Seed().LoadOrFail(&seed, sizeof(seed)); TBlobDepotTestEnvironment tenv(seed); auto vdisksRegular = tenv.Env->GetGroupInfo(tenv.RegularGroups[0])->GetDynamicInfo().ServiceIdForOrderNumber; - + TestRestoreRange(tenv, 15, tenv.RegularGroups[0], 10, &vdisksRegular); TestRestoreRange(tenv, 100, tenv.BlobDepot, 10, &vdisksBlobDepot); } diff --git a/ydb/core/blobstorage/ut_blobstorage/blob_depot_test_env.h b/ydb/core/blobstorage/ut_blobstorage/blob_depot_test_env.h index 51ccbf361e..4d0d9a47cd 100644 --- a/ydb/core/blobstorage/ut_blobstorage/blob_depot_test_env.h +++ b/ydb/core/blobstorage/ut_blobstorage/blob_depot_test_env.h @@ -21,7 +21,7 @@ struct TBlobInfo { TBlobInfo(const TBlobInfo& other) = default; TBlobInfo(TBlobInfo&& other) = default; TBlobInfo(TString data, ui64 tablet, ui32 cookie, ui32 gen = 1, ui32 step = 1, ui32 channel = 0) - : Status(EStatus::NONEXISTENT) + : Status(EStatus::NONEXISTENT) , Id(tablet, gen, step, channel, data.size(), cookie) , Data(data) { @@ -38,7 +38,7 @@ struct TBlobInfo { } else { status = "COLLECTED"; } - return TStringBuilder() << "Status# " << status << " Id# {" << Id.ToString() << "} Data# " << Data << + return TStringBuilder() << "Status# " << status << " Id# {" << Id.ToString() << "} Data# " << Data << " Keep# " << Keep << " DoNotKeep# " << DoNotKeep; } @@ -142,14 +142,14 @@ struct MultiTEvGetArgs : public TEvArgs { , IndexOnly(indexOnly) { } - + bool MustRestoreFirst = false; bool IndexOnly = false; }; struct TEvDiscoverArgs : public TEvArgs { TEvDiscoverArgs() = default; - TEvDiscoverArgs(ui32 minGeneration, bool readBody, bool discoverBlockedGeneration, ui32 forceBlockedGeneration, bool fromLeader) + TEvDiscoverArgs(ui32 minGeneration, bool readBody, bool discoverBlockedGeneration, ui32 forceBlockedGeneration, bool fromLeader) : TEvArgs(EEventType::DISCOVER) , MinGeneration(minGeneration) , ReadBody(readBody) @@ -162,13 +162,13 @@ struct TEvDiscoverArgs : public TEvArgs { ui32 MinGeneration = 0; bool ReadBody = true; bool DiscoverBlockedGeneration = false; - ui32 ForceBlockedGeneration = 0; + ui32 ForceBlockedGeneration = 0; bool FromLeader = false; }; struct TEvRangeArgs : public TEvArgs { TEvRangeArgs() = default; - TEvRangeArgs(bool mustRestoreFirst, bool indexOnly) + TEvRangeArgs(bool mustRestoreFirst, bool indexOnly) : TEvArgs(EEventType::RANGE) , MustRestoreFirst(mustRestoreFirst) , IndexOnly(indexOnly) @@ -182,14 +182,14 @@ struct TEvRangeArgs : public TEvArgs { struct TBlobDepotTestEnvironment { TMersenne<ui32> Mt; TMersenne<ui64> Mt64; - + std::unique_ptr<TEnvironmentSetup> Env; std::vector<ui32> RegularGroups; ui32 BlobDepot; ui32 BlobDepotTabletId; - TBlobDepotTestEnvironment(ui32 seed = 0, ui32 numGroups = 1, ui32 nodeCount = 8, - TBlobStorageGroupType erasure = TBlobStorageGroupType::ErasureMirror3of4) + TBlobDepotTestEnvironment(ui32 seed = 0, ui32 numGroups = 1, ui32 nodeCount = 8, + TBlobStorageGroupType erasure = TBlobStorageGroupType::ErasureMirror3of4) : Mt(seed) , Mt64(seed) { Cerr << "Mersenne random seed " << seed << Endl; @@ -197,7 +197,7 @@ struct TBlobDepotTestEnvironment { BlobDepotTabletId = 0; } - void ConfigureEnvironment(ui32 numGroups, std::unique_ptr<TEnvironmentSetup>& envPtr, std::vector<ui32>& regularGroups, ui32& blobDepot, + void ConfigureEnvironment(ui32 numGroups, std::unique_ptr<TEnvironmentSetup>& envPtr, std::vector<ui32>& regularGroups, ui32& blobDepot, ui32 nodeCount = 8, TBlobStorageGroupType erasure = TBlobStorageGroupType::ErasureMirror3of4) { envPtr = std::make_unique<TEnvironmentSetup>(TEnvironmentSetup::TSettings{ .NodeCount = nodeCount, @@ -270,7 +270,7 @@ struct TBlobDepotTestEnvironment { template <class T> T& Rand(std::vector<T>& v) { return v[Rand(v.size())]; - } + } ui32 SeedRand(ui32 a, ui32 b, ui32 seed) { TMersenne<ui32> temp(seed); diff --git a/ydb/core/blobstorage/ut_blobstorage/blob_depot_test_functions.cpp b/ydb/core/blobstorage/ut_blobstorage/blob_depot_test_functions.cpp index 282d62dc68..e179f7e642 100644 --- a/ydb/core/blobstorage/ut_blobstorage/blob_depot_test_functions.cpp +++ b/ydb/core/blobstorage/ut_blobstorage/blob_depot_test_functions.cpp @@ -447,7 +447,7 @@ void TestRestoreRange(TBlobDepotTestEnvironment& tenv, ui64 tabletId, ui32 group } } -void TestVerifiedRandom(TBlobDepotTestEnvironment& tenv, ui32 nodeCount, ui64 tabletId0, ui32 groupId, +void TestVerifiedRandom(TBlobDepotTestEnvironment& tenv, ui32 nodeCount, ui64 tabletId0, ui32 groupId, ui32 iterationsNum, ui32 decommitStep, ui32 timeLimitSec, std::vector<ui32> probabilities) { enum EActions { ALTER = 0, @@ -461,7 +461,7 @@ void TestVerifiedRandom(TBlobDepotTestEnvironment& tenv, ui32 nodeCount, ui64 ta COLLECT_GARBAGE_SOFT, RESTART_BLOB_DEPOT, }; - + std::vector<std::string> actionName = { "ALTER", "PUT", "GET", "MULTIGET", "RANGE", "BLOCK", "DISCOVER", "COLLECT_GARBAGE_HARD", "COLLECT_GARBAGE_SOFT", "RESTART_BLOB_DEPOT" }; @@ -694,7 +694,7 @@ void TestVerifiedRandom(TBlobDepotTestEnvironment& tenv, ui32 nodeCount, ui64 ta } } -void TestLoadPutAndGet(TBlobDepotTestEnvironment& tenv, ui64 tabletId, ui32 groupId, ui32 blobsNum, ui32 maxBlobSize, +void TestLoadPutAndGet(TBlobDepotTestEnvironment& tenv, ui64 tabletId, ui32 groupId, ui32 blobsNum, ui32 maxBlobSize, ui32 readsNum, bool decommit, ui32 timeLimitSec, std::vector<ui32> probablities) { enum EActions { GET, diff --git a/ydb/core/blobstorage/ut_blobstorage/blob_depot_test_functions.h b/ydb/core/blobstorage/ut_blobstorage/blob_depot_test_functions.h index 822e43684c..93641837d4 100644 --- a/ydb/core/blobstorage/ut_blobstorage/blob_depot_test_functions.h +++ b/ydb/core/blobstorage/ut_blobstorage/blob_depot_test_functions.h @@ -30,5 +30,5 @@ void TestRestoreRange(TBlobDepotTestEnvironment& tenv, ui64 tabletId, ui32 group void TestVerifiedRandom(TBlobDepotTestEnvironment& tenv, ui32 nodeCount, ui64 tabletId0, ui32 groupId, ui32 iterationsNum, ui32 decommitStep = 1e9, ui32 timeLimitSec = 0, std::vector<ui32> probabilities = { 10, 10, 3, 3, 2, 1, 1, 3, 3, 1 }); -void TestLoadPutAndGet(TBlobDepotTestEnvironment& tenv, ui64 tabletId, ui32 groupId, ui32 blobsNum, ui32 maxBlobSize, ui32 readsNum, +void TestLoadPutAndGet(TBlobDepotTestEnvironment& tenv, ui64 tabletId, ui32 groupId, ui32 blobsNum, ui32 maxBlobSize, ui32 readsNum, bool decommit = false, ui32 timeLimitSec = 0, std::vector<ui32> probabilities = { 5, 1, 5, 5, 1, 1 });
\ No newline at end of file diff --git a/ydb/core/blobstorage/ut_blobstorage/defrag.cpp b/ydb/core/blobstorage/ut_blobstorage/defrag.cpp index d0face737e..ee4dff8c6c 100644 --- a/ydb/core/blobstorage/ut_blobstorage/defrag.cpp +++ b/ydb/core/blobstorage/ut_blobstorage/defrag.cpp @@ -262,8 +262,8 @@ Y_UNIT_TEST_SUITE(Defragmentation) { readMsg = ev->Release<NPDisk::TEvChunkReadResult>(); env.Runtime->Send( new IEventHandle( - *rewriterActorId, - ev->Sender, + *rewriterActorId, + ev->Sender, messChunkReadResult(readMsg.Get())), ev->Sender.NodeId()); @@ -306,7 +306,7 @@ Y_UNIT_TEST_SUITE(Defragmentation) { Y_UNIT_TEST(CorruptedReadHandling) { TestReadErrorHandlingBase([] (const NPDisk::TEvChunkReadResult* msg) { return new NPDisk::TEvChunkReadResult( - NKikimrProto::EReplyStatus::CORRUPTED, + NKikimrProto::EReplyStatus::CORRUPTED, msg->ChunkIdx, msg->Offset, msg->Cookie, @@ -319,7 +319,7 @@ Y_UNIT_TEST_SUITE(Defragmentation) { Y_UNIT_TEST(GappedReadHandling) { TestReadErrorHandlingBase([] (const NPDisk::TEvChunkReadResult* msg) { NPDisk::TEvChunkReadResult* res = new NPDisk::TEvChunkReadResult( - NKikimrProto::EReplyStatus::OK, + NKikimrProto::EReplyStatus::OK, msg->ChunkIdx, msg->Offset, msg->Cookie, diff --git a/ydb/core/blobstorage/ut_blobstorage/group_reconfiguration.cpp b/ydb/core/blobstorage/ut_blobstorage/group_reconfiguration.cpp index d2ada3985c..d6ff8bc331 100644 --- a/ydb/core/blobstorage/ut_blobstorage/group_reconfiguration.cpp +++ b/ydb/core/blobstorage/ut_blobstorage/group_reconfiguration.cpp @@ -4,7 +4,7 @@ Y_UNIT_TEST_SUITE(GroupReconfiguration) { class TBsProxyLoader : public TActorBootstrapped<TBsProxyLoader> { public: - TBsProxyLoader(ui32 groupId, ui32& sendCounter, ui32& successCounter) + TBsProxyLoader(ui32 groupId, ui32& sendCounter, ui32& successCounter) : GroupId(groupId) , SendCounter(sendCounter) , SuccessCounter(successCounter) @@ -40,7 +40,7 @@ Y_UNIT_TEST_SUITE(GroupReconfiguration) { void HandleWakeup() { TString data = TString(BlobSize, '0'); SendToBSProxy(SelfId(), GroupId, new TEvBlobStorage::TEvPut( - TLogoBlobID(TabletId, 1, 1, Channel, data.size(), Counter++), + TLogoBlobID(TabletId, 1, 1, Channel, data.size(), Counter++), std::move(data), TInstant::Max())); SendCounter += 1; @@ -106,7 +106,7 @@ Y_UNIT_TEST_SUITE(GroupReconfiguration) { break; } } - + for (const auto& pdisk : base.GetPDisk()) { toNodeId = pdisk.GetNodeId(); if (nodesInGroup.count(toNodeId) == 0) { @@ -128,7 +128,7 @@ Y_UNIT_TEST_SUITE(GroupReconfiguration) { } } - + void VerifyCounters(std::vector<std::pair<ui32, ui32>>& counters, ui32 acceptableLoss = 5) { for (ui32 i = 0; i < counters.size(); ++i) { auto [sent, successes] = counters[i]; @@ -144,7 +144,7 @@ Y_UNIT_TEST_SUITE(GroupReconfiguration) { for (ui32 nodeId : nodesToCheck) { auto edge = env.Runtime->AllocateEdgeActor(nodeId); - + env.Runtime->WrapInActorContext(edge, [&] { env.Runtime->Send(new IEventHandle(MakeBlobStorageNodeWardenID(nodeId), edge, new TEvNodeWardenQueryGroupInfo(groupId), nodeId)); @@ -182,7 +182,7 @@ Y_UNIT_TEST_SUITE(GroupReconfiguration) { ui32 toNodeId; std::vector<std::pair<ui32, ui32>> counters; - + NKikimrBlobStorage::TConfigRequest request; NKikimrBlobStorage::TConfigResponse response; @@ -197,7 +197,7 @@ Y_UNIT_TEST_SUITE(GroupReconfiguration) { env->Runtime->FilterFunction = [&](ui32 nodeId, std::unique_ptr<IEventHandle>& ev) { if (ev->Sender.NodeId() == bscNodeId) { if (nodesInGroup.count(nodeId) > 0 && nodeId != fromNodeId && nodeId != toNodeId && nodeId != bscNodeId) { - if (ev->GetTypeRewrite() == TEvBlobStorage::TEvControllerNodeServiceSetUpdate::EventType + if (ev->GetTypeRewrite() == TEvBlobStorage::TEvControllerNodeServiceSetUpdate::EventType && !std::exchange(bscShutDown, true)) { Cerr << "Send configuration to nodeId# " << nodeId << Endl; return true; @@ -241,7 +241,7 @@ Y_UNIT_TEST_SUITE(GroupReconfiguration) { ui32 toNodeId; std::vector<std::pair<ui32, ui32>> counters; - + NKikimrBlobStorage::TConfigRequest request; NKikimrBlobStorage::TConfigResponse response; @@ -251,7 +251,7 @@ Y_UNIT_TEST_SUITE(GroupReconfiguration) { response = env->Invoke(request); env->Sim(TDuration::MilliSeconds(1)); - + std::array<bool, numNodes - 1> passedMessages{true}; @@ -284,7 +284,7 @@ Y_UNIT_TEST_SUITE(GroupReconfiguration) { class TConfigurationRequestActor : public TActorBootstrapped<TConfigurationRequestActor> { public: - TConfigurationRequestActor(ui32 groupId, ui64 bsController, TDuration& delay) + TConfigurationRequestActor(ui32 groupId, ui64 bsController, TDuration& delay) : GroupId(groupId) , BsController(bsController) , Delay(delay) diff --git a/ydb/core/blobstorage/ut_blobstorage/index_restore_get.cpp b/ydb/core/blobstorage/ut_blobstorage/index_restore_get.cpp index 7145c08df3..1841dc669e 100644 --- a/ydb/core/blobstorage/ut_blobstorage/index_restore_get.cpp +++ b/ydb/core/blobstorage/ut_blobstorage/index_restore_get.cpp @@ -50,7 +50,7 @@ Y_UNIT_TEST_SUITE(IndexRestoreGet) { for (ui32 idx = 0; idx < 8; ++idx) { const ui32 orderNumber = nums[idx]; Cerr << idx << ' ' << orderNumber << Endl; - + std::vector<ui32> v; if (idx < 6) { v.push_back(idx + 1); @@ -87,7 +87,7 @@ Y_UNIT_TEST_SUITE(IndexRestoreGet) { for (ui32 idx = 0; idx < 8; ++idx) { const ui32 orderNumber = nums[idx]; Cerr << idx << ' ' << orderNumber << Endl; - + std::vector<ui32> v; if (idx < 6) { v.push_back(idx + 1); diff --git a/ydb/core/blobstorage/ut_blobstorage/monitoring.cpp b/ydb/core/blobstorage/ut_blobstorage/monitoring.cpp index 583380e957..e4831d86a2 100644 --- a/ydb/core/blobstorage/ut_blobstorage/monitoring.cpp +++ b/ydb/core/blobstorage/ut_blobstorage/monitoring.cpp @@ -119,7 +119,7 @@ void Test(const TBlobStorageGroupInfo::TTopology& topology, TInflightActor* acto updateCounters(); UNIT_ASSERT_VALUES_EQUAL(dsproxyCost, vdiskCost); - + actor->SetGroupId(groupId); env.Runtime->Register(actor, 1); env.Sim(TDuration::Minutes(15)); @@ -326,7 +326,7 @@ Y_UNIT_TEST_SUITE(CostMetricsGetMirror3dc) { MAKE_TEST_W_DATASIZE(Mirror3dc, Get, 100, 10, 1000); MAKE_TEST_W_DATASIZE(Mirror3dc, Get, 10000, 1000, 1000); } - + Y_UNIT_TEST_SUITE(CostMetricsGetBlock4Plus2) { MAKE_TEST_W_DATASIZE(4Plus2Block, Get, 1, 1, 1000); MAKE_TEST_W_DATASIZE(4Plus2Block, Get, 10, 1, 1000); diff --git a/ydb/core/blobstorage/ut_blobstorage/multiget.cpp b/ydb/core/blobstorage/ut_blobstorage/multiget.cpp index bcd55908f9..d9695d63bd 100644 --- a/ydb/core/blobstorage/ut_blobstorage/multiget.cpp +++ b/ydb/core/blobstorage/ut_blobstorage/multiget.cpp @@ -29,7 +29,7 @@ Y_UNIT_TEST_SUITE(MultiGet) { }); ++numInFlight; } - + for (; numInFlight > 0; --numInFlight) { auto res = env.WaitForEdgeActorEvent<TEvBlobStorage::TEvPutResult>(edge, false); UNIT_ASSERT_VALUES_EQUAL(res->Get()->Status, NKikimrProto::OK); diff --git a/ydb/core/blobstorage/ut_blobstorage/read_only_vdisk.cpp b/ydb/core/blobstorage/ut_blobstorage/read_only_vdisk.cpp index d7ff263a8e..b75971f110 100644 --- a/ydb/core/blobstorage/ut_blobstorage/read_only_vdisk.cpp +++ b/ydb/core/blobstorage/ut_blobstorage/read_only_vdisk.cpp @@ -120,8 +120,8 @@ struct TTetsEnv { auto SendCollectGarbage(ui32 step) { const TActorId sender = Env.Runtime->AllocateEdgeActor(VDiskActorId.NodeId(), __FILE__, __LINE__); auto ev = std::make_unique<TEvBlobStorage::TEvCollectGarbage>( - 1, ++CollectGeneration, 0, - true, 1, step, + 1, ++CollectGeneration, 0, + true, 1, step, nullptr, nullptr, TInstant::Max() ); Env.Runtime->WrapInActorContext(sender, [&] { @@ -154,7 +154,7 @@ struct TTetsEnv { } const TActorId sender = Env.Runtime->AllocateEdgeActor(VDiskActorId.NodeId(), __FILE__, __LINE__); auto ev = std::make_unique<TEvLoad::TEvLoadTestRequest>(); - + TString conf("StorageLoad: {\n" "DurationSeconds: 8\n" "Tablets: {\n" diff --git a/ydb/core/blobstorage/ut_blobstorage/recovery.cpp b/ydb/core/blobstorage/ut_blobstorage/recovery.cpp index 151a150e45..8209450d6c 100644 --- a/ydb/core/blobstorage/ut_blobstorage/recovery.cpp +++ b/ydb/core/blobstorage/ut_blobstorage/recovery.cpp @@ -30,7 +30,7 @@ Y_UNIT_TEST_SUITE(CompatibilityInfo) { bool isCompatible, TValidateCallback validateCallback, bool suppressCompatibilityCheck = false) { passPoisons = 1000; const TString build = "ydb"; - + TCurrentConstructor oldInfoConstructor; if (oldVersion) { oldInfoConstructor = TCurrentConstructor{ @@ -159,7 +159,7 @@ Y_UNIT_TEST_SUITE(CompatibilityInfo) { auto response = env.WaitForEdgeActorEvent<TEvStateStorage::TEvInfo>(getGenEdge, true); return response->Get()->CurrentGeneration; }; - + const ui32 gen1 = getTabletGen(); env.Sim(TDuration::Seconds(30)); const ui32 gen2 = getTabletGen(); diff --git a/ydb/core/blobstorage/ut_blobstorage/sanitize_groups.cpp b/ydb/core/blobstorage/ut_blobstorage/sanitize_groups.cpp index 25abb5fd1d..26c40dd7d1 100644 --- a/ydb/core/blobstorage/ut_blobstorage/sanitize_groups.cpp +++ b/ydb/core/blobstorage/ut_blobstorage/sanitize_groups.cpp @@ -13,7 +13,7 @@ Y_UNIT_TEST_SUITE(GroupLayoutSanitizer) { } using TLocationGenerator = std::function<NActorsInterconnect::TNodeLocation(ui32, ui32, ui32)>; - + void MakeLocations(std::vector<TNodeLocation>& locations, ui32 numDatacenters, ui32 numRacksPerDC, ui32 numNodesPerRack, TLocationGenerator locationGenerator) { for (ui32 dc = 0; dc < numDatacenters; ++dc) { @@ -93,7 +93,7 @@ Y_UNIT_TEST_SUITE(GroupLayoutSanitizer) { std::unordered_map<ui32, TNodeLocation> nodes; std::unordered_map<TPDiskId, NLayoutChecker::TPDiskLayoutPosition> pdisks; - + for (ui32 i = 0; i < cfg.NodeSize(); ++i) { auto node = cfg.GetNode(i); nodes[node.GetNodeId()] = TNodeLocation(node.GetLocation()); @@ -186,11 +186,11 @@ Y_UNIT_TEST_SUITE(GroupLayoutSanitizer) { MakeLocations(locations, 4, 5, 1, locationGenerator); env->Initialize(); - + if (!allowMultipleRealmsOccupation) { env->Runtime->FilterFunction = {}; } - + // Update bs config { NKikimrBlobStorage::TConfigRequest request; diff --git a/ydb/core/blobstorage/vdisk/defrag/defrag_rewriter.cpp b/ydb/core/blobstorage/vdisk/defrag/defrag_rewriter.cpp index e832835a1b..9f50338e54 100644 --- a/ydb/core/blobstorage/vdisk/defrag/defrag_rewriter.cpp +++ b/ydb/core/blobstorage/vdisk/defrag/defrag_rewriter.cpp @@ -31,7 +31,7 @@ namespace NKikimr { : Rec(rec) , GType(gtype) {} - + void AddFromFresh(const TMemRecLogoBlob& memRec, const TRope*, const TKeyLogoBlob&, ui64) { Process(memRec, nullptr); } diff --git a/ydb/core/blobstorage/vdisk/defrag/defrag_rewriter.h b/ydb/core/blobstorage/vdisk/defrag/defrag_rewriter.h index 537f6b49fe..b9d1c966fb 100644 --- a/ydb/core/blobstorage/vdisk/defrag/defrag_rewriter.h +++ b/ydb/core/blobstorage/vdisk/defrag/defrag_rewriter.h @@ -38,7 +38,7 @@ namespace NKikimr { const TVDiskID &selfVDiskId, const TActorId ¬ifyId, std::vector<TDefragRecord> &&recs); - + bool IsDefragRewriter(const IActor* actor); } // NKikimr diff --git a/ydb/core/blobstorage/vdisk/skeleton/blobstorage_monactors.cpp b/ydb/core/blobstorage/vdisk/skeleton/blobstorage_monactors.cpp index a21b768533..e9982f1927 100644 --- a/ydb/core/blobstorage/vdisk/skeleton/blobstorage_monactors.cpp +++ b/ydb/core/blobstorage/vdisk/skeleton/blobstorage_monactors.cpp @@ -1160,7 +1160,7 @@ namespace NKikimr { cfg->BaseInfo.PDiskId, selfVDiskId, MakeBlobStorageNodeWardenID(skeletonFrontID.NodeId()), notifyId, ev->Sender ); } else { - return new TMonErrorActor(notifyId, ev, + return new TMonErrorActor(notifyId, ev, "VDisk restart in the normal state is not allowed <br>\n" "<a class=\"btn btn-default\" href=\"?\">Go back to the main VDisk page</a>" ); 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 2a0e2f2fa6..fc80848700 100644 --- a/ydb/core/blobstorage/vdisk/skeleton/skeleton_block_and_get.cpp +++ b/ydb/core/blobstorage/vdisk/skeleton/skeleton_block_and_get.cpp @@ -44,7 +44,7 @@ public: Request->Get()->Record.GetForceBlockTabletData().GetId(), Request->Get()->Record.GetForceBlockTabletData().GetGeneration(), VDiskIDFromVDiskID(Request->Get()->Record.GetVDiskID()), - Request->Get()->Record.GetMsgQoS().HasDeadlineSeconds() ? + Request->Get()->Record.GetMsgQoS().HasDeadlineSeconds() ? TInstant::Seconds(Request->Get()->Record.GetMsgQoS().GetDeadlineSeconds()) : TInstant::Seconds(VBLOCK_DEFAULT_DEADLINE_SECONDS) ); diff --git a/ydb/core/blobstorage/vdisk/skeleton/skeleton_vpatch_actor.h b/ydb/core/blobstorage/vdisk/skeleton/skeleton_vpatch_actor.h index df561accb7..cfb5441daa 100644 --- a/ydb/core/blobstorage/vdisk/skeleton/skeleton_vpatch_actor.h +++ b/ydb/core/blobstorage/vdisk/skeleton/skeleton_vpatch_actor.h @@ -33,7 +33,7 @@ struct TVPatchCtx : public TThrRefBase, TNonCopyable { IActor* CreateSkeletonVPatchActor(TActorId leaderId, const TBlobStorageGroupType &gType, TEvBlobStorage::TEvVPatchStart::TPtr &ev, TInstant now, TActorIDPtr skeletonFrontIDPtr, const ::NMonitoring::TDynamicCounters::TCounterPtr &vPatchFoundPartsMsgsPtr, - const ::NMonitoring::TDynamicCounters::TCounterPtr &vPatchResMsgsPtr, + const ::NMonitoring::TDynamicCounters::TCounterPtr &vPatchResMsgsPtr, const NVDiskMon::TLtcHistoPtr &getHistogram, const NVDiskMon::TLtcHistoPtr &putHistogram, const TIntrusivePtr<TVPatchCtx> &vPatchCtx, const TString &vDiskLogPrefix, ui64 incarnationGuid); diff --git a/ydb/core/blobstorage/vdisk/syncer/blobstorage_syncer_committer.cpp b/ydb/core/blobstorage/vdisk/syncer/blobstorage_syncer_committer.cpp index ac380f7a14..6ad4d1fc0a 100644 --- a/ydb/core/blobstorage/vdisk/syncer/blobstorage_syncer_committer.cpp +++ b/ydb/core/blobstorage/vdisk/syncer/blobstorage_syncer_committer.cpp @@ -132,7 +132,7 @@ namespace NKikimr { } else { LOG_WARN(ctx, NKikimrServices::BS_SYNCER, VDISKP(SyncerCtx->VCtx->VDiskLogPrefix, - "SelfCommit in TSyncerCommitter is disabled")); + "SelfCommit in TSyncerCommitter is disabled")); } TThis::Become(&TThis::StateFunc); } |