diff --git a/src/common/hostlist.c b/src/common/hostlist.c index 1ee2eb8f8fd8b9fa3a947c467c69d735a01debb3..d8c961c6f971895f3190ff7806f0273cb2af7202 100644 --- a/src/common/hostlist.c +++ b/src/common/hostlist.c @@ -3027,13 +3027,7 @@ ssize_t hostlist_ranged_string(hostlist_t hl, size_t n, char *buf) * this does not necessarily contain a * SYSTEM_DIMENSION dimensional * host list. It could just be numeric values */ - if (hl->hr[i]->prefix[0] && hl->hr[i]->width) { - debug("This node is not in %dD format. " - "Prefix of range %d is %s and suffix is " - "%d chars long", - SYSTEM_DIMENSIONS, i, - hl->hr[i]->prefix, hl->hr[i]->width); - } else if (hl->hr[i]->prefix[0]) { + if (hl->hr[i]->prefix[0]) { debug4("This node is not in %dD format. " "Prefix of range %d is %s and suffix is " "%d chars long", diff --git a/src/plugins/select/bluegene/block_allocator/bridge_linker.c b/src/plugins/select/bluegene/block_allocator/bridge_linker.c index 9fd11f69e7231ba642c5c6505b3e60d596095027..29b46e4e89d86d69de6c9bac752ea6f605dff11f 100644 --- a/src/plugins/select/bluegene/block_allocator/bridge_linker.c +++ b/src/plugins/select/bluegene/block_allocator/bridge_linker.c @@ -737,7 +737,7 @@ extern int bridge_set_log_params(char *api_file_name, unsigned int level) /* In the libraries linked to from the bridge there are stderr messages send which we would miss unless we dup this to the log */ - (void)dup2(fileno(fp), STDERR_FILENO); + //(void)dup2(fileno(fp), STDERR_FILENO); if(fp2) fclose(fp2); diff --git a/src/plugins/select/bluegene/plugin/bluegene.c b/src/plugins/select/bluegene/plugin/bluegene.c index a62e1df75ae3b6804be50445c07eb0af639e14fc..5a18c3c726dfb96893269d884ed4ab3963fa733f 100644 --- a/src/plugins/select/bluegene/plugin/bluegene.c +++ b/src/plugins/select/bluegene/plugin/bluegene.c @@ -186,6 +186,9 @@ extern int remove_all_users(char *bg_block_id, char *user_name) rm_partition_t *block_ptr = NULL; int rc, i, user_count; + /* We can't use bridge_get_block_info here because users are + filled in there. This function is very slow but necessary + here to get the correct block count and the users. */ if ((rc = bridge_get_block(bg_block_id, &block_ptr)) != STATUS_OK) { if(rc == INCONSISTENT_DATA && bg_conf->layout_mode == LAYOUT_DYNAMIC) @@ -205,7 +208,7 @@ extern int remove_all_users(char *bg_block_id, char *user_name) returnc = REMOVE_USER_ERR; user_count = 0; } else - debug2("got %d users for %s",user_count, bg_block_id); + debug2("got %d users for %s", user_count, bg_block_id); for(i=0; i<user_count; i++) { if(i) { if ((rc = bridge_get_data(block_ptr,