Skip to content

Commit dd139ea

Browse files
neiharneihar
committed
rename and add tests
1 parent 685933d commit dd139ea

File tree

11 files changed

+143
-112
lines changed

11 files changed

+143
-112
lines changed

‎cloud/blockstore/libs/storage/core/disk_counters.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ struct THistogramRequestCounters
397397
EPublishingPolicy::Repl,
398398
HistCounterOptions};
399399
TLowResCounter ConfirmBlobs{EPublishingPolicy::Repl, HistCounterOptions};
400-
TLowResCounter DeleteStalledUnconfirmedBlobs{
400+
TLowResCounter DeleteObsoleteUnconfirmedBlobs{
401401
EPublishingPolicy::Repl,
402402
HistCounterOptions};
403403

@@ -426,7 +426,7 @@ struct THistogramRequestCounters
426426
MakeMeta<&THistogramRequestCounters::AddConfirmedBlobs>(),
427427
MakeMeta<&THistogramRequestCounters::AddUnconfirmedBlobs>(),
428428
MakeMeta<&THistogramRequestCounters::ConfirmBlobs>(),
429-
MakeMeta<&THistogramRequestCounters::DeleteStalledUnconfirmedBlobs>(),
429+
MakeMeta<&THistogramRequestCounters::DeleteObsoleteUnconfirmedBlobs>(),
430430

431431
MakeMeta<&THistogramRequestCounters::WriteBlob>(),
432432
MakeMeta<&THistogramRequestCounters::ReadBlob>(),

‎cloud/blockstore/libs/storage/partition/part_actor.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ class TPartitionActor final
225225
void EnqueueProcessWriteQueueIfNeeded(const NActors::TActorContext& ctx);
226226
void EnqueueTrimFreshLogIfNeeded(const NActors::TActorContext& ctx);
227227
void EnqueueAddConfirmedBlobsIfNeeded(const NActors::TActorContext& ctx);
228-
void EnqueueDeleteStalledUnconfirmedBlobsIfNeeded(const NActors::TActorContext& ctx);
228+
void EnqueueDeleteObsoleteUnconfirmedBlobsIfNeeded(const NActors::TActorContext& ctx);
229229

230230
void UpdateStats(const NProto::TPartitionStats& update);
231231
void UpdateActorStats(const NActors::TActorContext& ctx);

‎cloud/blockstore/libs/storage/partition/part_actor_deletestalledunconfirmedblobs.cpp‎ renamed to ‎cloud/blockstore/libs/storage/partition/part_actor_deleteobsoleteunconfirmedblobs.cpp‎

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -18,40 +18,40 @@ using namespace NKikimr::NTabletFlatExecutor;
1818

1919
////////////////////////////////////////////////////////////////////////////////
2020

21-
void TPartitionActor::EnqueueDeleteStalledUnconfirmedBlobsIfNeeded(
21+
void TPartitionActor::EnqueueDeleteObsoleteUnconfirmedBlobsIfNeeded(
2222
const TActorContext& ctx)
2323
{
24-
if (State->GetStalledUnconfirmedBlobsState().Status !=
24+
if (State->GetObsoleteUnconfirmedBlobsState().Status !=
2525
EOperationStatus::Idle)
2626
{
2727
// already enqueued
2828
return;
2929
}
3030

31-
if (State->GetStalledUnconfirmedBlobs().empty()) {
31+
if (State->GetObsoleteUnconfirmedBlobs().empty()) {
3232
// not ready
3333
return;
3434
}
3535

36-
State->GetStalledUnconfirmedBlobsState().SetStatus(
36+
State->GetObsoleteUnconfirmedBlobsState().SetStatus(
3737
EOperationStatus::Enqueued);
3838

3939
auto request = std::make_unique<
40-
TEvPartitionPrivate::TEvDeleteStalledUnconfirmedBlobsRequest>(
40+
TEvPartitionPrivate::TEvDeleteObsoleteUnconfirmedBlobsRequest>(
4141
MakeIntrusive<TCallContext>(CreateRequestId()));
4242

4343
LOG_DEBUG(
4444
ctx,
4545
TBlockStoreComponents::PARTITION,
46-
"%s DeleteStalledUnconfirmedBlobs request sent: %lu",
46+
"%s DeleteObsoleteUnconfirmedBlobs request sent: %lu",
4747
LogTitle.GetWithTime().c_str(),
4848
request->CallContext->RequestId);
4949

5050
NCloud::Send(ctx, SelfId(), std::move(request));
5151
}
5252

53-
void TPartitionActor::HandleDeleteStalledUnconfirmedBlobs(
54-
const TEvPartitionPrivate::TEvDeleteStalledUnconfirmedBlobsRequest::TPtr&
53+
void TPartitionActor::HandleDeleteObsoleteUnconfirmedBlobs(
54+
const TEvPartitionPrivate::TEvDeleteObsoleteUnconfirmedBlobsRequest::TPtr&
5555
ev,
5656
const TActorContext& ctx)
5757
{
@@ -65,22 +65,22 @@ void TPartitionActor::HandleDeleteStalledUnconfirmedBlobs(
6565
LWTRACK(
6666
RequestReceived_Partition,
6767
requestInfo->CallContext->LWOrbit,
68-
"DeleteStalledUnconfirmedBlobs",
68+
"DeleteObsoleteUnconfirmedBlobs",
6969
requestInfo->CallContext->RequestId);
7070

71-
State->GetStalledUnconfirmedBlobsState().SetStatus(
71+
State->GetObsoleteUnconfirmedBlobsState().SetStatus(
7272
EOperationStatus::Started);
7373

74-
AddTransaction<TEvPartitionPrivate::TDeleteStalledUnconfirmedBlobsMethod>(
74+
AddTransaction<TEvPartitionPrivate::TDeleteObsoleteUnconfirmedBlobsMethod>(
7575
*requestInfo);
7676

77-
ExecuteTx(ctx, CreateTx<TDeleteStalledUnconfirmedBlobs>(requestInfo));
77+
ExecuteTx(ctx, CreateTx<TDeleteObsoleteUnconfirmedBlobs>(requestInfo));
7878
}
7979

80-
bool TPartitionActor::PrepareDeleteStalledUnconfirmedBlobs(
80+
bool TPartitionActor::PrepareDeleteObsoleteUnconfirmedBlobs(
8181
const TActorContext& ctx,
8282
TTransactionContext& tx,
83-
TTxPartition::TDeleteStalledUnconfirmedBlobs& args)
83+
TTxPartition::TDeleteObsoleteUnconfirmedBlobs& args)
8484
{
8585
Y_UNUSED(ctx);
8686
Y_UNUSED(tx);
@@ -89,50 +89,48 @@ bool TPartitionActor::PrepareDeleteStalledUnconfirmedBlobs(
8989
return true;
9090
}
9191

92-
void TPartitionActor::ExecuteDeleteStalledUnconfirmedBlobs(
92+
void TPartitionActor::ExecuteDeleteObsoleteUnconfirmedBlobs(
9393
const TActorContext& ctx,
9494
TTransactionContext& tx,
95-
TTxPartition::TDeleteStalledUnconfirmedBlobs& args)
95+
TTxPartition::TDeleteObsoleteUnconfirmedBlobs& args)
9696
{
9797
Y_UNUSED(ctx);
9898
Y_UNUSED(args);
9999

100100
TPartitionDatabase db(tx.DB);
101101

102-
const auto& stalledBlobs = State->GetStalledUnconfirmedBlobs();
102+
const auto& obsoleteBlobs = State->GetObsoleteUnconfirmedBlobs();
103103

104-
for (const auto& [commitId, blobs]: stalledBlobs) {
104+
for (const auto& [commitId, blobs]: obsoleteBlobs) {
105105
for (const auto& blob: blobs) {
106106
auto blobId = MakePartialBlobId(commitId, blob.UniqueId);
107107
db.DeleteUnconfirmedBlob(blobId);
108108
}
109109

110-
// Release barriers for this commitId
111110
State->GetGarbageQueue().ReleaseBarrier(commitId);
112111
State->GetCommitQueue().ReleaseBarrier(commitId);
113112
}
114113

115-
// Clear the stalled blobs structure
116-
State->ClearStalledUnconfirmedBlobs();
114+
State->ClearObsoleteUnconfirmedBlobs();
117115
}
118116

119-
void TPartitionActor::CompleteDeleteStalledUnconfirmedBlobs(
117+
void TPartitionActor::CompleteDeleteObsoleteUnconfirmedBlobs(
120118
const TActorContext& ctx,
121-
TTxPartition::TDeleteStalledUnconfirmedBlobs& args)
119+
TTxPartition::TDeleteObsoleteUnconfirmedBlobs& args)
122120
{
123121
TRequestScope timer(*args.RequestInfo);
124122

125-
State->GetStalledUnconfirmedBlobsState().SetStatus(EOperationStatus::Idle);
123+
State->GetObsoleteUnconfirmedBlobsState().SetStatus(EOperationStatus::Idle);
126124

127125
RemoveTransaction(*args.RequestInfo);
128126

129127
UpdateCPUUsageStat(ctx.Now(), args.RequestInfo->GetExecCycles());
130128
auto time =
131129
CyclesToDurationSafe(args.RequestInfo->GetTotalCycles()).MicroSeconds();
132-
PartCounters->RequestCounters.DeleteStalledUnconfirmedBlobs.AddRequest(
130+
PartCounters->RequestCounters.DeleteObsoleteUnconfirmedBlobs.AddRequest(
133131
time);
134132

135-
// Barriers were released in Execute, so process commit queue
133+
EnqueueDeleteObsoleteUnconfirmedBlobsIfNeeded(ctx);
136134
ProcessCommitQueue(ctx);
137135
}
138136

‎cloud/blockstore/libs/storage/partition/part_actor_statpartition.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ void TPartitionActor::HandleStatPartition(
100100
response->Record.MutableStats()->SetConfirmedBlobCount(
101101
State->GetConfirmedBlobCount());
102102

103-
response->Record.MutableStats()->SetStalledUnconfirmedBlobCount(
104-
State->GetStalledUnconfirmedBlobCount());
103+
response->Record.MutableStats()->SetObsoleteUnconfirmedBlobCount(
104+
State->GetObsoleteUnconfirmedBlobCount());
105105

106106
response->Record.MutableStats()->SetTrimFreshLogToCommitId(
107107
State->GetTrimFreshLogToCommitId());

‎cloud/blockstore/libs/storage/partition/part_actor_writeblocks.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ void TPartitionActor::HandleWriteBlocksCompleted(
392392
ProcessCommitQueue(ctx);
393393
EnqueueFlushIfNeeded(ctx);
394394
EnqueueAddConfirmedBlobsIfNeeded(ctx);
395-
EnqueueDeleteStalledUnconfirmedBlobsIfNeeded(ctx);
395+
EnqueueDeleteObsoleteUnconfirmedBlobsIfNeeded(ctx);
396396
}
397397

398398
} // namespace NCloud::NBlockStore::NStorage::NPartition

‎cloud/blockstore/libs/storage/partition/part_events_private.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ using TFlushedCommitIds = TVector<TFlushedCommitId>;
179179
xxx(PatchBlob, __VA_ARGS__) \
180180
xxx(AddConfirmedBlobs, __VA_ARGS__) \
181181
xxx(AddUnconfirmedBlobs, __VA_ARGS__) \
182-
xxx(DeleteStalledUnconfirmedBlobs, __VA_ARGS__) \
182+
xxx(DeleteObsoleteUnconfirmedBlobs, __VA_ARGS__) \
183183
// BLOCKSTORE_PARTITION_REQUESTS_PRIVATE
184184

185185
////////////////////////////////////////////////////////////////////////////////
@@ -676,14 +676,14 @@ struct TEvPartitionPrivate
676676
};
677677

678678
//
679-
// DeleteStalledUnconfirmedBlobs
679+
// DeleteObsoleteUnconfirmedBlobs
680680
//
681681

682-
struct TDeleteStalledUnconfirmedBlobsRequest
682+
struct TDeleteObsoleteUnconfirmedBlobsRequest
683683
{
684684
};
685685

686-
struct TDeleteStalledUnconfirmedBlobsResponse
686+
struct TDeleteObsoleteUnconfirmedBlobsResponse
687687
{
688688
};
689689

‎cloud/blockstore/libs/storage/partition/part_state.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -769,8 +769,8 @@ void TPartitionState::BlobsStalled(ui64 commitId, TVector<TBlobToConfirm> blobs)
769769
const auto blobCount = dstBlobs.size();
770770
Y_DEBUG_ABORT_UNLESS(blobs.empty() || blobCount == blobs.size());
771771

772-
StalledUnconfirmedBlobs[commitId] = std::move(dstBlobs);
773-
StalledUnconfirmedBlobCount += blobCount;
772+
ObsoleteUnconfirmedBlobs[commitId] = std::move(dstBlobs);
773+
ObsoleteUnconfirmedBlobCount += blobCount;
774774

775775
UnconfirmedBlobs.erase(it);
776776
Y_DEBUG_ABORT_UNLESS(UnconfirmedBlobCount >= blobCount);

‎cloud/blockstore/libs/storage/partition/part_state.h‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1333,8 +1333,8 @@ class TPartitionState
13331333
ui32 ConfirmedBlobCount = 0;
13341334
// contains entries from UnconfirmedBlobs that failed to write and need to
13351335
// be deleted
1336-
TCommitIdToBlobsToConfirm StalledUnconfirmedBlobs;
1337-
ui32 StalledUnconfirmedBlobCount = 0;
1336+
TCommitIdToBlobsToConfirm ObsoleteUnconfirmedBlobs;
1337+
ui32 ObsoleteUnconfirmedBlobCount = 0;
13381338

13391339
public:
13401340
const TCommitIdToBlobsToConfirm& GetUnconfirmedBlobs() const
@@ -1357,20 +1357,20 @@ class TPartitionState
13571357
return ConfirmedBlobCount;
13581358
}
13591359

1360-
const TCommitIdToBlobsToConfirm& GetStalledUnconfirmedBlobs() const
1360+
const TCommitIdToBlobsToConfirm& GetObsoleteUnconfirmedBlobs() const
13611361
{
1362-
return StalledUnconfirmedBlobs;
1362+
return ObsoleteUnconfirmedBlobs;
13631363
}
13641364

1365-
ui32 GetStalledUnconfirmedBlobCount() const
1365+
ui32 GetObsoleteUnconfirmedBlobCount() const
13661366
{
1367-
return StalledUnconfirmedBlobCount;
1367+
return ObsoleteUnconfirmedBlobCount;
13681368
}
13691369

1370-
void ClearStalledUnconfirmedBlobs()
1370+
void ClearObsoleteUnconfirmedBlobs()
13711371
{
1372-
StalledUnconfirmedBlobs.clear();
1373-
StalledUnconfirmedBlobCount = 0;
1372+
ObsoleteUnconfirmedBlobs.clear();
1373+
ObsoleteUnconfirmedBlobCount = 0;
13741374
}
13751375

13761376
bool OverlapsUnconfirmedBlobs(
@@ -1423,16 +1423,16 @@ class TPartitionState
14231423
}
14241424

14251425
//
1426-
// StalledUnconfirmedBlobs
1426+
// ObsoleteUnconfirmedBlobs
14271427
//
14281428

14291429
private:
1430-
TOperationState StalledUnconfirmedBlobsState;
1430+
TOperationState ObsoleteUnconfirmedBlobsState;
14311431

14321432
public:
1433-
TOperationState& GetStalledUnconfirmedBlobsState()
1433+
TOperationState& GetObsoleteUnconfirmedBlobsState()
14341434
{
1435-
return StalledUnconfirmedBlobsState;
1435+
return ObsoleteUnconfirmedBlobsState;
14361436
}
14371437

14381438
//

‎cloud/blockstore/libs/storage/partition/part_tx.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ namespace NCloud::NBlockStore::NStorage::NPartition {
6262
xxx(ScanDiskBatch, __VA_ARGS__) \
6363
xxx(AddUnconfirmedBlobs, __VA_ARGS__) \
6464
xxx(ConfirmBlobs, __VA_ARGS__) \
65-
xxx(DeleteStalledUnconfirmedBlobs, __VA_ARGS__) \
65+
xxx(DeleteObsoleteUnconfirmedBlobs, __VA_ARGS__) \
6666
xxx(LoadCompactionMapChunk, __VA_ARGS__) \
6767
// BLOCKSTORE_PARTITION_TRANSACTIONS
6868

@@ -680,14 +680,14 @@ struct TTxPartition
680680
};
681681

682682
//
683-
// DeleteStalledUnconfirmedBlobs
683+
// DeleteObsoleteUnconfirmedBlobs
684684
//
685685

686-
struct TDeleteStalledUnconfirmedBlobs
686+
struct TDeleteObsoleteUnconfirmedBlobs
687687
{
688688
const TRequestInfoPtr RequestInfo;
689689

690-
TDeleteStalledUnconfirmedBlobs(
690+
TDeleteObsoleteUnconfirmedBlobs(
691691
TRequestInfoPtr requestInfo)
692692
: RequestInfo(std::move(requestInfo))
693693
{}

0 commit comments

Comments
 (0)