Skip to content
Browse files

new tag

  • Loading branch information...
2 parents 18a04cd + ed4f5d0 commit 6d56b3ef46f2db9acfda05587a4a4a54d3ea1b4b @dannyauble dannyauble committed Apr 15, 2008
View
6 NEWS
@@ -1,6 +1,9 @@
This file describes changes in recent versions of SLURM. It primarily
documents those changes that are of interest to users and admins.
+* Changes in SLURM 1.2.28
+=========================
+
* Changes in SLURM 1.2.27
=========================
-- Record job eligible time in accounting database (for jobacct/gold only).
@@ -15,6 +18,7 @@ documents those changes that are of interest to users and admins.
-- Enhance job requeue on node failure to be more robust.
-- Added configuration parameter "DisableRootJobs". See "man slurm.conf"
for details.
+ -- Fixed issue with account = NULL in Gold job accounting plugin
* Changes in SLURM 1.2.26
=========================
@@ -25,8 +29,6 @@ documents those changes that are of interest to users and admins.
-- In srun and sbatch, do not check the PATH env var if an absolute pathname
of the program is specified (previously reported an error if no PATH).
-- Correct output of "sinfo -o %C" (CPU counts by node state).
- -- Treat attempt to submit a batch job against an existing resource allocation
- as an error if sched/wiki2 is configured (Moab).
* Changes in SLURM 1.2.25
=========================
View
8 src/plugins/jobacct/gold/base64.c
@@ -74,7 +74,7 @@ extern unsigned char *encode_base64(const unsigned char* in_str,
rlen++; /* for the eol */
ret_str = xmalloc(sizeof(unsigned char) * rlen);
- debug2("encoding %s", in_str);
+ debug4("encoding %s", in_str);
while (in_len--) {
char_array_3[i++] = *(in_str++);
@@ -111,7 +111,7 @@ extern unsigned char *encode_base64(const unsigned char* in_str,
}
- debug2("encoded %s", ret_str);
+ debug4("encoded %s", ret_str);
return ret_str;
}
@@ -136,7 +136,7 @@ extern unsigned char *decode_base64(const unsigned char *in_str)
int rlen = in_len * 3 / 4; /* always enough, but sometimes too
* much */
- debug2("decoding %s", in_str);
+ debug4("decoding %s", in_str);
ret_str = xmalloc(sizeof(unsigned char) * rlen);
memset(ret_str, 0, rlen);
@@ -193,7 +193,7 @@ extern unsigned char *decode_base64(const unsigned char *in_str)
ret_str[pos++] = char_array_3[j];
}
- debug2("decoded %s", ret_str);
+ debug4("decoded %s", ret_str);
return ret_str;
}
View
8 src/plugins/jobacct/gold/gold_interface.c
@@ -120,7 +120,7 @@ static gold_response_entry_t *_create_response_entry(char *object,
name_val->name = _get_return_name(gold_msg, i);
name_val->value = _get_return_value(gold_msg, i);
- debug3("got %s = %s", name_val->name, name_val->value);
+ debug4("got %s = %s", name_val->name, name_val->value);
list_push(resp_entry->name_val, name_val);
}
(*i)++;
@@ -477,7 +477,7 @@ extern gold_response_t *get_gold_response(gold_request_t *gold_request)
goto error;
}
- debug2("sending %d '%s'", rc, gold_msg);
+ debug3("sending %d '%s'", rc, gold_msg);
xstrcat(gold_msg, "0\r\n");
rc = _slurm_send_timeout(gold_fd, gold_msg, strlen(gold_msg),
@@ -518,7 +518,7 @@ extern gold_response_t *get_gold_response(gold_request_t *gold_request)
tmp_buff[i] = '\0';
ret_len = xstrntol(tmp_buff, NULL, i, 16);
- debug3("got size %d", ret_len);
+ debug4("got size %d", ret_len);
gold_msg = xmalloc(ret_len+1);
@@ -528,7 +528,7 @@ extern gold_response_t *get_gold_response(gold_request_t *gold_request)
goto error;
}
- debug2("got back '%s'", gold_msg);
+ debug3("got back '%s'", gold_msg);
if(_slurm_recv_timeout(gold_fd, tmp_buff, 3, 0, timeout) < 0) {
error("get_gold_response: "
"couldn't get the end of the message");
View
20 src/plugins/jobacct/gold/jobacct_gold.c
@@ -179,10 +179,13 @@ static char *_get_account_id(char *user, char *project, char *machine)
break;
}
list_iterator_destroy(itr);
-
- if(gold_account_id)
- return gold_account_id;
+ if(gold_account_id) {
+ debug2("Cached GOLD account id for %s-%s-%s is %s",
+ machine, project, user, gold_account_id);
+ return gold_account_id;
+ }
+
gold_request = create_gold_request(GOLD_OBJECT_ACCOUNT,
GOLD_ACTION_QUERY);
@@ -226,6 +229,8 @@ static char *_get_account_id(char *user, char *project, char *machine)
}
destroy_gold_response(gold_response);
+ debug2("GOLD account id for %s-%s-%s is %s",
+ machine, project, user, gold_account_id);
return gold_account_id;
}
@@ -720,6 +725,9 @@ static int _add_edit_job(gold_job_info_msg_t *job_ptr, gold_object_t action)
if (!gold_request)
return SLURM_ERROR;
+ if (job_ptr->account && job_ptr->account[0])
+ account = job_ptr->account;
+
if (action == GOLD_ACTION_CREATE) {
snprintf(tmp_buff, sizeof(tmp_buff), "%u", job_ptr->job_id);
gold_request_add_assignment(gold_request, "JobId", tmp_buff);
@@ -729,8 +737,7 @@ static int _add_edit_job(gold_job_info_msg_t *job_ptr, gold_object_t action)
gold_request_add_assignment(gold_request, "SubmitTime",
tmp_buff);
- gold_account_id = _get_account_id(user, account,
- cluster_name);
+ gold_account_id = _get_account_id(user, account, cluster_name);
if ((gold_account_id == NULL) ||
((gold_account_id[0] == '0') && (gold_account_id[1] == '\0'))) {
destroy_gold_request(gold_request);
@@ -774,9 +781,6 @@ static int _add_edit_job(gold_job_info_msg_t *job_ptr, gold_object_t action)
gold_request_add_assignment(gold_request, "JobName", jname);
xfree(jname);
- if (job_ptr->account && job_ptr->account[0])
- account = job_ptr->account;
-
if (job_ptr->nodes && job_ptr->nodes[0])
nodes = job_ptr->nodes;
View
3 testsuite/expect/test7.3
@@ -55,7 +55,8 @@ exec $bin_chmod 700 $io_prog
send_user "slurm_dir is $slurm_dir\n"
if {![test_aix]} {
- exec $bin_cc ${test_prog}.c -g -pthread -o ${test_prog} -I${slurm_dir}/include -Wl,--rpath=${slurm_dir}/lib -L${slurm_dir}/lib -lslurm
+ send_user "$bin_cc ${test_prog}.c -g -pthread -o ${test_prog} -I${slurm_dir}/include -Wl,--rpath=${slurm_dir}/lib -L${slurm_dir}/lib -lslurm\n"
+ exec $bin_cc ${test_prog}.c -g -pthread -o ${test_prog} -I${slurm_dir}/include -Wl,--rpath=${slurm_dir}/lib -L${slurm_dir}/lib -lslurm
} else {
send_user "$bin_cc ${test_prog}.c -Wl,-brtl -g -pthread -o ${test_prog} -I${slurm_dir}/include -L${slurm_dir}/lib -lslurm -lntbl\n"
exec $bin_cc ${test_prog}.c -Wl,-brtl -g -pthread -o ${test_prog} -I${slurm_dir}/include -L${slurm_dir}/lib -lslurm -lntbl

0 comments on commit 6d56b3e

Please sign in to comment.
Something went wrong with that request. Please try again.