resurrected RAID4PG

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@2162 29311d96-e01e-0410-9327-a35deaab8ce9

diff --git a/branches/ebofs/Makefile b/branches/ebofs/Makefile
index 52fc13494c3c665a376b81c69d8e6aab076440a0..c7c6ee195da98bdf64d7cd487202329e3568c554 100644 (file)
--- a/branches/ebofs/Makefile
+++ b/branches/ebofs/Makefile
@@ -75,10 +75,10 @@ MDS_OBJS= \
 OSD_OBJS= \
        osd/PG.o\
        osd/ReplicatedPG.o\
+       osd/RAID4PG.o\
        osd/Ager.o\
        osd/FakeStore.o\
        osd/OSD.o
-#      osd/RAID4PG.o\
 
 OSDC_OBJS= \
        osdc/Objecter.o\

diff --git a/branches/ebofs/mon/OSDMonitor.cc b/branches/ebofs/mon/OSDMonitor.cc
index 134357969155532c973a10bb73c1863ec0fcc8fb..2700f51992cee4c9434ded11202db2893f52c096 100644 (file)
--- a/branches/ebofs/mon/OSDMonitor.cc
+++ b/branches/ebofs/mon/OSDMonitor.cc
@@ -222,22 +222,24 @@ void OSDMonitor::build_crush_map(CrushWrapper& crush,
       crush_rule_add_step(rule, CRUSH_RULE_EMIT, 0, 0);
       crush_add_rule(crush.map, CRUSH_REP_RULE(i), rule);
     }
-    /*
+
     // raid
     for (int i=g_conf.osd_min_raid_width; i <= g_conf.osd_max_raid_width; i++) {
-      int r = CRUSH_RAID_RULE(i);      
       if (ndom >= i) {
-       crush.rules[r].steps.push_back(RuleStep(CRUSH_RULE_TAKE, nroot));
-       crush.rules[r].steps.push_back(RuleStep(CRUSH_RULE_CHOOSE_INDEP, i, 1));
-       crush.rules[r].steps.push_back(RuleStep(CRUSH_RULE_CHOOSE_INDEP, 1, 0));      
-       crush.rules[r].steps.push_back(RuleStep(CRUSH_RULE_EMIT));
+       crush_rule *rule = crush_make_rule();
+       crush_rule_add_step(rule, CRUSH_RULE_TAKE, rootid, 0);
+       crush_rule_add_step(rule, CRUSH_RULE_CHOOSE_INDEP, i, 1);
+       crush_rule_add_step(rule, CRUSH_RULE_CHOOSE_INDEP, 1, 0);
+       crush_rule_add_step(rule, CRUSH_RULE_EMIT, 0, 0);
+       crush_add_rule(crush.map, CRUSH_RAID_RULE(i), rule);
       } else {
-       crush.rules[r].steps.push_back(RuleStep(CRUSH_RULE_TAKE, nroot));
-       crush.rules[r].steps.push_back(RuleStep(CRUSH_RULE_CHOOSE_INDEP, i, 0));
-       crush.rules[r].steps.push_back(RuleStep(CRUSH_RULE_EMIT));
+       crush_rule *rule = crush_make_rule();
+       crush_rule_add_step(rule, CRUSH_RULE_TAKE, rootid, 0);
+       crush_rule_add_step(rule, CRUSH_RULE_CHOOSE_INDEP, i, 0);
+       crush_rule_add_step(rule, CRUSH_RULE_EMIT, 0, 0);
+       crush_add_rule(crush.map, CRUSH_RAID_RULE(i), rule);
       }
     }
-    */
     
   } else {
     // one bucket
@@ -258,15 +260,14 @@ void OSDMonitor::build_crush_map(CrushWrapper& crush,
       crush_rule_add_step(rule, CRUSH_RULE_EMIT, 0, 0);
       crush_add_rule(crush.map, CRUSH_REP_RULE(i), rule);
     }
-    /*
-    // raid
+    // raid4
     for (int i=g_conf.osd_min_raid_width; i <= g_conf.osd_max_raid_width; i++) {
-      int r = CRUSH_RAID_RULE(i);      
-      crush.rules[r].steps.push_back(RuleStep(CRUSH_RULE_TAKE, root));
-      crush.rules[r].steps.push_back(RuleStep(CRUSH_RULE_CHOOSE_INDEP, i, 0));
-      crush.rules[r].steps.push_back(RuleStep(CRUSH_RULE_EMIT));
+      crush_rule *rule = crush_make_rule();
+      crush_rule_add_step(rule, CRUSH_RULE_TAKE, root, 0);
+      crush_rule_add_step(rule, CRUSH_RULE_CHOOSE_INDEP, i, 0);
+      crush_rule_add_step(rule, CRUSH_RULE_EMIT, 0, 0);
+      crush_add_rule(crush.map, CRUSH_RAID_RULE(i), rule);
     }
-    */
   }
   
   crush.finalize();

diff --git a/branches/ebofs/osd/OSD.cc b/branches/ebofs/osd/OSD.cc
index 0512d57f13437d87630e3bfb12bac9851d0b52a8..6a7289c88ae32efb4178e08ce2c1995c9c77afc2 100644 (file)
--- a/branches/ebofs/osd/OSD.cc
+++ b/branches/ebofs/osd/OSD.cc
@@ -29,7 +29,7 @@
 
 
 #include "ReplicatedPG.h"
-//#include "RAID4PG.h"
+#include "RAID4PG.h"
 
 #include "Ager.h"
 
@@ -407,8 +407,8 @@ PG *OSD::_new_lock_pg(pg_t pgid)
   PG *pg;
   if (pgid.is_rep())
     pg = new ReplicatedPG(this, pgid);
-  //else if (pgid.is_raid4())
-  //pg = new RAID4PG(this, pgid);
+  else if (pgid.is_raid4())
+    pg = new RAID4PG(this, pgid);
   else 
     assert(0);
 
@@ -1355,14 +1355,13 @@ void OSD::advance_map(ObjectStore::Transaction& t)
     }
 
     // raided
-    /*
     for (int size = minraid; size <= maxraid; size++) {
       for (ps_t ps = 0; ps < numps; ++ps) 
        try_create_pg(pg_t(pg_t::TYPE_RAID4, size, ps, -1), t);
       for (ps_t ps = 0; ps < numlps; ++ps) 
        try_create_pg(pg_t(pg_t::TYPE_RAID4, size, ps, whoami), t);
     }
-    */
+
     dout(1) << "mkfs done, created " << pg_map.size() << " pgs" << dendl;
 
   } else {

diff --git a/branches/ebofs/osd/RAID4PG.cc b/branches/ebofs/osd/RAID4PG.cc
index 20cd6d8ab416be4958a88e693df5468eacd7faca..42ae7964294e6f788df52b5df57891d175f82556 100644 (file)
--- a/branches/ebofs/osd/RAID4PG.cc
+++ b/branches/ebofs/osd/RAID4PG.cc
@@ -31,6 +31,10 @@
 
 
 
+bool RAID4PG::preprocess_op(MOSDOp *op, utime_t now)
+{
+  return false;
+}
 
 void RAID4PG::do_op(MOSDOp *op)
 {
@@ -38,8 +42,6 @@ void RAID4PG::do_op(MOSDOp *op)
 
 }
 
-
-
 void RAID4PG::do_op_reply(MOSDOpReply *reply)
 {
 
@@ -98,6 +100,14 @@ void RAID4PG::on_role_change()
   //assert(0);
 }
 
+void RAID4PG::on_change()
+{
+  dout(10) << "on_change" << dendl;
+  //assert(0);
+}
+
+
+// misc recovery crap
 
 void RAID4PG::clean_up_local(ObjectStore::Transaction&)
 {

diff --git a/branches/ebofs/osd/RAID4PG.h b/branches/ebofs/osd/RAID4PG.h
index 98e4deab568959e51cd8376d88f71b2d99f160c4..10dade98f0d6279523bf043139f8f03185a2305d 100644 (file)
--- a/branches/ebofs/osd/RAID4PG.h
+++ b/branches/ebofs/osd/RAID4PG.h
@@ -41,10 +41,16 @@ protected:
   void op_pull(MOSDOp *op);
 
 
+  void clean_up_local(ObjectStore::Transaction& t);
+  void cancel_recovery();
+  bool do_recovery();
+  void purge_strays();
+
   
 public:
   RAID4PG(OSD *o, pg_t p) : PG(o,p) { }
 
+  bool preprocess_op(MOSDOp *op, utime_t now);
   void do_op(MOSDOp *op);
   void do_op_reply(MOSDOpReply *r);
 
@@ -55,19 +61,10 @@ public:
   bool is_missing_object(object_t oid);
   void wait_for_missing_object(object_t oid, MOSDOp *op);
 
-  void note_failed_osd(int osd);
-
+  void note_failed_osd(int o);
   void on_acker_change();
   void on_role_change();
-
-  void clean_up_local(ObjectStore::Transaction& t);
-
-  void cancel_recovery();
-  bool do_recovery();
-
-  void purge_strays();
-
-
+  void on_change();
 };