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: lib by andrew from
([email protected])
3. Linux-HA CVS: lib by andrew from
([email protected])
4. Linux-HA CVS: tools by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Fri, 2 Jun 2006 04:00:44 -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/pengine/testcases
Added Files:
probe-0.dot probe-0.exp probe-0.xml
Log Message:
Novell #180699: Probe annoymous clones correctly
Add a regression case
------------------------------
Message: 2
Date: Fri, 2 Jun 2006 09:33:23 -0600 (MDT)
From: [email protected]
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/pengine
Modified Files:
.cvsignore
Log Message:
Regular ignore file contents
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/pengine/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- .cvsignore 31 May 2006 15:45:01 -0000 1.1
+++ .cvsignore 2 Jun 2006 15:33:22 -0000 1.2
@@ -1,3 +1,8 @@
-Makefile.am
+Makefile.in
+Makefile
+.deps
+.libs
+*.lo
+*.la
ptest
today.diff
------------------------------
Message: 3
Date: Fri, 2 Jun 2006 09:34:18 -0600 (MDT)
From: [email protected]
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/pengine
Modified Files:
Makefile.am clone.c unpack.c utils.c
Log Message:
Backports from crm/pengine
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/pengine/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Makefile.am 31 May 2006 14:59:12 -0000 1.1
+++ Makefile.am 2 Jun 2006 15:34:18 -0000 1.2
@@ -50,7 +50,7 @@
lib_LTLIBRARIES = libpe_rules.la libpe_status.la libpengine.la
## binary progs
-halib_PROGRAMS = ptest
+#halib_PROGRAMS = ptest
## SOURCES
@@ -71,14 +71,14 @@
noinst_HEADERS = utils.h allocate.h pengine.h
-ptest_SOURCES = ptest.c
+#ptest_SOURCES = ptest.c
-ptest_CFLAGS = -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'
-ptest_LDADD = $(COMMONLIBS) \
- libpe_status.la \
- libpengine.la \
- $(top_builddir)/lib/crm/cib/libcib.la \
- $(top_builddir)/lib/crm/transition/libtransitioner.la
+#ptest_CFLAGS = -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'
+#ptest_LDADD = $(COMMONLIBS) \
+# libpe_status.la \
+# libpengine.la \
+# $(top_builddir)/lib/crm/cib/libcib.la \
+# $(top_builddir)/lib/crm/transition/libtransitioner.la
clean-generic:
rm -f *.log *.debug *~
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/pengine/clone.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- clone.c 31 May 2006 14:59:12 -0000 1.1
+++ clone.c 2 Jun 2006 15:34:18 -0000 1.2
@@ -1,4 +1,4 @@
-/* $Id: clone.c,v 1.1 2006/05/31 14:59:12 andrew Exp $ */
+/* $Id: clone.c,v 1.2 2006/06/02 15:34:18 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -155,7 +155,11 @@
if(crm_is_true(ordered)) {
clone_data->ordered = TRUE;
}
-
+
+ crm_debug("Options for %s", rsc->id);
+ crm_debug("\tClone max: %d", clone_data->clone_max);
+ crm_debug("\tClone node max: %d", clone_data->clone_node_max);
+
clone_data->xml_obj_child = find_xml_node(
xml_obj, XML_CIB_TAG_GROUP, FALSE);
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/pengine/unpack.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- unpack.c 31 May 2006 14:59:12 -0000 1.1
+++ unpack.c 2 Jun 2006 15:34:18 -0000 1.2
@@ -1,4 +1,4 @@
-/* $Id: unpack.c,v 1.1 2006/05/31 14:59:12 andrew Exp $ */
+/* $Id: unpack.c,v 1.2 2006/06/02 15:34:18 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -120,20 +120,22 @@
);
#endif
- get_cluster_pref("transition_idle_timeout");
+ get_cluster_pref("default_action_timeout");
+ if(value == NULL) {
+ get_cluster_pref("transition_idle_timeout");
+ }
if(value != NULL) {
long tmp = crm_get_msec(value);
if(tmp > 0) {
crm_free(data_set->transition_idle_timeout);
data_set->transition_idle_timeout = crm_strdup(value);
} else {
- crm_err("Invalid value for transition_idle_timeout: %s",
+ crm_err("Invalid value for default_action_timeout: %s",
value);
}
}
- crm_debug("%s set to: %s",
- "transition_idle_timeout", data_set->transition_idle_timeout);
+ crm_debug("default_action_timeout set to: %s",
data_set->transition_idle_timeout);
get_cluster_pref("default_"XML_RSC_ATTR_STICKINESS);
data_set->default_resource_stickiness = char2score(value);
@@ -1051,10 +1053,12 @@
if(value != NULL && safe_str_neq("default", value)) {
enum rsc_role_e req_role = text2role(value);
if(req_role != RSC_ROLE_UNKNOWN && req_role != rsc->next_role){
- crm_debug("%s: Overwriting calculated next role %s"
- " with requested next role %s",
- rsc->id, role2text(rsc->next_role),
- role2text(req_role));
+ if(rsc->next_role != RSC_ROLE_UNKNOWN) {
+ crm_debug("%s: Overwriting calculated next role
%s"
+ " with requested next role %s",
+ rsc->id, role2text(rsc->next_role),
+ role2text(req_role));
+ }
rsc->next_role = req_role;
}
}
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/pengine/utils.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- utils.c 31 May 2006 14:59:12 -0000 1.1
+++ utils.c 2 Jun 2006 15:34:18 -0000 1.2
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.1 2006/05/31 14:59:12 andrew Exp $ */
+/* $Id: utils.c,v 1.2 2006/06/02 15:34:18 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -602,10 +602,14 @@
node1_weight = node1->weight;
node2_weight = node2->weight;
- if(node1->details->unclean || node1->details->shutdown) {
+ if(node1->details->unclean
+ || node1->details->standby
+ || node1->details->shutdown) {
node1_weight = -INFINITY;
}
- if(node2->details->unclean || node2->details->shutdown) {
+ if(node2->details->unclean
+ || node2->details->standby
+ || node2->details->shutdown) {
node2_weight = -INFINITY;
}
@@ -999,6 +1003,11 @@
unpack_instance_attributes(xml_obj, XML_TAG_ATTR_SETS,
NULL, action->meta, NULL, data_set->now);
+ if(g_hash_table_lookup(action->meta, "timeout") == NULL) {
+ g_hash_table_insert(action->meta, crm_strdup("timeout"),
+
crm_strdup(data_set->transition_idle_timeout));
+ }
+
for(;lpc < DIMOF(fields); lpc++) {
value = g_hash_table_lookup(action->meta, fields[lpc]);
if(value != NULL) {
------------------------------
Message: 4
Date: Fri, 2 Jun 2006 09:35:15 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: tools by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : tools
Dir : linux-ha/tools
Modified Files:
ccdv.c
Log Message:
Output tweak
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/tools/ccdv.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ccdv.c 1 Jun 2006 11:32:58 -0000 1.4
+++ ccdv.c 2 Jun 2006 15:35:14 -0000 1.5
@@ -197,7 +197,7 @@
char *newbuf;
size_t ntoread;
ssize_t nread;
- printf("%s%s%s.\n", gAction, gTarget[0] ? " " : "", gTarget);
+ printf("%s%s%s\n", gAction, gTarget[0] ? " " : "", gTarget);
fflush(stdout);
for(;;) {
if (gNBufUsed == (gNBufAllocated - 1)) {
------------------------------
_______________________________________________
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 9
*******************************************
