libceph: monc hunt rate is 3s with backoff up to 30s

[linux-2.6-block.git] / include / linux / ceph / libceph.h

diff --git a/include/linux/ceph/libceph.h b/include/linux/ceph/libceph.h
index 3e3799cdc6e66d719fed8ae9adc8539d4e2cb0c6..e7975e4681e1a9110ee26506eaf4402ffcbad082 100644 (file)
--- a/include/linux/ceph/libceph.h
+++ b/include/linux/ceph/libceph.h
@@ -47,7 +47,6 @@ struct ceph_options {
        unsigned long mount_timeout;            /* jiffies */
        unsigned long osd_idle_ttl;             /* jiffies */
        unsigned long osd_keepalive_timeout;    /* jiffies */
-       unsigned long monc_ping_timeout;        /* jiffies */
 
        /*
         * any type that can't be simply compared or doesn't need need
@@ -68,7 +67,12 @@ struct ceph_options {
 #define CEPH_MOUNT_TIMEOUT_DEFAULT     msecs_to_jiffies(60 * 1000)
 #define CEPH_OSD_KEEPALIVE_DEFAULT     msecs_to_jiffies(5 * 1000)
 #define CEPH_OSD_IDLE_TTL_DEFAULT      msecs_to_jiffies(60 * 1000)
-#define CEPH_MONC_PING_TIMEOUT_DEFAULT msecs_to_jiffies(30 * 1000)
+
+#define CEPH_MONC_HUNT_INTERVAL                msecs_to_jiffies(3 * 1000)
+#define CEPH_MONC_PING_INTERVAL                msecs_to_jiffies(10 * 1000)
+#define CEPH_MONC_PING_TIMEOUT         msecs_to_jiffies(30 * 1000)
+#define CEPH_MONC_HUNT_BACKOFF         2
+#define CEPH_MONC_HUNT_MAX_MULT                10
 
 #define CEPH_MSG_MAX_FRONT_LEN (16*1024*1024)
 #define CEPH_MSG_MAX_MIDDLE_LEN        (16*1024*1024)