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: crm by andrew from
([email protected])
2. Linux-HA CVS: crm by andrew from
([email protected])
3. Linux-HA CVS: crm by andrew from
([email protected])
4. Linux-HA CVS: include by andrew from
([email protected])
5. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Fri, 31 Mar 2006 05:17:28 -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/pengine
Modified Files:
unpack.c
Log Message:
This mistakenly also applied to start ops
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/unpack.c,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -3 -r1.172 -r1.173
--- unpack.c 31 Mar 2006 11:58:17 -0000 1.172
+++ unpack.c 31 Mar 2006 12:17:27 -0000 1.173
@@ -1,4 +1,4 @@
-/* $Id: unpack.c,v 1.172 2006/03/31 11:58:17 andrew Exp $ */
+/* $Id: unpack.c,v 1.173 2006/03/31 12:17:27 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1420,8 +1420,8 @@
} else if(EXECRA_OK == actual_rc_i
&& is_probe == FALSE
- && is_stop_action == FALSE
- && rsc->role == RSC_ROLE_MASTER) {
+ && rsc->role == RSC_ROLE_MASTER
+ && safe_str_eq(task, CRMD_ACTION_STATUS)) {
/* catch status ops that return 0 instead of 8 while they
* are supposed to be in master mode
*/
------------------------------
Message: 2
Date: Fri, 31 Mar 2006 05:45:02 -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/cib
Modified Files:
io.c
Log Message:
Revert the patch to unpack.c... start should never be called when a resource
is in master mode.
Have the sorting in calculate_xml_digest() optional
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/io.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -3 -r1.53 -r1.54
--- io.c 31 Mar 2006 11:50:23 -0000 1.53
+++ io.c 31 Mar 2006 12:45:02 -0000 1.54
@@ -1,4 +1,4 @@
-/* $Id: io.c,v 1.53 2006/03/31 11:50:23 andrew Exp $ */
+/* $Id: io.c,v 1.54 2006/03/31 12:45:02 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -101,7 +101,7 @@
int start = 0, length = 0, read_len = 0;
if(local_cib != NULL) {
- digest = calculate_xml_digest(local_cib);
+ digest = calculate_xml_digest(local_cib, FALSE);
}
s_res = stat(CIB_FILENAME ".sig", &buf);
@@ -150,7 +150,7 @@
CRM_ASSERT(digest_strm != NULL);
if(digest == NULL) {
- digest = calculate_xml_digest(local_cib);
+ digest = calculate_xml_digest(local_cib, FALSE);
CRM_ASSERT(digest != NULL);
local_digest = digest;
}
@@ -580,7 +580,7 @@
exit(LSB_EXIT_GENERIC);
}
- digest = calculate_xml_digest(the_cib);
+ digest = calculate_xml_digest(the_cib, FALSE);
crm_info("Wrote version %s.%s.%s of the CIB to disk (digest: %s)",
admin_epoch?admin_epoch:"0",
epoch?epoch:"0", updates?updates:"0", digest);
------------------------------
Message: 3
Date: Fri, 31 Mar 2006 05:45:03 -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/crmd
Modified Files:
lrm.c
Log Message:
Revert the patch to unpack.c... start should never be called when a resource
is in master mode.
Have the sorting in calculate_xml_digest() optional
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/lrm.c,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -3 -r1.176 -r1.177
--- lrm.c 31 Mar 2006 11:58:17 -0000 1.176
+++ lrm.c 31 Mar 2006 12:45:02 -0000 1.177
@@ -506,7 +506,7 @@
#endif
g_hash_table_foreach(op->params, hash2field, args_xml);
filter_action_parameters(args_xml);
- digest = calculate_xml_digest(args_xml);
+ digest = calculate_xml_digest(args_xml, TRUE);
crm_xml_add(xml_op, XML_LRM_ATTR_OP_DIGEST, digest);
#if CRM_DEPRECATED_SINCE_2_0_4
#else
------------------------------
Message: 4
Date: Fri, 31 Mar 2006 05:45:03 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: include by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : include
Dir : linux-ha/include/crm/common
Modified Files:
xml.h
Log Message:
Revert the patch to unpack.c... start should never be called when a resource
is in master mode.
Have the sorting in calculate_xml_digest() optional
------------------------------
Message: 5
Date: Fri, 31 Mar 2006 05:45:03 -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/pengine
Modified Files:
unpack.c
Log Message:
Revert the patch to unpack.c... start should never be called when a resource
is in master mode.
Have the sorting in calculate_xml_digest() optional
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/unpack.c,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -3 -r1.173 -r1.174
--- unpack.c 31 Mar 2006 12:17:27 -0000 1.173
+++ unpack.c 31 Mar 2006 12:45:02 -0000 1.174
@@ -1,4 +1,4 @@
-/* $Id: unpack.c,v 1.173 2006/03/31 12:17:27 andrew Exp $ */
+/* $Id: unpack.c,v 1.174 2006/03/31 12:45:02 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1158,7 +1158,7 @@
g_hash_table_foreach(local_rsc_params, hash2field, pnow);
filter_action_parameters(pnow);
- pnow_digest = calculate_xml_digest(pnow);
+ pnow_digest = calculate_xml_digest(pnow, TRUE);
param_digest = crm_element_value(xml_op, XML_LRM_ATTR_OP_DIGEST);
if(param_digest == NULL) {
@@ -1168,7 +1168,7 @@
crm_info("Faking parameter digest creation for %s", ID(xml_op));
filter_action_parameters(local_params);
- local_param_digest = calculate_xml_digest(local_params);
+ local_param_digest = calculate_xml_digest(local_params, TRUE);
param_digest = local_param_digest;
free_xml(local_params);
@@ -1420,8 +1420,8 @@
} else if(EXECRA_OK == actual_rc_i
&& is_probe == FALSE
- && rsc->role == RSC_ROLE_MASTER
- && safe_str_eq(task, CRMD_ACTION_STATUS)) {
+ && is_stop_action == FALSE
+ && rsc->role == RSC_ROLE_MASTER) {
/* catch status ops that return 0 instead of 8 while they
* are supposed to be in master mode
*/
------------------------------
_______________________________________________
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 91
********************************************
