[DRBD-cvs] svn commit by phil - r2606 - in trunk: . scripts user - We are trying to get the dopd/drbd-peer-outdater stuff

[drbd-cvs at lists.linbit.com]

Author: phil
Date: 2006-11-30 16:00:22 +0100 (Thu, 30 Nov 2006)
New Revision: 2606

Modified:
   trunk/ROADMAP
   trunk/scripts/outdate-peer.sh
   trunk/user/drbdadm_main.c
Log:
We are trying to get the dopd/drbd-peer-outdater stuff commited
to heartbeat's revision control system. They want to support multiple
node, therefor we need to pass this informatipn (DRBD_PEER) on.


Modified: trunk/ROADMAP
===================================================================
--- trunk/ROADMAP	2006-11-29 09:20:06 UTC (rev 2605)
+++ trunk/ROADMAP	2006-11-30 15:00:22 UTC (rev 2606)
@@ -226,6 +226,10 @@
   * We need to store the fact that the peer is outdated/inconsistent
     in the meta-data. To allow an stand allone primary to be rebooted.
 
+  * The outdate-peer program gets two environment variables:
+    DRBD_RESOURCE the name of the DRBD-resource and DRBD_PEER
+    the host name of the peer.
+
   99% DONE
 
 8 New command drbdmeta
@@ -900,6 +904,8 @@
 
 43 Fix indexed meta-data.
 
+44 Callbacks to userspace should run asynchronous.
+
 Maybe:
 
 *  Switch to protocol C in case we are running without a local 

Modified: trunk/scripts/outdate-peer.sh
===================================================================
--- trunk/scripts/outdate-peer.sh	2006-11-29 09:20:06 UTC (rev 2605)
+++ trunk/scripts/outdate-peer.sh	2006-11-30 15:00:22 UTC (rev 2606)
@@ -39,7 +39,7 @@
 #
 
 #
-# The caller (drbdadm) sets DRBD_RESOURCE for us.
+# The caller (drbdadm) sets DRBD_RESOURCE and DRBD_PEER for us.
 #
 
 TIMEOUT=6

Modified: trunk/user/drbdadm_main.c
===================================================================
--- trunk/user/drbdadm_main.c	2006-11-29 09:20:06 UTC (rev 2605)
+++ trunk/user/drbdadm_main.c	2006-11-30 15:00:22 UTC (rev 2606)
@@ -762,6 +762,7 @@
   char *argv[] = { "/bin/sh", "-c", NULL , NULL };
 
   setenv("DRBD_RESOURCE",res->name,1);
+  setenv("DRBD_PEER",res->peer->name,1);
 
   if( (sh_cmd = get_opt_val(res->handlers,cmd,NULL)) ) {
     argv[2]=sh_cmd;