Merge remote-tracking branch 'origin/slurm-2.3'

NEWS

@@ -130,6 +130,9 @@ documents those changes that are of interest to users and admins.
     jobacct_gather_g_getinfo() until there is data to read from the socket.
  -- Fix typo in accounting when using reservations. Patch from Alejandro
     Lucero Palau.
+ -- Fix to the multifactor priority plugin to calculate effective usage earlier
+    to give a correct priority on the first decay cycle after a restart of the
+    slurmctld. Patch from Martin Perry, Bull.
 
 
 * Changes in SLURM 2.3.3

src/plugins/priority/multifactor/priority_multifactor.c

@@ -999,6 +999,12 @@ static void *_decay_thread(void *no_data)
 			}
 		}
 
+		/* now calculate all the normalized usage here */
+		assoc_mgr_lock(&locks);
+		_set_children_usage_efctv(
+			assoc_mgr_root_assoc->usage->childern_list);
+		assoc_mgr_unlock(&locks);
+
 		if (!last_ran)
 			goto get_usage;
 		else
@@ -1052,12 +1058,6 @@ static void *_decay_thread(void *no_data)
 		unlock_slurmctld(job_write_lock);
 
 	get_usage:
-		/* now calculate all the normalized usage here */
-		assoc_mgr_lock(&locks);
-		_set_children_usage_efctv(
-			assoc_mgr_root_assoc->usage->childern_list);
-		assoc_mgr_unlock(&locks);
-
 		last_ran = start_time;
 
 		_write_last_decay_ran(last_ran, last_reset);