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 andrew from
(linux-ha-cvs@lists.linux-ha.org)
2. Linux-HA CVS: mgmt by andrew from
(linux-ha-cvs@lists.linux-ha.org)
3. Linux-HA CVS: heartbeat 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: crm by andrew from
(linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Tue, 13 Jun 2006 01:12:08 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: mgmt by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : mgmt
Dir : linux-ha/mgmt/daemon
Modified Files:
Makefile.am
Log Message:
We only need to link against the PE status library
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/daemon/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- Makefile.am 8 Jun 2006 08:03:57 -0000 1.12
+++ Makefile.am 13 Jun 2006 07:12:07 -0000 1.13
@@ -59,5 +59,5 @@
$(top_builddir)/lib/apphb/libapphb.la \
$(top_builddir)/lib/crm/pengine/libpe_status.la \
$(top_builddir)/lib/hbclient/libhbclient.la \
- $(top_builddir)/crm/pengine/libpengine.la \
+ $(top_builddir)/lib/crm/pengine/libpe_status.la \
$(COMMONLIBS) $(CURSESLIBS)
------------------------------
Message: 2
Date: Tue, 13 Jun 2006 01:14:11 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: mgmt by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : mgmt
Dir : linux-ha/mgmt/daemon
Modified Files:
mgmt_crm.c
Log Message:
Spaces for readability
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/daemon/mgmt_crm.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -3 -r1.53 -r1.54
--- mgmt_crm.c 13 Jun 2006 06:47:38 -0000 1.53
+++ mgmt_crm.c 13 Jun 2006 07:14:10 -0000 1.54
@@ -1282,10 +1282,10 @@
break;
}
if( rsc->role==RSC_ROLE_SLAVE ) {
- ret = mgmt_msg_append(ret, "running(Slave)");
+ ret = mgmt_msg_append(ret, "running (Slave)");
}
else if( rsc->role==RSC_ROLE_MASTER) {
- ret = mgmt_msg_append(ret, "running(Master)");
+ ret = mgmt_msg_append(ret, "running (Master)");
}
else {
ret = mgmt_msg_append(ret, "running");
------------------------------
Message: 3
Date: Tue, 13 Jun 2006 01:57:12 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: heartbeat by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : heartbeat
Dir : linux-ha/heartbeat
Modified Files:
heartbeat.c
Log Message:
deal with the situation that the time restart is shorter than deadtime, fix 1280
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat/heartbeat.c,v
retrieving revision 1.511
retrieving revision 1.512
diff -u -3 -r1.511 -r1.512
--- heartbeat.c 31 May 2006 06:32:27 -0000 1.511
+++ heartbeat.c 13 Jun 2006 07:57:11 -0000 1.512
@@ -1,4 +1,4 @@
-/* $Id: heartbeat.c,v 1.511 2006/05/31 06:32:27 zhenh Exp $ */
+/* $Id: heartbeat.c,v 1.512 2006/06/13 07:57:11 zhenh Exp $ */
/*
* heartbeat: Linux-HA heartbeat code
*
@@ -2952,6 +2952,24 @@
, seqno, msgtime);
}
/*
+ * If the restart of a node is faster than deadtime,
+ * the previous status of node would be still ACTIVE
+ * while current status is INITSTATUS.
+ * So we reduce the live_node_count here.
+ */
+ if (fromnode->nodetype == NORMALNODE_I
+ && fromnode != curnode
+ && ( STRNCMP_CONST(fromnode->status, ACTIVESTATUS) == 0
+ || STRNCMP_CONST(fromnode->status, UPSTATUS) == 0)
+ && ( STRNCMP_CONST(status, INITSTATUS) == 0)) {
+ --live_node_count;
+ if (live_node_count < 1) {
+ cl_log(LOG_ERR
+ , "live_node_count too small (%d)"
+ , live_node_count);
+ }
+ }
+ /*
* IF
* It's from a normal node
* It isn't from us
@@ -6336,6 +6354,9 @@
/*
* $Log: heartbeat.c,v $
+ * Revision 1.512 2006/06/13 07:57:11 zhenh
+ * deal with the situation that the time restart is shorter than deadtime, fix
1280
+ *
* Revision 1.511 2006/05/31 06:32:27 zhenh
* To work with nodes in 2.0.5, we have to deal with the T_REPNODES message
without F_DELNODELIST field.
*
------------------------------
Message: 4
Date: Tue, 13 Jun 2006 03:39:07 -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/pengine
Modified Files:
pengine.c
Log Message:
Remove logging
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/pengine.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -3 -r1.115 -r1.116
--- pengine.c 8 Jun 2006 13:39:10 -0000 1.115
+++ pengine.c 13 Jun 2006 09:39:05 -0000 1.116
@@ -1,4 +1,4 @@
-/* $Id: pengine.c,v 1.115 2006/06/08 13:39:10 andrew Exp $ */
+/* $Id: pengine.c,v 1.116 2006/06/13 09:39:05 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -276,11 +276,6 @@
#endif
crm_debug_2("=#=#=#=#= Summary =#=#=#=#=");
- crm_debug_2("========= All Actions =========");
- slist_iter(action, action_t, data_set->actions, lpc,
- log_action(LOG_DEBUG_2, "\t", action, TRUE)
- );
-
crm_debug_2("\t========= Set %d (Un-runnable) =========", -1);
crm_action_debug_2(
slist_iter(action, action_t, data_set->actions, lpc,
------------------------------
Message: 5
Date: Tue, 13 Jun 2006 03:43:12 -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/pengine
Modified Files:
allocate.c native.c
Log Message:
The only reliable way to prevent resources from being active when
conflicting constraints are specified is to "uncolor" them.
rsc->runnable does not stop existing active resources, nor does it
flow on through the other dependancies.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/native.c,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -3 -r1.150 -r1.151
--- native.c 8 Jun 2006 13:39:10 -0000 1.150
+++ native.c 13 Jun 2006 09:43:12 -0000 1.151
@@ -1,4 +1,4 @@
-/* $Id: native.c,v 1.150 2006/06/08 13:39:10 andrew Exp $ */
+/* $Id: native.c,v 1.151 2006/06/13 09:43:12 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -191,9 +191,7 @@
slist_iter(
constraint, rsc_colocation_t, rsc->rsc_cons, lpc,
- crm_action_debug_3(
- print_rsc_colocation(
- "Pre-Processing constraint", constraint,FALSE));
+ crm_debug_3("Pre-Processing %s", constraint->id);
rsc->cmds->rsc_colocation_lh(
rsc, constraint->rsc_rh, constraint);
@@ -226,9 +224,7 @@
#if 1
slist_iter(
constraint, rsc_colocation_t, rsc->rsc_cons, lpc,
- crm_action_debug_3(
- print_rsc_colocation(
- "Post-Processing constraint",constraint,FALSE));
+ crm_debug_3("Post-Processing %s", constraint->id);
rsc->cmds->rsc_colocation_lh(
rsc, constraint->rsc_rh, constraint);
);
@@ -585,12 +581,32 @@
if(update_lh) {
pe_warn("Marking resource %s unrunnable as a result",
rsc_lh->id);
- rsc_lh->runnable = FALSE;
+ resource_location(rsc_lh, NULL, -INFINITY,
+ constraint->id, NULL);
+ if(rsc_lh->color) {
+ crm_free(rsc_lh->color->details->chosen_node);
+ rsc_lh->color->details->chosen_node = NULL;
+
+ pe_free_shallow_adv(
+ rsc_lh->color->details->candidate_nodes,
+ TRUE);
+ rsc_lh->color->details->candidate_nodes = NULL;
+ }
}
if(update_rh) {
pe_warn("Marking resource %s unrunnable as a result",
rsc_rh->id);
- rsc_rh->runnable = FALSE;
+ resource_location(rsc_rh, NULL, -INFINITY,
+ constraint->id, NULL);
+ if(rsc_rh->color) {
+ crm_free(rsc_rh->color->details->chosen_node);
+ rsc_rh->color->details->chosen_node = NULL;
+
+ pe_free_shallow_adv(
+ rsc_rh->color->details->candidate_nodes,
+ TRUE);
+ rsc_rh->color->details->candidate_nodes = NULL;
+ }
}
}
------------------------------
_______________________________________________
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 41
********************************************
