Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Added DebugFlags value of "License".

  • Loading branch information...
commit 2874451e6fe72bed918f4443e7366e139ea80fe9 1 parent a7c588b
@jette jette authored
View
1  NEWS
@@ -34,6 +34,7 @@ documents those changes that are of interest to users and admins.
-- BGQ - --export=NONE option for srun to make it so only the SLURM_JOB_ID
and SLURM_STEP_ID env vars are set.
-- Munge plugins - Add sleep between retries if can't connect to socket.
+ -- Added DebugFlags value of "License".
* Changes in Slurm 14.03.0pre6
==============================
View
11 RELEASE_NOTES
@@ -68,13 +68,13 @@ CONFIGURATION FILE CHANGES (see man appropriate man page for details)
-- SelectType: select/cray has been renamed select/alps.
-- Added SchedulingParameters paramter of "CR_LLN" and partition parameter of
"LLN=yes|no" to enable loadbased scheduling.
- -- In "SchedulerParameters", change default max_job_bf value from 50 to 100.
- -- Added "SchedulerParameters" option of "partition_job_depth" to limit
+ -- In SchedulerParameters, change default max_job_bf value from 50 to 100.
+ -- Added SchedulerParameters option of "partition_job_depth" to limit
scheduling logic depth by partition.
- -- Added "SchedulerParameters" option of "bf_max_job_start".
- -- In "SchedulerParameters", replace "max_job_bf" with "bf_max_job_test"
+ -- Added SchedulerParameters option of "bf_max_job_start".
+ -- In SchedulerParameters, replace "max_job_bf" with "bf_max_job_test"
(both will work for now).
- -- Add "SchedulerParameters" options of "preempt_reorder_count" and
+ -- Add SchedulerParameters options of "preempt_reorder_count" and
"preempt_strict_order".
-- Change MaxArraySize from 16-bit to 32-bit field.
-- Added fields to "scontrol show job" output: boards_per_node,
@@ -82,6 +82,7 @@ CONFIGURATION FILE CHANGES (see man appropriate man page for details)
ntasks_per_core, and nice.
-- gres.conf - Add "NodeName" specification so that a single gres.conf file
can be used for a heterogeneous cluster.
+ -- Added DebugFlags value of "License".
DBD CONFIGURATION FILE CHANGES (see "man slurmdbd.conf" for details)
====================================================================
View
3  doc/man/man5/slurm.conf.5
@@ -467,6 +467,9 @@ Gang scheduling details
\fBJobContainer\fR
Job container plugin details
.TP
+\fBLicense\fB
+License management details
+.TP
\fBNO_CONF_HASH\fR
Do not log when the slurm.conf files differs between SLURM daemons
.TP
View
1  slurm/slurm.h.in
@@ -1988,6 +1988,7 @@ typedef struct reservation_name_msg {
#define DEBUG_FLAG_SWITCH 0x00020000 /* SwitchType plugin */
#define DEBUG_FLAG_ENERGY 0x00040000 /* AcctGatherEnergy plugin */
#define DEBUG_FLAG_EXT_SENSORS 0x00080000 /* ExtSensorsType plugin */
+#define DEBUG_FLAG_LICENSE 0x00100000 /* AcctGatherProfile plugin */
#define DEBUG_FLAG_PROFILE 0x00200000 /* AcctGatherProfile plugin */
#define DEBUG_FLAG_INFINIBAND 0x00400000 /* AcctGatherInfiniband plugin */
#define DEBUG_FLAG_FILESYSTEM 0x00800000 /* AcctGatherFilesystem plugin */
View
7 src/common/read_config.c
@@ -4076,6 +4076,11 @@ extern char * debug_flags2str(uint32_t debug_flags)
xstrcat(rc, ",");
xstrcat(rc, "JobContainer");
}
+ if (debug_flags & DEBUG_FLAG_LICENSE) {
+ if (rc)
+ xstrcat(rc, ",");
+ xstrcat(rc, "License");
+ }
if (debug_flags & DEBUG_FLAG_NO_CONF_HASH) {
if (rc)
xstrcat(rc, ",");
@@ -4178,6 +4183,8 @@ extern uint32_t debug_str2flags(char *debug_flags)
rc |= DEBUG_FLAG_FILESYSTEM;
else if (strcasecmp(tok, "JobContainer") == 0)
rc |= DEBUG_FLAG_JOB_CONT;
+ else if (strcasecmp(tok, "License") == 0)
+ rc |= DEBUG_FLAG_LICENSE;
else if (strcasecmp(tok, "NO_CONF_HASH") == 0)
rc |= DEBUG_FLAG_NO_CONF_HASH;
else if (strcasecmp(tok, "NoRealTime") == 0)
View
2  src/slurmctld/licenses.c
@@ -68,6 +68,8 @@ static inline void _licenses_print(char *header, List licenses, int job_id)
if (licenses == NULL)
return;
+ if ((slurmctld_conf.debug_flags & DEBUG_FLAG_LICENSE) == 0)
+ return;
iter = list_iterator_create(licenses);
while ((license_entry = (licenses_t *) list_next(iter))) {
Please sign in to comment.
Something went wrong with that request. Please try again.