Merge branch 'unstable' of ssh://ceph.newdream.net/git/ceph into unstable

diff --cc src/config.cc
index 908e6d835492107cb3a7082bc6e7510e1493d00e,8ea7c1d9bdb6c74bcdcd2a31276a2494f5bebd6b..bb0cf00ae81f2a312886980d3d36bf86f79a9b98
--- 1/src/config.cc
--- 2/src/config.cc
+++ b/src/config.cc
@@@ -382,33 -381,32 +381,32 @@@ static struct config_option config_opti
        OPTION(debug, debug_mon, 0, INT, 1),
        OPTION(debug, debug_paxos, 0, INT, 0),
        OPTION(debug, debug_tp, 0, INT, 0),
-       OPTION(debug, debug_after, 0, INT, 0),
        OPTION(clock, clock_lock, 0, BOOL, false),
        OPTION(clock, clock_tare, 0, BOOL, false),
 -      OPTION(global, ms_tcp_nodelay, 0, BOOL, true),
 -      OPTION(global, ms_retry_interval, 0, DOUBLE, 2.0),
 -      OPTION(global, ms_fail_interval, 0, DOUBLE, 15.0),
 -      OPTION(global, ms_die_on_failure, 0, BOOL, false),
 -      OPTION(global, ms_nocrc, 0, BOOL, false),
 +      OPTION(messenger, ms_tcp_nodelay, 0, BOOL, true),
 +      OPTION(messenger, ms_retry_interval, 0, DOUBLE, 2.0),  // how often to attempt reconnect
 +      OPTION(messenger, ms_fail_interval, 0, DOUBLE, 15.0),  // fail after this long
 +      OPTION(messenger, ms_die_on_failure, 0, BOOL, false),
 +      OPTION(messenger, ms_nocrc, 0, BOOL, false),
        OPTION(mon, mon_tick_interval, 0, INT, 5),
 -      OPTION(mon, mon_osd_down_out_interval, 0, INT, 5),
 -      OPTION(mon, mon_lease, 0, FLOAT, 5),
 -      OPTION(mon, mon_lease_renew_interval, 0, FLOAT, 3),
 -      OPTION(mon, mon_lease_ack_timeout, 0, FLOAT, 10.0),
 -      OPTION(mon, mon_lease_timeout, 0, FLOAT, 10.0),
 -      OPTION(mon, mon_accept_timeout, 0, FLOAT, 10.0),
 +      OPTION(mon, mon_osd_down_out_interval, 0, INT, 5),  // seconds
 +      OPTION(mon, mon_lease, 0, FLOAT, 5),                // lease interval
 +      OPTION(mon, mon_lease_renew_interval, 0, FLOAT, 3), // on leader, to renew the lease
 +      OPTION(mon, mon_lease_ack_timeout, 0, FLOAT, 10.0), // on leader, if lease isn't acked by all peons
 +      OPTION(mon, mon_lease_timeout, 0, FLOAT, 10.0),     // on peon, if lease isn't extended
 +      OPTION(mon, mon_accept_timeout, 0, FLOAT, 10.0),    // on leader, if paxos update isn't accepted
        OPTION(mon, mon_stop_on_last_unmount, 0, BOOL, false),
        OPTION(mon, mon_stop_with_last_mds, 0, BOOL, false),
 -      OPTION(mon, mon_allow_mds_bully, 0, BOOL, false),
 -      OPTION(mon, mon_pg_create_interval, 0, FLOAT, 30.0),
 -      OPTION(paxos, paxos_propose_interval, 0, DOUBLE, 1.0),
 -      OPTION(paxos, paxos_observer_timeout, 0, DOUBLE, 5*60),
 +      OPTION(mon, mon_allow_mds_bully, 0, BOOL, false),   // allow a booting mds to (forcibly) claim an mds # .. FIXME
 +      OPTION(mon, mon_pg_create_interval, 0, FLOAT, 30.0), // no more than every 30s
 +      OPTION(paxos, paxos_propose_interval, 0, DOUBLE, 1.0),  // gather updates for this long before proposing a map update
 +      OPTION(paxos, paxos_observer_timeout, 0, DOUBLE, 5*60), // gather updates for this long before proposing a map update
        OPTION(client, client_cache_size, 0, INT, 1000),
        OPTION(client, client_cache_mid, 0, FLOAT, .5),
 -      OPTION(client, client_cache_stat_ttl, 0, INT, 0),
 -      OPTION(client, client_cache_readdir_ttl, 0, INT, 1),
 +      OPTION(client, client_cache_stat_ttl, 0, INT, 0), // seconds until cached stat results become invalid
 +      OPTION(client, client_cache_readdir_ttl, 0, INT, 1),  // 1 second only
        OPTION(client, client_use_random_mds, 0, BOOL, false),
 -      OPTION(client, client_mount_timeout, 0, DOUBLE, 10.0),
 +      OPTION(client, client_mount_timeout, 0, DOUBLE, 10.0),  // retry every N seconds
        OPTION(client, client_tick_interval, 0, DOUBLE, 1.0),
        OPTION(client, client_hack_balance_reads, 0, BOOL, false),
        OPTION(client, client_trace, 0, STR, 0),