From bbc43a8b5833f5838ae3981b795c4576ad8da00a Mon Sep 17 00:00:00 2001
From: Danny Auble <da@llnl.gov>
Date: Thu, 30 Apr 2009 23:29:45 +0000
Subject: [PATCH] Changed DbdBackup to DbdBackupHost for slurmdbd.conf file
---
NEWS | 1 +
src/slurmdbd/read_config.c | 9 +++++----
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/NEWS b/NEWS
index 4570059407b..5e2027c5ef4 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,7 @@ documents those changes that are of interest to users and admins.
-- Corrections to scheduling logic for topology/tree in configurations where
nodes are configured in multiple leaf switches.
-- Patch from Matthieu Hautreux for backup mysql deamon support.
+ -- Changed DbdBackup to DbdBackupHost for slurmdbd.conf file
* Changes in SLURM 1.4.0-pre13
==============================
diff --git a/src/slurmdbd/read_config.c b/src/slurmdbd/read_config.c
index 5842cae1fca..28d201eb87d 100644
--- a/src/slurmdbd/read_config.c
+++ b/src/slurmdbd/read_config.c
@@ -130,7 +130,7 @@ extern int read_slurmdbd_conf(void)
{"AuthInfo", S_P_STRING},
{"AuthType", S_P_STRING},
{"DbdAddr", S_P_STRING},
- {"DbdBackup", S_P_STRING},
+ {"DbdBackupHost", S_P_STRING},
{"DbdHost", S_P_STRING},
{"DbdPort", S_P_UINT16},
{"DebugLevel", S_P_UINT16},
@@ -191,7 +191,8 @@ extern int read_slurmdbd_conf(void)
"ArchiveSteps", tbl);
s_p_get_string(&slurmdbd_conf->auth_info, "AuthInfo", tbl);
s_p_get_string(&slurmdbd_conf->auth_type, "AuthType", tbl);
- s_p_get_string(&slurmdbd_conf->dbd_backup, "DbdBackup", tbl);
+ s_p_get_string(&slurmdbd_conf->dbd_backup,
+ "DbdBackupHost", tbl);
s_p_get_string(&slurmdbd_conf->dbd_host, "DbdHost", tbl);
s_p_get_string(&slurmdbd_conf->dbd_addr, "DbdAddr", tbl);
s_p_get_uint16(&slurmdbd_conf->dbd_port, "DbdPort", tbl);
@@ -332,7 +333,7 @@ extern void log_config(void)
debug2("AuthInfo = %s", slurmdbd_conf->auth_info);
debug2("AuthType = %s", slurmdbd_conf->auth_type);
debug2("DbdAddr = %s", slurmdbd_conf->dbd_addr);
- debug2("DbdBackup = %s", slurmdbd_conf->dbd_backup);
+ debug2("DbdBackupHost = %s", slurmdbd_conf->dbd_backup);
debug2("DbdHost = %s", slurmdbd_conf->dbd_host);
debug2("DbdPort = %u", slurmdbd_conf->dbd_port);
debug2("DebugLevel = %u", slurmdbd_conf->debug_level);
@@ -461,7 +462,7 @@ extern List dump_config(void)
list_append(my_list, key_pair);
key_pair = xmalloc(sizeof(config_key_pair_t));
- key_pair->name = xstrdup("DbdBackup");
+ key_pair->name = xstrdup("DbdBackupHost");
key_pair->value = xstrdup(slurmdbd_conf->dbd_backup);
list_append(my_list, key_pair);
--
GitLab