TMP

ytsaurus · Oct 10, 2024 · 58fd2b6 · 58fd2b6
1 parent c439d7c
commit 58fd2b6
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/pkg/components/queue_agent.go b/pkg/components/queue_agent.go
@@ -300,11 +300,26 @@ func (qa *QueueAgent) init(ctx context.Context, ytClient yt.Client) (err error)
 
 func (qa *QueueAgent) prepareInitQueueAgentState() {
 	path := "/usr/bin/init_queue_agent_state"
+	proxy := qa.cfgen.GetHTTPProxiesServiceAddress(consts.DefaultHTTPProxyRole)
 
+	existenceCheck := fmt.Sprintf(
+		`if [[ ! -f \"%s\" ]] && echo "%s doesn't exist, nothing to do" && exit 0`,
+		path,
+		path,
+	)
+	oldVersionInvokation := fmt.Sprintf("%s --create-registration-table --create-replicated-table-mapping-table --recursive --ignore-existing --proxy %s;",
+		path,
+		proxy,
+	)
+	newVersionInvokation := fmt.Sprintf("%s --create-registration-table --create-replicated-table-mapping-table --recursive --ignore-existing --latest --proxy %s;",
+		path,
+		proxy,
+	)
 	script := []string{
 		initJobWithNativeDriverPrologue(),
-		fmt.Sprintf("if [[ -f \"%s\" ]]; then %s --create-registration-table --create-replicated-table-mapping-table --recursive --ignore-existing --proxy %s; fi",
-			path, path, qa.cfgen.GetHTTPProxiesServiceAddress(consts.DefaultHTTPProxyRole)),
+		existenceCheck,
+		`[[ "$YTSAURUS_VERSION" < "24.1" ]] &&` + oldVersionInvokation,
+		`[[ "$YTSAURUS_VERSION" >= "24.2" ]] &&` + newVersionInvokation,
 	}
 
 	qa.initQAState.SetInitScript(strings.Join(script, "\n"))

diff --git a/pkg/testutil/spec_builders.go b/pkg/testutil/spec_builders.go
@@ -208,6 +208,15 @@ func WithQueryTracker(ytsaurus *ytv1.Ytsaurus) *ytv1.Ytsaurus {
 	return ytsaurus
 }
 
+func WithQueueAgent(ytsaurus *ytv1.Ytsaurus) *ytv1.Ytsaurus {
+	ytsaurus.Spec.QueueAgents = &ytv1.QueueAgentSpec{
+		InstanceSpec: ytv1.InstanceSpec{
+			InstanceCount: 1,
+		},
+	}
+	return ytsaurus
+}
+
 func WithRPCProxies(ytsaurus *ytv1.Ytsaurus) *ytv1.Ytsaurus {
 	ytsaurus.Spec.RPCProxies = []ytv1.RPCProxiesSpec{
 		createRPCProxiesSpec(),

diff --git a/test/e2e/ytsaurus_controller_test.go b/test/e2e/ytsaurus_controller_test.go
@@ -632,6 +632,7 @@ var _ = Describe("Basic test for Ytsaurus controller", func() {
 
 			ytsaurus := testutil.CreateBaseYtsaurusResource(namespace)
 			ytsaurus = testutil.WithQueryTracker(ytsaurus)
+			ytsaurus = testutil.WithQueueAgent(ytsaurus)
 
 			g := ytconfig.NewGenerator(ytsaurus, "local")