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

NEWS

@@ -146,6 +146,8 @@ documents those changes that are of interest to users and administrators.
     slurmstepd to close potential open ones.
  -- Step GRES value changed from type "int" to "int64_t" to support larger
     values.
+ -- Fix getting reservations to database when database is down.
+ -- Fix issue with sbcast not doing a correct fanout.
 
 * Changes in Slurm 15.08.8
 ==========================

src/common/file_bcast.c

@@ -366,6 +366,10 @@ static int _bcast_file(struct bcast_parameters *params)
 		bcast_msg.mtime     = 0;
 	}
 
+	if (!params->fanout)
+		params->fanout = MAX_THREADS;
+	slurm_set_tree_width(MIN(MAX_THREADS, params->fanout));
+
 	while (1) {
 		block_len = _get_block(params, buffer, buf_size);
 		if (block_len < 0)

src/plugins/accounting_storage/slurmdbd/accounting_storage_slurmdbd.c

@@ -763,7 +763,7 @@ extern int acct_storage_p_add_reservation(void *db_conn,
 {
 	slurmdbd_msg_t req;
 	dbd_rec_msg_t get_msg;
-	int rc, resp_code = SLURM_SUCCESS;
+	int rc;
 
 	memset(&get_msg, 0, sizeof(dbd_rec_msg_t));
 	get_msg.rec = resv;
@@ -771,11 +771,7 @@ extern int acct_storage_p_add_reservation(void *db_conn,
 	req.msg_type = DBD_ADD_RESV;
 	req.data = &get_msg;
 
-	rc = slurm_send_slurmdbd_recv_rc_msg(SLURM_PROTOCOL_VERSION,
-					     &req, &resp_code);
-
-	if (resp_code != SLURM_SUCCESS)
-		rc = resp_code;
+	rc = slurm_send_slurmdbd_msg(SLURM_PROTOCOL_VERSION, &req);
 
 	return rc;
 }
@@ -1134,18 +1130,14 @@ extern int acct_storage_p_modify_reservation(void *db_conn,
 {
 	slurmdbd_msg_t req;
 	dbd_rec_msg_t get_msg;
-	int rc, resp_code = SLURM_SUCCESS;
+	int rc;
 
 	memset(&get_msg, 0, sizeof(dbd_rec_msg_t));
 	get_msg.rec = resv;
 	req.msg_type = DBD_MODIFY_RESV;
 	req.data = &get_msg;
 
-	rc = slurm_send_slurmdbd_recv_rc_msg(SLURM_PROTOCOL_VERSION,
-					     &req, &resp_code);
-
-	if (resp_code != SLURM_SUCCESS)
-		rc = resp_code;
+	rc = slurm_send_slurmdbd_msg(SLURM_PROTOCOL_VERSION, &req);
 
 	return rc;
 }
@@ -1506,7 +1498,7 @@ extern int acct_storage_p_remove_reservation(void *db_conn,
 {
 	slurmdbd_msg_t req;
 	dbd_rec_msg_t get_msg;
-	int rc, resp_code = SLURM_SUCCESS;
+	int rc;
 
 	memset(&get_msg, 0, sizeof(dbd_rec_msg_t));
 	get_msg.rec = resv;
@@ -1514,11 +1506,7 @@ extern int acct_storage_p_remove_reservation(void *db_conn,
 	req.msg_type = DBD_REMOVE_RESV;
 	req.data = &get_msg;
 
-	rc = slurm_send_slurmdbd_recv_rc_msg(SLURM_PROTOCOL_VERSION,
-					     &req, &resp_code);
-
-	if ((rc == SLURM_SUCCESS) && (resp_code != SLURM_SUCCESS))
-		rc = resp_code;
+	rc = slurm_send_slurmdbd_msg(SLURM_PROTOCOL_VERSION, &req);
 
 	return rc;
 }