!2490 merge ascend800ia5x8-03 into master

【修改说明】A5适配调度资源类型解耦

Created-by: zhoushixian
Commit-by: zhoushixian
Merged-by: ascend-robot
Description: ## 问题/功能描述

本次PR主要包含三项功能修改：1）在任务删除逻辑中，增加了升级重调度限制条件，解决了在禁止Pod升级重调度的场景下错误删除非故障任务的问题，确保重调度行为与配置策略保持一致。2）为上述修改的函数新增了多个单元测试用例，覆盖了“允许升级”功能关闭、主节点故障、进程级及Pod级重调度等复杂场景，以增强逻辑验证和测试覆盖率。3）在调度插件中扩展了对`TpBlock`注解键的支持，使插件能够识别该注解并将其纳入PodGroup的元数据，以支持更细粒度的调度策略或资源管理。

## 修改方案描述

修改方案包括三部分核心内容：1）在`skipThisTask`函数中增加前置判断，通过调用`allowUpgradePodRescheduling()`方法获取配置状态，当系统禁止Pod升级重调度时，仅允许删除标记为故障的任务，从而精确控制删除范围。2）在测试文件`job_a5_test.go`中新增了多个测试用例构建函数，模拟不同业务场景下的`FaultJob`与`FaultTask`状态，验证`skipThisTask`函数在各种边界条件下的返回值是否符合预期。3）在调度插件的`annotationKeysForPodGroup`切片常量中新增`util.TpBlockAnnoKey`，使得Pod携带的`TpBlock`注解能够被提取并传播给PodGroup，供调度决策使用。

## 开发自检

- [x] 规范：是否完成开发自验
- [x] 规范：是否涉及资料改动，并已完成修改
- [x] 规范：新增代码DT用例覆盖
- [x] 规范：是否闭环AI工具检视意见
- [x] 安全：是否涉及对外接口/参数/环境变量改动，并同步修改资料
- [x] 安全：是否新增对外接口/参数，并进行校验

See merge request: Ascend/mind-cluster!2490

Author: zhoushixian

component/ascend-for-volcano/internal/rescheduling/job_a5.go

@@ -214,6 +214,10 @@ func (fJob *FaultJob) forceDeletePodsFor910A5(schedulerJob *plugin.SchedulerJob,
 }
 
 func (fJob *FaultJob) skipThisTask(dpi *deletePodInfo, fTask FaultTask, schedulerJob *plugin.SchedulerJob) bool {
+	// if upgrade is not allowed, only the fault task can be deleted
+	if !fJob.allowUpgradePodRescheduling() {
+		return !fTask.IsFaultTask
+	}
 	// when master pod fault or not pod rescheduling or fault pod, delete pod
 	if fJob.IsMasterFault {
 		return false

component/ascend-for-volcano/internal/rescheduling/job_a5_test.go

@@ -20,11 +20,12 @@ Package rescheduling is using for HuaWei Ascend pin fault rescheduling.
 package rescheduling
 
 import (
-	"github.com/agiledragon/gomonkey/v2"
-	"k8s.io/client-go/kubernetes"
 	"reflect"
 	"strconv"
 	"testing"
+
+	"github.com/agiledragon/gomonkey/v2"
+	"k8s.io/client-go/kubernetes"
 	"volcano.sh/volcano/pkg/scheduler/api"
 	"volcano.sh/volcano/pkg/scheduler/framework"
 	"volcano.sh/volcano/pkg/scheduler/plugins/ascend-volcano-plugin/common/util"
@@ -666,11 +667,133 @@ func buildSkipThisTaskTestCase3() skipThisTaskTestCase {
 	}
 }
 
+func buildSkipThisTaskTestCase4() skipThisTaskTestCase {
+	return skipThisTaskTestCase{
+		name: "04-SkipThisTask allow-upgrade-false fault-task",
+		fJob: &FaultJob{
+			ReScheduleLimit: util.ReschedulingUpperLimitPod, // allowUpgradePodRescheduling() returns false
+		},
+		cacheFuncBefore: func() {},
+		cacheFuncAfter:  func() {},
+		fTask: FaultTask{
+			IsFaultTask: true,
+		},
+		dpi: &deletePodInfo{},
+		schedulerJob: &plugin.SchedulerJob{
+			SchedulerJobAttr: util.SchedulerJobAttr{
+				ComJob: util.ComJob{Label: map[string]string{}},
+			},
+		},
+		want: false, // Should not skip fault task when allowUpgrade is false
+	}
+}
+
+func buildSkipThisTaskTestCase5() skipThisTaskTestCase {
+	return skipThisTaskTestCase{
+		name: "05-SkipThisTask allow-upgrade-false non-fault-task",
+		fJob: &FaultJob{
+			ReScheduleLimit: util.ReschedulingUpperLimitPod, // allowUpgradePodRescheduling() returns false
+		},
+		cacheFuncBefore: func() {},
+		cacheFuncAfter:  func() {},
+		fTask: FaultTask{
+			IsFaultTask: false,
+		},
+		dpi: &deletePodInfo{},
+		schedulerJob: &plugin.SchedulerJob{
+			SchedulerJobAttr: util.SchedulerJobAttr{
+				ComJob: util.ComJob{Label: map[string]string{}},
+			},
+		},
+		want: true, // Should skip non-fault task when allowUpgrade is false
+	}
+}
+
+func buildSkipThisTaskTestCase6() skipThisTaskTestCase {
+	return skipThisTaskTestCase{
+		name: "06-SkipThisTask is-master-fault",
+		fJob: &FaultJob{
+			ReScheduleLimit: "", // allowUpgradePodRescheduling() returns true
+			FaultJobA5Field: FaultJobA5Field{
+				IsMasterFault: true,
+			},
+		},
+		cacheFuncBefore: func() {},
+		cacheFuncAfter:  func() {},
+		fTask: FaultTask{
+			IsFaultTask: false,
+		},
+		dpi: &deletePodInfo{},
+		schedulerJob: &plugin.SchedulerJob{
+			SchedulerJobAttr: util.SchedulerJobAttr{
+				ComJob: util.ComJob{Label: map[string]string{}},
+			},
+		},
+		want: false, // Should not skip when IsMasterFault is true
+	}
+}
+
+func buildSkipThisTaskTestCase7() skipThisTaskTestCase {
+	return skipThisTaskTestCase{
+		name: "07-SkipThisTask process-rescheduling-skip",
+		fJob: &FaultJob{
+			ReScheduleLimit:   "", // allowUpgradePodRescheduling() returns true
+			PendingSessionNum: tpPendingTimes - 1,
+			FaultTasks:        []FaultTask{{IsFaultTask: true, NodeRankIndex: "0"}},
+		},
+		cacheFuncBefore: func() {},
+		cacheFuncAfter:  func() {},
+		fTask: FaultTask{
+			IsFaultTask:   false,
+			NodeRankIndex: "1",
+		},
+		dpi: &deletePodInfo{},
+		schedulerJob: &plugin.SchedulerJob{
+			SchedulerJobAttr: util.SchedulerJobAttr{
+				ComJob: util.ComJob{Label: map[string]string{util.ProcessRecoverEnable: util.EnableFunc}},
+			},
+		},
+		want: true, // Should skip when process rescheduling is in first stage
+	}
+}
+
+func buildSkipThisTaskTestCase8() skipThisTaskTestCase {
+	return skipThisTaskTestCase{
+		name: "08-SkipThisTask pod-rescheduling-skip",
+		fJob: &FaultJob{
+			ReScheduleLimit:   "",           // allowUpgradePodRescheduling() returns true
+			PendingSessionNum: pendingTimes, // Set to a value >= spPendingTimes
+			FaultTasks:        []FaultTask{{IsFaultTask: true, NodeName: "test-node"}},
+		},
+		cacheFuncBefore: func() {},
+		cacheFuncAfter:  func() {},
+		fTask: FaultTask{
+			IsFaultTask: false,
+			NodeName:    "test-node", // Same node as fault task
+		},
+		dpi: &deletePodInfo{
+			isSuperPod: true,
+			ids:        []string{"test-id"},
+		},
+		schedulerJob: &plugin.SchedulerJob{
+			SchedulerJobAttr: util.SchedulerJobAttr{
+				ComJob: util.ComJob{Label: map[string]string{util.SinglePodTag: util.EnableFunc}},
+			},
+		},
+		want: false, // Should not skip when pod rescheduling
+	}
+}
+
 func buildSkipThisTaskTestCases() []skipThisTaskTestCase {
 	return []skipThisTaskTestCase{
 		buildSkipThisTaskTestCase1(),
 		buildSkipThisTaskTestCase2(),
 		buildSkipThisTaskTestCase3(),
+		buildSkipThisTaskTestCase4(),
+		buildSkipThisTaskTestCase5(),
+		buildSkipThisTaskTestCase6(),
+		buildSkipThisTaskTestCase7(),
+		buildSkipThisTaskTestCase8(),
 	}
 }
 

component/ascend-for-volcano/plugin/type.go

@@ -98,6 +98,7 @@ var (
 	// add annotation from pod, if new anno key is needed add by pod, add key in this slice
 	annotationKeysForPodGroup = []string{
 		util.SuperPodAnnoKey,
+		util.TpBlockAnnoKey,
 		util.SchedulePolicyAnnoKey,
 		util.SuperPodFitAnnoKey,
 		util.MinAvailableKey,