From 2a25a85c206ce7dc42f910e6c08ef99f6deed3d0 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@schedmd.com>
Date: Tue, 5 Nov 2013 14:49:33 -0800
Subject: [PATCH] replace slurm_get_debug_flags() with
slurmctld_conf.debug_flags
---
src/slurmctld/front_end.c | 4 +--
src/slurmctld/gang.c | 4 +--
src/slurmctld/node_scheduler.c | 16 ++++-----
src/slurmctld/proc_req.c | 4 +--
src/slurmctld/reservation.c | 8 ++---
src/slurmctld/step_mgr.c | 16 ++++-----
src/slurmctld/trigger_mgr.c | 60 +++++++++++++++++-----------------
7 files changed, 56 insertions(+), 56 deletions(-)
diff --git a/src/slurmctld/front_end.c b/src/slurmctld/front_end.c
index c6cd35dd0aa..2a3fd9c7e7f 100644
--- a/src/slurmctld/front_end.c
+++ b/src/slurmctld/front_end.c
@@ -591,7 +591,7 @@ extern void restore_front_end_state(int recover)
fatal("front_end_node_cnt > tree_width (%u > %u)",
front_end_node_cnt, tree_width);
}
- if (slurm_get_debug_flags() & DEBUG_FLAG_FRONT_END)
+ if (slurmctld_conf.debug_flags & DEBUG_FLAG_FRONT_END)
log_front_end_state();
#endif
}
@@ -997,7 +997,7 @@ extern void sync_front_end_state(void)
}
}
- if (slurm_get_debug_flags() & DEBUG_FLAG_FRONT_END)
+ if (slurmctld_conf.debug_flags & DEBUG_FLAG_FRONT_END)
log_front_end_state();
#endif
}
diff --git a/src/slurmctld/gang.c b/src/slurmctld/gang.c
index fcf6322671c..bcca660fbcc 100644
--- a/src/slurmctld/gang.c
+++ b/src/slurmctld/gang.c
@@ -1161,7 +1161,7 @@ extern int gs_init(void)
if (gs_debug_flags & DEBUG_FLAG_GANG)
info("gang: entering gs_init");
timeslicer_seconds = slurmctld_conf.sched_time_slice;
- gs_debug_flags = slurm_get_debug_flags();
+ gs_debug_flags = slurmctld_conf.debug_flags;
gs_fast_schedule = slurm_get_fast_schedule();
gr_type = _get_gr_type();
preempt_job_list = list_create(_preempt_job_list_del);
@@ -1357,7 +1357,7 @@ extern int gs_reconfig(void)
gs_part_list = NULL;
/* reset global data */
- gs_debug_flags = slurm_get_debug_flags();
+ gs_debug_flags = slurmctld_conf.debug_flags;
gs_fast_schedule = slurm_get_fast_schedule();
gr_type = _get_gr_type();
_load_phys_res_cnt();
diff --git a/src/slurmctld/node_scheduler.c b/src/slurmctld/node_scheduler.c
index d36a70c193e..4f56e59baf7 100644
--- a/src/slurmctld/node_scheduler.c
+++ b/src/slurmctld/node_scheduler.c
@@ -173,7 +173,7 @@ static int _build_gres_alloc_string(struct job_record *job_ptr, int valtype)
i_first = bit_ffs(node_bitmap);
i_last = bit_fls(node_bitmap);
} else {
- if (slurm_get_debug_flags() & DEBUG_FLAG_GRES)
+ if (slurmctld_conf.debug_flags & DEBUG_FLAG_GRES)
debug("(%s:%d) job id: %u -- No nodes in bitmap of "
"job_record!",
THIS_FILE, __LINE__, job_ptr->job_id);
@@ -198,7 +198,7 @@ static int _build_gres_alloc_string(struct job_record *job_ptr, int valtype)
else
count = 0;
- if (slurm_get_debug_flags() & DEBUG_FLAG_GRES)
+ if (slurmctld_conf.debug_flags & DEBUG_FLAG_GRES)
debug("(%s:%d) job id: %u -- Count of "
"GRES types in the gres_list is: %d",
THIS_FILE, __LINE__, job_ptr->job_id, count);
@@ -206,7 +206,7 @@ static int _build_gres_alloc_string(struct job_record *job_ptr, int valtype)
/* Only reallocate when there is an increase in size of the
* local arrays. */
if (count > oldcount) {
- if (slurm_get_debug_flags() & DEBUG_FLAG_GRES)
+ if (slurmctld_conf.debug_flags & DEBUG_FLAG_GRES)
debug("(%s:%d) job id: %u -- Old GRES "
"count: %d New GRES count: %d",
THIS_FILE, __LINE__, job_ptr->job_id,
@@ -282,7 +282,7 @@ static int _build_gres_alloc_string(struct job_record *job_ptr, int valtype)
if (prefix[0] == '\0')
prefix = ",";
- if (slurm_get_debug_flags() & DEBUG_FLAG_GRES)
+ if (slurmctld_conf.debug_flags & DEBUG_FLAG_GRES)
debug("(%s:%d) job id: %u -- gres_alloc substring=(%s)",
THIS_FILE, __LINE__, job_ptr->job_id, buf);
}
@@ -1669,7 +1669,7 @@ extern int select_nodes(struct job_record *job_ptr, bool test_only,
* strings representing the amount of each GRES type requested
* and allocated. */
_fill_in_gres_fields(job_ptr);
- if (slurm_get_debug_flags() & DEBUG_FLAG_GRES)
+ if (slurmctld_conf.debug_flags & DEBUG_FLAG_GRES)
debug("(%s:%d) job id: %u -- job_record->gres: (%s), "
"job_record->gres_alloc: (%s)",
THIS_FILE, __LINE__, job_ptr->job_id,
@@ -1726,7 +1726,7 @@ static int _fill_in_gres_fields(struct job_record *job_ptr)
/* First build the GRES requested field. */
if ((req_config == NULL) || (req_config[0] == '\0')) {
- if (slurm_get_debug_flags() & DEBUG_FLAG_GRES)
+ if (slurmctld_conf.debug_flags & DEBUG_FLAG_GRES)
debug("(%s:%d) job id: %u -- job_record->gres "
"is empty or NULL; this is OK if no GRES "
"was requested",
@@ -1768,7 +1768,7 @@ static int _fill_in_gres_fields(struct job_record *job_ptr)
if (prefix[0] == '\0')
prefix = ",";
- if (slurm_get_debug_flags() & DEBUG_FLAG_GRES) {
+ if (slurmctld_conf.debug_flags & DEBUG_FLAG_GRES) {
debug("(%s:%d) job id:%u -- ngres_req:"
"%u, gres_req substring = (%s)",
THIS_FILE, __LINE__,
@@ -1793,7 +1793,7 @@ static int _fill_in_gres_fields(struct job_record *job_ptr)
/* Now build the GRES allocated field. */
rv = _build_gres_alloc_string(job_ptr, valtype);
- if (slurm_get_debug_flags() & DEBUG_FLAG_GRES) {
+ if (slurmctld_conf.debug_flags & DEBUG_FLAG_GRES) {
debug("(%s:%d) job id: %u -- job_record->gres: (%s), "
"job_record->gres_alloc: (%s)",
THIS_FILE, __LINE__, job_ptr->job_id,
diff --git a/src/slurmctld/proc_req.c b/src/slurmctld/proc_req.c
index 6b43b3c935e..0844bca3261 100644
--- a/src/slurmctld/proc_req.c
+++ b/src/slurmctld/proc_req.c
@@ -2135,7 +2135,7 @@ static void _slurm_rpc_node_registration(slurm_msg_t * msg)
}
if (error_code == SLURM_SUCCESS) {
/* do RPC call */
- if (!(slurm_get_debug_flags() & DEBUG_FLAG_NO_CONF_HASH) &&
+ if (!(slurmctld_conf.debug_flags & DEBUG_FLAG_NO_CONF_HASH) &&
(node_reg_stat_msg->hash_val != NO_VAL) &&
(node_reg_stat_msg->hash_val != slurm_get_hash_val())) {
error("Node %s appears to have a different slurm.conf "
@@ -4255,7 +4255,7 @@ inline static void _slurm_rpc_set_debug_flags(slurm_msg_t *msg)
}
lock_slurmctld (config_write_lock);
- debug_flags = slurm_get_debug_flags();
+ debug_flags = slurmctld_conf.debug_flags;
debug_flags &= (~request_msg->debug_flags_minus);
debug_flags |= request_msg->debug_flags_plus;
slurm_set_debug_flags(debug_flags);
diff --git a/src/slurmctld/reservation.c b/src/slurmctld/reservation.c
index 7c5d61f23fb..fa48649d3c1 100644
--- a/src/slurmctld/reservation.c
+++ b/src/slurmctld/reservation.c
@@ -406,7 +406,7 @@ static void _dump_resv_req(resv_desc_msg_t *resv_ptr, char *mode)
char *node_cnt_str = NULL;
int duration, i;
- if (!(slurm_get_debug_flags() & DEBUG_FLAG_RESERVATION))
+ if (!(slurmctld_conf.debug_flags & DEBUG_FLAG_RESERVATION))
return;
if (resv_ptr->start_time != (time_t) NO_VAL) {
@@ -2284,7 +2284,7 @@ extern int delete_resv(reservation_name_msg_t *resv_desc_ptr)
int rc = SLURM_SUCCESS;
time_t now = time(NULL);
- if (slurm_get_debug_flags() & DEBUG_FLAG_RESERVATION)
+ if (slurmctld_conf.debug_flags & DEBUG_FLAG_RESERVATION)
info("delete_resv: Name=%s", resv_desc_ptr->name);
iter = list_iterator_create(resv_list);
@@ -3123,7 +3123,7 @@ static bitstr_t *_pick_idle_nodes(bitstr_t *avail_bitmap,
}
/* Need to create reservation containing multiple blocks */
- resv_debug = slurm_get_debug_flags() & DEBUG_FLAG_RESERVATION;
+ resv_debug = slurmctld_conf.debug_flags & DEBUG_FLAG_RESERVATION;
for (i = 0; resv_desc_ptr->node_cnt[i]; i++) {
tmp_bitmap = _pick_idle_node_cnt(avail_bitmap, resv_desc_ptr,
resv_desc_ptr->node_cnt[i],
@@ -3684,7 +3684,7 @@ extern int job_test_resv(struct job_record *job_ptr, time_t *when,
}
list_iterator_destroy(iter);
- if (slurm_get_debug_flags() & DEBUG_FLAG_RESERVATION) {
+ if (slurmctld_conf.debug_flags & DEBUG_FLAG_RESERVATION) {
char *nodes = bitmap2node_name(*node_bitmap);
info("job_test_resv: job:%u reservation:%s nodes:%s",
job_ptr->job_id, nodes, job_ptr->resv_name);
diff --git a/src/slurmctld/step_mgr.c b/src/slurmctld/step_mgr.c
index 9e747a6b620..7b23f6ce621 100644
--- a/src/slurmctld/step_mgr.c
+++ b/src/slurmctld/step_mgr.c
@@ -1170,7 +1170,7 @@ _pick_step_nodes (struct job_record *job_ptr,
if (step_spec->node_list) {
bitstr_t *selected_nodes = NULL;
- if (slurm_get_debug_flags() & DEBUG_FLAG_STEPS)
+ if (slurmctld_conf.debug_flags & DEBUG_FLAG_STEPS)
info("selected nodelist is %s", step_spec->node_list);
error_code = node_name2bitmap(step_spec->node_list, false,
@@ -1292,7 +1292,7 @@ _pick_step_nodes (struct job_record *job_ptr,
if (step_p->state < JOB_RUNNING)
continue;
bit_or(nodes_idle, step_p->step_node_bitmap);
- if (slurm_get_debug_flags() & DEBUG_FLAG_STEPS) {
+ if (slurmctld_conf.debug_flags & DEBUG_FLAG_STEPS) {
char *temp;
temp = bitmap2node_name(step_p->
step_node_bitmap);
@@ -1306,7 +1306,7 @@ _pick_step_nodes (struct job_record *job_ptr,
bit_and(nodes_idle, nodes_avail);
}
- if (slurm_get_debug_flags() & DEBUG_FLAG_STEPS) {
+ if (slurmctld_conf.debug_flags & DEBUG_FLAG_STEPS) {
char *temp1, *temp2, *temp3;
temp1 = bitmap2node_name(nodes_avail);
temp2 = bitmap2node_name(nodes_idle);
@@ -1358,7 +1358,7 @@ _pick_step_nodes (struct job_record *job_ptr,
}
nodes_picked_cnt = bit_set_count(nodes_picked);
- if (slurm_get_debug_flags() & DEBUG_FLAG_STEPS) {
+ if (slurmctld_conf.debug_flags & DEBUG_FLAG_STEPS) {
verbose("step picked %d of %u nodes",
nodes_picked_cnt, step_spec->min_nodes);
}
@@ -1757,9 +1757,9 @@ extern void step_alloc_lps(struct step_record *step_ptr)
step_ptr->step_layout->
tasks[step_node_inx]);
}
- if (slurm_get_debug_flags() & DEBUG_FLAG_CPU_BIND)
+ if (slurmctld_conf.debug_flags & DEBUG_FLAG_CPU_BIND)
_dump_step_layout(step_ptr);
- if (slurm_get_debug_flags() & DEBUG_FLAG_STEPS) {
+ if (slurmctld_conf.debug_flags & DEBUG_FLAG_STEPS) {
info("step alloc of %s procs: %u of %u",
node_record_table_ptr[i_node].name,
job_resrcs_ptr->cpus_used[job_node_inx],
@@ -1882,7 +1882,7 @@ static void _step_dealloc_lps(struct step_record *step_ptr)
job_resrcs_ptr->memory_used[job_node_inx] = 0;
}
}
- if (slurm_get_debug_flags() & DEBUG_FLAG_STEPS) {
+ if (slurmctld_conf.debug_flags & DEBUG_FLAG_STEPS) {
info("step dealloc of %s procs: %u of %u",
node_record_table_ptr[i_node].name,
job_resrcs_ptr->cpus_used[job_node_inx],
@@ -2171,7 +2171,7 @@ step_create(job_step_create_request_msg_t *step_specs,
xfree(step_specs->node_list);
step_specs->node_list = xstrdup(step_node_list);
}
- if (slurm_get_debug_flags() & DEBUG_FLAG_STEPS) {
+ if (slurmctld_conf.debug_flags & DEBUG_FLAG_STEPS) {
verbose("Picked nodes %s when accumulating from %s",
step_node_list, step_specs->node_list);
}
diff --git a/src/slurmctld/trigger_mgr.c b/src/slurmctld/trigger_mgr.c
index b9da87fb77a..15d3875048e 100644
--- a/src/slurmctld/trigger_mgr.c
+++ b/src/slurmctld/trigger_mgr.c
@@ -154,7 +154,7 @@ static void _dump_trigger_msg(char *header, trigger_info_msg_t *msg)
{
int i;
- if ((slurm_get_debug_flags() & DEBUG_FLAG_TRIGGERS) == 0)
+ if ((slurmctld_conf.debug_flags & DEBUG_FLAG_TRIGGERS) == 0)
return;
info("%s", header);
@@ -976,7 +976,7 @@ static void _trigger_job_event(trig_mgr_info_t *trig_in, time_t now)
(IS_JOB_COMPLETED(trig_in->job_ptr)))) {
trig_in->state = 1;
trig_in->trig_time = now + (trig_in->trig_time - 0x8000);
- if (slurm_get_debug_flags() & DEBUG_FLAG_TRIGGERS) {
+ if (slurmctld_conf.debug_flags & DEBUG_FLAG_TRIGGERS) {
info("trigger[%u] event for job %u fini",
trig_in->trig_id, trig_in->job_id);
}
@@ -984,7 +984,7 @@ static void _trigger_job_event(trig_mgr_info_t *trig_in, time_t now)
}
if (trig_in->job_ptr == NULL) {
- if (slurm_get_debug_flags() & DEBUG_FLAG_TRIGGERS) {
+ if (slurmctld_conf.debug_flags & DEBUG_FLAG_TRIGGERS) {
info("trigger[%u] for defunct job %u",
trig_in->trig_id, trig_in->job_id);
}
@@ -999,7 +999,7 @@ static void _trigger_job_event(trig_mgr_info_t *trig_in, time_t now)
if (rem_time <= (0x8000 - trig_in->trig_time)) {
trig_in->state = 1;
trig_in->trig_time = now;
- if (slurm_get_debug_flags() & DEBUG_FLAG_TRIGGERS) {
+ if (slurmctld_conf.debug_flags & DEBUG_FLAG_TRIGGERS) {
info("trigger[%u] for job %u time",
trig_in->trig_id, trig_in->job_id);
}
@@ -1010,7 +1010,7 @@ static void _trigger_job_event(trig_mgr_info_t *trig_in, time_t now)
if (trig_in->trig_type & TRIGGER_TYPE_DOWN) {
if (_front_end_job_test(trigger_down_front_end_bitmap,
trig_in->job_ptr)) {
- if (slurm_get_debug_flags() & DEBUG_FLAG_TRIGGERS) {
+ if (slurmctld_conf.debug_flags & DEBUG_FLAG_TRIGGERS) {
info("trigger[%u] for job %u down",
trig_in->trig_id, trig_in->job_id);
}
@@ -1025,7 +1025,7 @@ static void _trigger_job_event(trig_mgr_info_t *trig_in, time_t now)
if (trigger_down_nodes_bitmap &&
bit_overlap(trig_in->job_ptr->node_bitmap,
trigger_down_nodes_bitmap)) {
- if (slurm_get_debug_flags() & DEBUG_FLAG_TRIGGERS) {
+ if (slurmctld_conf.debug_flags & DEBUG_FLAG_TRIGGERS) {
info("trigger[%u] for job %u down",
trig_in->trig_id, trig_in->job_id);
}
@@ -1040,7 +1040,7 @@ static void _trigger_job_event(trig_mgr_info_t *trig_in, time_t now)
if (trigger_fail_nodes_bitmap &&
bit_overlap(trig_in->job_ptr->node_bitmap,
trigger_fail_nodes_bitmap)) {
- if (slurm_get_debug_flags() & DEBUG_FLAG_TRIGGERS) {
+ if (slurmctld_conf.debug_flags & DEBUG_FLAG_TRIGGERS) {
info("trigger[%u] for job %u node fail",
trig_in->trig_id, trig_in->job_id);
}
@@ -1058,7 +1058,7 @@ static void _trigger_job_event(trig_mgr_info_t *trig_in, time_t now)
trig_in->state = 1;
trig_in->trig_time = now +
(0x8000 - trig_in->trig_time);
- if (slurm_get_debug_flags() & DEBUG_FLAG_TRIGGERS) {
+ if (slurmctld_conf.debug_flags & DEBUG_FLAG_TRIGGERS) {
info("trigger[%u] for job %u up",
trig_in->trig_id, trig_in->job_id);
}
@@ -1085,7 +1085,7 @@ static void _trigger_front_end_event(trig_mgr_info_t *trig_in, time_t now)
}
trig_in->state = 1;
trig_in->trig_time = now + (trig_in->trig_time - 0x8000);
- if (slurm_get_debug_flags() & DEBUG_FLAG_TRIGGERS) {
+ if (slurmctld_conf.debug_flags & DEBUG_FLAG_TRIGGERS) {
info("trigger[%u] for node %s down",
trig_in->trig_id, trig_in->res_id);
}
@@ -1105,7 +1105,7 @@ static void _trigger_front_end_event(trig_mgr_info_t *trig_in, time_t now)
}
trig_in->state = 1;
trig_in->trig_time = now + (trig_in->trig_time - 0x8000);
- if (slurm_get_debug_flags() & DEBUG_FLAG_TRIGGERS) {
+ if (slurmctld_conf.debug_flags & DEBUG_FLAG_TRIGGERS) {
info("trigger[%u] for node %s up",
trig_in->trig_id, trig_in->res_id);
}
@@ -1119,7 +1119,7 @@ static void _trigger_node_event(trig_mgr_info_t *trig_in, time_t now)
trigger_block_err) {
trig_in->state = 1;
trig_in->trig_time = now + (trig_in->trig_time - 0x8000);
- if (slurm_get_debug_flags() & DEBUG_FLAG_TRIGGERS)
+ if (slurmctld_conf.debug_flags & DEBUG_FLAG_TRIGGERS)
info("trigger[%u] for block_err", trig_in->trig_id);
return;
}
@@ -1144,7 +1144,7 @@ static void _trigger_node_event(trig_mgr_info_t *trig_in, time_t now)
if (trig_in->state == 1) {
trig_in->trig_time = now +
(trig_in->trig_time - 0x8000);
- if (slurm_get_debug_flags() & DEBUG_FLAG_TRIGGERS) {
+ if (slurmctld_conf.debug_flags & DEBUG_FLAG_TRIGGERS) {
info("trigger[%u] for node %s down",
trig_in->trig_id, trig_in->res_id);
}
@@ -1172,7 +1172,7 @@ static void _trigger_node_event(trig_mgr_info_t *trig_in, time_t now)
if (trig_in->state == 1) {
trig_in->trig_time = now +
(trig_in->trig_time - 0x8000);
- if (slurm_get_debug_flags() & DEBUG_FLAG_TRIGGERS) {
+ if (slurmctld_conf.debug_flags & DEBUG_FLAG_TRIGGERS) {
info("trigger[%u] for node %s drained",
trig_in->trig_id, trig_in->res_id);
}
@@ -1200,7 +1200,7 @@ static void _trigger_node_event(trig_mgr_info_t *trig_in, time_t now)
if (trig_in->state == 1) {
trig_in->trig_time = now +
(trig_in->trig_time - 0x8000);
- if (slurm_get_debug_flags() & DEBUG_FLAG_TRIGGERS) {
+ if (slurmctld_conf.debug_flags & DEBUG_FLAG_TRIGGERS) {
info("trigger[%u] for node %s fail",
trig_in->trig_id, trig_in->res_id);
}
@@ -1240,7 +1240,7 @@ static void _trigger_node_event(trig_mgr_info_t *trig_in, time_t now)
FREE_NULL_BITMAP(trigger_idle_node_bitmap);
if (trig_in->state == 1) {
trig_in->trig_time = now;
- if (slurm_get_debug_flags() & DEBUG_FLAG_TRIGGERS) {
+ if (slurmctld_conf.debug_flags & DEBUG_FLAG_TRIGGERS) {
info("trigger[%u] for node %s idle",
trig_in->trig_id, trig_in->res_id);
}
@@ -1268,7 +1268,7 @@ static void _trigger_node_event(trig_mgr_info_t *trig_in, time_t now)
if (trig_in->state == 1) {
trig_in->trig_time = now +
(trig_in->trig_time - 0x8000);
- if (slurm_get_debug_flags() & DEBUG_FLAG_TRIGGERS) {
+ if (slurmctld_conf.debug_flags & DEBUG_FLAG_TRIGGERS) {
info("trigger[%u] for node %s up",
trig_in->trig_id, trig_in->res_id);
}
@@ -1282,7 +1282,7 @@ static void _trigger_node_event(trig_mgr_info_t *trig_in, time_t now)
trig_in->trig_time = now + (trig_in->trig_time - 0x8000);
xfree(trig_in->res_id);
trig_in->res_id = xstrdup("reconfig");
- if (slurm_get_debug_flags() & DEBUG_FLAG_TRIGGERS)
+ if (slurmctld_conf.debug_flags & DEBUG_FLAG_TRIGGERS)
info("trigger[%u] for reconfig", trig_in->trig_id);
return;
}
@@ -1296,7 +1296,7 @@ static void _trigger_slurmctld_event(trig_mgr_info_t *trig_in, time_t now)
trig_in->trig_time = now + (trig_in->trig_time - 0x8000);
xfree(trig_in->res_id);
trig_in->res_id = xstrdup("primary_slurmctld_failure");
- if (slurm_get_debug_flags() & DEBUG_FLAG_TRIGGERS) {
+ if (slurmctld_conf.debug_flags & DEBUG_FLAG_TRIGGERS) {
info("trigger[%u] for primary_slurmctld_failure",
trig_in->trig_id);
}
@@ -1309,7 +1309,7 @@ static void _trigger_slurmctld_event(trig_mgr_info_t *trig_in, time_t now)
xfree(trig_in->res_id);
trig_in->res_id =
xstrdup("primary_slurmctld_resumed_operation");
- if (slurm_get_debug_flags() & DEBUG_FLAG_TRIGGERS) {
+ if (slurmctld_conf.debug_flags & DEBUG_FLAG_TRIGGERS) {
info("trigger[%u] for primary_slurmctld_resumed_"
"operation", trig_in->trig_id);
}
@@ -1321,7 +1321,7 @@ static void _trigger_slurmctld_event(trig_mgr_info_t *trig_in, time_t now)
trig_in->trig_time = now + (trig_in->trig_time - 0x8000);
xfree(trig_in->res_id);
trig_in->res_id = xstrdup("primary_slurmctld_resumed_control");
- if (slurm_get_debug_flags() & DEBUG_FLAG_TRIGGERS) {
+ if (slurmctld_conf.debug_flags & DEBUG_FLAG_TRIGGERS) {
info("trigger[%u] for primary_slurmctld_resumed_"
"control", trig_in->trig_id);
}
@@ -1333,7 +1333,7 @@ static void _trigger_slurmctld_event(trig_mgr_info_t *trig_in, time_t now)
trig_in->trig_time = now + (trig_in->trig_time - 0x8000);
xfree(trig_in->res_id);
trig_in->res_id = xstrdup("primary_slurmctld_acct_buffer_full");
- if (slurm_get_debug_flags() & DEBUG_FLAG_TRIGGERS) {
+ if (slurmctld_conf.debug_flags & DEBUG_FLAG_TRIGGERS) {
info("trigger[%u] for primary_slurmctld_acct_"
"buffer_full", trig_in->trig_id);
}
@@ -1345,7 +1345,7 @@ static void _trigger_slurmctld_event(trig_mgr_info_t *trig_in, time_t now)
trig_in->trig_time = now + (trig_in->trig_time - 0x8000);
xfree(trig_in->res_id);
trig_in->res_id = xstrdup("backup_slurmctld_failure");
- if (slurm_get_debug_flags() & DEBUG_FLAG_TRIGGERS) {
+ if (slurmctld_conf.debug_flags & DEBUG_FLAG_TRIGGERS) {
info("trigger[%u] for backup_slurmctld_failure",
trig_in->trig_id);
}
@@ -1357,7 +1357,7 @@ static void _trigger_slurmctld_event(trig_mgr_info_t *trig_in, time_t now)
trig_in->trig_time = now + (trig_in->trig_time - 0x8000);
xfree(trig_in->res_id);
trig_in->res_id = xstrdup("backup_slurmctld_resumed_operation");
- if (slurm_get_debug_flags() & DEBUG_FLAG_TRIGGERS) {
+ if (slurmctld_conf.debug_flags & DEBUG_FLAG_TRIGGERS) {
info("trigger[%u] for backup_slurmctld_resumed_"
"operation", trig_in->trig_id);
}
@@ -1369,7 +1369,7 @@ static void _trigger_slurmctld_event(trig_mgr_info_t *trig_in, time_t now)
trig_in->trig_time = now + (trig_in->trig_time - 0x8000);
xfree(trig_in->res_id);
trig_in->res_id = xstrdup("backup_slurmctld_assumed_control");
- if (slurm_get_debug_flags() & DEBUG_FLAG_TRIGGERS) {
+ if (slurmctld_conf.debug_flags & DEBUG_FLAG_TRIGGERS) {
info("trigger[%u] for bu_slurmctld_assumed_control",
trig_in->trig_id);
}
@@ -1385,7 +1385,7 @@ static void _trigger_slurmdbd_event(trig_mgr_info_t *trig_in, time_t now)
trig_in->trig_time = now + (trig_in->trig_time - 0x8000);
xfree(trig_in->res_id);
trig_in->res_id = xstrdup("primary_slurmdbd_failure");
- if (slurm_get_debug_flags() & DEBUG_FLAG_TRIGGERS)
+ if (slurmctld_conf.debug_flags & DEBUG_FLAG_TRIGGERS)
info("trigger[%u] for primary_slurmcdbd_failure",
trig_in->trig_id);
return;
@@ -1396,7 +1396,7 @@ static void _trigger_slurmdbd_event(trig_mgr_info_t *trig_in, time_t now)
trig_in->trig_time = now + (trig_in->trig_time - 0x8000);
xfree(trig_in->res_id);
trig_in->res_id = xstrdup("primary_slurmdbd_resumed_operation");
- if (slurm_get_debug_flags() & DEBUG_FLAG_TRIGGERS) {
+ if (slurmctld_conf.debug_flags & DEBUG_FLAG_TRIGGERS) {
info("trigger[%u] for primary_slurmdbd_resumed_"
"operation", trig_in->trig_id);
}
@@ -1412,7 +1412,7 @@ static void _trigger_database_event(trig_mgr_info_t *trig_in, time_t now)
trig_in->trig_time = now + (trig_in->trig_time - 0x8000);
xfree(trig_in->res_id);
trig_in->res_id = xstrdup("primary_database_failure");
- if (slurm_get_debug_flags() & DEBUG_FLAG_TRIGGERS) {
+ if (slurmctld_conf.debug_flags & DEBUG_FLAG_TRIGGERS) {
info("trigger[%u] for primary_database_failure",
trig_in->trig_id);
}
@@ -1424,7 +1424,7 @@ static void _trigger_database_event(trig_mgr_info_t *trig_in, time_t now)
trig_in->trig_time = now + (trig_in->trig_time - 0x8000);
xfree(trig_in->res_id);
trig_in->res_id = xstrdup("primary_database_resumed_operation");
- if (slurm_get_debug_flags() & DEBUG_FLAG_TRIGGERS) {
+ if (slurmctld_conf.debug_flags & DEBUG_FLAG_TRIGGERS) {
info("trigger[%u] for primary_database_resumed_"
"operation", trig_in->trig_id);
}
@@ -1594,7 +1594,7 @@ extern void trigger_process(void)
}
if ((trig_in->state == 1) &&
(trig_in->trig_time <= now)) {
- if (slurm_get_debug_flags() & DEBUG_FLAG_TRIGGERS) {
+ if (slurmctld_conf.debug_flags & DEBUG_FLAG_TRIGGERS) {
info("launching program for trigger[%u]",
trig_in->trig_id);
info(" uid=%u gid=%u program=%s arg=%s",
@@ -1630,7 +1630,7 @@ extern void trigger_process(void)
}
if (trig_in->child_pid == 0) {
- if (slurm_get_debug_flags() &
+ if (slurmctld_conf.debug_flags &
DEBUG_FLAG_TRIGGERS) {
info("purging trigger[%u]",
trig_in->trig_id);
--
GitLab