[DRBD-cvs] svn commit by phil - r2659 - trunk/drbd - Hmm, the main problem with the changes of the last week

[drbd-cvs at lists.linbit.com]

Author: phil
Date: 2007-01-08 14:54:01 +0100 (Mon, 08 Jan 2007)
New Revision: 2659

Modified:
   trunk/drbd/drbd_main.c
Log:
Hmm, the main problem with the changes of the last week was that the
  mdev->p_uuid no longer gets set to NULL after the initial resync.

Therefore we have to keep track of what happens to the peer's uuids.

This little change fixes various strange bugs. 
E.g. the "Both nodes become SyncTarget" observed by Ernest.


Modified: trunk/drbd/drbd_main.c
===================================================================
--- trunk/drbd/drbd_main.c	2007-01-08 12:57:25 UTC (rev 2658)
+++ trunk/drbd/drbd_main.c	2007-01-08 13:54:01 UTC (rev 2659)
@@ -832,6 +832,9 @@
 
 	if ( (os.conn != Connected && ns.conn == Connected) ) {
 		clear_bit(CRASHED_PRIMARY, &mdev->flags);
+		if( mdev->p_uuid ) {
+			mdev->p_uuid[UUID_FLAGS] &= ~((u64)2);
+		}
 	}
 
 	fp = DontCare;