Attachment 314932 Details for Bug 298931 – Have scand reclaim metadata from X% of rgrps at a time

[patch] Have scand reclaim metadata from X% of rgrps at a time

bz298931-percent-rgrp-free.patch (text/plain), 4.38 KB, created by Abhijith Das on 2008-08-25 17:15:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Abhijith Das

Created: 2008-08-25 17:15:11 UTC

Size: 4.38 KB

patch

obsolete

>diff -upr /adas/cluster/gfs-kernel/src/gfs/daemon.c gfs-kernel/src/gfs/daemon.c
>--- /adas/cluster/gfs-kernel/src/gfs/daemon.c	2008-08-10 17:56:50.000000000 -0500
>+++ gfs-kernel/src/gfs/daemon.c	2008-08-10 19:10:22.000000000 -0500
>@@ -26,6 +26,7 @@
> #include "recovery.h"
> #include "super.h"
> #include "unlinked.h"
>+#include "rgrp.h"
> 
> /**
>  * gfs_scand - Look for cached glocks and inodes to toss from memory
>@@ -186,7 +187,10 @@ gfs_inoded(void *data)
> 	struct gfs_sbd *sdp = (struct gfs_sbd *)data;
> 
> 	while (!kthread_should_stop()) {
>+		uint64_t inodes, metadata;
> 		gfs_unlinked_dealloc(sdp);
>+		gfs_reclaim_metadata(sdp, &inodes, &metadata, 
>+				     gfs_tune_get(sdp, gt_rgrp_free_perc));
> 		schedule_timeout_interruptible(gfs_tune_get(sdp, gt_inoded_secs) * HZ);
> 	}
> 
>diff -upr /adas/cluster/gfs-kernel/src/gfs/incore.h gfs-kernel/src/gfs/incore.h
>--- /adas/cluster/gfs-kernel/src/gfs/incore.h	2008-08-10 17:56:50.000000000 -0500
>+++ gfs-kernel/src/gfs/incore.h	2008-08-10 18:57:11.000000000 -0500
>@@ -905,6 +905,7 @@ struct gfs_tune {
> 	unsigned int gt_greedy_max;
> 	unsigned int gt_rgrp_try_threshold;
> 	unsigned int gt_statfs_fast;
>+	unsigned int gt_rgrp_free_perc; /* % of total rgrps to free metadata from */
> };
> 
> /*
>diff -upr /adas/cluster/gfs-kernel/src/gfs/ioctl.c gfs-kernel/src/gfs/ioctl.c
>--- /adas/cluster/gfs-kernel/src/gfs/ioctl.c	2008-08-10 17:56:50.000000000 -0500
>+++ gfs-kernel/src/gfs/ioctl.c	2008-08-10 19:08:12.000000000 -0500
>@@ -485,6 +485,7 @@ gi_get_tune(struct gfs_inode *ip,
>         gfs_printf("greedy_max %u\n", gt->gt_greedy_max);
>         gfs_printf("rgrp_try_threshold %u\n", gt->gt_rgrp_try_threshold);
>         gfs_printf("statfs_fast %u\n", gt->gt_statfs_fast);
>+        gfs_printf("rgrp_free_perc %u\n", gt->gt_rgrp_free_perc);
> 
>         error = 0;
> 
>@@ -772,8 +773,10 @@ gi_set_tune(struct gfs_sbd *sdp, struct 
> 			return error;
> 		else
> 			tune_set(gt_statfs_fast, x);
>-
>-
>+	} else if (strcmp(param, "rgrp_free_perc") == 0) {
>+		if (sscanf(value, "%u", &x) > 100)
>+			return -EINVAL;
>+		tune_set(gt_rgrp_free_perc, x);
> 	} else
> 		return -EINVAL;
> 
>@@ -808,7 +811,8 @@ gi_do_reclaim(struct gfs_inode *ip,
> 
> 	error = gfs_reclaim_metadata(ip->i_sbd,
> 				     &inodes,
>-				     &metadata);
>+				     &metadata,
>+				     100);
> 	if (error)
> 		return error;
> 
>diff -upr /adas/cluster/gfs-kernel/src/gfs/rgrp.c gfs-kernel/src/gfs/rgrp.c
>--- /adas/cluster/gfs-kernel/src/gfs/rgrp.c	2008-08-10 17:56:50.000000000 -0500
>+++ gfs-kernel/src/gfs/rgrp.c	2008-08-10 19:24:51.000000000 -0500
>@@ -2022,7 +2022,8 @@ gfs_rlist_free(struct gfs_rgrp_list *rli
> int
> gfs_reclaim_metadata(struct gfs_sbd *sdp, 
> 		     uint64_t *inodes,
>-		     uint64_t *metadata)
>+		     uint64_t *metadata,
>+		     uint32_t percent)
> {
> 	struct gfs_holder ji_gh, ri_gh, rgd_gh, t_gh;
> 	struct gfs_rgrpd *rgd;
>@@ -2034,7 +2035,9 @@ gfs_reclaim_metadata(struct gfs_sbd *sdp
> 	uint32_t goal;
> 	unsigned int x;
> 	int error = 0;
>+	uint64_t rg_max = (percent * sdp->sd_rgcount)/100, rg_count = 0;
> 
>+	rg_max = rg_max < 1 ? 1 : rg_max;
> 	*inodes = *metadata = 0;
> 
> 	/* Acquire the jindex lock here so we don't deadlock with a
>@@ -2049,7 +2052,7 @@ gfs_reclaim_metadata(struct gfs_sbd *sdp
> 		goto fail_jindex_relse;
> 
> 	for (rgd = gfs_rgrpd_get_first(sdp);
>-	     rgd;
>+	     rgd && rg_count < rg_max;
> 	     rgd = gfs_rgrpd_get_next(rgd)) {
> 		error = gfs_glock_nq_init(rgd->rd_gl,
> 					  LM_ST_EXCLUSIVE, GL_NOCACHE,
>@@ -2136,6 +2139,8 @@ gfs_reclaim_metadata(struct gfs_sbd *sdp
> 		gfs_glock_dq_uninit(&t_gh);
> 
> 		gfs_glock_dq_uninit(&rgd_gh);
>+
>+		rg_count++;
> 	}
> 
> 	gfs_glock_dq_uninit(&ri_gh);
>diff -upr /adas/cluster/gfs-kernel/src/gfs/rgrp.h gfs-kernel/src/gfs/rgrp.h
>--- /adas/cluster/gfs-kernel/src/gfs/rgrp.h	2008-08-10 17:56:50.000000000 -0500
>+++ gfs-kernel/src/gfs/rgrp.h	2008-08-10 18:17:38.000000000 -0500
>@@ -83,6 +83,7 @@ void gfs_rlist_free(struct gfs_rgrp_list
> 
> int gfs_reclaim_metadata(struct gfs_sbd *sdp,
> 			 uint64_t *inodes,
>-			 uint64_t *metadata);
>+			 uint64_t *metadata,
>+			 uint32_t percent);
> 
> #endif /* __RGRP_DOT_H__ */
>diff -upr /adas/cluster/gfs-kernel/src/gfs/super.c gfs-kernel/src/gfs/super.c
>--- /adas/cluster/gfs-kernel/src/gfs/super.c	2008-08-10 17:56:50.000000000 -0500
>+++ gfs-kernel/src/gfs/super.c	2008-08-10 19:01:54.000000000 -0500
>@@ -88,6 +88,7 @@ gfs_tune_init(struct gfs_tune *gt)
> 	gt->gt_greedy_max = HZ / 4;
> 	gt->gt_rgrp_try_threshold = 100;
> 	gt->gt_statfs_fast = 0;
>+	gt->gt_rgrp_free_perc = 5;
> }
> 
> /**

Actions: View | Diff

Attachments on bug 298931: 314932 | 316363 | 316624