Merge 4a67aff into 736e7ff

serbel324 · web-flow · commit 826c765da681 · 2024-01-31T14:06:05.000Z
diff --git a/ydb/core/blobstorage/vdisk/common/blobstorage_cost_tracker.cpp b/ydb/core/blobstorage/vdisk/common/blobstorage_cost_tracker.cpp
@@ -8,6 +8,12 @@ const TDiskOperationCostEstimator TBsCostModelBase::HDDEstimator{
     { 6.089e+06, 8.1 }, // HugeWriteCoefficients
 };
 
+const TDiskOperationCostEstimator TBsCostModelBase::SSDEstimator{
+    { 180000, 3.00 },   // ReadCoefficients
+    { 430, 4.2 },     // WriteCoefficients
+    { 110000, 3.6 },     // HugeWriteCoefficients
+};
+
 const TDiskOperationCostEstimator TBsCostModelBase::NVMEEstimator{
     { 10000, 1.3 },   // ReadCoefficients
     { 3300, 1.5 },     // WriteCoefficients
diff --git a/ydb/core/blobstorage/vdisk/common/blobstorage_cost_tracker.h b/ydb/core/blobstorage/vdisk/common/blobstorage_cost_tracker.h
@@ -63,6 +63,7 @@ class TBsCostModelBase {
     ui64 PDiskWriteBlockSize = 4ull * 1'000'000; // 4MB
 
     static const TDiskOperationCostEstimator HDDEstimator;
+    static const TDiskOperationCostEstimator SSDEstimator;
     static const TDiskOperationCostEstimator NVMEEstimator;
 
 private:
@@ -100,6 +101,9 @@ class TBsCostModelBase {
             case NPDisk::DEVICE_TYPE_ROT: {
                 return HDDEstimator.Write(chunkSize);
             }
+            case NPDisk::DEVICE_TYPE_SSD: {
+                return SSDEstimator.Write(chunkSize);
+            }
             case NPDisk::DEVICE_TYPE_NVME: {
                 return NVMEEstimator.Write(chunkSize);
             }
@@ -116,6 +120,9 @@ class TBsCostModelBase {
             case NPDisk::DEVICE_TYPE_ROT: {
                 return HDDEstimator.HugeWrite(chunkSize);
             }
+            case NPDisk::DEVICE_TYPE_SSD: {
+                return SSDEstimator.HugeWrite(chunkSize);
+            }
             case NPDisk::DEVICE_TYPE_NVME: {
                 return NVMEEstimator.HugeWrite(chunkSize);
             }
@@ -133,6 +140,9 @@ class TBsCostModelBase {
             case NPDisk::DEVICE_TYPE_ROT: {
                 return HDDEstimator.Read(chunkSize);
             }
+            case NPDisk::DEVICE_TYPE_SSD: {
+                return SSDEstimator.Read(chunkSize);
+            }
             case NPDisk::DEVICE_TYPE_NVME: {
                 return NVMEEstimator.Read(chunkSize);
             }

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,7 @@ class TBsCostModelBase {`
`63`	`63`	`ui64 PDiskWriteBlockSize = 4ull * 1'000'000; // 4MB`
`64`	`64`
`65`	`65`	`static const TDiskOperationCostEstimator HDDEstimator;`
	`66`	`+ static const TDiskOperationCostEstimator SSDEstimator;`
`66`	`67`	`static const TDiskOperationCostEstimator NVMEEstimator;`
`67`	`68`
`68`	`69`	`private:`
`@@ -100,6 +101,9 @@ class TBsCostModelBase {`
`100`	`101`	`case NPDisk::DEVICE_TYPE_ROT: {`
`101`	`102`	`return HDDEstimator.Write(chunkSize);`
`102`	`103`	`}`
	`104`	`+ case NPDisk::DEVICE_TYPE_SSD: {`
	`105`	`+ return SSDEstimator.Write(chunkSize);`
	`106`	`+ }`
`103`	`107`	`case NPDisk::DEVICE_TYPE_NVME: {`
`104`	`108`	`return NVMEEstimator.Write(chunkSize);`
`105`	`109`	`}`
`@@ -116,6 +120,9 @@ class TBsCostModelBase {`
`116`	`120`	`case NPDisk::DEVICE_TYPE_ROT: {`
`117`	`121`	`return HDDEstimator.HugeWrite(chunkSize);`
`118`	`122`	`}`
	`123`	`+ case NPDisk::DEVICE_TYPE_SSD: {`
	`124`	`+ return SSDEstimator.HugeWrite(chunkSize);`
	`125`	`+ }`
`119`	`126`	`case NPDisk::DEVICE_TYPE_NVME: {`
`120`	`127`	`return NVMEEstimator.HugeWrite(chunkSize);`
`121`	`128`	`}`
`@@ -133,6 +140,9 @@ class TBsCostModelBase {`
`133`	`140`	`case NPDisk::DEVICE_TYPE_ROT: {`
`134`	`141`	`return HDDEstimator.Read(chunkSize);`
`135`	`142`	`}`
	`143`	`+ case NPDisk::DEVICE_TYPE_SSD: {`
	`144`	`+ return SSDEstimator.Read(chunkSize);`
	`145`	`+ }`
`136`	`146`	`case NPDisk::DEVICE_TYPE_NVME: {`
`137`	`147`	`return NVMEEstimator.Read(chunkSize);`
`138`	`148`	`}`