[DRBD-cvs] drbd by phil; * Increased the size of the resync LRU a...

[drbd-user@lists.linbit.com]

DRBD CVS committal

Author  : phil
Module  : drbd

Dir     : drbd/drbd


Modified Files:
      Tag: rel-0_7-branch
	drbd_actlog.c drbd_fs.c drbd_main.c 


Log Message:
* Increased the size of the resync LRU a bit. But I guess the
  real solution will be to make this user-tunable.
* set mdev->la_size to 0 when we disconnect from the ll_dev
* Silented one of the "resync LRU too small" messages.

===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd/Attic/drbd_actlog.c,v
retrieving revision 1.1.2.81
retrieving revision 1.1.2.82
diff -u -3 -r1.1.2.81 -r1.1.2.82
--- drbd_actlog.c	26 Mar 2004 13:24:55 -0000	1.1.2.81
+++ drbd_actlog.c	29 Mar 2004 16:15:57 -0000	1.1.2.82
@@ -611,7 +611,7 @@
 			ext->rs_left -= cleared;
 			D_ASSERT(ext->rs_left >= 0);
 		} else {
-			WARN("Recounting sectors (resync LRU too small?)\n");
+			//WARN("Recounting sectors (resync LRU too small?)\n");
 			// This element should be in the cache 
 			// since drbd_rs_begin_io() pulled it already in.
 			ext->rs_left = bm_count_sectors(mdev->mbds_id,enr);
@@ -623,7 +623,7 @@
 		//	wake_up(&mdev->al_wait);
 	} else {
 		ERR("lc_get() failed! Probabely something stays"
-		    " dirty in the on disk BM\n");
+		    " dirty in the on disk BM. (resync LRU too small) \n");
 	}
 
 	list_for_each_safe(le,tmp,&mdev->resync->lru) {
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd/drbd_fs.c,v
retrieving revision 1.28.2.77
retrieving revision 1.28.2.78
diff -u -3 -r1.28.2.77 -r1.28.2.78
--- drbd_fs.c	24 Mar 2004 13:14:06 -0000	1.28.2.77
+++ drbd_fs.c	29 Mar 2004 16:15:57 -0000	1.28.2.78
@@ -797,6 +797,7 @@
 		}
 
 		drbd_free_ll_dev(mdev);
+		mdev->la_size=0;
 
 		if (mdev->cstate == Connected) drbd_send_param(mdev,0);
 		if (mdev->cstate == StandAlone) set_cstate(mdev,Unconfigured);
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd/drbd_main.c,v
retrieving revision 1.73.2.146
retrieving revision 1.73.2.147
diff -u -3 -r1.73.2.146 -r1.73.2.147
--- drbd_main.c	24 Mar 2004 13:14:06 -0000	1.73.2.146
+++ drbd_main.c	29 Mar 2004 16:15:57 -0000	1.73.2.147
@@ -316,6 +316,7 @@
 	} else {
 		WARN("Releasing backing storage device.\n");
 		drbd_free_ll_dev(mdev);
+		mdev->la_size=0;
 	}
 
 	return ok;
@@ -1414,7 +1415,7 @@
 		mdev->mbds_id = bm_init(0);
 		if (!mdev->mbds_id) goto Enomem;
 		// no need to lock access, we are still initializing the module.
-		mdev->resync = lc_alloc(13, sizeof(struct bm_extent),mdev);
+		mdev->resync = lc_alloc(17, sizeof(struct bm_extent),mdev);
 		if (!mdev->resync) goto Enomem;
 		mdev->act_log = lc_alloc(mdev->sync_conf.al_extents,
 					 sizeof(struct lc_element), mdev);