diff --git a/NEWS b/NEWS index 3b3967fb31f9b3cecba9d1099235f0a21c54f3d8..db9a047ba70c275ed4f05d308f212705b37b24ed 100644 --- a/NEWS +++ b/NEWS @@ -34,6 +34,7 @@ documents those changes that are of interest to users and administrators. -- Do not consider nodes explicitly powered up as DOWN with reason of "Node unexpected rebooted". -- Use correct slurmd spooldir when creating cpu-frequency locks. + -- Deprecated TICKET_BASED fairshare. Consider using the FAIR_TREE algorithm. * Changes in Slurm 14.11.7 ========================== diff --git a/doc/html/priority_multifactor2.shtml b/doc/html/priority_multifactor2.shtml index 777685f59a63d38bbfbab2c35dca2984ace44fcb..d5383894790e80e64061c7f02d718fef1926d28c 100644 --- a/doc/html/priority_multifactor2.shtml +++ b/doc/html/priority_multifactor2.shtml @@ -13,6 +13,10 @@ <a name=intro> <h2>Introduction</h2></a> +<p><b>Note:</b> This algorithm is deprecated and has been removed in 15.08. Please +consider using the <a href="fair_tree.html">Fair Tree</a> algorithm. +</p> + <p>A ticket-based variant of the priority/multifactor plugin is available. The reader is assumed to be familiar with the priority/multifactor plugin and only the differences are documented here.</p> diff --git a/src/slurmctld/read_config.c b/src/slurmctld/read_config.c index 79871eba799f4dbbf2d29e865c066ad6d99e08e0..ffcbe985cb784641ae14999640177031eb2acdd9 100644 --- a/src/slurmctld/read_config.c +++ b/src/slurmctld/read_config.c @@ -1118,6 +1118,10 @@ int read_slurm_conf(int recover, bool reconfig) /* Sync select plugin with synchronized job/node/part data */ select_g_reconfigure(); + if (slurmctld_conf.priority_flags & PRIORITY_FLAGS_TICKET_BASED) + info("TICKET_BASED fairshare is deprecated. Please consider " + "using the \"FAIR_TREE\" algorithm."); + slurmctld_conf.last_update = time(NULL); END_TIMER2("read_slurm_conf"); return error_code;