From 3c6975a2bd3d6e872b74bbc9942af127a9c9e340 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@llnl.gov>
Date: Thu, 9 Dec 2010 20:02:23 +0000
Subject: [PATCH] change FAIL_BANK_ACCOUNT to FAIL_ACCOUNT
---
contribs/perlapi/libslurm/perl/lib/Slurm/Constant.pm | 4 +++-
slurm/slurm.h.in | 2 +-
src/common/slurm_errno.c | 2 +-
src/common/slurm_protocol_defs.c | 4 ++--
src/slurmctld/acct_policy.c | 2 +-
src/slurmctld/job_mgr.c | 6 +++---
src/slurmctld/job_scheduler.c | 2 +-
7 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/contribs/perlapi/libslurm/perl/lib/Slurm/Constant.pm b/contribs/perlapi/libslurm/perl/lib/Slurm/Constant.pm
index 3eb45776c2a..63ba80349e6 100644
--- a/contribs/perlapi/libslurm/perl/lib/Slurm/Constant.pm
+++ b/contribs/perlapi/libslurm/perl/lib/Slurm/Constant.pm
@@ -541,10 +541,12 @@ This package export constants for use with Slurm. This includes enumerations and
=item * FAIL_INACTIVE_LIMIT 25
-=item * FAIL_BANK_ACCOUNT 26
+=item * FAIL_ACCOUNT 26
=item * FAIL_QOS 27
+=item * WAIT_QOS_THRES 28
+
=back
=head3 Job account types
diff --git a/slurm/slurm.h.in b/slurm/slurm.h.in
index 35dfc546bbd..4fd96d6a235 100644
--- a/slurm/slurm.h.in
+++ b/slurm/slurm.h.in
@@ -284,7 +284,7 @@ enum job_state_reason {
FAIL_EXIT_CODE, /* exit code was non-zero */
FAIL_TIMEOUT, /* reached end of time limit */
FAIL_INACTIVE_LIMIT, /* reached slurm InactiveLimit */
- FAIL_BANK_ACCOUNT, /* invalid bank account */
+ FAIL_ACCOUNT, /* invalid account */
FAIL_QOS, /* invalid QOS */
WAIT_QOS_THRES /* required QOS threshold has been breached */
};
diff --git a/src/common/slurm_errno.c b/src/common/slurm_errno.c
index dfef221b7e7..1ffe208479f 100644
--- a/src/common/slurm_errno.c
+++ b/src/common/slurm_errno.c
@@ -213,7 +213,7 @@ static slurm_errtab_t slurm_errtab[] = {
{ ESLURM_INVALID_TASK_MEMORY,
"Memory required by task is not available" },
{ ESLURM_INVALID_ACCOUNT,
- "Invalid account specified" },
+ "Invalid account or account/partition combination specified"},
{ ESLURM_INVALID_PARENT_ACCOUNT,
"Invalid parent account specified" },
{ ESLURM_SAME_PARENT_ACCOUNT,
diff --git a/src/common/slurm_protocol_defs.c b/src/common/slurm_protocol_defs.c
index 47a2557268e..76dabb09440 100644
--- a/src/common/slurm_protocol_defs.c
+++ b/src/common/slurm_protocol_defs.c
@@ -888,8 +888,8 @@ extern char *job_reason_string(enum job_state_reason inx)
return "TimeLimit";
case FAIL_INACTIVE_LIMIT:
return "InactiveLimit";
- case FAIL_BANK_ACCOUNT:
- return "InvalidBankAccount";
+ case FAIL_ACCOUNT:
+ return "InvalidAccount";
case FAIL_QOS:
return "InvalidQOS";
case WAIT_QOS_THRES:
diff --git a/src/slurmctld/acct_policy.c b/src/slurmctld/acct_policy.c
index b6cdf797ef7..36b1c6ac93c 100644
--- a/src/slurmctld/acct_policy.c
+++ b/src/slurmctld/acct_policy.c
@@ -64,7 +64,7 @@ static void _cancel_job(struct job_record *job_ptr)
last_job_update = now;
job_ptr->job_state = JOB_FAILED;
job_ptr->exit_code = 1;
- job_ptr->state_reason = FAIL_BANK_ACCOUNT;
+ job_ptr->state_reason = FAIL_ACCOUNT;
xfree(job_ptr->state_desc);
job_ptr->start_time = job_ptr->end_time = now;
job_completion_logger(job_ptr, false);
diff --git a/src/slurmctld/job_mgr.c b/src/slurmctld/job_mgr.c
index 9afb624d513..a1a970a3354 100644
--- a/src/slurmctld/job_mgr.c
+++ b/src/slurmctld/job_mgr.c
@@ -1280,7 +1280,7 @@ static int _load_job_state(Buf buffer, uint16_t protocol_version)
info("Cancelling job %u with invalid association",
job_id);
job_ptr->job_state = JOB_CANCELLED;
- job_ptr->state_reason = FAIL_BANK_ACCOUNT;
+ job_ptr->state_reason = FAIL_ACCOUNT;
xfree(job_ptr->state_desc);
if (IS_JOB_PENDING(job_ptr))
job_ptr->start_time = now;
@@ -8333,7 +8333,7 @@ extern int job_cancel_by_assoc_id(uint32_t assoc_id)
job_ptr->job_id);
/* make sure the assoc_mgr_lock isn't locked before this. */
job_signal(job_ptr->job_id, SIGKILL, 0, 0);
- job_ptr->state_reason = FAIL_BANK_ACCOUNT;
+ job_ptr->state_reason = FAIL_ACCOUNT;
xfree(job_ptr->state_desc);
cnt++;
}
@@ -8563,7 +8563,7 @@ extern int send_jobs_to_accounting(void)
"invalid association",
job_ptr->job_id);
job_ptr->job_state = JOB_CANCELLED;
- job_ptr->state_reason = FAIL_BANK_ACCOUNT;
+ job_ptr->state_reason = FAIL_ACCOUNT;
if (IS_JOB_PENDING(job_ptr))
job_ptr->start_time = now;
job_ptr->end_time = now;
diff --git a/src/slurmctld/job_scheduler.c b/src/slurmctld/job_scheduler.c
index b4ab8ee82a3..44673583d65 100644
--- a/src/slurmctld/job_scheduler.c
+++ b/src/slurmctld/job_scheduler.c
@@ -465,7 +465,7 @@ extern int schedule(uint32_t job_limit)
last_job_update = time(NULL);
job_ptr->job_state = JOB_FAILED;
job_ptr->exit_code = 1;
- job_ptr->state_reason = FAIL_BANK_ACCOUNT;
+ job_ptr->state_reason = FAIL_ACCOUNT;
xfree(job_ptr->state_desc);
job_ptr->start_time = job_ptr->end_time = time(NULL);
job_completion_logger(job_ptr, false);
--
GitLab