Skip to content

YQL-17704 switch GWM ut to CA #1567

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
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,14 @@ class TGlobalWorkerManagerTest: public TTestBase {
ActorRuntime_->Initialize();

for (ui32 i = 1; i < nodesNumber; i++) {
ActorRuntime_->GetLogSettings(i)->Mask = 0xffffffff;
ActorRuntime_->GetLogSettings(i)->Append(
NKikimrServices::EServiceKikimr_MIN,
NKikimrServices::EServiceKikimr_MAX,
NKikimrServices::EServiceKikimr_Name
);
TString explanation;
auto err = ActorRuntime_->GetLogSettings(i)->SetLevel(NActors::NLog::PRI_EMERG, NKikimrServices::KQP_COMPUTE, explanation); //do not care about CA errors in this test"
Y_ABORT_IF(err);
}

NActors::TDispatchOptions options;
Expand Down Expand Up @@ -387,8 +394,7 @@ class TGlobalWorkerManagerTest: public TTestBase {
TIntrusivePtr<NMonitoring::TDynamicCounters> counters = MakeIntrusive<NMonitoring::TDynamicCounters>();
auto gwmActor = MakeWorkerManagerActorID(NodeId());
TVector<NYql::NDqProto::TDqTask> tasks(workersCount);
//auto allocator = CreateResourceAllocator(gwmActor, execActor, execActor, workersCount, "TraceId", new TDqConfiguration(), counters, tasks, "sync");
auto allocator = CreateResourceAllocator(gwmActor, execActor, execActor, workersCount, "TraceId", new TDqConfiguration(), counters);
auto allocator = CreateResourceAllocator(gwmActor, execActor, execActor, workersCount, "TraceId", new TDqConfiguration(), counters, tasks);
const auto allocatorId = ActorRuntime_->Register(allocator);
return allocatorId;
}
Expand All @@ -403,10 +409,11 @@ class TGlobalWorkerManagerTest: public TTestBase {
THolder<TEvAllocateWorkersRequest> MakeAllocationRequest(TVector<TVector<TString>>& filesPerTask) const {
auto allocateRequest = MakeHolder<TEvAllocateWorkersRequest>(filesPerTask.size(), "Username");
allocateRequest->Record.SetTraceId("TraceId");

allocateRequest->Record.SetCreateComputeActor(true);
THashSet<TString> allFiles;

for (const auto& tf : filesPerTask) {
*allocateRequest->Record.AddTask() = NYql::NDqProto::TDqTask{};
Yql::DqsProto::TWorkerFilter taskFiles;
for (const auto& f : tf) {
Yql::DqsProto::TFile file;
Expand Down