From 7e0d6814c817b13ebcdaccabda484f02d0e15db2 Mon Sep 17 00:00:00 2001 From: adilger Date: Wed, 8 Jun 2005 10:46:27 +0000 Subject: [PATCH] Branch b1_4 Don't use the increased LDLM AST timeout on the MDS, rather use the old default value initially. Clients generally do not have the need to do disk operations before flushing an MDS lock. b=6422 --- lustre/mds/handler.c | 3 ++- lustre/obdclass/class_obd.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lustre/mds/handler.c b/lustre/mds/handler.c index b0ef204..03cc3e7 100644 --- a/lustre/mds/handler.c +++ b/lustre/mds/handler.c @@ -246,7 +246,7 @@ static int mds_connect(struct lustre_handle *conn, struct obd_device *obd, struct obd_uuid *cluuid, struct obd_connect_data *data) { struct obd_export *exp; - struct mds_export_data *med; /* */ + struct mds_export_data *med; struct mds_client_data *mcd; int rc, abort_recovery; ENTRY; @@ -1768,6 +1768,7 @@ static int mds_setup(struct obd_device *obd, obd_count len, void *buf) obd->obd_replayable ? "enabled" : "disabled"); } + ldlm_timeout = 6; ping_evictor_start(); RETURN(0); diff --git a/lustre/obdclass/class_obd.c b/lustre/obdclass/class_obd.c index 58568e8..054dfe3 100644 --- a/lustre/obdclass/class_obd.c +++ b/lustre/obdclass/class_obd.c @@ -89,7 +89,7 @@ int proc_version; unsigned int obd_fail_loc; unsigned int obd_dump_on_timeout; unsigned int obd_timeout = 100; /* seconds */ -unsigned int ldlm_timeout = 30; /* seconds */ +unsigned int ldlm_timeout = 20; /* seconds */ char obd_lustre_upcall[128] = "DEFAULT"; /* or NONE or /full/path/to/upcall */ unsigned int obd_sync_filter; /* = 0, don't sync by default */ -- 1.8.3.1