From 53ed4e0d54da64ff30f94b16b6053fa94cdedaa4 Mon Sep 17 00:00:00 2001 From: Pawel Jakub Dawidek Date: Thu, 9 Dec 2004 12:26:47 +0000 Subject: [PATCH] - Turn off 'fast' mode by default and increase maximum memory to consume when this mode is used. - Manual page update. --- sbin/geom/class/stripe/gstripe.8 | 6 +++--- sys/geom/stripe/g_stripe.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sbin/geom/class/stripe/gstripe.8 b/sbin/geom/class/stripe/gstripe.8 index df1b84e2c40d..bb9eed4dcf69 100644 --- a/sbin/geom/class/stripe/gstripe.8 +++ b/sbin/geom/class/stripe/gstripe.8 @@ -169,7 +169,7 @@ GEOM class. This can be set to a number between 0 and 3 inclusive. If set to 0 minimal debug information is printed, and if set to 3 the maximum amount of debug information in printed. -.It Va kern.geom.stripe.fast : No 1 +.It Va kern.geom.stripe.fast : No 0 If set to a non-zero value enable .Dq "fast mode" instead of the normal @@ -182,7 +182,7 @@ If enough memory cannot be allocated, .Nm STRIPE will fall back to .Dq "economic mode" . -.It Va kern.geom.stripe.maxmem : No 1310720 +.It Va kern.geom.stripe.maxmem : No 13107200 Maximum amount of memory that can be consumed by .Dq "fast mode" (in bytes). @@ -204,7 +204,7 @@ The following example shows how to set up a striped device from four disks with create a file system on it, and mount it: .Bd -literal -offset indent -gstripe label -v -s 4096 data /dev/da0 /dev/da1 /dev/da2 /dev/da3 +gstripe label -v -s 131072 data /dev/da0 /dev/da1 /dev/da2 /dev/da3 newfs /dev/stripe/data mount /dev/stripe/data /mnt [...] diff --git a/sys/geom/stripe/g_stripe.c b/sys/geom/stripe/g_stripe.c index 647316ba2817..57438e32d0f4 100644 --- a/sys/geom/stripe/g_stripe.c +++ b/sys/geom/stripe/g_stripe.c @@ -72,7 +72,7 @@ static u_int g_stripe_debug = 0; TUNABLE_INT("kern.geom.stripe.debug", &g_stripe_debug); SYSCTL_UINT(_kern_geom_stripe, OID_AUTO, debug, CTLFLAG_RW, &g_stripe_debug, 0, "Debug level"); -static int g_stripe_fast = 1; +static int g_stripe_fast = 0; TUNABLE_INT("kern.geom.stripe.fast", &g_stripe_fast); static int g_sysctl_stripe_fast(SYSCTL_HANDLER_ARGS) @@ -87,7 +87,7 @@ g_sysctl_stripe_fast(SYSCTL_HANDLER_ARGS) } SYSCTL_PROC(_kern_geom_stripe, OID_AUTO, fast, CTLTYPE_INT | CTLFLAG_RW, NULL, 0, g_sysctl_stripe_fast, "I", "Fast, but memory-consuming, mode"); -static u_int g_stripe_maxmem = MAX_IO_SIZE * 50; +static u_int g_stripe_maxmem = MAX_IO_SIZE * 100; TUNABLE_INT("kern.geom.stripe.maxmem", &g_stripe_maxmem); SYSCTL_UINT(_kern_geom_stripe, OID_AUTO, maxmem, CTLFLAG_RD, &g_stripe_maxmem, 0, "Maximum memory that can be allocated in \"fast\" mode (in bytes)");