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: lib by zhenh from ([email protected])
2. Linux-HA CVS: mgmt by zhenh from
([email protected])
3. Linux-HA CVS: mgmt by zhenh from
([email protected])
4. Linux-HA CVS: mgmt by zhenh from
([email protected])
5. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Thu, 30 Mar 2006 00:59:02 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/mgmt
Modified Files:
mgmt_client_lib.c
Log Message:
distinguish the reason of failed login
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/mgmt/mgmt_client_lib.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- mgmt_client_lib.c 14 Dec 2005 09:39:24 -0000 1.2
+++ mgmt_client_lib.c 30 Mar 2006 07:59:01 -0000 1.3
@@ -40,7 +40,12 @@
int sock = 0;
void* session = NULL;
-
+/*
+ * return value
+ * -1:can't connect to server
+ * -2:auth failed
+ * 0 :success
+ */
int
mgmt_connect(const char* server, const char* user, const char* passwd)
{
@@ -90,7 +95,7 @@
mgmt_del_msg(ret);
close(sock);
tls_close_client();
- return -1;
+ return -2;
}
mgmt_del_msg(msg);
------------------------------
Message: 2
Date: Thu, 30 Mar 2006 01:00:06 -0700 (MST)
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:
distinguish the reason of failed login
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/haclient.py.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- haclient.py.in 29 Mar 2006 11:28:28 -0000 1.14
+++ haclient.py.in 30 Mar 2006 08:00:05 -0000 1.15
@@ -1193,7 +1193,7 @@
if ret == gtk.RESPONSE_OK:
if not manager.login(server, user, password):
- msgbox(_("login failed"))
+ msgbox(manager.failed_reason)
self.update_ui()
@@ -1392,8 +1392,14 @@
def login(self, server, username, password) :
# connect to one of the cluster
+ self.failed_reason = ""
ip = socket.gethostbyname(server)
- if mgmt_connect(ip, username, password) == -1:
+ ret = mgmt_connect(ip, username, password)
+ if ret != 0 :
+ if ret == -1 :
+ self.failed_reason = "Can't connect to server"
+ elif ret == -2 :
+ self.failed_reason = "Failed in the
authentication.\n User Name or Password may be wrong."
mgmt_disconnect()
return False
self.connected = True
------------------------------
Message: 3
Date: Thu, 30 Mar 2006 02:52:55 -0700 (MST)
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_crm.c
Log Message:
fix a bug, the rsc_location can be empty
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/daemon/mgmt_crm.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- mgmt_crm.c 27 Mar 2006 08:32:13 -0000 1.18
+++ mgmt_crm.c 30 Mar 2006 09:52:54 -0000 1.19
@@ -109,6 +109,9 @@
{
int i;
GList* list = NULL;
+ if (root == NULL) {
+ return NULL;
+ }
for (i = 0; i < root->nfields; i++ ) {
if (strncmp(root->names[i], child_name, MAX_STRLEN) == 0) {
list = g_list_append(list, root->values[i]);
------------------------------
Message: 4
Date: Thu, 30 Mar 2006 03:09:17 -0700 (MST)
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:
fixed a bug, sometime the mgmtd exits without sending out disconnected event.
and a typo error
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/haclient.py.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- haclient.py.in 30 Mar 2006 08:00:05 -0000 1.15
+++ haclient.py.in 30 Mar 2006 10:09:17 -0000 1.16
@@ -1405,7 +1405,7 @@
self.connected = True
self.username = username
self.password = password
- self.active_nodes = self.get_active_nodes
+ self.active_nodes = self.get_active_nodes()
window.statusbar.push(1,"Updating data from server...")
gobject.timeout_add(100, window.update)
@@ -1460,8 +1460,9 @@
window.statusbar.push(1,"Updating data from server...")
gobject.timeout_add(100, window.update)
return True
- elif event == "evt:disconnected" :
+ elif event == None or event == "evt:disconnected" :
self.logout()
+ print self.active_nodes
for server in self.active_nodes :
if self.login(server, self.username,
self.password) :
break
------------------------------
Message: 5
Date: Thu, 30 Mar 2006 03:17:54 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm
Modified Files:
crm-1.0.dtd
Log Message:
Allow the numerical equivalent of true|false for all "boolean" fields
Add op_digest to lrm_rsc_op which is an md5 sum of the parameters used for
the operation
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crm-1.0.dtd,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -3 -r1.50 -r1.51
--- crm-1.0.dtd 29 Mar 2006 16:33:36 -0000 1.50
+++ crm-1.0.dtd 30 Mar 2006 10:17:53 -0000 1.51
@@ -28,7 +28,7 @@
dc_uuid CDATA #IMPLIED
ccm_transition CDATA #REQUIRED
- have_quorum (true|false) 'false'
+ have_quorum (true|1|false|0) 'false'
cib_feature_revision CDATA #REQUIRED
crm_feature_set CDATA #REQUIRED
@@ -86,49 +86,49 @@
id CDATA #REQUIRED
description CDATA #IMPLIED
- is_managed (true|false) 'true'
+ is_managed (true|1|false|0) 'true'
on_stopfail (ignore|stonith|block) #IMPLIED
restart_type (ignore|restart) 'ignore'
multiple_active (stop_start|stop_only|block) 'stop_start'
resource_stickiness (0|INFINITY|-INFINITY) '0'
start_prereq (nothing|quorum|fencing) #IMPLIED
- ordered (true|false) 'true'
- collocated (true|false) 'true'>
+ ordered (true|1|false|0) 'true'
+ collocated (true|1|false|0) 'true'>
<!ELEMENT clone (instance_attributes*, (primitive|group))>
<!ATTLIST clone
id CDATA #REQUIRED
description CDATA #IMPLIED
- is_managed (true|false) 'true'
+ is_managed (true|1|false|0) 'true'
on_stopfail (ignore|stonith|block) #IMPLIED
restart_type (ignore|restart) 'ignore'
multiple_active (stop_start|stop_only|block) 'stop_start'
resource_stickiness (0|INFINITY|-INFINITY) '0'
start_prereq (nothing|quorum|fencing) #IMPLIED
- notify (true|false) 'false'
+ notify (true|1|false|0) 'false'
- globally_unique (true|false) 'true'
+ globally_unique (true|1|false|0) 'true'
- ordered (true|false) 'true'
- interleave (true|false) 'false'>
+ ordered (true|1|false|0) 'true'
+ interleave (true|1|false|0) 'false'>
<!ELEMENT master_slave (instance_attributes*, (primitive|group))>
<!ATTLIST master_slave
id CDATA #REQUIRED
description CDATA #IMPLIED
- is_managed (true|false) 'true'
+ is_managed (true|1|false|0) 'true'
on_stopfail (ignore|stonith|block) #IMPLIED
restart_type (ignore|restart) 'ignore'
multiple_active (stop_start|stop_only|block) 'stop_start'
resource_stickiness (0|INFINITY|-INFINITY) '0'
start_prereq (nothing|quorum|fencing) #IMPLIED
- notify (true|false) 'false'
+ notify (true|1|false|0) 'false'
- globally_unique (true|false) 'true'
+ globally_unique (true|1|false|0) 'true'
- ordered (true|false) 'true'
- interleave (true|false) 'false'>
+ ordered (true|1|false|0) 'true'
+ interleave (true|1|false|0) 'false'>
<!-- Annotated version -->
<!ELEMENT instance_attributes (rule*, attributes)>
@@ -143,7 +143,7 @@
action (start|stop) 'start'
type (before|after) 'after'
to CDATA #REQUIRED
- symetrical (TRUE|FALSE) 'TRUE'>
+ symetrical (true|1|false|0) 'TRUE'>
<!-- Annotated version -->
<!ELEMENT rsc_colocation (lifetime?)>
@@ -213,11 +213,14 @@
<!ATTLIST node_state
id CDATA #REQUIRED
uname CDATA #REQUIRED
+ ha (active|inactive) #IMPLIED
crmd (online|offline) 'offline'
join (pending|member|down) 'down'
expected (pending|member|down) 'down'
- in_ccm (true|false) 'false'
+ in_ccm (true|1|false|0) 'false'
+ origin CDATA #IMPLIED
shutdown CDATA #IMPLIED
+ clear_shutdown CDATA #IMPLIED
timestamp CDATA #IMPLIED>
<!ELEMENT lrm (lrm_resources)>
<!-- Annotated version -->
@@ -230,7 +233,7 @@
type CDATA #REQUIRED
provider CDATA #IMPLIED>
-<!ELEMENT lrm_rsc_op (parameters?)>
+<!ELEMENT lrm_rsc_op EMPTY>
<!ATTLIST lrm_rsc_op
id CDATA #REQUIRED
operation CDATA #REQUIRED
@@ -238,8 +241,11 @@
rc_code CDATA #REQUIRED
call_id CDATA #REQUIRED
rsc_state CDATA #IMPLIED
- transition_key CDATA #IMPLIED
+ origin CDATA #IMPLIED
+ transition_key CDATA #IMPLIED
+ op_digest CDATA #IMPLIED
transition_magic CDATA #REQUIRED>
+
<!ELEMENT nvpair EMPTY>
<!ATTLIST nvpair
id CDATA #REQUIRED
@@ -327,7 +333,7 @@
on_node CDATA #REQUIRED
on_node_uuid CDATA #REQUIRED
timeout CDATA #REQUIRED
- allow_fail (true|false) 'false'>
+ allow_fail (true|1|false|0) 'false'>
<!-- For added flexibility, an action can trigger an event, which is
then consumed somewhere else. Woah. Cool.
@@ -339,7 +345,7 @@
on_node CDATA #REQUIRED
on_node_uuid CDATA #REQUIRED
timeout CDATA #REQUIRED
- allow_fail (true|false) 'false'>
+ allow_fail (true|1|false|0) 'false'>
<!-- crm_event: We can instruct a crmd to shutdown (maybe the whole node?),
sign-out cleanly, or to retrigger the DC election.
@@ -347,7 +353,7 @@
<!ELEMENT crm_event (attributes)>
<!ATTLIST crm_event
id CDATA #REQUIRED
- allow_fail (true|false) 'false'
+ allow_fail (true|1|false|0) 'false'
on_node CDATA #REQUIRED
on_node_uuid CDATA #REQUIRED
timeout CDATA #REQUIRED
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 28, Issue 83
********************************************
