Skip to content

Merge fixes from main related to long puts #5098

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 31, 2024
Merged

Merge fixes from main related to long puts #5098

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
102ea4b
Fix repeating EvVStatus request when query is being executed for too …
alexvru May 31, 2024
fa5ff2c
Fix BSC behaviour after start before first node connection (#5097)
alexvru May 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ydb/core/blobstorage/dsproxy/dsproxy_put.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,11 @@ class TBlobStorageGroupPutRequest : public TBlobStorageGroupRequestActor<TBlobSt

if (record.HasIncarnationGuid()) {
HandleIncarnation(issue, orderNumber, record.GetIncarnationGuid());
} else if (record.GetStatus() != NKikimrProto::OK) { // we can't obtain status from the vdisk; assume it has not been written
Y_ABORT_UNLESS(orderNumber < IncarnationRecords.size());
IncarnationRecords[orderNumber] = {};
PutImpl.InvalidatePartStates(orderNumber);
++*Mon->NodeMon->IncarnationChanges;
}

Action();
Expand Down
4 changes: 2 additions & 2 deletions ydb/core/mind/bscontroller/cmds_storage_pool.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,7 +704,7 @@ namespace NKikimr::NBsController {

TGroupInfo *group = Groups.FindForUpdate(vslot->GroupId);
vslot->Mood = TMood::Wipe;
vslot->Status = NKikimrBlobStorage::EVDiskStatus::INIT_PENDING;
vslot->Status = NKikimrBlobStorage::EVDiskStatus::ERROR;
vslot->IsReady = false;
GroupFailureModelChanged.insert(group->ID);
group->CalculateGroupStatus();
Expand Down Expand Up @@ -750,7 +750,7 @@ namespace NKikimr::NBsController {

TGroupInfo *group = Groups.FindForUpdate(vslot->GroupId);
vslot->Mood = targetMood;
vslot->Status = NKikimrBlobStorage::EVDiskStatus::INIT_PENDING;
vslot->Status = NKikimrBlobStorage::EVDiskStatus::ERROR;
vslot->IsReady = false;
GroupFailureModelChanged.insert(group->ID);
group->CalculateGroupStatus();
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/mind/bscontroller/impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ class TBlobStorageController : public TActor<TBlobStorageController>, public TTa
TVSlotReadyTimestampQ::iterator VSlotReadyTimestampIter;

public:
NKikimrBlobStorage::EVDiskStatus Status = NKikimrBlobStorage::EVDiskStatus::INIT_PENDING;
NKikimrBlobStorage::EVDiskStatus Status = NKikimrBlobStorage::EVDiskStatus::ERROR;
bool IsReady = false;
bool OnlyPhantomsRemain = false;

Expand Down