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

Add channel in qt config #273

Merged
merged 2 commits into from
Jun 7, 2024
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
5 changes: 3 additions & 2 deletions pkg/components/query_tracker.go
Original file line number Diff line number Diff line change
Expand Up @@ -268,8 +268,9 @@ func (qt *QueryTracker) init(ctx context.Context, ytClient yt.Client) (err error
map[string]interface{}{
"stages": map[string]interface{}{
"production": map[string]interface{}{
"root": "//sys/query_tracker",
"user": "query_tracker",
"root": "//sys/query_tracker",
"user": "query_tracker",
"channel": map[string]interface{}{"addresses": qt.cfgen.GetQueryTrackerAddresses()},
},
},
},
Expand Down
13 changes: 13 additions & 0 deletions pkg/ytconfig/generator.go
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,19 @@ func (g *Generator) GetYQLAgentAddresses() []string {
return names
}

func (g *Generator) GetQueryTrackerAddresses() []string {
names := make([]string, 0, g.ytsaurus.Spec.QueryTrackers.InstanceCount)
for _, podName := range g.GetQueryTrackerPodNames() {
names = append(names, fmt.Sprintf("%s.%s.%s.svc.%s:%d",
podName,
g.GetQueryTrackerServiceName(),
g.ytsaurus.Namespace,
g.clusterDomain,
consts.QueryTrackerRPCPort))
}
return names
}

func (g *Generator) GetQueueAgentAddresses() []string {
names := make([]string, 0, g.ytsaurus.Spec.QueueAgents.InstanceCount)
for _, podName := range g.GetQueueAgentPodNames() {
Expand Down
9 changes: 9 additions & 0 deletions pkg/ytconfig/names.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,15 @@ func (g *BaseGenerator) GetDiscoveryPodNames() []string {
return podNames
}

func (g *Generator) GetQueryTrackerPodNames() []string {
podNames := make([]string, 0, g.ytsaurus.Spec.QueryTrackers.InstanceSpec.InstanceCount)
for i := 0; i < int(g.ytsaurus.Spec.QueryTrackers.InstanceSpec.InstanceCount); i++ {
podNames = append(podNames, fmt.Sprintf("%s-%d", g.GetQueryTrackerStatefulSetName(), i))
}

return podNames
}

func (g *Generator) GetYQLAgentPodNames() []string {
podNames := make([]string, 0, g.ytsaurus.Spec.YQLAgents.InstanceSpec.InstanceCount)
for i := 0; i < int(g.ytsaurus.Spec.YQLAgents.InstanceSpec.InstanceCount); i++ {
Expand Down
20 changes: 20 additions & 0 deletions test/e2e/ytsaurus_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -564,6 +564,26 @@ var _ = Describe("Basic test for Ytsaurus controller", func() {
runImpossibleUpdateAndRollback(ytsaurus, ytClient)
})

It("Should run with query tracker and check that query tracker rpc address set up correctly", Label("basic"), func(ctx context.Context) {
By("Creating a Ytsaurus resource")

namespace := "querytrackeraddress"

ytsaurus := ytv1.CreateBaseYtsaurusResource(namespace)
ytsaurus = ytv1.WithQueryTracker(ytsaurus)

g := ytconfig.NewGenerator(ytsaurus, "local")

DeferCleanup(deleteYtsaurus, ytsaurus)
runYtsaurus(ytsaurus)

By("Creating ytsaurus client")
ytClient := getYtClient(g, namespace)

By("Check that query tracker channel exists in cluster_connection")
Expect(ytClient.NodeExists(ctx, ypath.Path("//sys/@cluster_connection/query_tracker/stages/production/channel"), nil)).Should(BeTrue())
})

It("Should run with query tracker and check that access control objects set up correctly", Label("basic"), func(ctx context.Context) {
By("Creating a Ytsaurus resource")

Expand Down
Loading