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

NEWS

@@ -383,7 +383,8 @@ documents those changes that are of interest to users and administrators.
 
 * Changes in Slurm 14.03.11
 ===========================
- -- ALPS - Fix depth for Memory items in BASIL with CLE 5.2.
+ -- ALPS - Fix depth for Memory items in BASIL with CLE 5.2
+    (changed starting in 5.2.3).
  -- ALPS - Fix issue when tracking memory on a PerNode basis instead of
     PerCPU.
  -- Modify assoc_mgr_fill_in_qos() to allow for a flag to know if the QOS read
@@ -408,8 +409,6 @@ documents those changes that are of interest to users and administrators.
  -- Double max string that Slurm can pack from 16MB to 32MB to support
     larger MPI2 configurations.
  -- Fix Centos5 compile issues.
- -- ALPS - Fix issue with CLE >5.2.0 and <5.2.46 where the depth of MEMARRAY
-    in BASIL was changed.
 
 * Changes in Slurm 14.03.10
 ===========================

src/plugins/select/alps/basil_alps.h

@@ -60,7 +60,7 @@ enum basil_version {
 	BV_5_0,		/* Basil 1.2 CLE 5.x unconfirmed simulator version  */
 	BV_5_1,		/* Basil 1.3 CLE 5.x unconfirmed simulator version  */
 	BV_5_2,		/* Basil 1.3 CLE 5.2 */
-	BV_5_2_46,	/* Basil 1.3 CLE 5.2.46+ */
+	BV_5_2_3,	/* Basil 1.3 CLE 5.2.46+ */
 	BV_MAX
 };
 

src/plugins/select/alps/libalps/do_query.c

@@ -82,11 +82,11 @@ extern enum basil_version get_basil_version(void)
 	if (_get_alps_engine(engine_version, sizeof(engine_version)) == NULL)
 		fatal("can not determine ALPS Engine version");
 	else if (strncmp(engine_version, "latest", 6) == 0) {
-		bv = BV_5_2_46;
+		bv = BV_5_2_3;
 	} else if (strncmp(engine_version, "5.2", 3) == 0) {
 		int macro = atoi(engine_version+4);
-		if (macro >= 46)
-			bv = BV_5_2_46;
+		if (macro >= 3) /* means 5.2.44+ */
+			bv = BV_5_2_3;
 		else
 			bv = BV_5_2;
 	} else if (strncmp(engine_version, "5.1", 3) == 0)
@@ -119,7 +119,9 @@ extern enum basil_version get_basil_version(void)
 		      "for this version",
 		      engine_version);
 
-	if (bv == BV_5_2_46) {
+	if (bv == BV_5_2_3) {
+		/* Starting in 5.2.UP03 (5.2.44) things changed, so
+		   make it that way */
 		basil_5_2_elements[BT_MEMARRAY].depth = 9;
 		basil_5_2_elements[BT_MEMORY].depth = 10;
 		basil_5_2_elements[BT_MEMALLOC].depth = 8;

src/plugins/select/alps/libalps/parser_common.c

@@ -516,7 +516,7 @@ static const struct element_handler *basil_tables[BV_MAX] = {
 	[BV_5_0] = basil_4_0_elements,
 	[BV_5_1] = basil_5_1_elements,
 	[BV_5_2] = basil_5_2_elements,
-	[BV_5_2_46] = basil_5_2_elements
+	[BV_5_2_3] = basil_5_2_elements
 };
 
 /**

src/plugins/select/alps/parser_common.h

@@ -24,7 +24,7 @@ const char *bv_names[BV_MAX] = {	/* Basil Protocol version */
 	[BV_5_0] = "1.2",
 	[BV_5_1] = "1.3",
 	[BV_5_2] = "1.3",
-	[BV_5_2_46] = "1.3"
+	[BV_5_2_3] = "1.3"
 };
 
 const char *bv_names_long[BV_MAX] = {	/* Actual version name */
@@ -37,7 +37,7 @@ const char *bv_names_long[BV_MAX] = {	/* Actual version name */
 	[BV_5_0] = "5.0",
 	[BV_5_1] = "5.1",
 	[BV_5_2] = "5.2",
-	[BV_5_2_46] = "5.2"
+	[BV_5_2_3] = "5.2"
 };
 
 /* Basil methods */