Skip to content

Backport new Hive API from 25-3; Handle TEvDrainNodeAck from Hive #4858

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
komarevtsev-d merged 1 commit into from
Jan 15, 2026
Merged

Backport new Hive API from 25-3; Handle TEvDrainNodeAck from Hive #4858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 5 additions & 4 deletions cloud/storage/core/libs/hive_proxy/hive_proxy_actor_drain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class TDrainNodeRequestActor final
const TActorContext& ctx);

void HandleDrainNodeResult(
const NKikimr::TEvHive::TEvDrainNodeResult::TPtr& ev,
const TEvHive::TEvDrainNodeResult::TPtr& ev,
const TActorContext& ctx);

STFUNC(StateWork);
Expand All @@ -57,7 +57,7 @@ class TDrainNodeRequestActor final
void TDrainNodeRequestActor::Bootstrap(const TActorContext& ctx)
{

auto ev = std::make_unique<NKikimr::TEvHive::TEvDrainNode>(Owner.NodeId());
auto ev = std::make_unique<TEvHive::TEvDrainNode>(Owner.NodeId());
ev->Record.SetKeepDown(KeepDown);
NKikimr::NTabletPipe::SendData(
ctx,
Expand Down Expand Up @@ -90,7 +90,7 @@ void TDrainNodeRequestActor::HandleChangeTabletClient(
}

void TDrainNodeRequestActor::HandleDrainNodeResult(
const NKikimr::TEvHive::TEvDrainNodeResult::TPtr& ev,
const TEvHive::TEvDrainNodeResult::TPtr& ev,
const TActorContext& ctx)
{
NProto::TError error;
Expand All @@ -110,7 +110,8 @@ STFUNC(TDrainNodeRequestActor::StateWork)
{
switch (ev->GetTypeRewrite()) {
HFunc(TEvHiveProxyPrivate::TEvChangeTabletClient, HandleChangeTabletClient);
HFunc(NKikimr::TEvHive::TEvDrainNodeResult, HandleDrainNodeResult);
HFunc(TEvHive::TEvDrainNodeResult, HandleDrainNodeResult);
IgnoreFunc(TEvHive::TEvDrainNodeAck);

default:
HandleUnexpectedEvent(ev, LogComponent, __PRETTY_FUNCTION__);
Expand Down
2 changes: 2 additions & 0 deletions cloud/storage/core/libs/hive_proxy/hive_proxy_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,8 @@ class THiveMock final
const TEvHive::TEvDrainNode::TPtr& ev,
const TActorContext& ctx)
{
ctx.Send(ev->Sender, new TEvHive::TEvDrainNodeAck());

const auto& msg = ev->Get();

NKikimrProto::EReplyStatus replyStatus = NKikimrProto::OK;
Expand Down
11 changes: 11 additions & 0 deletions contrib/ydb/core/base/hive.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,12 @@ namespace NKikimr {
EvReassignOnDecommitGroupReply,
EvUpdateTabletsObjectReply,
EvUpdateDomainReply,
EvResponseTabletDistribution,
EvResponseScaleRecommendation,
EvConfigureScaleRecommenderReply,
EvDrainNodeAck,
EvResponseDrainInfo,
EvSetDownReply,

EvEnd
};
Expand Down Expand Up @@ -868,6 +874,11 @@ namespace NKikimr {
struct TEvUpdateDomain : TEventPB<TEvUpdateDomain, NKikimrHive::TEvUpdateDomain, EvUpdateDomain> {};

struct TEvUpdateDomainReply : TEventPB<TEvUpdateDomainReply, NKikimrHive::TEvUpdateDomainReply, EvUpdateDomainReply> {};

struct TEvDrainNodeAck: TEventLocal<TEvDrainNodeAck, EvDrainNodeAck>
{
TEvDrainNodeAck() = default;
};
};

IActor* CreateDefaultHive(const TActorId &tablet, TTabletStorageInfo *info);
Expand Down
Loading