diff options
| -rw-r--r-- | ydb/core/statistics/aggregator/aggregator_impl.cpp | 89 | ||||
| -rw-r--r-- | ydb/core/statistics/aggregator/aggregator_impl.h | 4 | ||||
| -rw-r--r-- | ydb/core/statistics/aggregator/ut/ut_analyze_columnshard.cpp | 18 |
3 files changed, 91 insertions, 20 deletions
diff --git a/ydb/core/statistics/aggregator/aggregator_impl.cpp b/ydb/core/statistics/aggregator/aggregator_impl.cpp index 2c9c1108515..4a73e57fc63 100644 --- a/ydb/core/statistics/aggregator/aggregator_impl.cpp +++ b/ydb/core/statistics/aggregator/aggregator_impl.cpp @@ -883,9 +883,31 @@ void TStatisticsAggregator::ResetTraversalState(NIceDb::TNiceDb& db) { TraversalRound = 0; } -template <typename T, typename S> -void PrintContainerStart(const T& container, size_t count, TStringStream& str, - std::function<S(const typename T::value_type&)> extractor) +TString TStatisticsAggregator::GetNavigateTypeString() const { + switch (NavigateType) { + case Analyze: + return "Analyze"; + case Traversal: + return "Traversal"; + } +} + +TString TStatisticsAggregator::TForceTraversalTable::GetStatusString() const { + switch (Status) { + case EStatus::None: + return "None"; + case EStatus::AnalyzeStarted: + return "AnalyzeStarted"; + case EStatus::AnalyzeFinished: + return "AnalyzeFinished"; + case EStatus::TraversalStarted: + return "TraversalStarted"; + case EStatus::TraversalFinished: + return "TraversalFinished"; + } +} + +void PrintContainerStart(const auto& container, size_t count, TStringStream& str, auto extractor) { if (container.empty()) { return; @@ -922,49 +944,46 @@ bool TStatisticsAggregator::OnRenderAppHtmlPage(NMon::TEvRemoteHttpInfo::TPtr ev str << "BaseStatistics: " << BaseStatistics.size() << Endl; str << "SchemeShards: " << SchemeShards.size() << Endl; { - std::function<TSSId(const std::pair<const TSSId, size_t>&)> extr = - [](const auto& x) { return x.first; }; + auto extr = [](const auto& x) { return x.first; }; PrintContainerStart(SchemeShards, 4, str, extr); } str << "Nodes: " << Nodes.size() << Endl; { - std::function<TNodeId(const std::pair<const TNodeId, size_t>&)> extr = - [](const auto& x) { return x.first; }; + auto extr = [](const auto& x) { return x.first; }; PrintContainerStart(Nodes, 8, str, extr); } str << "RequestedSchemeShards: " << RequestedSchemeShards.size() << Endl; { - std::function<TSSId(const TSSId&)> extr = [](const auto& x) { return x; }; + auto extr = [](const auto& x) { return x; }; PrintContainerStart(RequestedSchemeShards, 4, str, extr); } str << "FastCounter: " << FastCounter << Endl; str << "FastCheckInFlight: " << FastCheckInFlight << Endl; str << "FastSchemeShards: " << FastSchemeShards.size() << Endl; { - std::function<TSSId(const TSSId&)> extr = [](const auto& x) { return x; }; + auto extr = [](const auto& x) { return x; }; PrintContainerStart(FastSchemeShards, 4, str, extr); } str << "FastNodes: " << FastNodes.size() << Endl; { - std::function<TNodeId(const TNodeId&)> extr = [](const auto& x) { return x; }; + auto extr = [](const auto& x) { return x; }; PrintContainerStart(FastNodes, 8, str, extr); } str << "PropagationInFlight: " << PropagationInFlight << Endl; str << "PropagationSchemeShards: " << PropagationSchemeShards.size() << Endl; { - std::function<TSSId(const TSSId&)> extr = [](const auto& x) { return x; }; + auto extr = [](const auto& x) { return x; }; PrintContainerStart(PropagationSchemeShards, 4, str, extr); } str << "PropagationNodes: " << PropagationNodes.size() << Endl; { - std::function<TNodeId(const TNodeId&)> extr = [](const auto& x) { return x; }; + auto extr = [](const auto& x) { return x; }; PrintContainerStart(FastNodes, 8, str, extr); } str << "LastSSIndex: " << LastSSIndex << Endl; str << "PendingRequests: " << PendingRequests.size() << Endl; str << "ProcessUrgentInFlight: " << ProcessUrgentInFlight << Endl << Endl; - str << "TraversalPathId: " << TraversalPathId << Endl; str << "Columns: " << Columns.size() << Endl; str << "DatashardRanges: " << DatashardRanges.size() << Endl; str << "CountMinSketches: " << CountMinSketches.size() << Endl << Endl; @@ -973,16 +992,54 @@ bool TStatisticsAggregator::OnRenderAppHtmlPage(NMon::TEvRemoteHttpInfo::TPtr ev if (!ScheduleTraversalsByTime.Empty()) { auto* oldestTable = ScheduleTraversalsByTime.Top(); str << " oldest table: " << oldestTable->PathId - << ", ordest table update time: " << oldestTable->LastUpdateTime << Endl; + << ", update time: " << oldestTable->LastUpdateTime.ToStringUpToSeconds() << Endl; } str << "ScheduleTraversalsBySchemeShard: " << ScheduleTraversalsBySchemeShard.size() << Endl; if (!ScheduleTraversalsBySchemeShard.empty()) { str << " " << ScheduleTraversalsBySchemeShard.begin()->first << Endl; - std::function<TPathId(const TPathId&)> extr = [](const auto& x) { return x; }; + auto extr = [](const auto& x) { return x; }; PrintContainerStart(ScheduleTraversalsBySchemeShard.begin()->second, 2, str, extr); } - str << "TraversalStartTime: " << TraversalStartTime << Endl; + str << "ForceTraversals: " << ForceTraversals.size() << Endl; + if (!ForceTraversals.empty()) { + auto extr = [](const auto& x) { return x.CreatedAt.ToStringUpToSeconds(); }; + PrintContainerStart(ForceTraversals, 2, str, extr); + } + + str << Endl; + str << "NavigateType: " << GetNavigateTypeString() << Endl; + str << "NavigateAnalyzeOperationId: " << NavigateAnalyzeOperationId << Endl; + str << "NavigatePathId: " << NavigatePathId << Endl; + + str << Endl; + str << "ForceTraversalOperationId: " << ForceTraversalOperationId << Endl; + if (ForceTraversalOperationId) { + auto forceTraversal = CurrentForceTraversalOperation(); + str << " CreatedAt: " << forceTraversal->CreatedAt << Endl; + str << ", ReplyToActorId: " << forceTraversal->ReplyToActorId << Endl; + str << ", Types: " << forceTraversal->Types << Endl; + str << ", Tables size: " << forceTraversal->Tables.size() << Endl; + str << ", Tables: " << Endl; + + for (size_t i = 0; i < forceTraversal->Tables.size(); ++i) { + const TForceTraversalTable& table = forceTraversal->Tables[i]; + str << " Table[" << i << "] PathId: " << table.PathId << Endl; + str << " Status: " << table.GetStatusString() << Endl; + str << " AnalyzedShards size: " << table.AnalyzedShards.size() << Endl; + str << " ColumnTags: " << table.ColumnTags << Endl; + } + } + + str << Endl; + str << "TraversalStartTime: " << TraversalStartTime.ToStringUpToSeconds() << Endl; + str << "TraversalPathId: " << TraversalPathId << Endl; + str << "TraversalIsColumnTable: " << TraversalIsColumnTable << Endl; + str << "TraversalStartKey: " << TraversalStartKey.GetBuffer() << Endl; + str << Endl; + str << "GlobalTraversalRound: " << GlobalTraversalRound << Endl; + str << "TraversalRound: " << TraversalRound << Endl; + str << "HiveRequestRound: " << HiveRequestRound << Endl; } } diff --git a/ydb/core/statistics/aggregator/aggregator_impl.h b/ydb/core/statistics/aggregator/aggregator_impl.h index ce7769308d1..1d75e08b6c0 100644 --- a/ydb/core/statistics/aggregator/aggregator_impl.h +++ b/ydb/core/statistics/aggregator/aggregator_impl.h @@ -335,6 +335,8 @@ private: Traversal }; ENavigateType NavigateType = Analyze; + TString GetNavigateTypeString() const; + TString NavigateAnalyzeOperationId; TPathId NavigatePathId; @@ -386,6 +388,8 @@ private: // stored in local db TraversalFinished, }; EStatus Status = EStatus::None; + + TString GetStatusString() const; }; struct TForceTraversalOperation { TString OperationId; diff --git a/ydb/core/statistics/aggregator/ut/ut_analyze_columnshard.cpp b/ydb/core/statistics/aggregator/ut/ut_analyze_columnshard.cpp index afffc39f965..4367cdc300b 100644 --- a/ydb/core/statistics/aggregator/ut/ut_analyze_columnshard.cpp +++ b/ydb/core/statistics/aggregator/ut/ut_analyze_columnshard.cpp @@ -49,9 +49,7 @@ Y_UNIT_TEST_SUITE(AnalyzeColumnshard) { auto& runtime = *env.GetServer().GetRuntime(); auto sender = runtime.AllocateEdgeActor(); - auto schemeShardStatsBlocker = runtime.AddObserver<TEvStatistics::TEvSchemeShardStats>([&](auto& ev) { - ev.Reset(); - }); + TBlockEvents<TEvStatistics::TEvAnalyzeTableResponse> block(runtime); auto tableInfo = CreateDatabaseColumnTables(env, 1, 1)[0]; @@ -64,7 +62,19 @@ Y_UNIT_TEST_SUITE(AnalyzeColumnshard) { AnalyzeStatus(runtime, sender, tableInfo.SaTabletId, operationId, NKikimrStat::TEvAnalyzeStatusResponse::STATUS_ENQUEUED); - schemeShardStatsBlocker.Remove(); + // Check EvRemoteHttpInfo + { + auto httpRequest = std::make_unique<NActors::NMon::TEvRemoteHttpInfo>("/app?"); + runtime.SendToPipe(tableInfo.SaTabletId, sender, httpRequest.release(), 0, {}); + auto httpResponse = runtime.GrabEdgeEventRethrow<NActors::NMon::TEvRemoteHttpInfoRes>(sender); + TString body = httpResponse->Get()->Html; + Cerr << body << Endl; + UNIT_ASSERT(body.Size() > 500); + UNIT_ASSERT(body.Contains("ForceTraversals: 1")); + } + + block.Unblock(); + block.Stop(); auto analyzeResonse = runtime.GrabEdgeEventRethrow<TEvStatistics::TEvAnalyzeResponse>(sender); UNIT_ASSERT_VALUES_EQUAL(analyzeResonse->Get()->Record.GetOperationId(), operationId); |