diff options
author | qoega <qoega@yandex-team.ru> | 2022-02-10 16:50:59 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:50:59 +0300 |
commit | 5f7298f3be27a7eb7ef000c903f6b233031ec3d1 (patch) | |
tree | 5fc9656bd7025252735f74e930cddf674a0e4b73 | |
parent | fa48a9aebc6cda36fdf7632883c934e1f262e71f (diff) | |
download | ydb-5f7298f3be27a7eb7ef000c903f6b233031ec3d1.tar.gz |
Restoring authorship annotation for <qoega@yandex-team.ru>. Commit 1 of 2.
-rw-r--r-- | library/cpp/monlib/dynamic_counters/counters.cpp | 4 | ||||
-rw-r--r-- | ydb/core/blobstorage/vdisk/hullop/blobstorage_hullload.h | 4 | ||||
-rw-r--r-- | ydb/core/blobstorage/vdisk/skeleton/blobstorage_monactors.cpp | 4 | ||||
-rw-r--r-- | ydb/core/tablet/tablet_req_findlatest.cpp | 4 | ||||
-rw-r--r-- | ydb/core/tx/coordinator/coordinator_impl.cpp | 4 | ||||
-rw-r--r-- | ydb/core/tx/coordinator/mediator_queue.cpp | 2 | ||||
-rw-r--r-- | ydb/core/tx/mediator/execute_queue.cpp | 8 | ||||
-rw-r--r-- | ydb/core/tx/mediator/mediator_impl.h | 8 | ||||
-rw-r--r-- | ydb/core/tx/mediator/tablet_queue.cpp | 4 | ||||
-rw-r--r-- | ydb/core/tx/tx_processing.h | 10 | ||||
-rw-r--r-- | ydb/core/tx/tx_proxy/datareq.cpp | 78 | ||||
-rw-r--r-- | ydb/core/tx/tx_proxy/mon.h | 164 | ||||
-rw-r--r-- | ydb/public/api/grpc/ydb_table_v1.proto | 4 |
13 files changed, 149 insertions, 149 deletions
diff --git a/library/cpp/monlib/dynamic_counters/counters.cpp b/library/cpp/monlib/dynamic_counters/counters.cpp index 3635d87d0d..32eb5656ce 100644 --- a/library/cpp/monlib/dynamic_counters/counters.cpp +++ b/library/cpp/monlib/dynamic_counters/counters.cpp @@ -64,8 +64,8 @@ TDynamicCounters::TCounterPtr TDynamicCounters::GetExpiringNamedCounter(const TS TDynamicCounters::TCounterPtr TDynamicCounters::GetCounter(const TString& value, bool derivative, EVisibility vis) { return GetNamedCounter("sensor", value, derivative, vis); -} - +} + TDynamicCounters::TCounterPtr TDynamicCounters::GetNamedCounter(const TString& name, const TString& value, bool derivative, EVisibility vis) { return AsCounterRef(GetNamedCounterImpl<false, TCounterForPtr>(name, value, derivative, vis)); } diff --git a/ydb/core/blobstorage/vdisk/hullop/blobstorage_hullload.h b/ydb/core/blobstorage/vdisk/hullop/blobstorage_hullload.h index d08b3a04d7..10519cc911 100644 --- a/ydb/core/blobstorage/vdisk/hullop/blobstorage_hullload.h +++ b/ydb/core/blobstorage/vdisk/hullop/blobstorage_hullload.h @@ -314,10 +314,10 @@ namespace NKikimr { , RestToReadIndex(0) , RestToReadOutbound(0) , Chunks() - { + { const TDiskPart& entry = levelSegment->GetEntryPoint(); Y_VERIFY_DEBUG(!entry.Empty()); - } + } }; diff --git a/ydb/core/blobstorage/vdisk/skeleton/blobstorage_monactors.cpp b/ydb/core/blobstorage/vdisk/skeleton/blobstorage_monactors.cpp index 44b3c58c9c..4529abd6b5 100644 --- a/ydb/core/blobstorage/vdisk/skeleton/blobstorage_monactors.cpp +++ b/ydb/core/blobstorage/vdisk/skeleton/blobstorage_monactors.cpp @@ -684,9 +684,9 @@ namespace NKikimr { , To() , IsRangeQuery(false) , ShowInternals(false) - { + { Y_UNUSED(ShowInternals); - } + } }; //////////////////////////////////////////////////////////////////////////// diff --git a/ydb/core/tablet/tablet_req_findlatest.cpp b/ydb/core/tablet/tablet_req_findlatest.cpp index ca3d09aa43..ab7879b3ed 100644 --- a/ydb/core/tablet/tablet_req_findlatest.cpp +++ b/ydb/core/tablet/tablet_req_findlatest.cpp @@ -79,9 +79,9 @@ public: , Info(info) , ChannelInfo(Info->ChannelInfo(0)) , CurrentHistoryIndex(ChannelInfo->History.size()) - { + { Y_VERIFY(CurrentHistoryIndex > 0); - } + } void Bootstrap() { Become(&TThis::StateInit); diff --git a/ydb/core/tx/coordinator/coordinator_impl.cpp b/ydb/core/tx/coordinator/coordinator_impl.cpp index b4eeb184e2..af4711b328 100644 --- a/ydb/core/tx/coordinator/coordinator_impl.cpp +++ b/ydb/core/tx/coordinator/coordinator_impl.cpp @@ -16,7 +16,7 @@ static constexpr TDuration MaxEmptyPlanDelay = TDuration::Seconds(1); static void SendTransactionStatus(const TActorId &proxy, TEvTxProxy::TEvProposeTransactionStatus::EStatus status, ui64 txid, ui64 stepId, const TActorContext &ctx, ui64 tabletId) { LOG_DEBUG_S(ctx, NKikimrServices::TX_COORDINATOR, "tablet# " << tabletId << " txid# " << txid - << " step# " << stepId << " Status# " << status << " SEND to# " << proxy.ToString() << " Proxy marker# C1"); + << " step# " << stepId << " Status# " << status << " SEND to# " << proxy.ToString() << " Proxy marker# C1"); ctx.Send(proxy, new TEvTxProxy::TEvProposeTransactionStatus(status, txid, stepId)); } @@ -143,7 +143,7 @@ void TTxCoordinator::PlanTx(TAutoPtr<TTransactionProposal> &proposal, const TAct void TTxCoordinator::Handle(TEvTxProxy::TEvProposeTransaction::TPtr &ev, const TActorContext &ctx) { TAutoPtr<TTransactionProposal> proposal = MakeTransactionProposal(ev, MonCounters.TxIn); LOG_DEBUG_S(ctx, NKikimrServices::TX_COORDINATOR, "tablet# " << TabletID() << " txid# " << proposal->TxId - << " HANDLE EvProposeTransaction marker# C0"); + << " HANDLE EvProposeTransaction marker# C0"); PlanTx(proposal, ctx); } diff --git a/ydb/core/tx/coordinator/mediator_queue.cpp b/ydb/core/tx/coordinator/mediator_queue.cpp index 9b3955fa1b..5821bc2543 100644 --- a/ydb/core/tx/coordinator/mediator_queue.cpp +++ b/ydb/core/tx/coordinator/mediator_queue.cpp @@ -70,7 +70,7 @@ class TTxCoordinatorMediatorQueue : public TActorBootstrapped<TTxCoordinatorMedi void Handle(TEvTxCoordinator::TEvMediatorQueueStep::TPtr &ev, const TActorContext &ctx) { TEvTxCoordinator::TEvMediatorQueueStep *msg = ev->Get(); LOG_DEBUG_S(ctx, NKikimrServices::TX_COORDINATOR_MEDIATOR_QUEUE, "Actor# " << ctx.SelfID.ToString() - << " HANDLE EvMediatorQueueStep step# " << msg->Step->Step); + << " HANDLE EvMediatorQueueStep step# " << msg->Step->Step); if (msg->GenCookie == GenCookie && PipeClient) { const NFlatTxCoordinator::TMediatorStep &step = *msg->Step; diff --git a/ydb/core/tx/mediator/execute_queue.cpp b/ydb/core/tx/mediator/execute_queue.cpp index 07740e9f82..fcf71089fd 100644 --- a/ydb/core/tx/mediator/execute_queue.cpp +++ b/ydb/core/tx/mediator/execute_queue.cpp @@ -38,8 +38,8 @@ namespace NTxMediator { TStringBuilder ss; ss << "Mediator exec queue [" << MediatorId << "], step# " << step << " for tablet [" << tablet << "]. TxIds:"; for (const auto &x : tx) - ss << " txid# " << x.TxId; - ss << " marker# M2"; + ss << " txid# " << x.TxId; + ss << " marker# M2"; return (TString)ss; }()); @@ -49,7 +49,7 @@ namespace NTxMediator { TStringBuilder ss; for (const auto &x : tx) ss << " txid# " << x.TxId; - ss << " marker# M3"; + ss << " marker# M3"; return (TString)ss; }()); ctx.Send(bucket.ActiveActor, new TEv(step, tablet, tx)); @@ -69,7 +69,7 @@ namespace NTxMediator { const ui32 totalCoordinators = step->Steps.size(); LOG_DEBUG_S(ctx, NKikimrServices::TX_MEDIATOR_EXEC_QUEUE, "Actor# " << ctx.SelfID.ToString() - << " MediatorId# " << MediatorId << " HANDLE TEvCommitStep " << step->ToString() << " marker# M1"); + << " MediatorId# " << MediatorId << " HANDLE TEvCommitStep " << step->ToString() << " marker# M1"); for (ui32 i = 0; i != totalCoordinators; ++i) { TCoordinatorStep &coord = *step->Steps[i]; diff --git a/ydb/core/tx/mediator/mediator_impl.h b/ydb/core/tx/mediator/mediator_impl.h index c98bd4246b..b9d8311a85 100644 --- a/ydb/core/tx/mediator/mediator_impl.h +++ b/ydb/core/tx/mediator/mediator_impl.h @@ -72,7 +72,7 @@ namespace NTxMediator { TString ToString() const { TStringStream str; - str << "{TCoordinatorStep step# " << Step; + str << "{TCoordinatorStep step# " << Step; str << " PrevStep# " << PrevStep; if (Transactions.size()) { str << "Transactions: {"; @@ -189,7 +189,7 @@ struct TEvTxMediator { TString ToString() const { TStringStream str; - str << "{TEvCommitTabletStep step# " << Step; + str << "{TEvCommitTabletStep step# " << Step; str << " TabletId# " << TabletId; str << " Transactions {"; for (size_t i = 0; i < Transactions.size(); ++i) { @@ -209,7 +209,7 @@ struct TEvTxMediator { TString ToString() const { TStringStream str; - str << "{TEvStepPlanComplete step# " << Step; + str << "{TEvStepPlanComplete step# " << Step; str << "}"; return str.Str(); } @@ -228,7 +228,7 @@ struct TEvTxMediator { TString ToString() const { TStringStream str; - str << "{TEvOoOTabletStep step# " << Step; + str << "{TEvOoOTabletStep step# " << Step; str << " TabletId# " << TabletId; str << " Transactions {"; for (size_t i = 0; i < Transactions.size(); ++i) { diff --git a/ydb/core/tx/mediator/tablet_queue.cpp b/ydb/core/tx/mediator/tablet_queue.cpp index b28179517c..90176be26f 100644 --- a/ydb/core/tx/mediator/tablet_queue.cpp +++ b/ydb/core/tx/mediator/tablet_queue.cpp @@ -88,7 +88,7 @@ class TTxMediatorTabletQueue : public TActor<TTxMediatorTabletQueue> { if (tx.Moderator) x->SetModerator(tx.Moderator); ActorIdToProto(tx.AckTo, x->MutableAckTo()); - LOG_DEBUG(ctx, NKikimrServices::TX_MEDIATOR_PRIVATE, "Send from %" PRIu64 " to tablet %" PRIu64 ", step# %" + LOG_DEBUG(ctx, NKikimrServices::TX_MEDIATOR_PRIVATE, "Send from %" PRIu64 " to tablet %" PRIu64 ", step# %" PRIu64 ", txid# %" PRIu64 ", marker M5" PRIu64, Mediator, tablet, tabletStep->StepRef->Step, tx.TxId); } LOG_DEBUG_S(ctx, NKikimrServices::TX_MEDIATOR_TABLETQUEUE, "Actor# " << ctx.SelfID.ToString() @@ -139,7 +139,7 @@ class TTxMediatorTabletQueue : public TActor<TTxMediatorTabletQueue> { const TTabletId tablet = msg->TabletId; LOG_DEBUG_S(ctx, NKikimrServices::TX_MEDIATOR_TABLETQUEUE, "Actor# " << ctx.SelfID.ToString() - << " Mediator# " << Mediator << " HANDLE " << msg->ToString() << " marker# M4"); + << " Mediator# " << Mediator << " HANDLE " << msg->ToString() << " marker# M4"); TTabletEntry &tabletEntry = PerTabletPlanQueue[tablet]; if (!ActiveStep) { diff --git a/ydb/core/tx/tx_processing.h b/ydb/core/tx/tx_processing.h index 72276c1af3..c2a5442311 100644 --- a/ydb/core/tx/tx_processing.h +++ b/ydb/core/tx/tx_processing.h @@ -42,7 +42,7 @@ struct TEvTxProcessing { TString ToString() const { TStringStream str; - str << "{TEvPlanStep step# " << Record.GetStep(); + str << "{TEvPlanStep step# " << Record.GetStep(); str << " MediatorId# " << Record.GetMediatorID(); str << " TabletID " << Record.GetTabletID(); str << "}"; @@ -77,7 +77,7 @@ struct TEvTxProcessing { TString ToString() const { TStringStream str; str << "{TEvPlanStepAck TabletId# " << Record.GetTabletId(); - str << " step# " << Record.GetStep(); + str << " step# " << Record.GetStep(); for (size_t i = 0; i < Record.TxIdSize(); ++i) { str << " txid# " << Record.GetTxId(i); } @@ -99,7 +99,7 @@ struct TEvTxProcessing { TString ToString() const { TStringStream str; str << "{TEvPlanStepAccepted TabletId# " << Record.GetTabletId(); - str << " step# " << Record.GetStep(); + str << " step# " << Record.GetStep(); str << "}"; return str.Str(); } @@ -122,7 +122,7 @@ struct TEvTxProcessing { TString ToString() const { TStringStream str; - str << "{TEvReadSet step# " << Record.GetStep(); + str << "{TEvReadSet step# " << Record.GetStep(); str << " txid# " << Record.GetTxId(); str << " TabletSource# " << Record.GetTabletSource(); str << " TabletDest# " << Record.GetTabletDest(); @@ -163,7 +163,7 @@ struct TEvTxProcessing { TString ToString() const { TStringStream str; - str << "{TEvReadSet step# " << Record.GetStep(); + str << "{TEvReadSet step# " << Record.GetStep(); str << " txid# " << Record.GetTxId(); str << " TabletSource# " << Record.GetTabletSource(); str << " TabletDest# " << Record.GetTabletDest(); diff --git a/ydb/core/tx/tx_proxy/datareq.cpp b/ydb/core/tx/tx_proxy/datareq.cpp index af48b42d60..01f61ab28d 100644 --- a/ydb/core/tx/tx_proxy/datareq.cpp +++ b/ydb/core/tx/tx_proxy/datareq.cpp @@ -360,8 +360,8 @@ private: void ProcessFlatMKQLResolve(NSchemeCache::TSchemeCacheRequest *cacheRequest, const TActorContext &ctx); void ProcessReadTableResolve(NSchemeCache::TSchemeCacheRequest *cacheRequest, const TActorContext &ctx); - TIntrusivePtr<TTxProxyMon> TxProxyMon; - + TIntrusivePtr<TTxProxyMon> TxProxyMon; + void Die(const TActorContext &ctx) override { --*TxProxyMon->DataReqInFly; @@ -474,7 +474,7 @@ public: , WallClockResolved(TInstant::MicroSeconds(0)) , WallClockPrepared(TInstant::MicroSeconds(0)) , WallClockPlanned(TInstant::MicroSeconds(0)) - , TxProxyMon(mon) + , TxProxyMon(mon) { ++*TxProxyMon->DataReqInFly; } @@ -813,7 +813,7 @@ void TDataReq::ReportStatus(TEvTxUserProxy::TEvProposeTransactionStatus::EStatus << " total time: " << totalTime.ToString() << " marker# P13"); - TxProxyMon->ReportStatusOK->Inc(); + TxProxyMon->ReportStatusOK->Inc(); TxProxyMon->TxPrepareTimeHgram->Collect(prepareTime.MilliSeconds()); TxProxyMon->TxExecuteTimeHgram->Collect(executeTime.MilliSeconds()); @@ -838,7 +838,7 @@ void TDataReq::ReportStatus(TEvTxUserProxy::TEvProposeTransactionStatus::EStatus << " shard: " << ComplainingDatashards.front() << " table: " << fnGetTableIdByShard(ComplainingDatashards.front()) << " marker# P13a"); - TxProxyMon->ReportStatusNotOK->Inc(); + TxProxyMon->ReportStatusNotOK->Inc(); break; case TEvTxUserProxy::TResultStatus::ProxyShardNotAvailable: case TEvTxUserProxy::TResultStatus::ProxyShardUnknown: @@ -1192,7 +1192,7 @@ void TDataReq::MarkShardError(ui64 shardId, TDataReq::TPerTablet &perTablet, boo "Actor# " << ctx.SelfID.ToString() << " txid# " << TxId << " invalidateDistCache: " << invalidateDistCache << " DIE TDataReq MarkShardError TabletsLeft# " << TabletsLeft); - TxProxyMon->MarkShardError->Inc(); + TxProxyMon->MarkShardError->Inc(); return Die(ctx); } } @@ -1247,7 +1247,7 @@ void TDataReq::Handle(TEvTxProxyReq::TEvMakeRequest::TPtr &ev, const TActorConte LOG_DEBUG_S_SAMPLED_BY(ctx, NKikimrServices::TX_PROXY, TxId, "Actor# " << ctx.SelfID.ToString() << " Cookie# " << (ui64)ev->Cookie - << " txid# " << TxId << " HANDLE TDataReq marker# P1"); + << " txid# " << TxId << " HANDLE TDataReq marker# P1"); if (!record.GetUserToken().empty()) { UserToken = new NACLib::TUserToken(record.GetUserToken()); @@ -1334,10 +1334,10 @@ void TDataReq::Handle(TEvTxProxyReq::TEvMakeRequest::TPtr &ev, const TActorConte ReportStatus( TEvTxUserProxy::TEvProposeTransactionStatus::EStatus::WrongRequest, NKikimrIssues::TStatusIds::BAD_REQUEST, true, ctx); - TxProxyMon->MakeRequestWrongRequest->Inc(); + TxProxyMon->MakeRequestWrongRequest->Inc(); return Die(ctx); } else if (resolveReq->Request->ResultSet.empty()) { - TxProxyMon->MakeRequestEmptyAffectedSet->Inc(); + TxProxyMon->MakeRequestEmptyAffectedSet->Inc(); if (FlatMKQLRequest) { FlatMKQLRequest->EngineResultStatusCode = FlatMKQLRequest->Engine->PrepareShardPrograms( NMiniKQL::IEngineFlat::TShardLimits(0, 0)); @@ -1366,7 +1366,7 @@ void TDataReq::Handle(TEvTxProxyReq::TEvMakeRequest::TPtr &ev, const TActorConte } resolveReq->Request->DatabaseName = record.GetDatabaseName(); - TxProxyMon->MakeRequestProxyAccepted->Inc(); + TxProxyMon->MakeRequestProxyAccepted->Inc(); LOG_DEBUG_S_SAMPLED_BY(ctx, NKikimrServices::TX_PROXY, TxId, "Actor# " << ctx.SelfID.ToString() << " txid# " << TxId << " SEND to# " << Services.SchemeCache.ToString() << " TSchemeCache with " @@ -1529,7 +1529,7 @@ void TDataReq::Handle(TEvTxProxySchemeCache::TEvResolveKeySetResult::TPtr &ev, c LOG_LOG_S_SAMPLED_BY(ctx, (request->ErrorCount == 0 ? NActors::NLog::PRI_DEBUG : NActors::NLog::PRI_ERROR), NKikimrServices::TX_PROXY, TxId, "Actor# " << ctx.SelfID.ToString() << " txid# " << TxId - << " HANDLE EvResolveKeySetResult TDataReq marker# P3 ErrorCount# " << request->ErrorCount); + << " HANDLE EvResolveKeySetResult TDataReq marker# P3 ErrorCount# " << request->ErrorCount); TxProxyMon->CacheRequestLatency->Collect((Now() - WallClockAccepted).MilliSeconds()); WallClockResolved = Now(); @@ -1709,7 +1709,7 @@ void TDataReq::HandlePrepare(TEvPipeCache::TEvDeliveryProblem::TPtr &ev, const T } Become(&TThis::StatePrepareErrors, ctx, TDuration::MilliSeconds(500), new TEvents::TEvWakeup); - TxProxyMon->ClientConnectedError->Inc(); + TxProxyMon->ClientConnectedError->Inc(); return HandlePrepareErrors(ev, ctx); } @@ -1796,7 +1796,7 @@ void TDataReq::HandlePrepare(TEvDataShard::TEvProposeTransactionResult::TPtr &ev WallClockFirstPrepareReply = WallClockLastPrepareReply; if (perTablet->TabletStatus == TPerTablet::ETabletStatus::StatusPrepared) { // do nothing - TxProxyMon->TxResultTabletPrepared->Inc(); + TxProxyMon->TxResultTabletPrepared->Inc(); return; } @@ -1821,8 +1821,8 @@ void TDataReq::HandlePrepare(TEvDataShard::TEvProposeTransactionResult::TPtr &ev AggrMaxStep = Min(AggrMaxStep, perTablet->MaxStep); AggrMinStep = Max(AggrMinStep, perTablet->MinStep); - TxProxyMon->TxResultPrepared->Inc(); - + TxProxyMon->TxResultPrepared->Inc(); + if (record.HasExecLatency()) ElapsedPrepareExec = Max<TDuration>(ElapsedPrepareExec, TDuration::MilliSeconds(record.GetExecLatency())); if (record.HasProposeLatency()) @@ -1874,7 +1874,7 @@ void TDataReq::HandlePrepare(TEvDataShard::TEvProposeTransactionResult::TPtr &ev if (record.HasProposeLatency()) ElapsedExecComplete = Max<TDuration>(ElapsedExecComplete, TDuration::MilliSeconds(record.GetProposeLatency())); - TxProxyMon->TxResultComplete->Inc(); + TxProxyMon->TxResultComplete->Inc(); return MergeResult(ev, ctx); case NKikimrTxDataShard::TEvProposeTransactionResult::RESPONSE_DATA: ProcessStreamResponseData(ev, ctx); @@ -1894,12 +1894,12 @@ void TDataReq::HandlePrepare(TEvDataShard::TEvProposeTransactionResult::TPtr &ev ReportStatus(TEvTxUserProxy::TEvProposeTransactionStatus::EStatus::ProxyShardNotAvailable, NKikimrIssues::TStatusIds::REJECTED, true, ctx); } Become(&TThis::StatePrepareErrors, ctx, TDuration::MilliSeconds(500), new TEvents::TEvWakeup); - TxProxyMon->TxResultError->Inc(); + TxProxyMon->TxResultError->Inc(); return HandlePrepareErrors(ev, ctx); } case NKikimrTxDataShard::TEvProposeTransactionResult::ABORTED: ReportStatus(TEvTxUserProxy::TEvProposeTransactionStatus::EStatus::ExecAborted, NKikimrIssues::TStatusIds::SUCCESS, true, ctx); - TxProxyMon->TxResultAborted->Inc(); + TxProxyMon->TxResultAborted->Inc(); return Die(ctx); case NKikimrTxDataShard::TEvProposeTransactionResult::TRY_LATER: ExtractDatashardErrors(record); @@ -1938,7 +1938,7 @@ void TDataReq::HandlePrepare(TEvDataShard::TEvProposeTransactionResult::TPtr &ev ExtractDatashardErrors(record); CancelProposal(tabletId); ReportStatus(TEvTxUserProxy::TEvProposeTransactionStatus::EStatus::ProxyShardUnknown, NKikimrIssues::TStatusIds::ERROR, true, ctx); - TxProxyMon->TxResultFatal->Inc(); + TxProxyMon->TxResultFatal->Inc(); return Die(ctx); } } @@ -2006,7 +2006,7 @@ void TDataReq::HandlePrepareErrors(TEvDataShard::TEvProposeTransactionResult::TP } void TDataReq::HandlePrepareErrorTimeout(const TActorContext &ctx) { - TxProxyMon->PrepareErrorTimeout->Inc(); + TxProxyMon->PrepareErrorTimeout->Inc(); return Die(ctx); } @@ -2016,35 +2016,35 @@ void TDataReq::Handle(TEvTxProxy::TEvProposeTransactionStatus::TPtr &ev, const T const NKikimrTx::TEvProposeTransactionStatus &record = msg->Record; switch (msg->GetStatus()) { case TEvTxProxy::TEvProposeTransactionStatus::EStatus::StatusAccepted: - TxProxyMon->ClientTxStatusAccepted->Inc(); - // nop + TxProxyMon->ClientTxStatusAccepted->Inc(); + // nop LOG_DEBUG_S_SAMPLED_BY(ctx, NKikimrServices::TX_PROXY, TxId, "Actor# " << ctx.SelfID.ToString() << " txid# " << TxId - << " HANDLE TEvProposeTransactionStatus TDataReq marker# P11 Status# " << msg->GetStatus()); - break; + << " HANDLE TEvProposeTransactionStatus TDataReq marker# P11 Status# " << msg->GetStatus()); + break; case TEvTxProxy::TEvProposeTransactionStatus::EStatus::StatusProcessed: - TxProxyMon->ClientTxStatusProcessed->Inc(); - // nop + TxProxyMon->ClientTxStatusProcessed->Inc(); + // nop LOG_DEBUG_S_SAMPLED_BY(ctx, NKikimrServices::TX_PROXY, TxId, "Actor# " << ctx.SelfID.ToString() << " txid# " << TxId - << " HANDLE TEvProposeTransactionStatus TDataReq marker# P11 Status# " << msg->GetStatus()); - break; + << " HANDLE TEvProposeTransactionStatus TDataReq marker# P11 Status# " << msg->GetStatus()); + break; case TEvTxProxy::TEvProposeTransactionStatus::EStatus::StatusConfirmed: - TxProxyMon->ClientTxStatusConfirmed->Inc(); + TxProxyMon->ClientTxStatusConfirmed->Inc(); // nop LOG_DEBUG_S_SAMPLED_BY(ctx, NKikimrServices::TX_PROXY, TxId, "Actor# " << ctx.SelfID.ToString() << " txid# " << TxId - << " HANDLE TEvProposeTransactionStatus TDataReq marker# P11 Status# " << msg->GetStatus()); + << " HANDLE TEvProposeTransactionStatus TDataReq marker# P11 Status# " << msg->GetStatus()); break; case TEvTxProxy::TEvProposeTransactionStatus::EStatus::StatusPlanned: // ok PlanStep = record.GetStepId(); CoordinatorStatus = ECoordinatorStatus::Planned; - TxProxyMon->ClientTxStatusPlanned->Inc(); + TxProxyMon->ClientTxStatusPlanned->Inc(); LOG_DEBUG_S_SAMPLED_BY(ctx, NKikimrServices::TX_PROXY, TxId, "Actor# " << ctx.SelfID.ToString() << " txid# " << TxId - << " HANDLE TEvProposeTransactionStatus TDataReq marker# P10 Status# " << msg->GetStatus()); + << " HANDLE TEvProposeTransactionStatus TDataReq marker# P10 Status# " << msg->GetStatus()); WallClockPlanned = Now(); if (ProxyFlags & TEvTxUserProxy::TEvProposeTransaction::ProxyReportPlanned) ReportStatus(TEvTxUserProxy::TEvProposeTransactionStatus::EStatus::CoordinatorPlanned, NKikimrIssues::TStatusIds::TRANSIENT, false, ctx); @@ -2060,9 +2060,9 @@ void TDataReq::Handle(TEvTxProxy::TEvProposeTransactionStatus::TPtr &ev, const T // smth goes wrong LOG_ERROR_S_SAMPLED_BY(ctx, NKikimrServices::TX_PROXY, TxId, "Actor# " << ctx.SelfID.ToString() << " txid# " << TxId - << " HANDLE TEvProposeTransactionStatus TDataReq marker# P9 Status# " << msg->GetStatus()); + << " HANDLE TEvProposeTransactionStatus TDataReq marker# P9 Status# " << msg->GetStatus()); ReportStatus(TEvTxUserProxy::TEvProposeTransactionStatus::EStatus::CoordinatorDeclined, NKikimrIssues::TStatusIds::REJECTED, true, ctx); - TxProxyMon->ClientTxStatusCoordinatorDeclined->Inc(); + TxProxyMon->ClientTxStatusCoordinatorDeclined->Inc(); return Die(ctx); } } @@ -2207,14 +2207,14 @@ void TDataReq::HandlePlan(TEvDataShard::TEvProposeTransactionResult::TPtr &ev, c if (Y_LIKELY(perTablet)) { perTablet->TabletStatus = TPerTablet::ETabletStatus::StatusFinished; } - TxProxyMon->PlanClientTxResultComplete->Inc(); + TxProxyMon->PlanClientTxResultComplete->Inc(); return MergeResult(ev, ctx); case NKikimrTxDataShard::TEvProposeTransactionResult::RESPONSE_DATA: ProcessStreamResponseData(ev, ctx); return; case NKikimrTxDataShard::TEvProposeTransactionResult::ABORTED: ReportStatus(TEvTxUserProxy::TEvProposeTransactionStatus::EStatus::ExecAborted, NKikimrIssues::TStatusIds::SUCCESS, true, ctx); - TxProxyMon->PlanClientTxResultAborted->Inc(); + TxProxyMon->PlanClientTxResultAborted->Inc(); return Die(ctx); case NKikimrTxDataShard::TEvProposeTransactionResult::RESULT_UNAVAILABLE: ExtractDatashardErrors(record); @@ -2229,7 +2229,7 @@ void TDataReq::HandlePlan(TEvDataShard::TEvProposeTransactionResult::TPtr &ev, c default: ExtractDatashardErrors(record); ReportStatus(TEvTxUserProxy::TEvProposeTransactionStatus::EStatus::ExecError, NKikimrIssues::TStatusIds::ERROR, true, ctx); - TxProxyMon->PlanClientTxResultExecError->Inc(); + TxProxyMon->PlanClientTxResultExecError->Inc(); return Die(ctx); } } @@ -2324,7 +2324,7 @@ void TDataReq::HandlePlan(TEvPipeCache::TEvDeliveryProblem::TPtr &ev, const TAct return Die(ctx); } - + LOG_LOG_S_SAMPLED_BY(ctx, NActors::NLog::PRI_ERROR, NKikimrServices::TX_PROXY, TxId, "Actor# " << ctx.SelfID.ToString() << " txid# " << TxId << " lost pipe with unknown endpoint, ignoring"); @@ -2493,7 +2493,7 @@ void TDataReq::HandleExecTimeout(const TActorContext &ctx) { "Actor# " << ctx.SelfID.ToString() << " txid# " << TxId << " HANDLE ExecTimeout TDataReq"); ReportStatus(TEvTxUserProxy::TEvProposeTransactionStatus::EStatus::ExecTimeout, NKikimrIssues::TStatusIds::TIMEOUT, true, ctx); - TxProxyMon->ExecTimeout->Inc(); + TxProxyMon->ExecTimeout->Inc(); return Die(ctx); } diff --git a/ydb/core/tx/tx_proxy/mon.h b/ydb/core/tx/tx_proxy/mon.h index d747ab4f99..5ffbae6a8c 100644 --- a/ydb/core/tx/tx_proxy/mon.h +++ b/ydb/core/tx/tx_proxy/mon.h @@ -1,26 +1,26 @@ -#pragma once -#include "defs.h" - +#pragma once +#include "defs.h" + #include <ydb/core/mon/mon.h> #include <ydb/library/yql/minikql/aligned_page_pool.h> #include <library/cpp/actors/helpers/mon_histogram_helper.h> - -namespace NKikimr { -namespace NTxProxy { - - //////////////////////////////////////////////////////////////////////////// - // TX PROXY MONITORING COUNTERS - //////////////////////////////////////////////////////////////////////////// - struct TTxProxyMon : public TThrRefBase { - - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters; - - // tx_proxy group - TIntrusivePtr<NMonitoring::TDynamicCounters> TxGroup; - + +namespace NKikimr { +namespace NTxProxy { + + //////////////////////////////////////////////////////////////////////////// + // TX PROXY MONITORING COUNTERS + //////////////////////////////////////////////////////////////////////////// + struct TTxProxyMon : public TThrRefBase { + + TIntrusivePtr<NMonitoring::TDynamicCounters> Counters; + + // tx_proxy group + TIntrusivePtr<NMonitoring::TDynamicCounters> TxGroup; + NMonitoring::THistogramPtr CacheRequestLatency; - NMonitoring::TDynamicCounters::TCounterPtr Navigate; + NMonitoring::TDynamicCounters::TCounterPtr Navigate; NMonitoring::THistogramPtr NavigateLatency; NMonitoring::TDynamicCounters::TCounterPtr SchemeRequest; NMonitoring::THistogramPtr SchemeRequestLatency; @@ -28,23 +28,23 @@ namespace NTxProxy { //NMonitoring::THistogramPtr MakeRequestLatency; NMonitoring::TDynamicCounters::TCounterPtr SnapshotRequest; NMonitoring::TDynamicCounters::TCounterPtr CommitWritesRequest; - - NMonitoring::TDynamicCounters::TCounterPtr SchemeRequestProxyNotReady; - NMonitoring::TDynamicCounters::TCounterPtr MakeRequestProxyNotReady; - NMonitoring::TDynamicCounters::TCounterPtr TxNotImplemented; + + NMonitoring::TDynamicCounters::TCounterPtr SchemeRequestProxyNotReady; + NMonitoring::TDynamicCounters::TCounterPtr MakeRequestProxyNotReady; + NMonitoring::TDynamicCounters::TCounterPtr TxNotImplemented; NMonitoring::TDynamicCounters::TCounterPtr KqpRequest; - + NMonitoring::TDynamicCounters::TCounterPtr DataReqInFly; NMonitoring::TDynamicCounters::TCounterPtr SchemeReqInFly; NMonitoring::TDynamicCounters::TCounterPtr NavigateReqInFly; - // tx_proxy_datareq group - TIntrusivePtr<NMonitoring::TDynamicCounters> DataReqGroup; - - NMonitoring::TDynamicCounters::TCounterPtr ReportStatusOK; - NMonitoring::TDynamicCounters::TCounterPtr ReportStatusNotOK; + // tx_proxy_datareq group + TIntrusivePtr<NMonitoring::TDynamicCounters> DataReqGroup; + + NMonitoring::TDynamicCounters::TCounterPtr ReportStatusOK; + NMonitoring::TDynamicCounters::TCounterPtr ReportStatusNotOK; NMonitoring::TDynamicCounters::TCounterPtr ReportStatusStreamData; - + NMonitoring::THistogramPtr TxPrepareTimeHgram; NMonitoring::THistogramPtr TxExecuteTimeHgram; NMonitoring::THistogramPtr TxTotalTimeHgram; @@ -58,78 +58,78 @@ namespace NTxProxy { NMonitoring::THistogramPtr TxPrepareBuildShardProgramsHgram; NMonitoring::THistogramPtr TxPrepareSendShardProgramsHgram; - NMonitoring::TDynamicCounters::TCounterPtr MiniKQLResolveSentToShard; - NMonitoring::TDynamicCounters::TCounterPtr MiniKQLWrongRequest; - + NMonitoring::TDynamicCounters::TCounterPtr MiniKQLResolveSentToShard; + NMonitoring::TDynamicCounters::TCounterPtr MiniKQLWrongRequest; + NMonitoring::TDynamicCounters::TCounterPtr ReadTableResolveSentToShard; NMonitoring::TDynamicCounters::TCounterPtr ReadTableWrongRequest; NMonitoring::TDynamicCounters::TCounterPtr MiniKQLProgramSize; NMonitoring::TDynamicCounters::TCounterPtr MiniKQLParamsSize; - NMonitoring::TDynamicCounters::TCounterPtr ExecTimeout; - NMonitoring::TDynamicCounters::TCounterPtr MarkShardError; - NMonitoring::TDynamicCounters::TCounterPtr PrepareErrorTimeout; - - NMonitoring::TDynamicCounters::TCounterPtr PlanClientDestroyed; - NMonitoring::TDynamicCounters::TCounterPtr PlanClientConnected; - NMonitoring::TDynamicCounters::TCounterPtr PlanCoordinatorDeclined; - - NMonitoring::TDynamicCounters::TCounterPtr PlanClientTxResultComplete; - NMonitoring::TDynamicCounters::TCounterPtr PlanClientTxResultAborted; + NMonitoring::TDynamicCounters::TCounterPtr ExecTimeout; + NMonitoring::TDynamicCounters::TCounterPtr MarkShardError; + NMonitoring::TDynamicCounters::TCounterPtr PrepareErrorTimeout; + + NMonitoring::TDynamicCounters::TCounterPtr PlanClientDestroyed; + NMonitoring::TDynamicCounters::TCounterPtr PlanClientConnected; + NMonitoring::TDynamicCounters::TCounterPtr PlanCoordinatorDeclined; + + NMonitoring::TDynamicCounters::TCounterPtr PlanClientTxResultComplete; + NMonitoring::TDynamicCounters::TCounterPtr PlanClientTxResultAborted; NMonitoring::TDynamicCounters::TCounterPtr PlanClientTxResultResultUnavailable; NMonitoring::TDynamicCounters::TCounterPtr PlanClientTxResultCancelled; - NMonitoring::TDynamicCounters::TCounterPtr PlanClientTxResultExecError; - - NMonitoring::TDynamicCounters::TCounterPtr ClientTxStatusAccepted; - NMonitoring::TDynamicCounters::TCounterPtr ClientTxStatusProcessed; - NMonitoring::TDynamicCounters::TCounterPtr ClientTxStatusConfirmed; - NMonitoring::TDynamicCounters::TCounterPtr ClientTxStatusPlanned; - NMonitoring::TDynamicCounters::TCounterPtr ClientTxStatusCoordinatorDeclined; - - NMonitoring::TDynamicCounters::TCounterPtr MakeRequestProxyAccepted; - NMonitoring::TDynamicCounters::TCounterPtr MakeRequestWrongRequest; - NMonitoring::TDynamicCounters::TCounterPtr MakeRequestEmptyAffectedSet; - - NMonitoring::TDynamicCounters::TCounterPtr ResolveKeySetLegacySuccess; - NMonitoring::TDynamicCounters::TCounterPtr ResolveKeySetMiniKQLSuccess; + NMonitoring::TDynamicCounters::TCounterPtr PlanClientTxResultExecError; + + NMonitoring::TDynamicCounters::TCounterPtr ClientTxStatusAccepted; + NMonitoring::TDynamicCounters::TCounterPtr ClientTxStatusProcessed; + NMonitoring::TDynamicCounters::TCounterPtr ClientTxStatusConfirmed; + NMonitoring::TDynamicCounters::TCounterPtr ClientTxStatusPlanned; + NMonitoring::TDynamicCounters::TCounterPtr ClientTxStatusCoordinatorDeclined; + + NMonitoring::TDynamicCounters::TCounterPtr MakeRequestProxyAccepted; + NMonitoring::TDynamicCounters::TCounterPtr MakeRequestWrongRequest; + NMonitoring::TDynamicCounters::TCounterPtr MakeRequestEmptyAffectedSet; + + NMonitoring::TDynamicCounters::TCounterPtr ResolveKeySetLegacySuccess; + NMonitoring::TDynamicCounters::TCounterPtr ResolveKeySetMiniKQLSuccess; NMonitoring::TDynamicCounters::TCounterPtr ResolveKeySetReadTableSuccess; - NMonitoring::TDynamicCounters::TCounterPtr ResolveKeySetFail; - NMonitoring::TDynamicCounters::TCounterPtr ResolveKeySetWrongRequest; + NMonitoring::TDynamicCounters::TCounterPtr ResolveKeySetFail; + NMonitoring::TDynamicCounters::TCounterPtr ResolveKeySetWrongRequest; NMonitoring::TDynamicCounters::TCounterPtr ResolveKeySetDomainLocalityFail; NMonitoring::TDynamicCounters::TCounterPtr ResolveKeySetRedirectUnavaible; - - NMonitoring::TDynamicCounters::TCounterPtr ClientConnectedOk; - NMonitoring::TDynamicCounters::TCounterPtr ClientConnectedError; - - NMonitoring::TDynamicCounters::TCounterPtr ClientDestroyedOk; - NMonitoring::TDynamicCounters::TCounterPtr ClientDestroyedError; - - NMonitoring::TDynamicCounters::TCounterPtr TxResultTabletPrepared; - NMonitoring::TDynamicCounters::TCounterPtr TxResultPrepared; - NMonitoring::TDynamicCounters::TCounterPtr TxResultComplete; - NMonitoring::TDynamicCounters::TCounterPtr TxResultError; - NMonitoring::TDynamicCounters::TCounterPtr TxResultAborted; - NMonitoring::TDynamicCounters::TCounterPtr TxResultFatal; + + NMonitoring::TDynamicCounters::TCounterPtr ClientConnectedOk; + NMonitoring::TDynamicCounters::TCounterPtr ClientConnectedError; + + NMonitoring::TDynamicCounters::TCounterPtr ClientDestroyedOk; + NMonitoring::TDynamicCounters::TCounterPtr ClientDestroyedError; + + NMonitoring::TDynamicCounters::TCounterPtr TxResultTabletPrepared; + NMonitoring::TDynamicCounters::TCounterPtr TxResultPrepared; + NMonitoring::TDynamicCounters::TCounterPtr TxResultComplete; + NMonitoring::TDynamicCounters::TCounterPtr TxResultError; + NMonitoring::TDynamicCounters::TCounterPtr TxResultAborted; + NMonitoring::TDynamicCounters::TCounterPtr TxResultFatal; NMonitoring::TDynamicCounters::TCounterPtr TxResultShardOverloaded; NMonitoring::TDynamicCounters::TCounterPtr TxResultShardTryLater; NMonitoring::TDynamicCounters::TCounterPtr TxResultExecError; NMonitoring::TDynamicCounters::TCounterPtr TxResultResultUnavailable; NMonitoring::TDynamicCounters::TCounterPtr TxResultCancelled; - - NMonitoring::TDynamicCounters::TCounterPtr MergeResultRequestExecError; - NMonitoring::TDynamicCounters::TCounterPtr MergeResultRequestExecComplete; - NMonitoring::TDynamicCounters::TCounterPtr MergeResultMiniKQLExecError; - NMonitoring::TDynamicCounters::TCounterPtr MergeResultMiniKQLExecComplete; - NMonitoring::TDynamicCounters::TCounterPtr MergeResultMiniKQLUnknownStatus; - + + NMonitoring::TDynamicCounters::TCounterPtr MergeResultRequestExecError; + NMonitoring::TDynamicCounters::TCounterPtr MergeResultRequestExecComplete; + NMonitoring::TDynamicCounters::TCounterPtr MergeResultMiniKQLExecError; + NMonitoring::TDynamicCounters::TCounterPtr MergeResultMiniKQLExecComplete; + NMonitoring::TDynamicCounters::TCounterPtr MergeResultMiniKQLUnknownStatus; + NMonitoring::TDynamicCounters::TCounterPtr ResultsReceivedCount; NMonitoring::TDynamicCounters::TCounterPtr ResultsReceivedSize; TAlignedPagePoolCounters AllocPoolCounters; TTxProxyMon(const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters); - }; - -} // NTxProxy -} // NKikimr + }; + +} // NTxProxy +} // NKikimr diff --git a/ydb/public/api/grpc/ydb_table_v1.proto b/ydb/public/api/grpc/ydb_table_v1.proto index dbbf62c5c8..6660eb8051 100644 --- a/ydb/public/api/grpc/ydb_table_v1.proto +++ b/ydb/public/api/grpc/ydb_table_v1.proto @@ -9,9 +9,9 @@ service TableService { // Create new session. Implicit session creation is forbidden, // so user must create new session before execute any query, - // otherwise BAD_SESSION status will be returned. + // otherwise BAD_SESSION status will be returned. // Simultaneous execution of requests are forbiden. - // Sessions are volatile, can be invalidated by server, for example in case + // Sessions are volatile, can be invalidated by server, for example in case // of fatal errors. All requests with this session will fail with BAD_SESSION status. // So, client must be able to handle BAD_SESSION status. rpc CreateSession(Table.CreateSessionRequest) returns (Table.CreateSessionResponse); |