fixed extra debug

src/common/node_select.c

@@ -159,7 +159,7 @@ typedef struct slurm_select_context {
 static int select_context_cnt = -1;
 static int select_context_default = -1;
 /* If there is a new select plugin, list it here */
-static char *select_plugin_list = "bluegene,cons_res,linear";
+static char *select_plugin_list = "bgq,bluegene,cons_res,linear";
 static slurm_select_context_t * select_context = NULL;
 static pthread_mutex_t		select_context_lock =
 	PTHREAD_MUTEX_INITIALIZER;
@@ -346,7 +346,6 @@ extern int slurm_select_init(void)
 	one_name = strtok_r(names, ",", &last);
 	while (one_name) {
 		full_name = xstrdup_printf("select/%s", one_name);
-		info("trying %s", full_name);
 		for (i=0; i<select_context_cnt; i++) {
 			if (!strcmp(full_name, select_context[i].select_type))
 				break;

src/plugins/select/bgq/select_bgq.cc

@@ -60,10 +60,13 @@ slurmdb_cluster_rec_t *working_cluster_rec = NULL;
 
 extern "C" {
 
-const char plugin_name[]       	= "BG/Q node selection plugin";
-const char plugin_type[]       	= "select/bgq";
-const uint32_t plugin_id	= 103;
-const uint32_t plugin_version	= 100;
+/* for some reason the extern "C" wrap above doesn't work for these
+ * const vars, so we have to explicitly set it for each one.
+ */
+extern "C" const char plugin_name[]       	= "BG/Q node selection plugin";
+extern "C" const char plugin_type[]       	= "select/bgq";
+extern "C" const uint32_t plugin_id	= 103;
+extern "C" const uint32_t plugin_version	= 100;
 
 /*
  * init() is called when the plugin is loaded, before any other functions
@@ -79,13 +82,6 @@ extern int init ( void )
 		      SYSTEM_DIMENSIONS);
 #endif
 
-#ifdef HAVE_BG_FILES
-		if ((SELECT_MESH  != RM_MESH)
-		    || (SELECT_TORUS != RM_TORUS)
-		    || (SELECT_NAV   != RM_NAV))
-			fatal("enum conn_type out of sync with rm_api.h");
-#endif
-
 		verbose("%s loading...", plugin_name);
 		/* if this is coming from something other than the controller
 		   we don't want to read the config or anything like that. */