prefer task options for PluginInfo request

Iceber · k8s-infra-cherrypick-robot · commit 8a16a6a04ad0 · 2025-03-28T18:33:13.000Z
Signed-off-by: Iceber Gu &lt;caiwei95@hotmail.com&gt;
diff --git a/core/runtime/v2/task_manager.go b/core/runtime/v2/task_manager.go
@@ -266,12 +266,12 @@ func (m *TaskManager) validateRuntimeFeatures(ctx context.Context, opts runtime.
 		return nil
 	}
 
-	ropts := opts.RuntimeOptions
-	if ropts == nil || ropts.GetValue() == nil {
-		ropts = opts.TaskOptions
+	topts := opts.TaskOptions
+	if topts == nil || topts.GetValue() == nil {
+		topts = opts.RuntimeOptions
 	}
 
-	pInfo, err := m.PluginInfo(ctx, &apitypes.RuntimeRequest{RuntimePath: opts.Runtime, Options: typeurl.MarshalProto(ropts)})
+	pInfo, err := m.PluginInfo(ctx, &apitypes.RuntimeRequest{RuntimePath: opts.Runtime, Options: typeurl.MarshalProto(topts)})
 	if err != nil {
 		return fmt.Errorf("runtime info: %w", err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -266,12 +266,12 @@ func (m *TaskManager) validateRuntimeFeatures(ctx context.Context, opts runtime.`
`266`	`266`	`return nil`
`267`	`267`	`}`
`268`	`268`
`269`		`- ropts := opts.RuntimeOptions`
`270`		`- if ropts == nil \|\| ropts.GetValue() == nil {`
`271`		`- ropts = opts.TaskOptions`
	`269`	`+ topts := opts.TaskOptions`
	`270`	`+ if topts == nil \|\| topts.GetValue() == nil {`
	`271`	`+ topts = opts.RuntimeOptions`
`272`	`272`	`}`
`273`	`273`
`274`		`- pInfo, err := m.PluginInfo(ctx, &apitypes.RuntimeRequest{RuntimePath: opts.Runtime, Options: typeurl.MarshalProto(ropts)})`
	`274`	`+ pInfo, err := m.PluginInfo(ctx, &apitypes.RuntimeRequest{RuntimePath: opts.Runtime, Options: typeurl.MarshalProto(topts)})`
`275`	`275`	`if err != nil {`
`276`	`276`	`return fmt.Errorf("runtime info: %w", err)`
`277`	`277`	`}`