Skip to content
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

Jump to bottom

[Filestore] NBSNEBIUS-91: Add ForcedCleanup handle for fs (#268) #331

Merged
merged 5 commits into from
Feb 5, 2024
Merged

[Filestore] NBSNEBIUS-91: Add ForcedCleanup handle for fs (#268) #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
188a94a
[Filestore] NBSNEBIUS-91: Add ForcedCleanup handle for fs (#268)
debnatkh Feb 2, 2024
29b7df4
fix SetObserverFunc usage int stable-23-3
Feb 2, 2024
5098609
try to fix cmake build
Feb 5, 2024
0a6324f
try to fix cmake build
Feb 5, 2024
6138616
try to fix cmake build
Feb 5, 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
4 changes: 2 additions & 2 deletions cloud/filestore/libs/storage/tablet/tablet_actor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ class TIndexTabletActor final
void EnqueueBlobIndexOpIfNeeded(const NActors::TActorContext& ctx);
void EnqueueCollectGarbageIfNeeded(const NActors::TActorContext& ctx);
void EnqueueTruncateIfNeeded(const NActors::TActorContext& ctx);
void EnqueueForcedCompactionIfNeeded(const NActors::TActorContext& ctx);
void EnqueueForcedRangeOperationIfNeeded(const NActors::TActorContext& ctx);
void LoadNextCompactionMapChunkIfNeeded(const NActors::TActorContext& ctx);

void NotifySessionEvent(
Expand Down Expand Up @@ -294,7 +294,7 @@ class TIndexTabletActor final
const NActors::TActorContext& ctx,
const TCgiParameters& params,
TRequestInfoPtr requestInfo);
void HandleHttpInfo_Compaction(
void HandleHttpInfo_ForceOperation(
const NActors::TActorContext& ctx,
const TCgiParameters& params,
TRequestInfoPtr requestInfo);
Expand Down
205 changes: 140 additions & 65 deletions cloud/filestore/libs/storage/tablet/tablet_actor_compactionforced.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,34 +22,46 @@ namespace {

////////////////////////////////////////////////////////////////////////////////

class TForcedCompactionActor final
: public TActorBootstrapped<TForcedCompactionActor>
/**
* @brief An actor that performs forced compaction or forced cleanup. It is
* implemented as a template class to avoid code duplication.
*
* @tparam TRequestConstructor A functor that constructs a unique_ptr to a
* request that is necessary to be performed to passed range.
*/
template <typename TResponseType, typename TRequestConstructor>
class TForcedOperationActor final
: public TActorBootstrapped<
TForcedOperationActor<TResponseType, TRequestConstructor>>
{
private:
using TBase = NActors::TActorBootstrapped<
TForcedOperationActor<TResponseType, TRequestConstructor>>;

const TActorId Tablet;
const TString LogTag;
const TDuration RetryTimeout;

const TIndexTabletState::TForcedCompactionStatePtr State;
const TIndexTabletState::TForcedRangeOperationStatePtr State;
const TRequestInfoPtr RequestInfo;

public:
TForcedCompactionActor(
TForcedOperationActor(
TActorId tablet,
TString logTag,
TDuration retry,
TIndexTabletState::TForcedCompactionStatePtr state,
TIndexTabletState::TForcedRangeOperationStatePtr state,
TRequestInfoPtr requestInfo);

void Bootstrap(const TActorContext& ctx);

private:
STFUNC(StateWork);

void SendCompactionRequest(const TActorContext& ctx);
void SendRangeOperationRequest(const TActorContext& ctx);

void HandleCompactionResponse(
const TEvIndexTabletPrivate::TEvCompactionResponse::TPtr& ev,
void HandleRangeOperationResponse(
const typename TResponseType::TPtr& ev,
const TActorContext& ctx);

void HandleWakeUp(
Expand All @@ -67,58 +79,67 @@ class TForcedCompactionActor final

////////////////////////////////////////////////////////////////////////////////

TForcedCompactionActor::TForcedCompactionActor(
template <typename TResponseType, typename TRequestConstructor>
TForcedOperationActor<TResponseType, TRequestConstructor>::
TForcedOperationActor(
TActorId tablet,
TString logTag,
TDuration retry,
TIndexTabletState::TForcedCompactionStatePtr state,
TIndexTabletState::TForcedRangeOperationStatePtr state,
TRequestInfoPtr requestInfo)
: Tablet(tablet)
, LogTag(std::move(logTag))
, RetryTimeout(retry)
, State(std::move(state))
, RequestInfo(std::move(requestInfo))
{
ActivityType = TFileStoreActivities::TABLET_WORKER;
TBase::ActivityType = TFileStoreActivities::TABLET_WORKER;
}

void TForcedCompactionActor::Bootstrap(const TActorContext& ctx)
template <typename TResponseType, typename TRequestConstructor>
void TForcedOperationActor<TResponseType, TRequestConstructor>::Bootstrap(
const TActorContext& ctx)
{
Become(&TThis::StateWork);
TBase::Become(&TBase::TThis::StateWork);

FILESTORE_TRACK(
RequestReceived_TabletWorker,
RequestInfo->CallContext,
"ForcedCompaction");
"ForcedRangeOperation");

SendCompactionRequest(ctx);
SendRangeOperationRequest(ctx);
}

void TForcedCompactionActor::SendCompactionRequest(const TActorContext& ctx)
template <typename TResponseType, typename TRequestConstructor>
void TForcedOperationActor<TResponseType, TRequestConstructor>::
SendRangeOperationRequest(const TActorContext& ctx)
{
auto request = std::make_unique<TEvIndexTabletPrivate::TEvCompactionRequest>(
State->GetCurrentRange(), true);
auto request = TRequestConstructor()(State->GetCurrentRange());

ctx.Send(Tablet, request.release());
}

STFUNC(TForcedCompactionActor::StateWork)
template <typename TResponseType, typename TRequestConstructor>
STFUNC(
(TForcedOperationActor<TResponseType, TRequestConstructor>::StateWork))
{
switch (ev->GetTypeRewrite()) {
HFunc(TEvents::TEvWakeup, HandleWakeUp);
HFunc(TEvents::TEvPoisonPill, HandlePoisonPill);

HFunc(TEvIndexTabletPrivate::TEvCompactionResponse, HandleCompactionResponse);
HFunc(TResponseType, HandleRangeOperationResponse);

default:
HandleUnexpectedEvent(ev, TFileStoreComponents::TABLET_WORKER);
break;
}
}

void TForcedCompactionActor::HandleCompactionResponse(
const TEvIndexTabletPrivate::TEvCompactionResponse::TPtr& ev,
const TActorContext& ctx)
template <typename TResponseType, typename TRequestConstructor>
void TForcedOperationActor<TResponseType, TRequestConstructor>::
HandleRangeOperationResponse(
const typename TResponseType::TPtr& ev,
const TActorContext& ctx)
{
auto* msg = ev->Get();

Expand All @@ -135,79 +156,115 @@ void TForcedCompactionActor::HandleCompactionResponse(
return ReplyAndDie(ctx, {});
}

SendCompactionRequest(ctx);
SendRangeOperationRequest(ctx);
}

void TForcedCompactionActor::HandleWakeUp(
const TEvents::TEvWakeup::TPtr& ev,
const TActorContext& ctx)
template <typename TResponseType, typename TRequestConstructor>
void TForcedOperationActor<TResponseType, TRequestConstructor>::
HandleWakeUp(const TEvents::TEvWakeup::TPtr& ev, const TActorContext& ctx)
{
Y_UNUSED(ev);
SendCompactionRequest(ctx);
SendRangeOperationRequest(ctx);
}

void TForcedCompactionActor::HandlePoisonPill(
const TEvents::TEvPoison::TPtr& ev,
const TActorContext& ctx)
template <typename TResponseType, typename TRequestConstructor>
void TForcedOperationActor<TResponseType, TRequestConstructor>::
HandlePoisonPill(
const TEvents::TEvPoison::TPtr& ev,
const TActorContext& ctx)
{
Y_UNUSED(ev);
ReplyAndDie(ctx, MakeError(E_FAIL, "actor killed"));
}

void TForcedCompactionActor::ReplyAndDie(
const TActorContext& ctx,
const NProto::TError& error)
template <typename TResponseType, typename TRequestConstructor>
void TForcedOperationActor<TResponseType, TRequestConstructor>::
ReplyAndDie(const TActorContext& ctx, const NProto::TError& error)
{
{
// notify tablet
auto response = std::make_unique<TEvIndexTabletPrivate::TEvForcedCompactionCompleted>(
error);
auto response = std::make_unique<
TEvIndexTabletPrivate::TEvForcedRangeOperationCompleted>(error);
NCloud::Send(ctx, Tablet, std::move(response));
}

FILESTORE_TRACK(
ResponseSent_TabletWorker,
RequestInfo->CallContext,
"ForcedCompaction");
"ForcedRangeOperation");

if (RequestInfo->Sender != Tablet) {
// reply to caller
auto response = std::make_unique<TEvIndexTabletPrivate::TEvForcedCompactionResponse>(
error);
auto response = std::make_unique<
TEvIndexTabletPrivate::TEvForcedRangeOperationResponse>(error);
NCloud::Reply(ctx, *RequestInfo, std::move(response));
}

Die(ctx);
TBase::Die(ctx);
}

////////////////////////////////////////////////////////////////////////////////

struct TCompactionRequestConstructor
{
std::unique_ptr<TEvIndexTabletPrivate::TEvCompactionRequest> operator()(
const ui32 rangeId) const
{
return std::make_unique<TEvIndexTabletPrivate::TEvCompactionRequest>(
rangeId,
true);
}
};

struct TCleanupRequestConstructor
{
std::unique_ptr<TEvIndexTabletPrivate::TEvCleanupRequest> operator()(
const ui32 range) const
{
return std::make_unique<TEvIndexTabletPrivate::TEvCleanupRequest>(
range);
}
};

using TForcedCompactionActor = TForcedOperationActor<
TEvIndexTabletPrivate::TEvCompactionResponse,
TCompactionRequestConstructor>;

using TForcedCleanupActor = TForcedOperationActor<
TEvIndexTabletPrivate::TEvCleanupResponse,
TCleanupRequestConstructor>;

} // namespace

////////////////////////////////////////////////////////////////////////////////

void TIndexTabletActor::EnqueueForcedCompactionIfNeeded(const TActorContext& ctx)
void TIndexTabletActor::EnqueueForcedRangeOperationIfNeeded(
const TActorContext& ctx)
{
if (IsForcedCompactionRunning()) {
if (IsForcedRangeOperationRunning()) {
return;
}

auto ranges = DequeueForcedCompaction();
if (ranges.empty()) {
auto pendingRequest = DequeueForcedRangeOperation();
if (pendingRequest.Ranges.empty()) {
return;
}

auto request =
std::make_unique<TEvIndexTabletPrivate::TEvForcedCompactionRequest>(std::move(ranges));
std::make_unique<TEvIndexTabletPrivate::TEvForcedRangeOperationRequest>(
std::move(pendingRequest.Ranges),
pendingRequest.Mode);
ctx.Send(ctx.SelfID, request.release());
}

void TIndexTabletActor::HandleForcedCompaction(
const TEvIndexTabletPrivate::TEvForcedCompactionRequest::TPtr& ev,
void TIndexTabletActor::HandleForcedRangeOperation(
const TEvIndexTabletPrivate::TEvForcedRangeOperationRequest::TPtr& ev,
const TActorContext& ctx)
{
auto* msg = ev->Get();

LOG_DEBUG(ctx, TFileStoreComponents::TABLET,
"%s ForcedCompaction request for %lu ranges",
"%s ForcedRangeOperation request for %lu ranges",
LogTag.c_str(),
msg->Ranges.size());

Expand All @@ -218,8 +275,8 @@ void TIndexTabletActor::HandleForcedCompaction(
return;
}

auto response =
std::make_unique<TEvIndexTabletPrivate::TEvForcedCompactionResponse>(error);
auto response = std::make_unique<
TEvIndexTabletPrivate::TEvForcedRangeOperationResponse>(error);
NCloud::Reply(ctx, *ev, std::move(response));
};

Expand All @@ -234,39 +291,57 @@ void TIndexTabletActor::HandleForcedCompaction(
msg->CallContext);

// will loose original request info in case of enqueueing external request
if (IsForcedCompactionRunning()) {
EnqueueForcedCompaction(std::move(msg->Ranges));
if (IsForcedRangeOperationRunning()) {
EnqueueForcedRangeOperation(std::move(msg->Ranges), msg->Mode);
return;
}

StartForcedCompaction(std::move(msg->Ranges));
StartForcedRangeOperation(std::move(msg->Ranges));

std::unique_ptr<IActor> actor;

auto actor = std::make_unique<TForcedCompactionActor>(
ctx.SelfID,
LogTag,
Config->GetCompactionRetryTimeout(),
GetForcedCompactionState(),
std::move(requestInfo));
switch (msg->Mode) {
case TEvIndexTabletPrivate::EForcedRangeOperationMode::Compaction:
actor = std::make_unique<TForcedCompactionActor>(
ctx.SelfID,
LogTag,
Config->GetCompactionRetryTimeout(),
GetForcedRangeOperationState(),
std::move(requestInfo));
break;

case TEvIndexTabletPrivate::EForcedRangeOperationMode::Cleanup:
actor = std::make_unique<TForcedCleanupActor>(
ctx.SelfID,
LogTag,
Config->GetCompactionRetryTimeout(),
GetForcedRangeOperationState(),
std::move(requestInfo));
break;

default:
TABLET_VERIFY_C(false, "unexpected forced compaction mode");
}

auto actorId = ctx.Register(actor.release());
WorkerActors.insert(actorId);
}

void TIndexTabletActor::HandleForcedCompactionCompleted(
const TEvIndexTabletPrivate::TEvForcedCompactionCompleted::TPtr& ev,
void TIndexTabletActor::HandleForcedRangeOperationCompleted(
const TEvIndexTabletPrivate::TEvForcedRangeOperationCompleted::TPtr& ev,
const TActorContext& ctx)
{
auto* msg = ev->Get();
LOG_DEBUG(ctx, TFileStoreComponents::TABLET,
"%s ForcedCompaction completed (%s)",
"%s ForcedRangeOperation completed (%s)",
LogTag.c_str(),
FormatError(msg->GetError()).c_str());

TABLET_VERIFY(IsForcedCompactionRunning());
TABLET_VERIFY(IsForcedRangeOperationRunning());
WorkerActors.erase(ev->Sender);

CompleteForcedCompaction();
EnqueueForcedCompactionIfNeeded(ctx);
CompleteForcedRangeOperation();
EnqueueForcedRangeOperationIfNeeded(ctx);
}

} // namespace NCloud::NFileStore::NStorage
Loading
Loading