[prev in list] [next in list] [prev in thread] [next in thread] 

List:       drbd-cvs
Subject:    [DRBD-cvs] svn commit by phil - r3071 - branches/drbd-8.0/drbd -
From:       drbd-cvs () linbit ! com
Date:       2007-09-24 15:44:11
Message-ID: 20070924154411.A9B5E4008D () garcon1 ! linbit ! com
[Download RAW message or body]

Author: phil
Date: 2007-09-24 17:44:09 +0200 (Mon, 24 Sep 2007)
New Revision: 3071

Modified:
   branches/drbd-8.0/drbd/drbd_receiver.c
Log:
This fixes an issue Johannes triggered with his drbd-proxy.

The asender terminated while the connection state was WFReportParams,
actually it should set the connection state to NetworkFailure. -> 
That causes the receiver to exit really soon....

That if statement is a very old leftofer, making sure that
the fource NetworkFailure states to no overwrite each other. This
is nowadays done by the early state sanitizing code in 
_drbd_set_state() in a much better way.



Modified: branches/drbd-8.0/drbd/drbd_receiver.c
===================================================================
--- branches/drbd-8.0/drbd/drbd_receiver.c	2007-09-21 13:25:13 UTC (rev 3070)
+++ branches/drbd-8.0/drbd/drbd_receiver.c	2007-09-24 15:44:09 UTC (rev 3071)
@@ -3423,8 +3423,7 @@
 	if(0) {
 	err:
 		clear_bit(SIGNAL_ASENDER, &mdev->flags);
-		if (mdev->state.conn >= Connected)
-			drbd_force_state(mdev,NS(conn,NetworkFailure));
+		drbd_force_state(mdev,NS(conn,NetworkFailure));
 	}
 
 	D_ASSERT(mdev->state.conn < Connected);

_______________________________________________
drbd-cvs mailing list
drbd-cvs@lists.linbit.com
http://lists.linbit.com/mailman/listinfo/drbd-cvs
[prev in list] [next in list] [prev in thread] [next in thread]