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

NEWS

@@ -116,6 +116,8 @@ documents those changes that are of interest to users and admins.
  -- BGQ - Fix job step timeout actually happen when done from within an
     allocation.
  -- Reset node MAINT state flag when a reservation's nodes or flags change.
+ -- Accounting - Fix issue where QOS usage was being zeroed out on a
+    slurmctld restart.
 
 * Changes in SLURM 2.4.4
 ========================

src/common/assoc_mgr.h

@@ -352,11 +352,15 @@ extern void assoc_mgr_remove_assoc_usage(slurmdb_association_rec_t *assoc);
 extern int dump_assoc_mgr_state(char *state_save_location);
 
 /*
- * Read in the usage for association if the database
- * is up when starting.
+ * Read in the past usage for associations.
  */
 extern int load_assoc_usage(char *state_save_location);
 
+/*
+ * Read in the past usage for qos.
+ */
+extern int load_qos_usage(char *state_save_location);
+
 /*
  * Read in the information of the association mgr if the database
  * isn't up when starting.

src/slurmctld/controller.c

@@ -390,6 +390,7 @@ int main(int argc, char *argv[])
 	   way.  If we get an error we can't do anything about it.
 	*/
 	load_assoc_usage(slurmctld_conf.state_save_location);
+	load_qos_usage(slurmctld_conf.state_save_location);
 
 	/* This thread is looking for when we get correct data from
 	   the database so we can update the assoc_ptr's in the jobs