Send Linux-ha-cvs mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of Linux-ha-cvs digest..."
Today's Topics:
1. Linux-HA CVS: heartbeat by zhenh from
([email protected])
2. Linux-HA CVS: include by zhenh from
([email protected])
3. Linux-HA CVS: mgmt by zhenh from
([email protected])
4. Linux-HA CVS: include by zhenh from
([email protected])
5. Linux-HA CVS: mgmt by zhenh from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Thu, 25 May 2006 20:55:28 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: heartbeat by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : heartbeat
Dir : linux-ha/heartbeat
Modified Files:
config.c
Log Message:
add "cluster" directive as the name of cluster to ha.cf and parameter of cluster
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat/config.c,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -3 -r1.200 -r1.201
--- config.c 29 Apr 2006 13:12:20 -0000 1.200
+++ config.c 26 May 2006 02:55:28 -0000 1.201
@@ -1,4 +1,4 @@
-/* $Id: config.c,v 1.200 2006/04/29 13:12:20 alan Exp $ */
+/* $Id: config.c,v 1.201 2006/05/26 02:55:28 zhenh Exp $ */
/*
* Parse various heartbeat configuration files...
*
@@ -70,6 +70,7 @@
void dellist_destroy(void);
int dellist_add(const char* nodename);
+static int set_cluster_name(const char * value);
static int add_normal_node(const char *);
static int set_hopfudge(const char *);
static int set_keepalive_ms(const char *);
@@ -129,7 +130,8 @@
const char * defaultvalue;
const char * explanation;
}Directives[] =
-{ {KEY_HOST, add_normal_node, FALSE, NULL, NULL}
+{ {KEY_CLUSTER, set_cluster_name, TRUE, "linux-ha", "the name of
cluster"}
+, {KEY_HOST, add_normal_node, FALSE, NULL, NULL}
, {KEY_HOPS, set_hopfudge, TRUE, "1", "# of hops above cluster size"}
, {KEY_KEEPALIVE, set_keepalive_ms, TRUE, "1000ms", "keepalive time"}
, {KEY_DEADTIME, set_deadtime_ms, TRUE, "30000ms", "node deadtime"}
@@ -1341,7 +1343,13 @@
return(HA_OK);
}
-
+/* Set the name of cluster */
+static int
+set_cluster_name(const char * value)
+{
+ strncpy(config->cluster, value, PATH_MAX);
+ return(HA_OK);
+}
/* Process a node declaration */
static int
@@ -2577,6 +2585,9 @@
/*
* $Log: config.c,v $
+ * Revision 1.201 2006/05/26 02:55:28 zhenh
+ * add "cluster" directive as the name of cluster to ha.cf and parameter of
cluster
+ *
* Revision 1.200 2006/04/29 13:12:20 alan
*
* Patch to allow the management daemon to not be started
------------------------------
Message: 2
Date: Thu, 25 May 2006 20:55:28 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: include by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : include
Dir : linux-ha/include
Modified Files:
hb_api.h heartbeat.h
Log Message:
add "cluster" directive as the name of cluster to ha.cf and parameter of cluster
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/include/hb_api.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- hb_api.h 23 Apr 2006 22:06:10 -0000 1.45
+++ hb_api.h 26 May 2006 02:55:28 -0000 1.46
@@ -1,4 +1,4 @@
-/* $Id: hb_api.h,v 1.45 2006/04/23 22:06:10 alan Exp $ */
+/* $Id: hb_api.h,v 1.46 2006/05/26 02:55:28 zhenh Exp $ */
/*
* Client-side Low-level clustering API for heartbeat.
*
@@ -391,6 +391,7 @@
/* Parameters we can ask for via get_parameter */
#define KEY_HBVERSION "hbversion" /* Not a configuration
parameter */
+#define KEY_CLUSTER "cluster"
#define KEY_HOST "node"
#define KEY_HOPS "hopfudge"
#define KEY_KEEPALIVE "keepalive"
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/include/heartbeat.h,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -3 -r1.84 -r1.85
--- heartbeat.h 26 Apr 2006 03:42:07 -0000 1.84
+++ heartbeat.h 26 May 2006 02:55:28 -0000 1.85
@@ -1,4 +1,4 @@
-/* $Id: heartbeat.h,v 1.84 2006/04/26 03:42:07 alan Exp $ */
+/* $Id: heartbeat.h,v 1.85 2006/05/26 02:55:28 zhenh Exp $ */
/*
* heartbeat.h: core definitions for the Linux-HA heartbeat program
*
@@ -311,6 +311,7 @@
seqno_t generation; /* Heartbeat generation # */
cl_uuid_t uuid; /* uuid for this node*/
int uuidfromname; /* do we get uuid from
nodename?*/
+ char cluster[PATH_MAX]; /* the name of cluster*/
hbjointype_t rtjoinconfig; /* Runtime join behavior */
int authnum;
Stonith* stonith; /* Stonith method - r1-style cluster
only */
------------------------------
Message: 3
Date: Thu, 25 May 2006 21:08:54 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: mgmt by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : mgmt
Dir : linux-ha/mgmt/daemon
Modified Files:
mgmt_hb.c
Log Message:
add cluster name parameter to mgmt library
------------------------------
Message: 4
Date: Thu, 25 May 2006 21:08:54 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: include by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : include
Dir : linux-ha/include/mgmt
Modified Files:
mgmt_common.h
Log Message:
add cluster name parameter to mgmt library
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/include/mgmt/mgmt_common.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- mgmt_common.h 12 May 2006 06:32:10 -0000 1.9
+++ mgmt_common.h 26 May 2006 03:08:54 -0000 1.10
@@ -162,7 +162,7 @@
#define F_MGMT_UDPPORT 19
#define F_MGMT_WARNTIME 20
#define F_MGMT_WATCHDOG 21
-
+#define F_MGMT_CLUSTER 22
/*
description:
------------------------------
Message: 5
Date: Thu, 25 May 2006 21:22:42 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: mgmt by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : mgmt
Dir : linux-ha/mgmt/client
Modified Files:
haclient.py.in
Log Message:
show the name of cluster as the root of the tree in GUI
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/haclient.py.in,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- haclient.py.in 26 May 2006 02:10:23 -0000 1.46
+++ haclient.py.in 26 May 2006 03:22:42 -0000 1.47
@@ -473,7 +473,7 @@
status = _("with quorum")
else :
status = _("without quorum")
- root = self.store.append(None, [_("Linux-HA cluster"),status,
"cluster"])
+ root = self.store.append(None, [config["cluster"],status,
"cluster"])
nodes_root = self.store.append(root, [_("Nodes"),"", "nodes"])
for node in nodes :
@@ -1722,7 +1722,7 @@
"deadping","deadtime","hbversion","hopfudge",
"initdead","keepalive","logfacility","logfile",
"msgfmt","nice_failback","node","normalpoll",
- "stonith","udpport","warntime","watchdog"]
+ "stonith","udpport","warntime","watchdog",
"cluster"]
crm_attr_names =
["transition_idle_timeout","symmetric_cluster","stonith_enabled",
"no_quorum_policy","default_resource_stickiness", "have_quorum",
"default_resource_failure_stickiness"]
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 30, Issue 85
********************************************
