Skip to content

Commit e873d60

Browse files
alexd65536alexd65536
committed
rename CheckIntegrity placement statuses (ydb-platform#19145)
1 parent 2e69f72 commit e873d60

File tree

3 files changed

+21
-21
lines changed

3 files changed

+21
-21
lines changed

‎ydb/core/base/blobstorage.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1365,12 +1365,12 @@ struct TEvBlobStorage {
13651365
TString ErrorReason;
13661366

13671367
enum EPlacementStatus {
1368-
PS_OK = 1, // blob parts are placed according to fail model
1369-
PS_ERROR = 2, // blob is lost/unrecoverable
1370-
PS_UNKNOWN = 3, // status is unknown because of missing disks or network problems
1371-
PS_NOT_YET = 4, // there are missing parts but status may become OK after replication
1372-
PS_RECOVERABLE = 5, // blob parts are definitely placed incorrectly or there are missing parts
1373-
// but blob may be recovered
1368+
PS_OK = 1, // blob parts are placed according to fail model
1369+
PS_BLOB_IS_LOST = 2, // blob is lost/unrecoverable
1370+
PS_UNKNOWN = 3, // status is unknown because of missing disks or network problems
1371+
PS_REPLICATION_IN_PROGRESS = 4, // there are missing parts but status may become OK after replication
1372+
PS_BLOB_IS_RECOVERABLE = 5, // blob parts are definitely placed incorrectly or there are missing parts
1373+
// but blob may be recovered
13741374
};
13751375
EPlacementStatus PlacementStatus;
13761376

‎ydb/core/blobstorage/dsproxy/dsproxy_check_integrity_get.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,13 +150,13 @@ class TBlobStorageGroupCheckIntegrityRequest
150150
PartLayoutWithNotYet, faultyDisks);
151151

152152
if (stateNotYet == TBlobStorageGroupInfo::EBS_FULL) {
153-
PendingResult->PlacementStatus = TEvCheckIntegrityResult::PS_NOT_YET;
153+
PendingResult->PlacementStatus = TEvCheckIntegrityResult::PS_REPLICATION_IN_PROGRESS;
154154
} else if (state == TBlobStorageGroupInfo::EBS_RECOVERABLE_FRAGMENTARY) {
155-
PendingResult->PlacementStatus = TEvCheckIntegrityResult::PS_RECOVERABLE;
155+
PendingResult->PlacementStatus = TEvCheckIntegrityResult::PS_BLOB_IS_RECOVERABLE;
156156
} else if (HasErrorDisks) {
157157
PendingResult->PlacementStatus = TEvCheckIntegrityResult::PS_UNKNOWN;
158158
} else {
159-
PendingResult->PlacementStatus = TEvCheckIntegrityResult::PS_ERROR;
159+
PendingResult->PlacementStatus = TEvCheckIntegrityResult::PS_BLOB_IS_LOST;
160160
}
161161
break;
162162
}

‎ydb/core/blobstorage/ut_blobstorage/check_integrity.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ Y_UNIT_TEST_SUITE(CheckIntegrityBlock42) {
165165

166166
auto result = check.Request();
167167
UNIT_ASSERT(result->Status == NKikimrProto::OK);
168-
UNIT_ASSERT(result->PlacementStatus == TEvBlobStorage::TEvCheckIntegrityResult::PS_RECOVERABLE);
168+
UNIT_ASSERT(result->PlacementStatus == TEvBlobStorage::TEvCheckIntegrityResult::PS_BLOB_IS_RECOVERABLE);
169169
}
170170

171171
Y_UNIT_TEST(PlacementBlobIsLost) {
@@ -177,7 +177,7 @@ Y_UNIT_TEST_SUITE(CheckIntegrityBlock42) {
177177

178178
auto result = check.Request();
179179
UNIT_ASSERT(result->Status == NKikimrProto::OK);
180-
UNIT_ASSERT(result->PlacementStatus == TEvBlobStorage::TEvCheckIntegrityResult::PS_ERROR);
180+
UNIT_ASSERT(result->PlacementStatus == TEvBlobStorage::TEvCheckIntegrityResult::PS_BLOB_IS_LOST);
181181
}
182182

183183
Y_UNIT_TEST(PlacementWrongDisks) {
@@ -191,7 +191,7 @@ Y_UNIT_TEST_SUITE(CheckIntegrityBlock42) {
191191

192192
auto result = check.Request();
193193
UNIT_ASSERT(result->Status == NKikimrProto::OK);
194-
UNIT_ASSERT(result->PlacementStatus == TEvBlobStorage::TEvCheckIntegrityResult::PS_RECOVERABLE);
194+
UNIT_ASSERT(result->PlacementStatus == TEvBlobStorage::TEvCheckIntegrityResult::PS_BLOB_IS_RECOVERABLE);
195195
}
196196

197197
Y_UNIT_TEST(PlacementAllOnHandoff) {
@@ -203,7 +203,7 @@ Y_UNIT_TEST_SUITE(CheckIntegrityBlock42) {
203203

204204
auto result = check.Request();
205205
UNIT_ASSERT(result->Status == NKikimrProto::OK);
206-
UNIT_ASSERT(result->PlacementStatus == TEvBlobStorage::TEvCheckIntegrityResult::PS_RECOVERABLE);
206+
UNIT_ASSERT(result->PlacementStatus == TEvBlobStorage::TEvCheckIntegrityResult::PS_BLOB_IS_RECOVERABLE);
207207
}
208208

209209
Y_UNIT_TEST(PlacementDisintegrated) {
@@ -264,7 +264,7 @@ Y_UNIT_TEST_SUITE(CheckIntegrityBlock42) {
264264

265265
auto result = check.Request();
266266
UNIT_ASSERT(result->Status == NKikimrProto::OK);
267-
UNIT_ASSERT(result->PlacementStatus == TEvBlobStorage::TEvCheckIntegrityResult::PS_RECOVERABLE);
267+
UNIT_ASSERT(result->PlacementStatus == TEvBlobStorage::TEvCheckIntegrityResult::PS_BLOB_IS_RECOVERABLE);
268268
}
269269

270270
Y_UNIT_TEST(PlacementStatusUnknown) {
@@ -378,7 +378,7 @@ Y_UNIT_TEST_SUITE(CheckIntegrityBlock42) {
378378

379379
auto result = check.Request();
380380
UNIT_ASSERT(result->Status == NKikimrProto::OK);
381-
UNIT_ASSERT(result->PlacementStatus == TEvBlobStorage::TEvCheckIntegrityResult::PS_RECOVERABLE);
381+
UNIT_ASSERT(result->PlacementStatus == TEvBlobStorage::TEvCheckIntegrityResult::PS_BLOB_IS_RECOVERABLE);
382382
UNIT_ASSERT(result->DataStatus == TEvBlobStorage::TEvCheckIntegrityResult::DS_OK);
383383

384384
Cerr << result->DataErrorInfo << Endl;
@@ -394,7 +394,7 @@ Y_UNIT_TEST_SUITE(CheckIntegrityBlock42) {
394394

395395
auto result = check.Request();
396396
UNIT_ASSERT(result->Status == NKikimrProto::OK);
397-
UNIT_ASSERT(result->PlacementStatus == TEvBlobStorage::TEvCheckIntegrityResult::PS_RECOVERABLE);
397+
UNIT_ASSERT(result->PlacementStatus == TEvBlobStorage::TEvCheckIntegrityResult::PS_BLOB_IS_RECOVERABLE);
398398
UNIT_ASSERT(result->DataStatus == TEvBlobStorage::TEvCheckIntegrityResult::DS_ERROR);
399399

400400
Cerr << result->DataErrorInfo << Endl;
@@ -475,15 +475,15 @@ Y_UNIT_TEST_SUITE(CheckIntegrityMirror3dc) {
475475

476476
auto result = check.Request();
477477
UNIT_ASSERT(result->Status == NKikimrProto::OK);
478-
UNIT_ASSERT(result->PlacementStatus == TEvBlobStorage::TEvCheckIntegrityResult::PS_RECOVERABLE);
478+
UNIT_ASSERT(result->PlacementStatus == TEvBlobStorage::TEvCheckIntegrityResult::PS_BLOB_IS_RECOVERABLE);
479479
}
480480

481481
Y_UNIT_TEST(PlacementBlobIsLost) {
482482
TCheckIntegrityEnvMirror3dc check;
483483

484484
auto result = check.Request();
485485
UNIT_ASSERT(result->Status == NKikimrProto::OK);
486-
UNIT_ASSERT(result->PlacementStatus == TEvBlobStorage::TEvCheckIntegrityResult::PS_ERROR);
486+
UNIT_ASSERT(result->PlacementStatus == TEvBlobStorage::TEvCheckIntegrityResult::PS_BLOB_IS_LOST);
487487
}
488488

489489
Y_UNIT_TEST(PlacementDisintegrated) {
@@ -545,7 +545,7 @@ Y_UNIT_TEST_SUITE(CheckIntegrityMirror3dc) {
545545

546546
auto result = check.Request();
547547
UNIT_ASSERT(result->Status == NKikimrProto::OK);
548-
UNIT_ASSERT(result->PlacementStatus == TEvBlobStorage::TEvCheckIntegrityResult::PS_RECOVERABLE);
548+
UNIT_ASSERT(result->PlacementStatus == TEvBlobStorage::TEvCheckIntegrityResult::PS_BLOB_IS_RECOVERABLE);
549549
}
550550

551551
Y_UNIT_TEST(DataOk) {
@@ -621,7 +621,7 @@ Y_UNIT_TEST_SUITE(CheckIntegrityMirror3of4) {
621621

622622
auto result = check.Request();
623623
UNIT_ASSERT(result->Status == NKikimrProto::OK);
624-
UNIT_ASSERT(result->PlacementStatus == TEvBlobStorage::TEvCheckIntegrityResult::PS_RECOVERABLE);
624+
UNIT_ASSERT(result->PlacementStatus == TEvBlobStorage::TEvCheckIntegrityResult::PS_BLOB_IS_RECOVERABLE);
625625
}
626626

627627
Y_UNIT_TEST(PlacementBlobIsLost) {
@@ -632,7 +632,7 @@ Y_UNIT_TEST_SUITE(CheckIntegrityMirror3of4) {
632632

633633
auto result = check.Request();
634634
UNIT_ASSERT(result->Status == NKikimrProto::OK);
635-
UNIT_ASSERT(result->PlacementStatus == TEvBlobStorage::TEvCheckIntegrityResult::PS_ERROR);
635+
UNIT_ASSERT(result->PlacementStatus == TEvBlobStorage::TEvCheckIntegrityResult::PS_BLOB_IS_LOST);
636636
}
637637

638638
Y_UNIT_TEST(PlacementDisintegrated) {

0 commit comments

Comments
 (0)