-
Notifications
You must be signed in to change notification settings - Fork 697
[YQL-17174] added spilling library for compute actors #1544
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.
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
lll-phill-lll
merged 8 commits into
ydb-platform:main
from
lll-phill-lll:YQL-17174-add-spilling-actor-for-compute-actors
Feb 8, 2024
Merged
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
eb285a6
[YQL-17174] added spilling library for compute actors
lll-phill-lll 9641b8e
Removed unnecessary code
lll-phill-lll f6407e2
Refactoring: spiller factory added -> removed dependence of comp_node…
lll-phill-lll 7988479
removed unused includes
lll-phill-lll fa3416a
some code improvements
lll-phill-lll 6921e8b
fixup
lll-phill-lll 1bd051d
fixup
lll-phill-lll b92757d
pr fixes
lll-phill-lll File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
#include "compute_storage.h" | ||
|
||
#include "compute_storage_actor.h" | ||
|
||
#include <ydb/library/yql/utils/yql_panic.h> | ||
#include <ydb/library/services/services.pb.h> | ||
|
||
#include <ydb/library/actors/core/actor_bootstrapped.h> | ||
#include <ydb/library/actors/core/hfunc.h> | ||
#include <ydb/library/actors/core/log.h> | ||
|
||
#include <util/generic/buffer.h> | ||
#include <util/generic/map.h> | ||
#include <util/generic/set.h> | ||
|
||
|
||
namespace NYql::NDq { | ||
|
||
using namespace NActors; | ||
|
||
class TDqComputeStorage : public IDqComputeStorage { | ||
public: | ||
TDqComputeStorage(TTxId txId, const TString& spillerName, std::function<void()>&& wakeUpCallback) { | ||
|
||
ComputeStorageActor_ = CreateDqComputeStorageActor(txId, spillerName, std::move(wakeUpCallback)); | ||
ComputeStorageActorId_ = TlsActivationContext->AsActorContext().Register(ComputeStorageActor_->GetActor()); | ||
} | ||
|
||
~TDqComputeStorage() { | ||
TlsActivationContext->AsActorContext().Send(ComputeStorageActorId_, new TEvents::TEvPoison); | ||
lll-phill-lll marked this conversation as resolved.
Show resolved
Hide resolved
|
||
} | ||
|
||
NThreading::TFuture<TKey> Put(TRope&& blob) override { | ||
return ComputeStorageActor_->Put(std::move(blob)); | ||
} | ||
|
||
std::optional<NThreading::TFuture<TRope>> Get(TKey key) override { | ||
return ComputeStorageActor_->Get(key); | ||
} | ||
|
||
NThreading::TFuture<void> Delete(TKey key) override { | ||
return ComputeStorageActor_->Delete(key); | ||
} | ||
|
||
std::optional<NThreading::TFuture<TRope>> Extract(TKey key) override { | ||
return ComputeStorageActor_->Extract(key); | ||
} | ||
|
||
private: | ||
IDqComputeStorageActor* ComputeStorageActor_; | ||
TActorId ComputeStorageActorId_; | ||
}; | ||
|
||
IDqComputeStorage::TPtr MakeComputeStorage(const TString& spillerName, std::function<void()>&& wakeUpCallback) { | ||
return std::make_shared<TDqComputeStorage>(TTxId(), spillerName, std::move(wakeUpCallback)); | ||
} | ||
|
||
} // namespace NYql::NDq | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
#pragma once | ||
|
||
#include <ydb/library/yql/dq/common/dq_common.h> | ||
#include <ydb/library/yql/minikql/computation/mkql_spiller.h> | ||
#include <ydb/library/actors/core/actor.h> | ||
|
||
namespace NActors { | ||
class TActorSystem; | ||
}; | ||
|
||
namespace NYql::NDq { | ||
|
||
// This class will be refactored to be non-actor spiller part | ||
class IDqComputeStorage | ||
{ | ||
public: | ||
using TPtr = std::shared_ptr<IDqComputeStorage>; | ||
using TKey = ui64; | ||
|
||
virtual ~IDqComputeStorage() = default; | ||
|
||
virtual NThreading::TFuture<TKey> Put(TRope&& blob) = 0; | ||
|
||
virtual std::optional<NThreading::TFuture<TRope>> Get(TKey key) = 0; | ||
|
||
virtual std::optional<NThreading::TFuture<TRope>> Extract(TKey key) = 0; | ||
|
||
virtual NThreading::TFuture<void> Delete(TKey key) = 0; | ||
}; | ||
|
||
IDqComputeStorage::TPtr MakeComputeStorage(const TString& spillerName, std::function<void()>&& wakeUpCallback); | ||
|
||
} // namespace NYql::NDq |
305 changes: 305 additions & 0 deletions
305
ydb/library/yql/dq/actors/spilling/compute_storage_actor.cpp
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,305 @@ | ||
#include "compute_storage_actor.h" | ||
|
||
#include "spilling.h" | ||
#include "spilling_file.h" | ||
|
||
#include <ydb/library/yql/utils/yql_panic.h> | ||
#include <ydb/library/services/services.pb.h> | ||
|
||
#include <ydb/library/actors/core/actor_bootstrapped.h> | ||
#include <ydb/library/actors/core/hfunc.h> | ||
#include <ydb/library/actors/core/log.h> | ||
|
||
#include <util/generic/size_literals.h> | ||
|
||
namespace NYql::NDq { | ||
|
||
using namespace NActors; | ||
|
||
namespace { | ||
|
||
#define LOG_D(s) \ | ||
LOG_DEBUG_S(*TlsActivationContext, NKikimrServices::KQP_COMPUTE, "TxId: " << TxId_ << ". " << s) | ||
#define LOG_I(s) \ | ||
LOG_INFO_S(*TlsActivationContext, NKikimrServices::KQP_COMPUTE, "TxId: " << TxId << ". " << s) | ||
#define LOG_E(s) \ | ||
LOG_ERROR_S(*TlsActivationContext, NKikimrServices::KQP_COMPUTE, "TxId: " << TxId_ << ". " << s) | ||
#define LOG_C(s) \ | ||
LOG_CRIT_S(*TlsActivationContext, NKikimrServices::KQP_COMPUTE, "TxId: " << TxId << ". " << s) | ||
#define LOG_W(s) \ | ||
LOG_WARN_S(*TlsActivationContext, NKikimrServices::KQP_COMPUTE, "TxId: " << TxId << ". " << s) | ||
#define LOG_T(s) \ | ||
LOG_TRACE_S(*TlsActivationContext, NKikimrServices::KQP_COMPUTE, "TxId: " << TxId_ << ". " << s) | ||
|
||
class TDqComputeStorageActor : public NActors::TActorBootstrapped<TDqComputeStorageActor>, | ||
public IDqComputeStorageActor | ||
{ | ||
using TBase = TActorBootstrapped<TDqComputeStorageActor>; | ||
// size + promise with key | ||
using TWritingBlobInfo = std::pair<ui64, NThreading::TPromise<IDqComputeStorageActor::TKey>>; | ||
// remove after read + promise with blob | ||
using TLoadingBlobInfo = std::pair<bool, NThreading::TPromise<TRope>>; | ||
// void promise that completes when block is removed | ||
using TDeletingBlobInfo = NThreading::TPromise<void>; | ||
public: | ||
TDqComputeStorageActor(TTxId txId, const TString& spillerName, std::function<void()>&& wakeupCallback) | ||
: TxId_(txId), | ||
SpillerName_(spillerName), | ||
WakeupCallback_(wakeupCallback) | ||
{ | ||
} | ||
|
||
void Bootstrap() { | ||
Become(&TDqComputeStorageActor::WorkState); | ||
} | ||
|
||
static constexpr char ActorName[] = "DQ_COMPUTE_STORAGE"; | ||
|
||
IActor* GetActor() override { | ||
return this; | ||
} | ||
|
||
NThreading::TFuture<IDqComputeStorageActor::TKey> Put(TRope&& blob) override { | ||
InitializeIfNot(); | ||
// Use lock to prevent race when state is changed on event processing and on Put call | ||
std::lock_guard lock(Mutex_); | ||
|
||
FailOnError(); | ||
|
||
ui64 size = blob.size(); | ||
|
||
Send(SpillingActorId_, new TEvDqSpilling::TEvWrite(NextBlobId, std::move(blob))); | ||
lll-phill-lll marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
auto it = WritingBlobs_.emplace(NextBlobId, std::make_pair(size, NThreading::NewPromise<IDqComputeStorageActor::TKey>())).first; | ||
WritingBlobsSize_ += size; | ||
|
||
++NextBlobId; | ||
|
||
auto& promise = it->second.second; | ||
|
||
return promise.GetFuture(); | ||
} | ||
|
||
std::optional<NThreading::TFuture<TRope>> Get(IDqComputeStorageActor::TKey blobId) override { | ||
return GetInternal(blobId, false); | ||
} | ||
|
||
std::optional<NThreading::TFuture<TRope>> Extract(IDqComputeStorageActor::TKey blobId) override { | ||
return GetInternal(blobId, true); | ||
} | ||
|
||
NThreading::TFuture<void> Delete(IDqComputeStorageActor::TKey blobId) override { | ||
InitializeIfNot(); | ||
// Use lock to prevent race when state is changed on event processing and on Delete call | ||
std::lock_guard lock(Mutex_); | ||
|
||
FailOnError(); | ||
|
||
auto promise = NThreading::NewPromise<void>(); | ||
auto future = promise.GetFuture(); | ||
|
||
if (!StoredBlobs_.contains(blobId)) { | ||
promise.SetValue(); | ||
return future; | ||
} | ||
|
||
DeletingBlobs_.emplace(blobId, std::move(promise)); | ||
|
||
Send(SpillingActorId_, new TEvDqSpilling::TEvRead(blobId, true)); | ||
|
||
return future; | ||
} | ||
|
||
protected: | ||
std::optional<NThreading::TFuture<TRope>>GetInternal(IDqComputeStorageActor::TKey blobId, bool removeAfterRead) { | ||
InitializeIfNot(); | ||
// Use lock to prevent race when state is changed on event processing and on Get call | ||
std::lock_guard lock(Mutex_); | ||
FailOnError(); | ||
|
||
if (!StoredBlobs_.contains(blobId)) return std::nullopt; | ||
|
||
TLoadingBlobInfo loadingblobInfo = std::make_pair(removeAfterRead, NThreading::NewPromise<TRope>()); | ||
auto it = LoadingBlobs_.emplace(blobId, std::move(loadingblobInfo)).first; | ||
|
||
Send(SpillingActorId_, new TEvDqSpilling::TEvRead(blobId, false)); | ||
|
||
auto& promise = it->second.second; | ||
return promise.GetFuture(); | ||
} | ||
|
||
void PassAway() override { | ||
InitializeIfNot(); | ||
Send(SpillingActorId_, new TEvents::TEvPoison); | ||
TBase::PassAway(); | ||
} | ||
|
||
void FailOnError() { | ||
InitializeIfNot(); | ||
if (Error_) { | ||
LOG_E("Error: " << *Error_); | ||
Send(SpillingActorId_, new TEvents::TEvPoison); | ||
} | ||
} | ||
|
||
private: | ||
STATEFN(WorkState) { | ||
switch (ev->GetTypeRewrite()) { | ||
hFunc(TEvDqSpilling::TEvWriteResult, HandleWork); | ||
hFunc(TEvDqSpilling::TEvReadResult, HandleWork); | ||
hFunc(TEvDqSpilling::TEvError, HandleWork); | ||
cFunc(TEvents::TEvPoison::EventType, PassAway); | ||
default: | ||
Y_ABORT("TDqComputeStorageActor::WorkState unexpected event type: %" PRIx32 " event: %s", | ||
ev->GetTypeRewrite(), | ||
ev->ToString().data()); | ||
} | ||
} | ||
|
||
void HandleWork(TEvDqSpilling::TEvWriteResult::TPtr& ev) { | ||
auto& msg = *ev->Get(); | ||
LOG_T("[TEvWriteResult] blobId: " << msg.BlobId); | ||
|
||
// Use lock to prevent race when state is changed on event processing and on Put call | ||
std::lock_guard lock(Mutex_); | ||
|
||
auto it = WritingBlobs_.find(msg.BlobId); | ||
if (it == WritingBlobs_.end()) { | ||
LOG_E("Got unexpected TEvWriteResult, blobId: " << msg.BlobId); | ||
|
||
Error_ = "Internal error"; | ||
|
||
Send(SpillingActorId_, new TEvents::TEvPoison); | ||
return; | ||
} | ||
|
||
auto& [size, promise] = it->second; | ||
|
||
WritingBlobsSize_ -= size; | ||
|
||
StoredBlobsCount_++; | ||
StoredBlobsSize_ += size; | ||
|
||
StoredBlobs_.insert(msg.BlobId); | ||
|
||
// complete future and wake up waiting compute node | ||
promise.SetValue(msg.BlobId); | ||
|
||
WritingBlobs_.erase(it); | ||
WakeupCallback_(); | ||
} | ||
|
||
void HandleWork(TEvDqSpilling::TEvReadResult::TPtr& ev) { | ||
auto& msg = *ev->Get(); | ||
LOG_T("[TEvReadResult] blobId: " << msg.BlobId << ", size: " << msg.Blob.size()); | ||
|
||
// Use lock to prevent race when state is changed on event processing and on Put call | ||
std::lock_guard lock(Mutex_); | ||
|
||
// if there was Delete request | ||
if (HandleDelete(msg.BlobId, msg.Blob.Size())) { | ||
return; | ||
} | ||
|
||
auto it = LoadingBlobs_.find(msg.BlobId); | ||
if (it == LoadingBlobs_.end()) { | ||
LOG_E("Got unexpected TEvReadResult, blobId: " << msg.BlobId); | ||
|
||
Error_ = "Internal error"; | ||
lll-phill-lll marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
Send(SpillingActorId_, new TEvents::TEvPoison); | ||
return; | ||
} | ||
|
||
bool removedAfterRead = it->second.first; | ||
if (removedAfterRead) { | ||
UpdateStatsAfterBlobDeletion(msg.BlobId, msg.Blob.Size()); | ||
} | ||
|
||
TRope res(TString(reinterpret_cast<const char*>(msg.Blob.Data()), msg.Blob.Size())); | ||
|
||
auto& promise = it->second.second; | ||
promise.SetValue(std::move(res)); | ||
|
||
LoadingBlobs_.erase(it); | ||
|
||
WakeupCallback_(); | ||
} | ||
|
||
void HandleWork(TEvDqSpilling::TEvError::TPtr& ev) { | ||
auto& msg = *ev->Get(); | ||
LOG_D("[TEvError] " << msg.Message); | ||
|
||
Error_.ConstructInPlace(msg.Message); | ||
} | ||
|
||
bool HandleDelete(IDqComputeStorageActor::TKey blobId, ui64 size) { | ||
auto it = DeletingBlobs_.find(blobId); | ||
if (it == DeletingBlobs_.end()) { | ||
return false; | ||
} | ||
|
||
UpdateStatsAfterBlobDeletion(blobId, size); | ||
|
||
auto& promise = it->second; | ||
promise.SetValue(); | ||
DeletingBlobs_.erase(it); | ||
return true; | ||
} | ||
|
||
void UpdateStatsAfterBlobDeletion(IDqComputeStorageActor::TKey blobId, ui64 size) { | ||
StoredBlobsCount_--; | ||
StoredBlobsSize_ -= size; | ||
StoredBlobs_.erase(blobId); | ||
} | ||
|
||
// It's illegal to initialize an inner actor in the actor's ctor. Because in this case ctx will not be initialized because it's initialized afger Bootstrap event. | ||
// But also it's not possible to initialize inner actor in the bootstrap function because in this case Put/Get may be called before the Bootstrap -> inner worker will be uninitialized. | ||
// In current implementation it's still possible to leave inner actor uninitialized that is why it's planned to split this class into Actor part + non actor part | ||
void InitializeIfNot() { | ||
if (IsInitialized_) return; | ||
auto spillingActor = CreateDqLocalFileSpillingActor(TxId_, SpillerName_, | ||
SelfId(), false); | ||
SpillingActorId_ = Register(spillingActor); | ||
|
||
IsInitialized_ = true; | ||
} | ||
|
||
|
||
protected: | ||
const TTxId TxId_; | ||
TActorId SpillingActorId_; | ||
|
||
TMap<IDqComputeStorageActor::TKey, TWritingBlobInfo> WritingBlobs_; | ||
TSet<ui64> StoredBlobs_; | ||
ui64 WritingBlobsSize_ = 0; | ||
|
||
ui32 StoredBlobsCount_ = 0; | ||
lll-phill-lll marked this conversation as resolved.
Show resolved
Hide resolved
|
||
ui64 StoredBlobsSize_ = 0; | ||
|
||
TMap<IDqComputeStorageActor::TKey, TLoadingBlobInfo> LoadingBlobs_; | ||
|
||
TMap<IDqComputeStorageActor::TKey, TDeletingBlobInfo> DeletingBlobs_; | ||
|
||
TMaybe<TString> Error_; | ||
|
||
IDqComputeStorageActor::TKey NextBlobId = 0; | ||
|
||
TString SpillerName_; | ||
|
||
bool IsInitialized_ = false; | ||
|
||
std::function<void()> WakeupCallback_; | ||
|
||
private: | ||
std::mutex Mutex_; | ||
|
||
}; | ||
|
||
} // anonymous namespace | ||
|
||
IDqComputeStorageActor* CreateDqComputeStorageActor(TTxId txId, const TString& spillerName, std::function<void()>&& wakeupCallback) { | ||
return new TDqComputeStorageActor(txId, spillerName, std::move(wakeupCallback)); | ||
} | ||
|
||
} // namespace NYql::NDq |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.