Send Linux-ha-cvs mailing list submissions to
linux-ha-cvs@lists.linux-ha.org
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: mgmt by zhenh from
(linux-ha-cvs@lists.linux-ha.org)
2. Linux-HA CVS: mgmt by zhenh from
(linux-ha-cvs@lists.linux-ha.org)
3. Linux-HA CVS: include by zhenh from
(linux-ha-cvs@lists.linux-ha.org)
4. Linux-HA CVS: crm by andrew from
(linux-ha-cvs@lists.linux-ha.org)
5. Linux-HA CVS: lib by andrew from
(linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Mon, 5 Jun 2006 23:05:05 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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:
pass NULL as hostname when we clean up a resource
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/daemon/mgmt_crm.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- mgmt_crm.c 5 Jun 2006 11:07:04 -0000 1.48
+++ mgmt_crm.c 6 Jun 2006 05:05:04 -0000 1.49
@@ -847,8 +847,10 @@
NULL, &crmd_channel);
send_hello_message(crmd_channel, our_pid, client_name, "0", "1");
- delete_lrm_rsc(crmd_channel, argv[1], argv[2]);
- refresh_lrm(crmd_channel, argv[1]);
+ delete_lrm_rsc(crmd_channel, NULL, argv[1]);
+ refresh_lrm(crmd_channel, NULL);
+
+
return cl_strdup(MSG_OK);
}
------------------------------
Message: 2
Date: Mon, 5 Jun 2006 23:06:47 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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:
fix a bug, mistype the handler of cleanup resource
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/haclient.py.in,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -3 -r1.50 -r1.51
--- haclient.py.in 5 Jun 2006 11:09:38 -0000 1.50
+++ haclient.py.in 6 Jun 2006 05:06:46 -0000 1.51
@@ -1457,8 +1457,7 @@
manager.do_cmd("move_rsc\n%s\ndown"%self.cur_name)
def on_item_cleanup(self, action) :
- hostname = manager.get_rsc_running_on(self.cur_name)
- manager.do_cmd("cleanup_rsc\n"+hostname[0] + "\n" +
self.cur_name)
+ manager.do_cmd("cleanup_rsc\n"+self.cur_name)
def load_icon(self, name, file) :
icons = gtk.IconFactory()
@@ -1563,7 +1562,7 @@
('resource', None, _('Resources')),
('addrsc', "ha-add-resource", _('Add New Item'),
None,_('add new item'), self.on_add_item),
('delrsc', "ha-remove-resource", _('Delete'),
None,_('delete current item'), self.on_del_item),
- ('cleanuprsc', "ha-cleanup-resource", _('Clean up'),
None,_('refresh the resource'), self.on_item_action),
+ ('cleanuprsc', "ha-cleanup-resource", _('Clean up'),
None,_('refresh the resource'), self.on_item_cleanup),
('startrsc', "ha-start-resource", _('Start'),
None,_('start resource'), self.on_item_action),
('stoprsc', "ha-stop-resource", _('Stop'), None,_('stop
resource'), self.on_item_action),
('defaultrsc', "ha-default-resource", _('Default'),
None,_('work as default'), self.on_item_action),
------------------------------
Message: 3
Date: Mon, 5 Jun 2006 23:18:06 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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:
don't need hostname when we clean up a resource
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/include/mgmt/mgmt_common.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- mgmt_common.h 5 Jun 2006 05:38:57 -0000 1.11
+++ mgmt_common.h 6 Jun 2006 05:18:06 -0000 1.12
@@ -385,7 +385,7 @@
description:
clean up a unmanaged resource
format:
- MSG_CLEANUP_RSC hostname resource
+ MSG_CLEANUP_RSC resource
return:
MSG_OK
or
------------------------------
Message: 4
Date: Tue, 6 Jun 2006 00:17:54 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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/admin
Modified Files:
crm_resource.c
Log Message:
Pass the options in the right order.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/crm_resource.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- crm_resource.c 29 May 2006 11:53:53 -0000 1.33
+++ crm_resource.c 6 Jun 2006 06:17:53 -0000 1.34
@@ -1,4 +1,4 @@
-/* $Id: crm_resource.c,v 1.33 2006/05/29 11:53:53 andrew Exp $ */
+/* $Id: crm_resource.c,v 1.34 2006/06/06 06:17:53 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -897,7 +897,7 @@
fprintf(stderr, "You need to supply a value with the -v
option\n");
return CIBRES_MISSING_FIELD;
}
- rc = set_resource_attr(rsc_id, prop_id, prop_set, prop_name,
+ rc = set_resource_attr(rsc_id, prop_set, prop_id, prop_name,
prop_value, cib_conn, &data_set);
} else if(rsc_cmd == 'd') {
------------------------------
Message: 5
Date: Tue, 6 Jun 2006 10:36:31 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/crm/common
Modified Files:
xml.c
Log Message:
Corruption in the CIB is to be avoided at all costs...
unconditionally turn on verification of XML diff application
Fix the generation of XML diffs to better reflect the actual changes
(and prevent false positives when verification is performed)
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/xml.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -3 -r1.89 -r1.90
--- xml.c 31 May 2006 06:01:43 -0000 1.89
+++ xml.c 6 Jun 2006 16:36:31 -0000 1.90
@@ -1,4 +1,4 @@
-/* $Id: xml.c,v 1.89 2006/05/31 06:01:43 andrew Exp $ */
+/* $Id: xml.c,v 1.90 2006/06/06 16:36:31 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1627,7 +1627,6 @@
" saw %d", root_nodes_seen);
result = FALSE;
-#if CRM_DEV_BUILD
} else if(result) {
crm_data_t *intermediate = NULL;
crm_data_t *diff_of_diff = NULL;
@@ -1636,16 +1635,17 @@
intermediate = diff_xml_object(old, *new, FALSE);
diff_of_diff = diff_xml_object(intermediate, diff, TRUE);
if(diff_of_diff != NULL) {
- crm_warn("Diff application failed!");
+ crm_err("Diff application failed!");
log_xml_diff(LOG_DEBUG, diff_of_diff,
"diff:diff_of_diff");
log_xml_diff(LOG_INFO, intermediate,
"diff:actual_diff");
+ crm_log_xml_info(old, "diff:old");
+ crm_log_xml_info(*new, "diff:new");
result = FALSE;
}
free_xml(diff_of_diff);
free_xml(intermediate);
diff_of_diff = NULL;
intermediate = NULL;
-#endif
}
if(result == FALSE) {
@@ -1808,6 +1808,7 @@
crm_data_t *right_child = NULL;
const char *right_val = NULL;
const char *name = NULL;
+ const char *value = NULL;
int lpc = 0;
const char *filter[] = {
@@ -1903,8 +1904,10 @@
/* check for XML_DIFF_MARKER in a child */
xml_child_iter(
right, right_child,
- if(crm_element_value(right_child, XML_DIFF_MARKER)) {
- crm_debug_2("Found the root of the deletion:
%s", name);
+ value = crm_element_value(right_child, XML_DIFF_MARKER);
+ if(value != NULL && safe_str_eq(value, "removed:top")) {
+ crm_debug("Found the root of the deletion: %s",
name);
+ crm_log_xml_debug(right_child, "deletion");
differences = TRUE;
break;
}
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
Linux-ha-cvs@lists.linux-ha.org
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 31, Issue 14
********************************************
