dlm: master - dlm_controld: use totem.cluster_name

David Teigland teigland at fedoraproject.org
Wed Jan 25 17:48:28 UTC 2012


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=c939ac3799a7e5088e2225eabf1d93210fed875c
Commit:        c939ac3799a7e5088e2225eabf1d93210fed875c
Parent:        abb3da4d5c2f2a09d777d7dd520d42b70d16ef15
Author:        David Teigland <teigland at redhat.com>
AuthorDate:    Wed Jan 25 11:47:47 2012 -0600
Committer:     David Teigland <teigland at redhat.com>
CommitterDate: Wed Jan 25 11:47:47 2012 -0600

dlm_controld: use totem.cluster_name

which is now the real location for it

Signed-off-by: David Teigland <teigland at redhat.com>
---
 dlm_controld/action.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlm_controld/action.c b/dlm_controld/action.c
index ae3f6cd..8aa84a4 100644
--- a/dlm_controld/action.c
+++ b/dlm_controld/action.c
@@ -67,14 +67,14 @@ static int detect_cluster_name(void)
 		return -1; 
 	}
 
-	rv = cmap_get_string(handle, "cluster.name", &str);
+	rv = cmap_get_string(handle, "totem.cluster_name", &str);
 	if (rv != CS_OK) {
-		log_error("cmap_get_string cluster.name error %d", rv);
+		log_error("cmap_get_string totem.cluster_name error %d", rv);
 		goto out;
 	} else
 		err = 0;
 
-	log_debug("cmap cluster.name = '%s'", str);
+	log_debug("cmap totem.cluster_name = '%s'", str);
 
 	strncpy(cluster_name, str, DLM_LOCKSPACE_LEN);
  out:


More information about the cluster-commits mailing list