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: lrm by sunjd from (linux-ha-cvs@lists.linux-ha.org)
2. Linux-HA CVS: heartbeat by alan from
(linux-ha-cvs@lists.linux-ha.org)
3. Linux-HA CVS: crm by andrew 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: linux-ha by alan from
(linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Wed, 12 Jul 2006 20:21:43 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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:
bug1346: resolve the hangup issue
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lrm/lrmd/lrmd.c,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -3 -r1.231 -r1.232
--- lrmd.c 12 Jul 2006 16:19:00 -0000 1.231
+++ lrmd.c 13 Jul 2006 02:21:42 -0000 1.232
@@ -1,4 +1,4 @@
-/* $Id: lrmd.c,v 1.231 2006/07/12 16:19:00 alan Exp $ */
+/* $Id: lrmd.c,v 1.232 2006/07/13 02:21:42 sunjd Exp $ */
/*
* Local Resource Manager Daemon
*
@@ -205,6 +205,7 @@
/* ops They will run later */
GHashTable* last_op_table; /* Last operation of each type */
lrmd_op_t* last_op_done; /* The last finished op of the resource
*/
+ guint delay_timeout; /* The delay value of op_list execution
*/
};
struct lrmd_op
@@ -284,6 +285,7 @@
/* Utility functions */
static int flush_op(lrmd_op_t* op);
+static gboolean rsc_execution_freeze_timeout(gpointer data);
static int perform_op(lrmd_rsc_t* rsc);
static int unregister_client(lrmd_client_t* client);
static int on_op_done(lrmd_op_t* op);
@@ -360,7 +362,8 @@
static gboolean shutdown_in_progress = FALSE;
static unsigned long apphb_interval = 2000; /* Millisecond */
static gboolean reg_to_apphbd = FALSE;
-static int MAX_CHILD_NUMBER = 512;
+static int MAX_CHILD_NUMBER = 16;
+static int INTERVAL_RETRY = 1000; /* Millisecond */
static int child_number = 0;
/*
@@ -860,6 +863,12 @@
lrmd_op_destroy(rsc->last_op_done);
rsc->last_op_done = NULL;
}
+
+ if ((int)rsc->delay_timeout > 0) {
+ Gmain_timeout_remove(rsc->delay_timeout);
+ rsc->delay_timeout = (guint)-1;
+ }
+
cl_free(rsc);
}
@@ -874,6 +883,7 @@
dump_mem_stats();
return NULL;
}
+ rsc->delay_timeout = (guint)-1;
if (id) {
rsc->id = cl_strdup(id);
}
@@ -3031,6 +3041,24 @@
return HA_OK;
}
+/* Resume the execution of ops of the resource */
+static gboolean
+rsc_execution_freeze_timeout(gpointer data)
+{
+ lrmd_rsc_t* rsc = (lrmd_rsc_t*)data;
+
+ if ((int)rsc->delay_timeout > 0) {
+ Gmain_timeout_remove(rsc->delay_timeout);
+ rsc->delay_timeout = (guint)-1;
+ }
+
+ if (rsc != NULL) {
+ perform_op(rsc);
+ }
+
+ return FALSE;
+}
+
/* this function gets the first op in the rsc op list and execute it*/
int
perform_op(lrmd_rsc_t* rsc)
@@ -3065,6 +3093,8 @@
" behind and including this: %s "
, MAX_CHILD_NUMBER
, op_info(op));
+ rsc->delay_timeout = Gmain_timeout_add(INTERVAL_RETRY
+ , rsc_execution_freeze_timeout, rsc);
break;
}
@@ -3854,6 +3884,9 @@
}
/*
* $Log: lrmd.c,v $
+ * Revision 1.232 2006/07/13 02:21:42 sunjd
+ * bug1346: resolve the hangup issue
+ *
* Revision 1.231 2006/07/12 16:19:00 alan
* Disabled the process throttling code in the LRM - to let us get the release
out.
*
------------------------------
Message: 2
Date: Wed, 12 Jul 2006 20:39:41 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: heartbeat by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Project : linux-ha
Module : heartbeat
Dir : linux-ha/heartbeat
Modified Files:
heartbeat.c
Log Message:
Put in a fix for a local DOS attack on heartbeat.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat/heartbeat.c,v
retrieving revision 1.513
retrieving revision 1.514
diff -u -3 -r1.513 -r1.514
--- heartbeat.c 22 Jun 2006 01:00:51 -0000 1.513
+++ heartbeat.c 13 Jul 2006 02:39:41 -0000 1.514
@@ -1,4 +1,4 @@
-/* $Id: heartbeat.c,v 1.513 2006/06/22 01:00:51 alan Exp $ */
+/* $Id: heartbeat.c,v 1.514 2006/07/13 02:39:41 alan Exp $ */
/*
* heartbeat: Linux-HA heartbeat code
*
@@ -496,7 +496,7 @@
int ipcid;
struct pstat_shm * shm;
- if ((ipcid = shmget(IPC_PRIVATE, sizeof(*procinfo), 0666)) < 0) {
+ if ((ipcid = shmget(IPC_PRIVATE, sizeof(*procinfo), 0600)) < 0) {
cl_perror("Cannot shmget for process status");
return;
}
@@ -6354,6 +6354,9 @@
/*
* $Log: heartbeat.c,v $
+ * Revision 1.514 2006/07/13 02:39:41 alan
+ * Put in a fix for a local DOS attack on heartbeat.
+ *
* Revision 1.513 2006/06/22 01:00:51 alan
* Raised the heartbeat (debug) CPU limit to 70%.
*
------------------------------
Message: 3
Date: Thu, 13 Jul 2006 04:20:13 -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/testcases
Added Files:
probe-1.dot probe-1.exp probe-1.xml
Log Message:
Regression tests for probes that didnt complete yet
------------------------------
Message: 4
Date: Thu, 13 Jul 2006 04:20:13 -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:
regression.sh
Log Message:
Regression tests for probes that didnt complete yet
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/regression.sh,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -3 -r1.91 -r1.92
--- regression.sh 5 Jul 2006 14:22:59 -0000 1.91
+++ regression.sh 13 Jul 2006 10:20:12 -0000 1.92
@@ -57,6 +57,7 @@
echo ""
do_test date-1 "Dates" -d "2005-020"
do_test probe-0 "Probe (anon clone)"
+do_test probe-1 "Pending Probe"
do_test standby "Standby"
do_test comments "Comments"
------------------------------
Message: 5
Date: Thu, 13 Jul 2006 05:43:26 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
ConfigureMe
Log Message:
Put 64-bit fix back in ConfigureMe
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/ConfigureMe,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- ConfigureMe 24 May 2006 17:04:36 -0000 1.54
+++ ConfigureMe 13 Jul 2006 11:43:25 -0000 1.55
@@ -95,6 +95,19 @@
fi
CFENV="$distro"
FLAGS="--prefix=/usr --sysconfdir=/etc --localstatedir=/var $DFLAGS"
+ case `uname -m` in
+ x86_64)
+ # Hmmm... Let's check for building from chrooted 32-bit environment...
+ case `file /bin/uname` in
+ *Intel*80?86*) ;;
+ *) FLAGS="$FLAGS --libexecdir=/usr/lib64 --libdir=/usr/lib64";;
+ esac
+ ;;
+ # FIXME. I don't think it's a general fixing.
+ s390*)
+ FLAGS="$FLAGS --libexecdir=/usr/lib64 --libdir=/usr/lib64";;
+ *) ;;
+ esac
}
ConfigureAIX() {
------------------------------
_______________________________________________
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 32, Issue 43
********************************************
