@@ -47,6 +47,8 @@
* networking / disk / timings affected by load (use Adaptive Timeouts)
*/
extern unsigned int obd_timeout; /* seconds */
+extern unsigned int ping_interval; /* seconds */
+extern unsigned int ping_evict_timeout_multiplier;
extern unsigned int obd_timeout_set;
extern unsigned int at_min;
extern unsigned int at_max;
@@ -66,7 +68,7 @@
/* Should be very conservative; must catch the first reconnect after reboot */
#define OBD_RECOVERY_TIME_SOFT (obd_timeout * 3)
/* Change recovery-small 26b time if you change this */
-#define PING_INTERVAL max(obd_timeout / 4, 1U)
+#define PING_INTERVAL ping_interval
/* a bit more than maximal journal commit time in seconds */
#define PING_INTERVAL_SHORT min(PING_INTERVAL, 7U)
/* Client may skip 1 ping; we must wait at least 2.5. But for multiple
@@ -75,7 +77,7 @@
* and there's no urgent need to evict a client just because it's idle, we
* should be very conservative here.
*/
-#define PING_EVICT_TIMEOUT (PING_INTERVAL * 6)
+#define PING_EVICT_TIMEOUT (PING_INTERVAL * ping_evict_timeout_multiplier)
#define DISK_TIMEOUT 50 /* Beyond this we warn about disk speed */
#define CONNECTION_SWITCH_MIN 5U /* Connection switching rate limiter */
/* Max connect interval for nonresponsive servers; ~50s to avoid building up
@@ -63,6 +63,11 @@
EXPORT_SYMBOL(obd_dirty_pages);
unsigned int obd_timeout = OBD_TIMEOUT_DEFAULT; /* seconds */
EXPORT_SYMBOL(obd_timeout);
+unsigned int ping_interval = (OBD_TIMEOUT_DEFAULT > 4) ?
+ (OBD_TIMEOUT_DEFAULT / 4) : 1;
+EXPORT_SYMBOL(ping_interval);
+unsigned int ping_evict_timeout_multiplier = 6;
+EXPORT_SYMBOL(ping_evict_timeout_multiplier);
unsigned int obd_timeout_set;
EXPORT_SYMBOL(obd_timeout_set);
/* Adaptive timeout defs here instead of ptlrpc module for /sys/fs/ access */
@@ -869,6 +869,7 @@ int class_process_config(struct lustre_cfg *lcfg)
CDEBUG(D_IOCTL, "changing lustre timeout from %d to %d\n",
obd_timeout, lcfg->lcfg_num);
obd_timeout = max(lcfg->lcfg_num, 1U);
+ ping_interval = max(obd_timeout / 4, 1U);
obd_timeout_set = 1;
err = 0;
goto out;
@@ -109,7 +109,6 @@ static ssize_t static_uintvalue_store(struct kobject *kobj,
{ __ATTR(name, 0644, static_uintvalue_show, \
static_uintvalue_store), value }
-LUSTRE_STATIC_UINT_ATTR(timeout, &obd_timeout);
LUSTRE_STATIC_UINT_ATTR(debug_peer_on_timeout, &obd_debug_peer_on_timeout);
LUSTRE_STATIC_UINT_ATTR(dump_on_timeout, &obd_dump_on_timeout);
LUSTRE_STATIC_UINT_ATTR(dump_on_eviction, &obd_dump_on_eviction);
@@ -119,6 +118,8 @@ static ssize_t static_uintvalue_store(struct kobject *kobj,
LUSTRE_STATIC_UINT_ATTR(at_early_margin, &at_early_margin);
LUSTRE_STATIC_UINT_ATTR(at_history, &at_history);
LUSTRE_STATIC_UINT_ATTR(lbug_on_eviction, &obd_lbug_on_eviction);
+LUSTRE_STATIC_UINT_ATTR(ping_interval, &ping_interval);
+LUSTRE_STATIC_UINT_ATTR(evict_multiplier, &ping_evict_timeout_multiplier);
static ssize_t max_dirty_mb_show(struct kobject *kobj, struct attribute *attr,
char *buf)
@@ -311,6 +312,30 @@ static ssize_t jobid_this_session_store(struct kobject *kobj,
return ret ?: count;
}
+static ssize_t timeout_show(struct kobject *kobj,
+ struct attribute *attr,
+ char *buf)
+{
+ return sprintf(buf, "%u\n", obd_timeout);
+}
+
+static ssize_t timeout_store(struct kobject *kobj,
+ struct attribute *attr,
+ const char *buffer,
+ size_t count)
+{
+ unsigned int val;
+ int rc;
+
+ rc = kstrtouint(buffer, 10, &val);
+ if (rc)
+ return rc;
+ obd_timeout = val ?: 1U;
+ ping_interval = max(obd_timeout / 4, 1U);
+
+ return count;
+}
+
/* Root for /sys/kernel/debug/lustre */
struct dentry *debugfs_lustre_root;
EXPORT_SYMBOL_GPL(debugfs_lustre_root);
@@ -321,6 +346,7 @@ static ssize_t jobid_this_session_store(struct kobject *kobj,
LUSTRE_RW_ATTR(jobid_var);
LUSTRE_RW_ATTR(jobid_name);
LUSTRE_RW_ATTR(jobid_this_session);
+LUSTRE_RW_ATTR(timeout);
static struct attribute *lustre_attrs[] = {
&lustre_attr_version.attr,
@@ -329,7 +355,7 @@ static ssize_t jobid_this_session_store(struct kobject *kobj,
&lustre_attr_jobid_name.attr,
&lustre_attr_jobid_var.attr,
&lustre_attr_jobid_this_session.attr,
- &lustre_sattr_timeout.u.attr,
+ &lustre_attr_timeout.attr,
&lustre_attr_max_dirty_mb.attr,
&lustre_sattr_debug_peer_on_timeout.u.attr,
&lustre_sattr_dump_on_timeout.u.attr,
@@ -340,6 +366,8 @@ static ssize_t jobid_this_session_store(struct kobject *kobj,
&lustre_sattr_at_early_margin.u.attr,
&lustre_sattr_at_history.u.attr,
&lustre_sattr_lbug_on_eviction.u.attr,
+ &lustre_sattr_ping_interval.u.attr,
+ &lustre_sattr_evict_multiplier.u.attr,
NULL,
};