[DRBD-cvs] svn commit by phil - r2481 - trunk/drbd - * Now I finally have the impression that the "sync-afte

[drbd-cvs at lists.linbit.com]

Author: phil
Date: 2006-09-30 21:27:26 +0200 (Sat, 30 Sep 2006)
New Revision: 2481

Modified:
   trunk/drbd/drbd_main.c
   trunk/drbd/drbd_receiver.c
Log:
* Now I finally have the impression that the "sync-after" code
  works
* Found and fixed a bug in the code that decides about resync.
  In case it clears the bitmap it has also to discard the bitmap
  UUID      


Modified: trunk/drbd/drbd_main.c
===================================================================
--- trunk/drbd/drbd_main.c	2006-09-29 20:56:19 UTC (rev 2480)
+++ trunk/drbd/drbd_main.c	2006-09-30 19:27:26 UTC (rev 2481)
@@ -1028,7 +1028,9 @@
 	}
 
 	// A resync finished or aborted, wake paused devices...
-	if ( os.conn > Connected && ns.conn <= Connected) {
+	if ( (os.conn > Connected && ns.conn <= Connected) ||
+	     (os.peer_isp && !ns.peer_isp) ||
+	     (os.user_isp && !ns.user_isp) ) {
 		resume_next_sg(mdev);
 	}
 

Modified: trunk/drbd/drbd_receiver.c
===================================================================
--- trunk/drbd/drbd_receiver.c	2006-09-29 20:56:19 UTC (rev 2480)
+++ trunk/drbd/drbd_receiver.c	2006-09-30 19:27:26 UTC (rev 2481)
@@ -1855,6 +1855,7 @@
 		if(drbd_bm_total_weight(mdev)) {
 			INFO("No resync -> clearing bit map.\n");
 			drbd_bm_clear_all(mdev);
+			drbd_uuid_set_bm(mdev,0UL);
 			if (unlikely(drbd_bm_write(mdev) < 0))
 				return conn_mask;
 		}