Up the version of the DBD rpc_version and handle the multi cluster logic

related to it.

src/common/slurm_protocol_util.c

@@ -52,8 +52,10 @@ uint16_t _get_slurm_version(uint32_t rpc_version)
 {
 	uint16_t version;
 
-	if (rpc_version >= 11)
+	if (rpc_version >= 12)
 		version = SLURM_PROTOCOL_VERSION;
+	else if (rpc_version >= 11)
+		version = SLURM_2_5_PROTOCOL_VERSION;
 	else if (rpc_version >= 10)
 		version = SLURM_2_4_PROTOCOL_VERSION;
 	else
@@ -78,6 +80,7 @@ int check_header_version(header_t * header)
 
 	if (slurmdbd_conf) {
 		if ((header->version != SLURM_PROTOCOL_VERSION)     &&
+		    (header->version != SLURM_2_5_PROTOCOL_VERSION) &&
 		    (header->version != SLURM_2_4_PROTOCOL_VERSION) &&
 		    (header->version != SLURM_2_3_PROTOCOL_VERSION))
 			slurm_seterrno_ret(SLURM_PROTOCOL_VERSION_ERROR);
@@ -140,7 +143,8 @@ int check_header_version(header_t * header)
 		case REQUEST_UPDATE_NODE:
 		case REQUEST_UPDATE_PARTITION:
 		case REQUEST_UPDATE_RESERVATION:
-			if ((header->version == SLURM_2_5_PROTOCOL_VERSION) ||
+			if ((header->version == SLURM_2_6_PROTOCOL_VERSION) ||
+			    (header->version == SLURM_2_5_PROTOCOL_VERSION) ||
 			    (header->version == SLURM_2_4_PROTOCOL_VERSION) ||
 			    (header->version == SLURM_2_3_PROTOCOL_VERSION))
 				break;

src/common/slurmdbd_defs.h

@@ -76,7 +76,8 @@
  *	communicating with it (e.g. it will not accept messages with a
  *	version higher than SLURMDBD_VERSION).
  */
-#define SLURMDBD_VERSION       11
+#define SLURMDBD_VERSION       12
+#define SLURMDBD_2_6_VERSION   12 /* 2.6 */
 #define SLURMDBD_2_5_VERSION   11 /* 2.5 */
 #define SLURMDBD_2_4_VERSION   10 /* 2.4 */
 #define SLURMDBD_2_3_VERSION	9 /* 2.3 */