kclient: typo

diff --git a/src/TODO b/src/TODO
index 92624c732ec7067fa7b612bf342eb33045f5f36b..e5197451410fe5a31740c5cc7865f9a9fc2f22c6 100644 (file)
--- a/src/TODO
+++ b/src/TODO
@@ -1,7 +1,9 @@
 v0.3
 - client rsync bug?
+- osd: primary needs to check requests if replica set changes
 
 v0.4
+- fix msgr protocol wrt resets, and varying connection close policies
 - ENOSPC
 - finish client failure recovery (reconnect after long eviction; and slow delayed reconnect)
 - make kclient sendpage (and rip out io interruption?)

diff --git a/src/config.cc b/src/config.cc
index 2a0b70122d962f5bc3101b26739d3885d1dec90a..f1d437b3e530df8ee7b2878f8698dcce2192d797 100644 (file)
--- a/src/config.cc
+++ b/src/config.cc
@@ -323,7 +323,7 @@ md_config_t g_conf = {
   mds_decay_halflife: 5,
 
   mds_beacon_interval: 4, //30.0,
-  mds_beacon_grace: 15, //60*60.0,
+  mds_beacon_grace: 30, //60*60.0,
 
   mds_session_timeout: 60,    // cap bits and leases time out if client idle
   mds_session_autoclose: 300, // autoclose idle session 

diff --git a/src/kernel/messenger.c b/src/kernel/messenger.c
index 4b07692395b87efdbf66fd0a2ce0f5aa62dd9160..c817988825724daf4245958e9e5f750658e5d410 100644 (file)
--- a/src/kernel/messenger.c
+++ b/src/kernel/messenger.c
@@ -1904,7 +1904,7 @@ void ceph_msg_put(struct ceph_msg *m)
                     ceph_msg_type_name(le32_to_cpu(m->hdr.type)),
                     le32_to_cpu(m->hdr.front_len),
                     le32_to_cpu(m->hdr.data_len));
-               WARN();
+               WARN_ON(1);
        }
        if (atomic_dec_and_test(&m->nref)) {
                dout(20, "ceph_msg_put last one on %p\n", m);