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.

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

KqpRun fixed performance and backtrace printing #5368

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion ydb/core/testlib/actors/test_runtime.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ namespace NActors {
}

if (NeedMonitoring && !SingleSysEnv) {
ui16 port = GetPortManager().GetPort();
ui16 port = MonitoringPortOffset ? MonitoringPortOffset + nodeIndex : GetPortManager().GetPort();
node->Mon.Reset(new NActors::TSyncHttpMon({
.Port = port,
.Threads = 10,
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/testlib/test_client.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ namespace Tests {

NKikimr::SetupChannelProfiles(app);

Runtime->SetupMonitoring();
Runtime->SetupMonitoring(Settings->MonitoringPortOffset);
Runtime->SetLogBackend(Settings->LogBackend);

Runtime->AddAppDataInit([this](ui32 nodeIdx, NKikimr::TAppData& appData) {
Expand Down
2 changes: 2 additions & 0 deletions ydb/core/testlib/test_client.h
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ namespace Tests {
ui16 Port;
ui16 GrpcPort = 0;
int GrpcMaxMessageSize = 0; // 0 - default (4_MB), -1 - no limit
ui16 MonitoringPortOffset = 0;
NKikimrProto::TAuthConfig AuthConfig;
NKikimrPQ::TPQConfig PQConfig;
NKikimrPQ::TPQClusterDiscoveryConfig PQClusterDiscoveryConfig;
Expand Down Expand Up @@ -157,6 +158,7 @@ namespace Tests {

TServerSettings& SetGrpcPort(ui16 value) { GrpcPort = value; return *this; }
TServerSettings& SetGrpcMaxMessageSize(int value) { GrpcMaxMessageSize = value; return *this; }
TServerSettings& SetMonitoringPortOffset(ui16 value) { MonitoringPortOffset = value; return *this; }
TServerSettings& SetSupportsRedirect(bool value) { SupportsRedirect = value; return *this; }
TServerSettings& SetTracePath(const TString& value) { TracePath = value; return *this; }
TServerSettings& SetDomain(ui32 value) { Domain = value; return *this; }
Expand Down
3 changes: 2 additions & 1 deletion ydb/library/actors/testlib/test_runtime.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1594,8 +1594,9 @@ namespace NActors {
return node->DynamicCounters;
}

void TTestActorRuntimeBase::SetupMonitoring() {
void TTestActorRuntimeBase::SetupMonitoring(ui16 monitoringPortOffset) {
NeedMonitoring = true;
MonitoringPortOffset = monitoringPortOffset;
}

void TTestActorRuntimeBase::SendInternal(TAutoPtr<IEventHandle> ev, ui32 nodeIndex, bool viaActorSystem) {
Expand Down
3 changes: 2 additions & 1 deletion ydb/library/actors/testlib/test_runtime.h
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ namespace NActors {
void EnableScheduleForActor(const TActorId& actorId, bool allow = true);
bool IsScheduleForActorEnabled(const TActorId& actorId) const;
TIntrusivePtr<NMonitoring::TDynamicCounters> GetDynamicCounters(ui32 nodeIndex = 0);
void SetupMonitoring();
void SetupMonitoring(ui16 monitoringPortOffset = 0);

using TEventObserverCollection = std::list<std::function<void(TAutoPtr<IEventHandle>& event)>>;
class TEventObserverHolder {
Expand Down Expand Up @@ -655,6 +655,7 @@ namespace NActors {
TIntrusivePtr<IRandomProvider> DispatcherRandomProvider;
TAutoPtr<TLogBackend> LogBackend;
bool NeedMonitoring;
ui16 MonitoringPortOffset = 0;

TIntrusivePtr<IRandomProvider> RandomProvider;
TIntrusivePtr<ITimeProvider> TimeProvider;
Expand Down
2 changes: 1 addition & 1 deletion ydb/tests/fq/yt/kqprun.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def yql_exec(self, program=None, program_file=None, verbose=False, check_error=T

cmd += '--emulate-yt ' \
'--exclude-linked-udfs ' \
'--clear-execution query ' \
'--execution-case query ' \
'--app-config=%(config_file)s ' \
'--script-query=%(program_file)s ' \
'--scheme-query=%(scheme_file)s ' \
Expand Down
Loading
Loading