[DRBD-cvs] user by phil; * Fixed another annoying special case wi...

[drbd-user@lists.linbit.com]

DRBD CVS committal

Author  : phil
Project : drbd
Module  : user

Dir     : drbd/user


Modified Files:
      Tag: rel-0_7-branch
	drbdadm_main.c 


Log Message:
* Fixed another annoying special case with the resync code.
  [Triggered if accidentially w_make_resync_request() just 
  stopped one of its runs, when all requests for this resync
  process were issued. -> But since it has not yet seen the
  MBDS_DONE we run into the ASSERTION in w_update_odbm() ]

* Removed gs_snr. Was unused.

* Increased the time drbdsetup may take. Reading AL and BitMap
  can take some time on real systems...   

===================================================================
RCS file: /var/lib/cvs/drbd/drbd/user/Attic/drbdadm_main.c,v
retrieving revision 1.1.2.36
retrieving revision 1.1.2.37
diff -u -3 -r1.1.2.36 -r1.1.2.37
--- drbdadm_main.c	12 Feb 2004 20:24:48 -0000	1.1.2.36
+++ drbdadm_main.c	7 Mar 2004 20:17:18 -0000	1.1.2.37
@@ -331,7 +331,7 @@
   if( !may_sleep ) {
     sigaction(SIGALRM,&sa,&so);
     alarm_raised=0;
-    alarm(2);
+    alarm(25); // Reading the AL & BitMap can take some time.
   }
 
   while(1) {