Merge branch 'unstable' into mon-remove

Conflicts:
	src/cmon.cc
	src/include/ceph_fs.h
	src/mon/MonClient.cc
	src/mon/Monitor.cc

diff --cc src/cmon.cc
Simple merge

diff --cc src/include/ceph_fs.h
index 8c672a45b721443e3ef8954b165b52ef79274fe0,f8823e13386b581ace3cb3feeb0eae645fe3020e..70a451ccbc9f4e25fc8e5560ee43fc2b423b2d4f
--- 1/src/include/ceph_fs.h
--- 2/src/include/ceph_fs.h
+++ b/src/include/ceph_fs.h
@@@ -56,21 -42,8 +42,9 @@@
  #define CEPH_FEATURE_UID            (1<<0)
  #define CEPH_FEATURE_NOSRCADDR      (1<<1)
  #define CEPH_FEATURE_MONCLOCKCHECK  (1<<2)
- #define CEPH_FEATURE_MONNAMES       (1<<3)
- 
- #define CEPH_FEATURE_SUPPORTED_MON  CEPH_FEATURE_UID|CEPH_FEATURE_NOSRCADDR|\
-                                   CEPH_FEATURE_MONCLOCKCHECK|\
-                                   CEPH_FEATURE_MONNAMES
- #define CEPH_FEATURE_REQUIRED_MON   CEPH_FEATURE_UID
- #define CEPH_FEATURE_SUPPORTED_MDS  CEPH_FEATURE_UID|CEPH_FEATURE_NOSRCADDR|\
-                                   CEPH_FEATURE_MONNAMES
- #define CEPH_FEATURE_REQUIRED_MDS   CEPH_FEATURE_UID
- #define CEPH_FEATURE_SUPPORTED_OSD  CEPH_FEATURE_UID|CEPH_FEATURE_NOSRCADDR|\
-                                   CEPH_FEATURE_MONNAMES
- #define CEPH_FEATURE_REQUIRED_OSD   CEPH_FEATURE_UID
- #define CEPH_FEATURE_SUPPORTED_CLIENT CEPH_FEATURE_NOSRCADDR|\
-                                   CEPH_FEATURE_MONNAMES
- #define CEPH_FEATURE_REQUIRED_CLIENT 0
+ #define CEPH_FEATURE_FLOCK          (1<<3)
+ #define CEPH_FEATURE_SUBSCRIBE2     (1<<4)
++#define CEPH_FEATURE_MONNAMES       (1<<5)
  
  
  /*

diff --cc src/messages/MForward.h
Simple merge

diff --cc src/mkcephfs.in
Simple merge

diff --cc src/mon/AuthMonitor.cc
Simple merge

diff --cc src/mon/ClassMonitor.cc
Simple merge

diff --cc src/mon/Elector.h
Simple merge

diff --cc src/mon/LogMonitor.cc
Simple merge

diff --cc src/mon/MDSMonitor.cc
Simple merge

diff --cc src/mon/MonClient.cc
index 53ca2dc2fee50afff80aa940764456db73cdf15d,91d33d4aefffdd3cd98de064987cfeca8f9d1a7c..e0e798ef704e216452e93664d8586586ce01800e
--- 1/src/mon/MonClient.cc
--- 2/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@@ -118,8 -115,8 +118,8 @@@ int MonClient::get_monmap(
    dout(10) << "get_monmap" << dendl;
    Mutex::Locker l(monc_lock);
    
-   _sub_want("monmap", monmap.get_epoch());
+   _sub_want("monmap", 0, 0);
 -  if (cur_mon < 0)
 +  if (cur_mon.empty())
      _reopen_session();
  
    while (want_monmap)
@@@ -288,8 -266,8 +288,8 @@@ int MonClient::authenticate(double time
      return 0;
    }
  
-   _sub_want("monmap", monmap.get_epoch());
+   _sub_want("monmap", monmap.get_epoch() ? monmap.get_epoch() + 1 : 0, 0);
 -  if (cur_mon < 0)
 +  if (cur_mon.empty())
      _reopen_session();
  
    utime_t until = g_clock.now();
@@@ -450,7 -429,7 +450,7 @@@ bool MonClient::ms_handle_reset(Connect
  void MonClient::_finish_hunting()
  {
    if (hunting) {
-     dout(0) << "found mon." << cur_mon << dendl; 
 -    dout(1) << "found mon" << cur_mon << dendl;
++    dout(1) << "found mon." << cur_mon << dendl; 
      hunting = false;
    }
  }

diff --cc src/mon/MonClient.h
Simple merge

diff --cc src/mon/MonMap.h
Simple merge

diff --cc src/mon/Monitor.cc
index 15d9cff796c03b9d738d1bd4f455cc63cc681eef,68f0079c8d25bc6f1fbbb10567c2fa45428f8678..9ec3846222651b5cea01a3b98b53747fd28f1647
--- 1/src/mon/Monitor.cc
--- 2/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@@ -404,14 -400,14 +404,16 @@@ void Monitor::handle_forward(MForward *
      dout(0) << "forward from entity with insufficient caps! " 
            << session->caps << dendl;
    } else {
 -
 -    MonSession *s = new MonSession(m->client);
 -    s->caps = m->client_caps;
      Connection *c = new Connection;
 +    MonSession *s = new MonSession(m->msg->get_source_inst(), c);
      c->set_priv(s);
+     c->set_peer_addr(m->client.addr);
+     c->set_peer_type(m->client.name.type());
  
 +    s->caps = m->client_caps;
 +    s->proxy_con = m->get_connection()->get();
 +    s->proxy_tid = m->tid;
 +
      PaxosServiceMessage *req = m->msg;
      m->msg = NULL;  // so ~MForward doesn't delete it
      req->set_connection(c);
@@@ -843,9 -840,9 +848,9 @@@ void Monitor::check_subs(
  
  void Monitor::check_sub(Subscription *sub)
  {
-   dout(0) << "check_sub monmap last " << sub->last << " have " << monmap->get_epoch() << dendl;
-   if (sub->last < monmap->get_epoch()) {
+   dout(0) << "check_sub monmap next " << sub->next << " have " << monmap->get_epoch() << dendl;
+   if (sub->next <= monmap->get_epoch()) {
 -    send_latest_monmap(sub->session->inst);
 +    send_latest_monmap(sub->session->con);
      if (sub->onetime)
        session_map.remove_sub(sub);
      else

diff --cc src/mon/Monitor.h
Simple merge

diff --cc src/mon/OSDMonitor.cc
Simple merge

diff --cc src/mon/PGMonitor.cc
Simple merge

diff --cc src/mon/Paxos.cc
Simple merge

diff --cc src/mon/Paxos.h
Simple merge

diff --cc src/mon/Session.h
Simple merge

diff --cc src/testmsgr.cc
Simple merge

diff --cc src/vstart.sh
Simple merge