From: Sage Weil <sage@newdream.net>
Date: Thu, 19 Nov 2009 00:01:20 +0000 (-0800)
Subject: Merge commit 'd00b917143e2afd72851bfd0400b2c2a1f3fc018' into auth
X-Git-Tag: v0.18~98
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2e2eaa6b1f0e9ba93d1f7435f6effd93d8eb7439;p=ceph.git

Merge commit 'd00b917143e2afd72851bfd0400b2c2a1f3fc018' into auth
---

2e2eaa6b1f0e9ba93d1f7435f6effd93d8eb7439
diff --cc src/mon/MonClient.cc
index ee00704825de,eec0fc06c504..e7ec0d576863
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@@ -420,13 -355,10 +420,12 @@@ void MonClient::tick(
  {
    dout(10) << "tick" << dendl;
  
 +  _check_auth_rotating();
 +  
    if (hunting) {
-     dout(0) << "continuing hunt" << dendl;
+     dout(1) << "continuing hunt" << dendl;
      _reopen_session();
- 
-   } else {
+   } else if (cur_mon >= 0) {
      // just renew as needed
      utime_t now = g_clock.now();
      if (now > sub_renew_after)
diff --cc src/osd/OSD.h
index fbb66b083ff2,5d662cb1fdc4..9b1ab2041f39
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@@ -106,9 -101,9 +106,10 @@@ protected
  
    LogClient   logclient;
  
 +
    int whoami;
    const char *dev_path, *journal_path;
+   bool mknewjournal;
  
    class C_Tick : public Context {
      OSD *osd;