From 4e7794e7852f585d80035dd11e0207105ff0bc30 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@schedmd.com>
Date: Fri, 19 May 2017 13:44:12 -0600
Subject: [PATCH] Revert "node_features/knl_generic: Do not repeatedly log
errors when trying to read"
This reverts commit c23805206ce780460eaa4af151ca5b023190c4ff.
---
NEWS | 2 --
.../knl_generic/node_features_knl_generic.c | 24 -------------------
2 files changed, 26 deletions(-)
diff --git a/NEWS b/NEWS
index e81eaf02043..f9e88b5afb7 100644
--- a/NEWS
+++ b/NEWS
@@ -35,8 +35,6 @@ documents those changes that are of interest to users and administrators.
-- Fix minor typos in the documentation.
-- node_features/knl_cray: Preserve non-KNL active features if slurmctld
reconfigured while node boot in progress.
- -- node_features/knl_generic: Do not repeatedly log errors when trying to read
- KNL modes if not KNL system.
* Changes in Slurm 17.02.3
==========================
diff --git a/src/plugins/node_features/knl_generic/node_features_knl_generic.c b/src/plugins/node_features/knl_generic/node_features_knl_generic.c
index 8225304a231..7b179eebefb 100644
--- a/src/plugins/node_features/knl_generic/node_features_knl_generic.c
+++ b/src/plugins/node_features/knl_generic/node_features_knl_generic.c
@@ -165,7 +165,6 @@ static char *mc_path = NULL;
static uint32_t syscfg_timeout = 0;
static bool reconfig = false;
static time_t shutdown_time = 0;
-static int syscfg_found = -1;
static char *syscfg_path = NULL;
static uint32_t ume_check_interval = 0;
static pthread_mutex_t ume_mutex = PTHREAD_MUTEX_INITIALIZER;
@@ -745,10 +744,6 @@ extern int init(void)
mc_path = xstrdup("/sys/devices/system/edac/mc");
if (!syscfg_path)
syscfg_path = xstrdup("/usr/bin/syscfg");
- if (access(syscfg_path, X_OK) == 0)
- syscfg_found = 1;
- else
- syscfg_found = 0;
if ((resume_program = slurm_get_resume_program())) {
error("Use of ResumeProgram with %s not currently supported",
@@ -863,18 +858,6 @@ extern void node_features_p_node_state(char **avail_modes, char **current_mode)
if (!syscfg_path || !avail_modes || !current_mode)
return;
- if (syscfg_found == 0) {
- /* This node on cluster lacks syscfg; should not be KNL */
- static bool log_event = true;
- if (log_event) {
- info("%s: syscfg program not found, can not get KNL modes",
- __func__);
- log_event = false;
- }
- *avail_modes = NULL;
- *current_mode = NULL;
- return;
- }
argv[0] = "syscfg";
argv[1] = "/d";
@@ -1137,13 +1120,6 @@ extern int node_features_p_node_set(char *active_features)
error("%s: SyscfgPath not configured", __func__);
return SLURM_ERROR;
}
- if (syscfg_found == 0) {
- /* This node on cluster lacks syscfg; should not be KNL.
- * This code should never be reached */
- error("%s: syscfg program not found; can not set KNL modes",
- __func__);
- return SLURM_ERROR;
- }
/* Identify available Cluster/NUMA modes */
argv[0] = "syscfg";
--
GitLab