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: cts by andrew from
([email protected])
2. Linux-HA CVS: crm by andrew from
([email protected])
3. Linux-HA CVS: lrm by sunjd from ([email protected])
4. Linux-HA CVS: lrm by sunjd from ([email protected])
----------------------------------------------------------------------
Message: 1
Date: Mon, 3 Apr 2006 09:17:41 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: cts by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : cts
Dir : linux-ha/cts
Modified Files:
CIB.py.in
Log Message:
Set options in a on-deprecated way
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cts/CIB.py.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- CIB.py.in 27 Mar 2006 14:56:19 -0000 1.6
+++ CIB.py.in 3 Apr 2006 15:17:40 -0000 1.7
@@ -14,15 +14,20 @@
class CIB:
cib_option_template = '''
+ <cluster_property_set id="default-options">
+ <attributes>
<nvpair id="c-pref-1" name="transition_idle_timeout" value="3m"/>
<nvpair id="c-pref-2" name="symmetric_cluster" value="true"/>
- <nvpair id="c-pref-3" name="short_resource_names" value="%d"/>
+ <nvpair id="c-pref-3" name="short_resource_names" value="true"/>
<nvpair id="c-pref-4" name="stop_orphan_resources" value="true"/>
<nvpair id="c-pref-5" name="stop_orphan_actions" value="true"/>
<nvpair id="c-pref-6" name="remove_after_stop" value="false"/>
<nvpair id="c-pref-7" name="is_managed_default" value="true"/>
<nvpair id="c-pref-8" name="no_quorum_policy" value="stop"/>
- <nvpair id="c-pref-9" name="default_resource_stickiness" value="0"/>
'''
+ <nvpair id="c-pref-9" name="default_resource_stickiness" value="0"/>
+ <nvpair id="c-pref-10" name="stonith_enabled" value="%d"/>
+ </attributes>
+ </cluster_property_set>'''
dc_ipaddr_resource_template = '''
@@ -174,9 +179,6 @@
</primitive>
</clone>"""
- cib_fencing = """
- <nvpair id="stonith_enabled" name="stonith_enabled" value="true"/> """
-
cib_template ='''
<cib cib_feature_revision="1" have_quorum="false">
<configuration>
@@ -202,9 +204,7 @@
self.CM = CM
#make up crm config
- cib_options = self.cib_option_template % self.CM.use_short_names
- if CM.Env["DoFencing"] == 1:
- cib_options += self.cib_fencing
+ cib_options = self.cib_option_template % CM.Env["DoFencing"]
#create resources and their constraints
resources = ""
------------------------------
Message: 2
Date: Mon, 3 Apr 2006 09:18:25 -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/crmd
Modified Files:
lrm.c
Log Message:
Misc logging
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/lrm.c,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -3 -r1.177 -r1.178
--- lrm.c 31 Mar 2006 12:45:02 -0000 1.177
+++ lrm.c 3 Apr 2006 15:18:25 -0000 1.178
@@ -330,8 +330,7 @@
const char *state = NULL;
crm_data_t *xml_op = NULL;
char *op_id = NULL;
- const char *caller_version = NULL;
-
+ const char *caller_version = NULL;
CRM_DEV_ASSERT(op != NULL);
if(crm_assert_failed) {
@@ -345,6 +344,8 @@
crm_debug_3("Ignoring cancelled op");
return TRUE;
}
+
+ crm_debug_3("Caller version: %s", caller_version);
if(safe_str_eq(op->op_type, CRMD_ACTION_NOTIFY)) {
const char *n_type = g_hash_table_lookup(
------------------------------
Message: 3
Date: Mon, 3 Apr 2006 09:44:42 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lrm by sunjd from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : sunjd
Host :
Project : linux-ha
Module : lrm
Dir : linux-ha/lrm/lrmd
Modified Files:
lrmd.c
Log Message:
should fix bug 1163
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lrm/lrmd/lrmd.c,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -3 -r1.218 -r1.219
--- lrmd.c 15 Mar 2006 02:54:28 -0000 1.218
+++ lrmd.c 3 Apr 2006 15:44:42 -0000 1.219
@@ -1,4 +1,4 @@
-/* $Id: lrmd.c,v 1.218 2006/03/15 02:54:28 sunjd Exp $ */
+/* $Id: lrmd.c,v 1.219 2006/04/03 15:44:42 sunjd Exp $ */
/*
* Local Resource Manager Daemon
*
@@ -607,6 +607,8 @@
ret->msg = ha_msg_copy(op->msg);
ret->rsc_id = cl_strdup(op->rsc_id);
ret->timeout_tag = -1;
+ op->rapop = NULL;
+ op->first_line_ra_stdout[0] = EOS;
ret->repeat_timeout_tag = -1;
ret->exec_pid = -1;
ret->is_copy = TRUE;
@@ -3774,6 +3776,9 @@
}
/*
* $Log: lrmd.c,v $
+ * Revision 1.219 2006/04/03 15:44:42 sunjd
+ * should fix bug 1163
+ *
* Revision 1.218 2006/03/15 02:54:28 sunjd
* log output level tweak
*
------------------------------
Message: 4
Date: Mon, 3 Apr 2006 09:49:28 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lrm by sunjd from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : sunjd
Host :
Project : linux-ha
Module : lrm
Dir : linux-ha/lrm/lrmd
Modified Files:
lrmd.c
Log Message:
sorry for typo
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lrm/lrmd/lrmd.c,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -3 -r1.219 -r1.220
--- lrmd.c 3 Apr 2006 15:44:42 -0000 1.219
+++ lrmd.c 3 Apr 2006 15:49:27 -0000 1.220
@@ -1,4 +1,4 @@
-/* $Id: lrmd.c,v 1.219 2006/04/03 15:44:42 sunjd Exp $ */
+/* $Id: lrmd.c,v 1.220 2006/04/03 15:49:27 sunjd Exp $ */
/*
* Local Resource Manager Daemon
*
@@ -607,8 +607,8 @@
ret->msg = ha_msg_copy(op->msg);
ret->rsc_id = cl_strdup(op->rsc_id);
ret->timeout_tag = -1;
- op->rapop = NULL;
- op->first_line_ra_stdout[0] = EOS;
+ ret->rapop = NULL;
+ ret->first_line_ra_stdout[0] = EOS;
ret->repeat_timeout_tag = -1;
ret->exec_pid = -1;
ret->is_copy = TRUE;
@@ -3776,6 +3776,9 @@
}
/*
* $Log: lrmd.c,v $
+ * Revision 1.220 2006/04/03 15:49:27 sunjd
+ * sorry for typo
+ *
* Revision 1.219 2006/04/03 15:44:42 sunjd
* should fix bug 1163
*
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 29, Issue 11
********************************************
