From fe8c3db46276aaa33cf81b1c75a348ca8f5207d6 Mon Sep 17 00:00:00 2001 From: Johann Lombardi Date: Fri, 8 Jan 2010 23:44:03 +0100 Subject: [PATCH] Disable async journal commit & cancel lock before replay features by default This reverts commit d7bdeb27b53b12f8c567fa220f82e1ca2a10a470. --- lustre/ldlm/ldlm_request.c | 2 +- lustre/obdfilter/filter.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lustre/ldlm/ldlm_request.c b/lustre/ldlm/ldlm_request.c index a8d6479..81cb983 100644 --- a/lustre/ldlm/ldlm_request.c +++ b/lustre/ldlm/ldlm_request.c @@ -51,7 +51,7 @@ CFS_MODULE_PARM(ldlm_enqueue_min, "i", int, 0644, "lock enqueue timeout minimum"); /* in client side, whether the cached locks will be canceled before replay */ -unsigned int ldlm_cancel_unused_locks_before_replay = 1; +unsigned int ldlm_cancel_unused_locks_before_replay = 0; static void interrupted_completion_wait(void *data) { diff --git a/lustre/obdfilter/filter.c b/lustre/obdfilter/filter.c index 24f370c..8c5c914 100644 --- a/lustre/obdfilter/filter.c +++ b/lustre/obdfilter/filter.c @@ -1965,7 +1965,7 @@ int filter_common_setup(struct obd_device *obd, obd_count len, void *buf, filter->fo_readcache_max_filesize = FILTER_MAX_CACHE_SIZE; filter->fo_fmd_max_num = FILTER_FMD_MAX_NUM_DEFAULT; filter->fo_fmd_max_age = FILTER_FMD_MAX_AGE_DEFAULT; - filter->fo_syncjournal = 0; /* Don't sync journals on i/o by default */ + filter->fo_syncjournal = 1; /* Sync journals on i/o by default b=19128 */ rc = filter_prep(obd); if (rc) -- 1.8.3.1