From 75cbf934dea9044b203421c925b57cdf4b7d6872 Mon Sep 17 00:00:00 2001
From: sageweil <sageweil@29311d96-e01e-0410-9327-a35deaab8ce9>
Date: Wed, 29 Aug 2007 00:42:14 +0000
Subject: [PATCH] osd cleanup, small bugfix

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1724 29311d96-e01e-0410-9327-a35deaab8ce9
---
 trunk/ceph/osd/OSD.cc          | 10 ++--------
 trunk/ceph/osd/OSD.h           |  5 +----
 trunk/ceph/osd/ReplicatedPG.cc | 18 +++++++-----------
 3 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/trunk/ceph/osd/OSD.cc b/trunk/ceph/osd/OSD.cc
index c08f7c0024bc6..87d597a8bbb13 100644
--- a/trunk/ceph/osd/OSD.cc
+++ b/trunk/ceph/osd/OSD.cc
@@ -283,11 +283,8 @@ int OSD::init()
   timer.add_event_after(g_conf.osd_heartbeat_interval, new C_Heartbeat(this));
 
   // and stat beacon
-  send_pg_stats_event = new C_Stats(this);
-  timer.add_event_after(g_conf.osd_pg_stats_interval, send_pg_stats_event);
+  timer.add_event_after(g_conf.osd_pg_stats_interval, new C_Stats(this));
 
-  //dout(0) << "osd_rep " << g_conf.osd_rep << dendl;
-  
   return 0;
 }
 
@@ -298,8 +295,6 @@ int OSD::shutdown()
   state = STATE_STOPPING;
 
   // cancel timers
-  timer.cancel_event(send_pg_stats_event);
-  send_pg_stats_event = 0;
   timer.cancel_all();
   timer.join();
 
@@ -721,8 +716,7 @@ void OSD::send_pg_stats()
   messenger->send_message(m, monmap->get_inst(mon));  
 
   // reschedule
-  send_pg_stats_event = new C_Stats(this);
-  timer.add_event_after(g_conf.osd_pg_stats_interval, send_pg_stats_event);
+  timer.add_event_after(g_conf.osd_pg_stats_interval, new C_Stats(this));
 }
 
 
diff --git a/trunk/ceph/osd/OSD.h b/trunk/ceph/osd/OSD.h
index 60e63b29c4620..1b48b0cbadfd7 100644
--- a/trunk/ceph/osd/OSD.h
+++ b/trunk/ceph/osd/OSD.h
@@ -286,10 +286,7 @@ private:
   public:
     C_Stats(OSD *o) : osd(o) {}
     void finish(int r) { 
-      if (osd->send_pg_stats_event == this) {
-	osd->send_pg_stats_event = 0;
-	osd->send_pg_stats(); 
-      }
+      osd->send_pg_stats(); 
     }
   };
   void send_pg_stats(); 
diff --git a/trunk/ceph/osd/ReplicatedPG.cc b/trunk/ceph/osd/ReplicatedPG.cc
index eb3c388845525..8832a9d94e1d5 100644
--- a/trunk/ceph/osd/ReplicatedPG.cc
+++ b/trunk/ceph/osd/ReplicatedPG.cc
@@ -299,10 +299,6 @@ void ReplicatedPG::do_op(MOSDOp *op)
   case OSD_OP_READ:
   case OSD_OP_STAT:
     op_read(op);
-    if (op->get_op() == OSD_OP_READ) {
-      osd->logger->inc("c_rd");
-      osd->logger->inc("c_rdb", op->get_length());
-    }
     break;
     
     // rep stuff
@@ -332,11 +328,6 @@ void ReplicatedPG::do_op(MOSDOp *op)
     } else {
       // go go gadget pg
       op_modify(op);
-      
-      if (op->get_op() == OSD_OP_WRITE) {
-	osd->logger->inc("c_wr");
-	osd->logger->inc("c_wrb", op->get_length());
-      }
     }
     break;
     
@@ -421,6 +412,8 @@ void ReplicatedPG::op_read(MOSDOp *op)
 	reply->set_length(r);
 	dout(15) << " read got " << r << " / " << op->get_length() << " bytes from obj " << oid << dendl;
       }
+      osd->logger->inc("c_rd");
+      osd->logger->inc("c_rdb", op->get_length());
       break;
 
     case OSD_OP_STAT:
@@ -1120,6 +1113,11 @@ void ReplicatedPG::op_modify(MOSDOp *op)
            << " " << op->get_offset() << "~" << op->get_length()
            << dendl;  
 
+  if (op->get_op() == OSD_OP_WRITE) {
+    osd->logger->inc("c_wr");
+    osd->logger->inc("c_wrb", op->get_length());
+  }
+
   // issue replica writes
   RepGather *repop = 0;
   bool alone = (acting.size() == 1);
@@ -1188,8 +1186,6 @@ void ReplicatedPG::op_modify(MOSDOp *op)
     oncommit->ack();
   }
 
-
-
 }
 
 
-- 
2.39.5