[DRBD-cvs] r1642 - branches/drbd-0.7/user

[svn at svn.drbd.org]

Author: phil
Date: 2004-11-16 16:55:31 +0100 (Tue, 16 Nov 2004)
New Revision: 1642

Modified:
   branches/drbd-0.7/user/drbdadm_adjust.c
   branches/drbd-0.7/user/drbdadm_main.c
Log:
Changed the order in which drbdadm does the configuration steps:
Was: Disk, Net , Syncer
Now: Disk, Syncer, Net

In this order when the syncer wants to start (after connect) the
right sync grop and rate is already set.


Modified: branches/drbd-0.7/user/drbdadm_adjust.c
===================================================================
--- branches/drbd-0.7/user/drbdadm_adjust.c	2004-11-16 14:14:35 UTC (rev 1641)
+++ branches/drbd-0.7/user/drbdadm_adjust.c	2004-11-16 15:55:31 UTC (rev 1642)
@@ -367,8 +367,8 @@
     do_resize=0;
   }
   if(do_resize)  if( (rv=adm_resize(res,0)) ) return rv;
+  if(do_syncer)  if( (rv=adm_syncer(res,0)) ) return rv;
   if(do_connect) if( (rv=adm_connect(res,0))) return rv;
-  if(do_syncer)  if( (rv=adm_syncer(res,0)) ) return rv;
 
   return 0;
 }

Modified: branches/drbd-0.7/user/drbdadm_main.c
===================================================================
--- branches/drbd-0.7/user/drbdadm_main.c	2004-11-16 14:14:35 UTC (rev 1641)
+++ branches/drbd-0.7/user/drbdadm_main.c	2004-11-16 15:55:31 UTC (rev 1642)
@@ -574,8 +574,8 @@
 {
   int r;
   if( (r=adm_attach(res,unused)) ) return r;
-  if( (r=adm_connect(res,unused)) ) return r;
-  return adm_syncer(res,unused);
+  if( (r=adm_syncer(res,unused)) ) return r;
+  return adm_connect(res,unused);
 }
 
 static int on_primary(struct d_resource* res ,char* flag)