Don't try to recover cons_res state data on slurmctld -c (cold start).

NEWS

@@ -16,6 +16,8 @@ documents those changes that are of interest to users and admins.
     info for jobs changed.
  -- BLUEGENE - Changed logic for wiring bgl blocks to be more maintainable.
     (Haven't tested on large system yet, works on 2 base partition system)
+ -- Do not read the select/cons_res state save file if slurmctld is 
+    cold-started (with the "-c" option).
 
 * Changes in SLURM 1.2.0-pre6
 =============================

src/plugins/select/cons_res/select_cons_res.c

@@ -1139,6 +1139,10 @@ extern int select_p_state_restore(char *dir_name)
 
 	info("cons_res: select_p_state_restore");
 
+	if (!dir_name) {
+		error ("Starting cons_res with clean slate");
+		return SLURM_SUCCESS;
+	}
 	file_name = xstrdup(dir_name);
 	xstrcat(file_name, "/cons_res_state");
 	state_fd = open (file_name, O_RDONLY);

src/slurmctld/controller.c

@@ -255,8 +255,8 @@ int main(int argc, char *argv[])
 	if ( checkpoint_init(slurmctld_conf.checkpoint_type) != 
 			SLURM_SUCCESS )
 		fatal( "failed to initialize checkpoint plugin" );
-	if (select_g_state_restore(slurmctld_conf.state_save_location))
-		fatal( "failed to restore node selection plugin state");
+	if (slurm_select_init() != SLURM_SUCCESS )
+		fatal( "failed to initialize node selection plugin state");
 
 	while (1) {
 		/* initialization for each primary<->backup switch */
@@ -290,12 +290,18 @@ int main(int argc, char *argv[])
 		info("Running as primary controller");
 
 		/* Recover node scheduler state info */
-		if (select_g_state_restore(slurmctld_conf.state_save_location)
-				!= SLURM_SUCCESS ) {
+		if (recover) {
+			error_code = select_g_state_restore(
+					slurmctld_conf.state_save_location);
+		} else {
+			error_code = select_g_state_restore(NULL);
+		}
+		if (error_code != SLURM_SUCCESS ) {
 			error("failed to restore node selection state");
 			abort();
 		}
 
+
 		/*
 		 * create attached thread to process RPCs
 		 */
@@ -342,6 +348,7 @@ int main(int argc, char *argv[])
 		switch_save(slurmctld_conf.state_save_location);
 		if (slurmctld_config.resume_backup == false)
 			break;
+		recover = 2;
 	}
 
 	/* Since pidfile is created as user root (its owner is