From 13a1ef46cda5a6189b9b4bf3f5e19d13b1a6e289 Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Mon, 31 Jul 2006 20:44:38 +0000
Subject: [PATCH] svn merge -r8704:8726
https://eris.llnl.gov/svn/slurm/branches/slurm-1.1
---
NEWS | 2 +-
doc/man/man5/slurm.conf.5 | 2 +-
src/common/plugstack.c | 9 ++++-----
src/slurmctld/agent.c | 9 ++++++---
4 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/NEWS b/NEWS
index d5976fd383d..95860e36399 100644
--- a/NEWS
+++ b/NEWS
@@ -1791,7 +1791,7 @@ documents those changes that are of interest to users and admins.
* Changes in SLURM 0.2.0-pre2
=============================
-
+
-- Fix for reconfigure when public/private key path is changed.
-- Shared memory fixes in slurmd.
- fix for infinite semaphore incrementation bug.
diff --git a/doc/man/man5/slurm.conf.5 b/doc/man/man5/slurm.conf.5
index bfd7546d9ca..9c1a0e71fe7 100644
--- a/doc/man/man5/slurm.conf.5
+++ b/doc/man/man5/slurm.conf.5
@@ -950,7 +950,7 @@ JobCredentialPublicCertificate=/usr/local/slurm/public.cert
.br
JobAcctType=jobacct/linux
.br
-JobAcctLoc=/var/log/slurm_accounting.log
+JobAcctLogFile=/var/log/slurm_accounting.log
.br
JobAcctParameters="Frequency=30,MaxSendRetries=5"
.br
diff --git a/src/common/plugstack.c b/src/common/plugstack.c
index 21c0215e216..e2c386bdfd7 100644
--- a/src/common/plugstack.c
+++ b/src/common/plugstack.c
@@ -283,12 +283,12 @@ _spank_plugin_find (const char *path, const char *file)
* Ensure PATH ends with a :
*/
if (dir[pathlen - 1] != ':') {
- dir[pathlen] = ':';
- dir[pathlen+1] = '\0';
+ dir[pathlen] = ':';
+ dir[pathlen+1] = '\0';
}
entry = dir;
- while ((p = strchr(dir, ':'))) {
+ while ((p = strchr(entry, ':'))) {
char *fq_path;
*(p++) = '\0';
@@ -297,9 +297,8 @@ _spank_plugin_find (const char *path, const char *file)
xstrcatchar (fq_path, '/');
xstrcat (fq_path, file);
- if (access (fq_path, F_OK) == 0) {
+ if (plugin_peek (fq_path, NULL, 0, NULL) != SLURM_ERROR)
return (fq_path);
- }
xfree (fq_path);
entry = p;
diff --git a/src/slurmctld/agent.c b/src/slurmctld/agent.c
index 107504224ab..92f8859d5f7 100644
--- a/src/slurmctld/agent.c
+++ b/src/slurmctld/agent.c
@@ -1197,6 +1197,7 @@ extern int agent_retry (int min_wait)
agent_arg_t *agent_arg_ptr;
ListIterator retry_iter;
+ slurm_mutex_lock(&retry_mutex);
if (retry_list) {
static time_t last_msg_time = (time_t) 0;
uint32_t msg_type[5], i = 0;
@@ -1221,21 +1222,23 @@ extern int agent_retry (int min_wait)
last_msg_time = now;
}
}
- if (agent_cnt >= MAX_AGENT_CNT) /* too much work already */
+ if (agent_cnt >= MAX_AGENT_CNT) { /* too much work already */
+ slurm_mutex_unlock(&retry_mutex);
return list_size;
+ }
- slurm_mutex_lock(&retry_mutex);
if (retry_list) {
/* first try to find a new (never tried) record */
retry_iter = list_iterator_create(retry_list);
while ((queued_req_ptr = (queued_request_t *)
list_next(retry_iter))) {
- if (queued_req_ptr->last_attempt == 0)
+ if (queued_req_ptr->last_attempt == 0) {
list_remove(retry_iter);
list_size--;
break;
}
+ }
list_iterator_destroy(retry_iter);
}
--
GitLab