From 4388710e21304fd373da93dfdb8f46e4fdbac640 Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Tue, 27 May 2014 10:39:02 -0700
Subject: [PATCH] Cosmetic changes
---
src/common/node_select.c | 12 ++++++++----
src/plugins/select/cons_res/select_cons_res.c | 4 ++--
src/slurmctld/read_config.c | 16 ++++++++--------
3 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/src/common/node_select.c b/src/common/node_select.c
index 3a5c8d7c3d5..c55b14815fa 100644
--- a/src/common/node_select.c
+++ b/src/common/node_select.c
@@ -53,10 +53,11 @@
#include <dirent.h>
#include "src/common/list.h"
+#include "src/common/node_select.h"
#include "src/common/slurm_protocol_api.h"
+#include "src/common/slurm_selecttype_info.h"
#include "src/common/xstring.h"
#include "src/slurmctld/slurmctld.h"
-#include "src/common/node_select.h"
/*
* Must be synchronized with slurm_select_ops_t in node_select.h.
@@ -218,9 +219,12 @@ extern int slurm_select_init(bool only_default)
if (!strcasecmp(type, "select/linear")) {
uint16_t cr_type = slurm_get_select_type_param();
if ((cr_type & CR_SOCKET) || (cr_type & CR_CORE) ||
- (cr_type & CR_CPU))
- fatal("Invalid SelectTypeParameter "
- "for select/linear");
+ (cr_type & CR_CPU)) {
+ fatal("Invalid SelectTypeParameters for "
+ "select/linear: %s (%u)",
+ select_type_param_string(cr_type),
+ cr_type);
+ }
}
#ifdef HAVE_BG
diff --git a/src/plugins/select/cons_res/select_cons_res.c b/src/plugins/select/cons_res/select_cons_res.c
index c95cb275793..9b38c9d06ea 100644
--- a/src/plugins/select/cons_res/select_cons_res.c
+++ b/src/plugins/select/cons_res/select_cons_res.c
@@ -1914,8 +1914,8 @@ extern int select_p_node_init(struct node_record *node_ptr, int node_cnt)
info("cons_res: select_p_node_init");
if ((cr_type & (CR_CPU | CR_SOCKET | CR_CORE)) == 0) {
- fatal("Invalid SelectTypeParameter: %s",
- select_type_param_string(cr_type));
+ fatal("Invalid SelectTypeParameters: %s (%u)",
+ select_type_param_string(cr_type), cr_type);
}
if (node_ptr == NULL) {
error("select_p_node_init: node_ptr == NULL");
diff --git a/src/slurmctld/read_config.c b/src/slurmctld/read_config.c
index 39dd479a71f..e913dddd872 100644
--- a/src/slurmctld/read_config.c
+++ b/src/slurmctld/read_config.c
@@ -903,9 +903,9 @@ int read_slurm_conf(int recover, bool reconfig)
_build_all_nodeline_info();
if (reconfig) {
if (_compare_hostnames(old_node_table_ptr,
- old_node_record_count,
- node_record_table_ptr,
- node_record_count) < 0) {
+ old_node_record_count,
+ node_record_table_ptr,
+ node_record_count) < 0) {
fatal("%s: hostnames inconsistency detected", __func__);
}
}
@@ -1981,9 +1981,9 @@ _compare_hostnames(struct node_record *old_node_table,
hostset_t set;
if (old_node_count != node_count) {
- error("%s: node count has changed before reconfiguration \
-from %d to %d. You have to restart slurmctld.",
- __func__, old_node_count, node_count);
+ error("%s: node count has changed before reconfiguration "
+ "from %d to %d. You have to restart slurmctld.",
+ __func__, old_node_count, node_count);
return -1;
}
@@ -2006,8 +2006,8 @@ from %d to %d. You have to restart slurmctld.",
cc = 0;
if (strcmp(old_ranged, ranged) != 0) {
- error("%s: node names changed before reconfiguration. \
-You have to restart slurmctld.", __func__);
+ error("%s: node names changed before reconfiguration. "
+ "You have to restart slurmctld.", __func__);
cc = -1;
}
--
GitLab