diff --git a/doc/html/Makefile.am b/doc/html/Makefile.am index 03eb95a3ee43c70969b8613875f1b1ef9a72e426..977fd669b91b665f397dc5854b1b1e14d58bb416 100644 --- a/doc/html/Makefile.am +++ b/doc/html/Makefile.am @@ -19,7 +19,8 @@ generated_html = \ gang_scheduling.html \ help.html \ ibm.html \ - job_priority.html \ + priority_multifactor.html \ + priority_plugins.html \ jobacct_gatherplugins.html \ accounting_storageplugins.html \ jobcompplugins.html \ diff --git a/doc/html/Makefile.in b/doc/html/Makefile.in index 470f8fd1be443d79d18401088a8d0fff41688cfe..decb37b77f93aef9e70fbcade6dd320721ed70c1 100644 --- a/doc/html/Makefile.in +++ b/doc/html/Makefile.in @@ -268,7 +268,8 @@ generated_html = \ gang_scheduling.html \ help.html \ ibm.html \ - job_priority.html \ + priority_multifactor.html \ + priority_plugins.html \ jobacct_gatherplugins.html \ accounting_storageplugins.html \ jobcompplugins.html \ @@ -283,7 +284,6 @@ generated_html = \ plugins.html \ power_save.html \ preempt.html \ - priority_plugins.html \ proctrack_plugins.html \ programmer_guide.html \ publications.html \ diff --git a/doc/html/documentation.shtml b/doc/html/documentation.shtml index 6cd73c1d0f41914d64fb2e1c9cc3d74334facb0f..ba75b23a0367aa7df731380f0e7d4ab11cc1bf51 100644 --- a/doc/html/documentation.shtml +++ b/doc/html/documentation.shtml @@ -29,7 +29,7 @@ Also see <a href="publications.html">Publications and Presentations</a>. <ul> <li><a href="cons_res.shtml">Consumable Resources Guide</a></li> <li><a href="gang_scheduling.shtml">Gang Scheduling</a></li> -<li><a href="job_priority.shtml">Job Priority</a></li> +<li><a href="priority_multifactor.shtml">Multifactor Job Priority</a></li> <li><a href="preempt.shtml">Preemption</a></li> <li><a href="resource_limits.shtml">Resource Limits</a></li> <li><a href="reservations.shtml">Resource Reservation Gude</a></li> diff --git a/doc/html/overview.shtml b/doc/html/overview.shtml index 78ff344d3b8b6cede561252e29e9045abda8fa70..ee92de90546ff74286b7b54ae7aa4e7a759c8354 100644 --- a/doc/html/overview.shtml +++ b/doc/html/overview.shtml @@ -18,8 +18,8 @@ Optional plugins can be used for <a href="gang_scheduling.html">gang scheduling</a> (time sharing for parallel jobs), backfill scheduling, <a href="resource_limits.html">resource limits</a> by user or bank account, -and sophisticated <a href="job_priority.html">job prioritization</a> -algorithms. +and sophisticated <a href="priority_multifactor.html"> multifactor job + prioritization</a> algorithms. <p>SLURM has been developed through the collaborative efforts of @@ -95,8 +95,9 @@ FIFO (First In First Out, default), backfill, gang (time-slicing for parallel jo The Maui Scheduler</a>, and <a href="http://www.clusterresources.com/pages/products/moab-cluster-suite.php"> Moab Cluster Suite</a>. -There is also a <a href="job_priority.html">job prioritization</a> plugin -available for use with the FIFO, backfil and gang schedulers. Jobs can be +There is also a <a href="priority_multifactor.html">multifactor job + prioritization</a> plugin +available for use with the FIFO, backfill and gang schedulers. Jobs can be prioritized by age, size, fair-share allocation, etc. Many <a href="resource_limits.html">resource limits</a> are also configurable by user or bank account.</li> diff --git a/doc/html/job_priority.shtml b/doc/html/priority_multifactor.shtml similarity index 100% rename from doc/html/job_priority.shtml rename to doc/html/priority_multifactor.shtml diff --git a/doc/html/priority_plugins.shtml b/doc/html/priority_plugins.shtml index ecb084a52b80174c7abbea05d0f85877bc45d966..77dc18a3af656508570e86f77235771082b2c390 100644 --- a/doc/html/priority_plugins.shtml +++ b/doc/html/priority_plugins.shtml @@ -69,7 +69,9 @@ configuration. Called whenever slurmctld is reconfigured.</p> <p class="commandline">int priority_p_set_cpu_shares(uint32_t procs, uint32_t half_life)</p> <p style="margin-left:.2in"><b>Description</b>: Conveys the machine's processor -count and half-life configuration to the priority plugin.</p> +count and half-life configuration to the priority plugin. Which + would be used to set the available shares for underlying layers in + a hierarchical fairshare.</p> <p style="margin-left:.2in"><b>Arguments</b>:<br> <span class="commandline">procs</span> (input) the machine's processor count<br> <span class="commandline">half_life</span> (input) the configured half-life</p> diff --git a/doc/html/quickstart_admin.shtml b/doc/html/quickstart_admin.shtml index 711b984ad0f9b37491e4de6ecb5633cca4775bbd..588ac7a1163bca222806ffc02a7fe415a36c97e5 100644 --- a/doc/html/quickstart_admin.shtml +++ b/doc/html/quickstart_admin.shtml @@ -230,7 +230,7 @@ with two options available: <i>basic</i> (first-in-first-out) and The <i>multifactor</i> plugin will assign a priority to jobs based upon a multitude of configuration parameters (age, size, fair-share allocation, etc.) and its details are beyond the scope of this document. -See the <a href="job_priority.html">Job Priority Plugin</a> +See the <a href="priority_multifactor.html">Multifactor Job Priority Plugin</a> document for details.</p> <p>The <b>SchedType</b> configuration parameter controls how queued diff --git a/doc/html/slurm.shtml b/doc/html/slurm.shtml index 3491911d3cc9293c0f940a2b279ecc64f2b6712c..8cdfdafd39b4f55a27249dc4be741253f7e07a08 100644 --- a/doc/html/slurm.shtml +++ b/doc/html/slurm.shtml @@ -21,8 +21,8 @@ More complex configurations rely upon a <a href="http://www.mysql.com/">MySQL</a> database for archiving <a href="accounting.html">accounting</a> records, managing <a href="resource_limits.html">resource limits</a> by user or bank account, -or supporting sophisticated <a href="job_priority.html">job prioritization</a> -algorithms. +or supporting sophisticated <a href="priority_multifactor.html">multifactor + job prioritization</a> algorithms. SLURM also provides an Applications Programming Interface (API) for integration with external schedulers such as <a href="http://www.clusterresources.com/pages/products/maui-cluster-scheduler.php"> diff --git a/testsuite/expect/Makefile.in b/testsuite/expect/Makefile.in index 618ef9439ae401c939ace9a8106066d1550a2c3d..aece327cb8eeaea3212b9722c7c84c5b4d229b1b 100644 --- a/testsuite/expect/Makefile.in +++ b/testsuite/expect/Makefile.in @@ -450,6 +450,9 @@ EXTRA_DIST = \ test12.1 \ test12.2 \ test12.2.prog.c \ + test12.3 \ + test12.4 \ + test12.5 \ test13.1 \ test14.1 \ test14.2 \ @@ -554,6 +557,8 @@ EXTRA_DIST = \ test21.23 \ test21.24 \ test22.1 \ + test23.1 \ + test23.2 \ usleep all: all-am