Skip to content

Commit

Permalink
UI updates for stable-24-3 (#9928)
Browse files Browse the repository at this point in the history 
Co-authored-by: Valery Mironov <mbkkt@ydb.tech>
Co-authored-by: Anton Standrik <astandrik@gmail.com>
Co-authored-by: Daniil Cherednik <dcherednik@ydb.tech>
Co-authored-by: Vasily Gerasimov <UgnineSirdis@ydb.tech>
Co-authored-by: Andrei Rykov <arykov@ydb.tech>
Co-authored-by: kruall <kruall@ydb.tech>
Co-authored-by: Andrey Neporada <aneporada@ydb.tech>
Co-authored-by: Ivan Sukhov <evanevannnn@ydb.tech>
Co-authored-by: niksaveliev <nik@saveliev.me>
Co-authored-by: Artem Alekseev <fexolm@ydb.tech>
Co-authored-by: Артём Муфазалов <67755036+artemmufazalov@users.noreply.github.com>
Co-authored-by: uzhastik <uzhas@ydb.tech>
  • Loading branch information
@adameat @MBkkt
@astandrik @dcherednik @UgnineSirdis @StekPerepolnen @kruall @nepal @evanevanevanevannnn @niksaveliev @fexolm @artemmufazalov @uzhastik
13 people authored Oct 7, 2024
1 parent 6b5b451 commit 462f216
Show file tree
Hide file tree
Showing 128 changed files with 13,588 additions and 8,401 deletions.
20 changes: 11 additions & 9 deletions ydb/core/base/board_lookup.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ namespace NKikimr {
class TBoardLookupActor : public TActorBootstrapped<TBoardLookupActor> {
const TString Path;
const TActorId Owner;
const ui64 Cookie;
const EBoardLookupMode Mode;
const bool Subscriber;
TBoardRetrySettings BoardRetrySettings;
Expand Down Expand Up @@ -111,12 +112,12 @@ class TBoardLookupActor : public TActorBootstrapped<TBoardLookupActor> {
void NotAvailable() {
if (CurrentStateFunc() != &TThis::StateSubscribe) {
Send(Owner, new TEvStateStorage::TEvBoardInfo(
TEvStateStorage::TEvBoardInfo::EStatus::NotAvailable, Path));
TEvStateStorage::TEvBoardInfo::EStatus::NotAvailable, Path), 0, Cookie);
} else {
Send(Owner,
new TEvStateStorage::TEvBoardInfoUpdate(
TEvStateStorage::TEvBoardInfo::EStatus::NotAvailable, Path
)
), 0, Cookie
);
}
return PassAway();
Expand All @@ -129,7 +130,7 @@ class TBoardLookupActor : public TActorBootstrapped<TBoardLookupActor> {
auto reply = MakeHolder<TEvStateStorage::TEvBoardInfo>(
TEvStateStorage::TEvBoardInfo::EStatus::Ok, Path);
reply->InfoEntries = std::move(Info);
Send(Owner, std::move(reply));
Send(Owner, std::move(reply), 0, Cookie);
if (Subscriber) {
Become(&TThis::StateSubscribe);
return;
Expand Down Expand Up @@ -240,7 +241,7 @@ class TBoardLookupActor : public TActorBootstrapped<TBoardLookupActor> {
auto reply = MakeHolder<TEvStateStorage::TEvBoardInfoUpdate>(
TEvStateStorage::TEvBoardInfo::EStatus::Ok, Path);
reply->Updates = { { oid, std::move(update.value()) } };
Send(Owner, std::move(reply));
Send(Owner, std::move(reply), 0, Cookie);
}
} else {
if (info.GetDropped()) {
Expand Down Expand Up @@ -308,7 +309,7 @@ class TBoardLookupActor : public TActorBootstrapped<TBoardLookupActor> {
auto reply = MakeHolder<TEvStateStorage::TEvBoardInfoUpdate>(
TEvStateStorage::TEvBoardInfo::EStatus::Ok, Path);
reply->Updates = std::move(updates);
Send(Owner, std::move(reply));
Send(Owner, std::move(reply), 0, Cookie);
}
}

Expand Down Expand Up @@ -484,7 +485,7 @@ class TBoardLookupActor : public TActorBootstrapped<TBoardLookupActor> {
auto reply = MakeHolder<TEvStateStorage::TEvBoardInfoUpdate>(
TEvStateStorage::TEvBoardInfo::EStatus::Ok, Path);
reply->Updates = std::move(updates);
Send(Owner, std::move(reply));
Send(Owner, std::move(reply), 0, Cookie);
}
}

Expand All @@ -495,9 +496,10 @@ class TBoardLookupActor : public TActorBootstrapped<TBoardLookupActor> {

TBoardLookupActor(
const TString &path, TActorId owner, EBoardLookupMode mode,
TBoardRetrySettings boardRetrySettings)
TBoardRetrySettings boardRetrySettings, ui64 cookie = 0)
: Path(path)
, Owner(owner)
, Cookie(cookie)
, Mode(mode)
, Subscriber(Mode == EBoardLookupMode::Subscription)
, BoardRetrySettings(std::move(boardRetrySettings))
Expand Down Expand Up @@ -545,8 +547,8 @@ class TBoardLookupActor : public TActorBootstrapped<TBoardLookupActor> {

IActor* CreateBoardLookupActor(
const TString &path, const TActorId &owner, EBoardLookupMode mode,
TBoardRetrySettings boardRetrySettings) {
return new TBoardLookupActor(path, owner, mode, std::move(boardRetrySettings));
TBoardRetrySettings boardRetrySettings, ui64 cookie) {
return new TBoardLookupActor(path, owner, mode, std::move(boardRetrySettings), cookie);
}

}
2 changes: 1 addition & 1 deletion ydb/core/base/statestorage.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,7 @@ IActor* CreateStateStorageBoardReplica(const TIntrusivePtr<TStateStorageInfo> &,
IActor* CreateSchemeBoardReplica(const TIntrusivePtr<TStateStorageInfo>&, ui32);
IActor* CreateBoardLookupActor(
const TString &path, const TActorId &owner, EBoardLookupMode mode,
TBoardRetrySettings boardRetrySettings = {});
TBoardRetrySettings boardRetrySettings = {}, ui64 cookie = 0);
IActor* CreateBoardPublishActor(
const TString &path, const TString &payload, const TActorId &owner, ui32 ttlMs, bool reg,
TBoardRetrySettings boardRetrySettings = {});
Expand Down
5 changes: 3 additions & 2 deletions ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1477,7 +1477,7 @@ void TPDisk::WhiteboardReport(TWhiteboardReport &whiteboardReport) {
TGuard<TMutex> guard(StateMutex);
const ui64 totalSize = Format.DiskSize;
const ui64 availableSize = (ui64)Format.ChunkSize * Keeper.GetFreeChunkCount();

if (*Mon.PDiskBriefState != TPDiskMon::TPDisk::Error) {
*Mon.FreeSpaceBytes = availableSize;
*Mon.UsedSpaceBytes = totalSize - availableSize;
Expand All @@ -1487,7 +1487,7 @@ void TPDisk::WhiteboardReport(TWhiteboardReport &whiteboardReport) {
*Mon.UsedSpaceBytes = 32_KB;
*Mon.TotalSpaceBytes = 32_KB;
}

NKikimrWhiteboard::TPDiskStateInfo& pdiskState = reportResult->PDiskState->Record;
pdiskState.SetPDiskId(PDiskId);
pdiskState.SetPath(Cfg->GetDevicePath());
Expand All @@ -1499,6 +1499,7 @@ void TPDisk::WhiteboardReport(TWhiteboardReport &whiteboardReport) {
pdiskState.SetSystemSize(Format.ChunkSize * (Keeper.GetOwnerHardLimit(OwnerSystemLog) + Keeper.GetOwnerHardLimit(OwnerSystemReserve)));
pdiskState.SetLogUsedSize(Format.ChunkSize * (Keeper.GetOwnerHardLimit(OwnerCommonStaticLog) - Keeper.GetOwnerFree(OwnerCommonStaticLog)));
pdiskState.SetLogTotalSize(Format.ChunkSize * Keeper.GetOwnerHardLimit(OwnerCommonStaticLog));
pdiskState.SetNumActiveSlots(TotalOwners);
if (ExpectedSlotCount) {
pdiskState.SetExpectedSlotCount(ExpectedSlotCount);
}
Expand Down
41 changes: 21 additions & 20 deletions ydb/core/grpc_services/query/rpc_execute_script.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include <ydb/core/base/appdata.h>
#include <ydb/library/ydb_issue/issue_helpers.h>
#include <ydb/core/grpc_services/base/base.h>
#include <ydb/core/grpc_services/rpc_request_base.h>
#include <ydb/core/grpc_services/rpc_kqp_base.h>
#include <ydb/core/grpc_services/audit_dml_operations.h>
#include <ydb/core/kqp/common/kqp.h>
Expand Down Expand Up @@ -71,27 +72,28 @@ std::tuple<Ydb::StatusIds::StatusCode, NYql::TIssues> FillKqpRequest(
return {Ydb::StatusIds::SUCCESS, {}};
}

class TExecuteScriptRPC : public TActorBootstrapped<TExecuteScriptRPC> {
class TExecuteScriptRPC : public TRpcRequestActor<TExecuteScriptRPC, TEvExecuteScriptRequest, false> {
public:
using TRpcRequestActorBase = TRpcRequestActor<TExecuteScriptRPC, TEvExecuteScriptRequest, false>;

static constexpr NKikimrServices::TActivity::EType ActorActivityType() {
return NKikimrServices::TActivity::GRPC_REQ;
}

TExecuteScriptRPC(TEvExecuteScriptRequest* request)
: Request_(request)
TExecuteScriptRPC(IRequestNoOpCtx* request)
: TRpcRequestActorBase(request)
{}

void Bootstrap() {
NYql::TIssues issues;
const auto& request = *Request_->GetProtoRequest();
const auto& request = GetProtoRequest();

if (request.operation_params().operation_mode() == Ydb::Operations::OperationParams::SYNC) {
if (request->operation_params().operation_mode() == Ydb::Operations::OperationParams::SYNC) {
issues.AddIssue("ExecuteScript must be asyncronous operation");
return Reply(Ydb::StatusIds::BAD_REQUEST, issues);
}

AuditContextAppend(Request_.get(), request);

AuditContextAppend(Request.Get(), request);
Ydb::StatusIds::StatusCode status = Ydb::StatusIds::SUCCESS;
if (auto scriptRequest = MakeScriptRequest(issues, status)) {
if (Send(NKqp::MakeKqpProxyID(SelfId().NodeId()), scriptRequest.Release())) {
Expand Down Expand Up @@ -122,14 +124,14 @@ class TExecuteScriptRPC : public TActorBootstrapped<TExecuteScriptRPC> {
}

THolder<NKqp::TEvKqp::TEvScriptRequest> MakeScriptRequest(NYql::TIssues& issues, Ydb::StatusIds::StatusCode& status) const {
const auto* req = Request_->GetProtoRequest();
const auto traceId = Request_->GetTraceId();
const auto* req = GetProtoRequest();
const auto traceId = Request->GetTraceId();

auto ev = MakeHolder<NKqp::TEvKqp::TEvScriptRequest>();

SetAuthToken(ev, *Request_);
SetDatabase(ev, *Request_);
SetRlPath(ev, *Request_);
SetAuthToken(ev, *Request);
SetDatabase(ev, *Request);
SetRlPath(ev, *Request);

if (traceId) {
ev->Record.SetTraceId(traceId.GetRef());
Expand Down Expand Up @@ -162,12 +164,9 @@ class TExecuteScriptRPC : public TActorBootstrapped<TExecuteScriptRPC> {

result.set_status(status);

AuditContextAppend(Request_.get(), *Request_->GetProtoRequest(), result);

TString serializedResult;
Y_PROTOBUF_SUPPRESS_NODISCARD result.SerializeToString(&serializedResult);
AuditContextAppend(Request.Get(), GetProtoRequest(), result);

Request_->SendSerializedResult(std::move(serializedResult), status);
TProtoResponseHelper::SendProtoResponse(result, status, Request);

PassAway();
}
Expand All @@ -177,9 +176,6 @@ class TExecuteScriptRPC : public TActorBootstrapped<TExecuteScriptRPC> {
result.set_ready(true);
Reply(status, std::move(result), issues);
}

private:
std::unique_ptr<TEvExecuteScriptRequest> Request_;
};

} // namespace
Expand All @@ -193,6 +189,11 @@ void DoExecuteScript(std::unique_ptr<IRequestNoOpCtx> p, const IFacilityProvider
f.RegisterActor(new TExecuteScriptRPC(req));
}

} // namespace NQuery

template<>
IActor* TEvExecuteScriptRequest::CreateRpcActor(IRequestNoOpCtx* msg) {
return new TExecuteScriptRPC(msg);
}

} // namespace NKikimr::NGRpcService
12 changes: 7 additions & 5 deletions ydb/core/grpc_services/query/rpc_fetch_script_results.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class TFetchScriptResultsRPC : public TRpcRequestActor<TFetchScriptResultsRPC, T
return NKikimrServices::TActivity::GRPC_REQ;
}

TFetchScriptResultsRPC(TEvFetchScriptResultsRequest* request)
TFetchScriptResultsRPC(IRequestNoOpCtx* request)
: TRpcRequestActorBase(request)
{}

Expand Down Expand Up @@ -108,10 +108,7 @@ class TFetchScriptResultsRPC : public TRpcRequestActor<TFetchScriptResultsRPC, T

result.set_status(status);

TString serializedResult;
Y_PROTOBUF_SUPPRESS_NODISCARD result.SerializeToString(&serializedResult);

Request->SendSerializedResult(std::move(serializedResult), status);
TProtoResponseHelper::SendProtoResponse(result, status, Request);

PassAway();
}
Expand Down Expand Up @@ -154,4 +151,9 @@ void DoFetchScriptResults(std::unique_ptr<IRequestNoOpCtx> p, const IFacilityPro

}

template<>
IActor* TEvFetchScriptResultsRequest::CreateRpcActor(IRequestNoOpCtx* msg) {
return new TFetchScriptResultsRPC(msg);
}

} // namespace NKikimr::NGRpcService
Loading

0 comments on commit 462f216

Please sign in to comment.