Skip to content

Commit c3344ba

Browse files
authored
Merge branch 'ydb-platform:main' into main
2 parents bd40c0d + 9c84445 commit c3344ba

File tree

16 files changed

+106
-652
lines changed

16 files changed

+106
-652
lines changed

ydb/core/blobstorage/ut_blobstorage/balancing.cpp

Lines changed: 0 additions & 305 deletions
This file was deleted.

ydb/core/blobstorage/ut_blobstorage/ut_balancing/ya.make

Lines changed: 0 additions & 15 deletions
This file was deleted.

ydb/core/blobstorage/ut_blobstorage/ya.make

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ REQUIREMENTS(ram:32)
6060
END()
6161

6262
RECURSE_FOR_TESTS(
63-
ut_balancing
6463
ut_blob_depot
6564
ut_blob_depot_fat
6665
ut_donor

ydb/core/blobstorage/vdisk/common/blobstorage_cost_tracker.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ class TBsCostModelBase {
2828

2929
// Estimated Coefficients
3030
// cost = A + B * size
31-
double WriteA = 2520;
32-
double WriteB = 5.7668;
31+
double WriteA = 6500;
32+
double WriteB = 11.1;
3333

3434
double ReadA = WriteA;
3535
double ReadB = WriteB;
3636

37-
double HugeWriteA = 1.26748409e+06;
38-
double HugeWriteB = 2.69514462e+01;
37+
double HugeWriteA = 6.089e+06;
38+
double HugeWriteB = 8.1;
3939

4040
private:
4141
enum class EMemoryOperationType {
@@ -206,9 +206,9 @@ class TBsCostModelBase {
206206
// WRITES
207207
ui64 GetCost(const NPDisk::TEvChunkWrite& ev) const {
208208
if (ev.PriorityClass == NPriPut::Log) {
209-
return EstimatedWriteCost(ev.PartsPtr->Size());
209+
return EstimatedWriteCost(ev.PartsPtr->ByteSize());
210210
} else {
211-
return EstimatedHugeWriteCost(ev.PartsPtr->Size());
211+
return EstimatedHugeWriteCost(ev.PartsPtr->ByteSize());
212212
}
213213
}
214214
};

ydb/core/util/testactorsys.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ class TTestActorSystem {
161161
}
162162

163163
void StateFunc(TAutoPtr<IEventHandle>& ev) {
164-
Y_ABORT_UNLESS(HandlePtr, "event %s is not being captured by this actor Tag# %s", ev->GetTypeName().data(), Tag.data());
164+
Y_ABORT_UNLESS(HandlePtr, "event is not being captured by this actor Tag# %s", Tag.data());
165165
Y_ABORT_UNLESS(!*HandlePtr);
166166
HandlePtr->reset(ev.Release());
167167
}

ydb/library/yql/cfg/tests/gateways-experimental.conf

Whitespace-only changes.

0 commit comments

Comments
 (0)