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: fencing by sunjd from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Fri, 9 Jun 2006 04:16:52 -0600 (MDT)
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/admin
Modified Files:
crm_resource.c
Log Message:
The reverse of Novell #183221
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/crm_resource.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- crm_resource.c 9 Jun 2006 10:15:06 -0000 1.37
+++ crm_resource.c 9 Jun 2006 10:16:51 -0000 1.38
@@ -1,4 +1,4 @@
-/* $Id: crm_resource.c,v 1.37 2006/06/09 10:15:06 andrew Exp $ */
+/* $Id: crm_resource.c,v 1.38 2006/06/09 10:16:51 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -434,7 +434,7 @@
constraints = get_object_root(XML_CIB_TAG_CONSTRAINTS, cib);
id = crm_concat("cli-prefer", rsc_id, '-');
- can_run = create_xml_node(constraints, XML_CONS_TAG_RSC_LOCATION);
+ can_run = create_xml_node(NULL, XML_CONS_TAG_RSC_LOCATION);
crm_xml_add(can_run, XML_ATTR_ID, id);
crm_free(id);
@@ -520,6 +520,8 @@
crm_xml_add(expr, XML_EXPR_ATTR_OPERATION, "eq");
crm_xml_add(expr, XML_EXPR_ATTR_VALUE, preferred_node);
crm_xml_add(expr, XML_EXPR_ATTR_TYPE, "string");
+
+ add_node_copy(constraints, can_run);
}
if(preferred_node != NULL || existing_node != NULL) {
@@ -530,6 +532,7 @@
free_xml(fragment);
free_xml(dont_run);
+ free_xml(can_run);
return rc;
}
------------------------------
Message: 2
Date: Fri, 9 Jun 2006 05:43:20 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: fencing by sunjd from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : sunjd
Host :
Project : linux-ha
Module : fencing
Dir : linux-ha/fencing/stonithd
Modified Files:
stonithd.c
Log Message:
use stonithd_log instead
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/fencing/stonithd/stonithd.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -3 -r1.90 -r1.91
--- stonithd.c 30 May 2006 10:15:56 -0000 1.90
+++ stonithd.c 9 Jun 2006 11:43:19 -0000 1.91
@@ -1,4 +1,4 @@
-/* $Id: stonithd.c,v 1.90 2006/05/30 10:15:56 sunjd Exp $ */
+/* $Id: stonithd.c,v 1.91 2006/06/09 11:43:19 sunjd Exp $ */
/* File: stonithd.c
* Description: STONITH daemon for node fencing
@@ -799,7 +799,7 @@
}
msg_mask = LLC_FILTER_DEFAULT;
- cl_log(LOG_DEBUG, "Setting message filter mode");
+ stonithd_log(LOG_DEBUG, "Setting message filter mode");
if (hb->llc_ops->setfmode(hb, msg_mask) != HA_OK) {
stonithd_log(LOG_ERR, "Cannot set filter mode");
stonithd_log(LOG_ERR, "REASON: %s", hb->llc_ops->errmsg(hb));
@@ -1299,7 +1299,7 @@
ipc_auth, FALSE, accept_client_dispatch, NULL,
NULL);
if (api_source == NULL) {
- cl_log(LOG_DEBUG, "Cannot create API listening source of "
+ stonithd_log(LOG_DEBUG, "Cannot create API listening source of "
"server side from IPC");
return LSB_EXIT_GENERIC;
}
@@ -3438,6 +3438,9 @@
/*
* $Log: stonithd.c,v $
+ * Revision 1.91 2006/06/09 11:43:19 sunjd
+ * use stonithd_log instead
+ *
* Revision 1.90 2006/05/30 10:15:56 sunjd
* add two level 2 logs
*
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 31, Issue 31
********************************************
