From: Sage Weil <sage@newdream.net>
Date: Thu, 23 Apr 2009 22:12:06 +0000 (-0700)
Subject: mon: fix osd mark out code
X-Git-Tag: v0.7.3~63
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=93a05f75789efc04ff47f90215dd06cf0e65f6a5;p=ceph.git

mon: fix osd mark out code
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 5afa32718ae..9b788653314 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -798,20 +798,22 @@ void OSDMonitor::tick()
   utime_t now = g_clock.now();
   map<int,utime_t>::iterator i = down_pending_out.begin();
   while (i != down_pending_out.end()) {
+    int o = i->first;
     utime_t down = now;
     down -= i->second;
     i++;
 
     if (down.sec() >= g_conf.mon_osd_down_out_interval) {
-      dout(10) << "tick marking osd" << i->first << " OUT after " << down
+      dout(10) << "tick marking osd" << o << " OUT after " << down
 	       << " sec (target " << g_conf.mon_osd_down_out_interval << ")" << dendl;
-      down_pending_out.erase(i->first);
-      pending_inc.new_weight[i->first] = CEPH_OSD_OUT;
+      pending_inc.new_weight[o] = CEPH_OSD_OUT;
       do_propose = true;
 
       stringstream ss;
-      ss << osdmap.get_inst(i->first) << " out (down for " << down << ")";
+      ss << "osd" << o << " out (down for " << down << ")";
       mon->get_logclient()->log(LOG_DEBUG, ss);
+
+      down_pending_out.erase(o);
     }
   }