feat: task account_chain

Author: huerni

internal/cacctmgr/CmdArgParser.go

@@ -537,8 +537,8 @@ func init() {
 			addQosCmd.Flags().Uint32VarP(&FlagQos.MaxJobsPerUser, "max-jobs-per-user", "J", math.MaxUint32, "Set the maximum number of jobs per user")
 			addQosCmd.Flags().Uint32VarP(&FlagQos.MaxJobsPerAccount, "max-jobs-per-account", "j", math.MaxUint32, "Set the maximum number of jobs per account")
 			addQosCmd.Flags().Uint32VarP(&FlagQos.MaxCpusPerUser, "max-cpus-per-user", "c", math.MaxUint32, "Set the maximum number of CPUs per user")
-			addQosCmd.Flags().Uint32VarP(&FlagQos.MaxSubmitJobsPerUser, "max-submit-jobs-per-user", "s", math.MaxUint32, "Set the maximum number of submit jobs per user")
-			addQosCmd.Flags().Uint32VarP(&FlagQos.MaxSubmitJobsPerAccount, "max-submit-jobs-per-account", "S", math.MaxUint32, "Set the maximum number of submit jobs per account")
+			addQosCmd.Flags().Uint32VarP(&FlagQos.MaxSubmitJobsPerUser, "max-submit-jobs-per-user", "S", math.MaxUint32, "Set the maximum number of submit jobs per user")
+			addQosCmd.Flags().Uint32VarP(&FlagQos.MaxSubmitJobsPerAccount, "max-submit-jobs-per-account", "s", math.MaxUint32, "Set the maximum number of submit jobs per account")
 			addQosCmd.Flags().Uint64VarP(&FlagQos.MaxTimeLimitPerTask, "max-time-limit-per-task", "T", util.MaxJobTimeLimit, "Set the maximum time limit per job (in seconds)")
 			if err := addQosCmd.MarkFlagRequired("name"); err != nil {
 				log.Fatalln("Can't mark 'name' flag required")
@@ -653,8 +653,8 @@ func init() {
 			modifyQosCmd.Flags().Uint32VarP(&FlagQos.MaxJobsPerUser, "max-jobs-per-user", "J", math.MaxUint32, "Set the maximum number of jobs per user")
 			modifyQosCmd.Flags().Uint32VarP(&FlagQos.MaxJobsPerAccount, "max-jobs-per-account", "j", math.MaxUint32, "Set the maximum number of jobs per account")
 			modifyQosCmd.Flags().Uint32VarP(&FlagQos.MaxCpusPerUser, "max-cpus-per-user", "c", math.MaxUint32, "Set the maximum number of CPUs per user")
-			modifyQosCmd.Flags().Uint32VarP(&FlagQos.MaxSubmitJobsPerUser, "max-submit-jobs-per-user", "s", math.MaxUint32, "Set the maximum number of submit jobs per user")
-			modifyQosCmd.Flags().Uint32VarP(&FlagQos.MaxSubmitJobsPerAccount, "max-submit-jobs-per-account", "S", math.MaxUint32, "Set the maximum number of submit jobs per account")
+			modifyQosCmd.Flags().Uint32VarP(&FlagQos.MaxSubmitJobsPerUser, "max-submit-jobs-per-user", "S", math.MaxUint32, "Set the maximum number of submit jobs per user")
+			modifyQosCmd.Flags().Uint32VarP(&FlagQos.MaxSubmitJobsPerAccount, "max-submit-jobs-per-account", "s", math.MaxUint32, "Set the maximum number of submit jobs per account")
 			modifyQosCmd.Flags().Uint64VarP(&FlagQos.MaxTimeLimitPerTask, "max-time-limit-per-task", "T", util.MaxJobTimeLimit, "Set the maximum time limit per job (in seconds)")
 
 			// Rules

internal/util/err.go

@@ -120,6 +120,7 @@ var errMsgMap = map[protos.ErrCode]string{
 	protos.ErrCode_ERR_NOT_IN_ALLOWED_LIST:       "The account does not have permission to run jobs in this partition. Please contact the administrator to add it to the allowed list",
 	protos.ErrCode_ERR_IN_DENIED_LIST:            "The account has been denied access to this partition. Please contact the security administrator if access is required",
 	protos.ErrCode_ERR_MAX_JOB_COUNT_PER_ACCOUNT: "The number of tasks for the current account has reached its limit",
+	protos.ErrCode_ERR_USER_HAS_TASK:             "The user has jobs pending or running, cannot be deleted",
 }
 
 func ErrMsg(err_code protos.ErrCode) string {

protos/PublicDefs.proto

@@ -478,6 +478,7 @@ enum ErrCode {
   ERR_EBPF = 69;
   ERR_SUPERVISOR = 70;
   ERR_MAX_JOB_COUNT_PER_ACCOUNT = 71;
+  ERR_USER_HAS_TASK = 72;
 }
 
 enum EntityType {