osd, crush: add 'erasure' pool/pg type

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/crush/CrushCompiler.cc b/src/crush/CrushCompiler.cc
index 5f92bf7e4ecd0f65258e98af67ebd93548c02a91..4dc0c674ed54de0f74c15a5a6b9d3e399eb68665 100644 (file)
--- a/src/crush/CrushCompiler.cc
+++ b/src/crush/CrushCompiler.cc
@@ -233,6 +233,9 @@ int CrushCompiler::decompile(ostream &out)
     case CEPH_PG_TYPE_RAID4:
       out << "\ttype raid4\n";
       break;
+    case CEPH_PG_TYPE_ERASURE:
+      out << "\ttype erasure\n";
+      break;
     default:
       out << "\ttype " << crush.get_rule_mask_type(i) << "\n";
     }
@@ -562,8 +565,10 @@ int CrushCompiler::parse_rule(iter_t const& i)
   int type;
   if (tname == "replicated")
     type = CEPH_PG_TYPE_REP;
-  else if (tname == "raid4") 
+  else if (tname == "raid4")
     type = CEPH_PG_TYPE_RAID4;
+  else if (tname == "erasure")
+    type = CEPH_PG_TYPE_ERASURE;
   else 
     assert(0);    
 

diff --git a/src/crush/grammar.h b/src/crush/grammar.h
index bb37fed428c85bff3e4781e334b9db1c9ebda646..e916421cb7e0ef7aa498589bdb34afeb0e4f4631 100644 (file)
--- a/src/crush/grammar.h
+++ b/src/crush/grammar.h
@@ -131,7 +131,7 @@ struct crush_grammar : public grammar<crush_grammar>
                                step_emit );
       crushrule = str_p("rule") >> !name >> '{'
                           >> str_p("ruleset") >> posint
-                          >> str_p("type") >> ( str_p("replicated") | str_p("raid4") )
+                          >> str_p("type") >> ( str_p("replicated") | str_p("raid4") | str_p("erasure") )
                           >> str_p("min_size") >> posint
                           >> str_p("max_size") >> posint
                           >> +step

diff --git a/src/include/rados.h b/src/include/rados.h
index c410f8016720141a34724c373384a893c83a2abf..eb65648d7c851a7488d184c9374968ea6366a75c 100644 (file)
--- a/src/include/rados.h
+++ b/src/include/rados.h
@@ -64,9 +64,13 @@ struct ceph_pg {
 
 /*
  * pg pool types
+ *
+ * NOTE: These map 1:1 on to the pg_pool_t::TYPE_* values.  They are
+ * duplicated here only for CrushCompiler's benefit.
  */
 #define CEPH_PG_TYPE_REP     1
 #define CEPH_PG_TYPE_RAID4   2
+#define CEPH_PG_TYPE_ERASURE 3
 
 /*
  * stable_mod func is used to control number of placement groups.

diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
index 351d050c476a6652c1cc4404a11a1ab407db4cfc..d90c60e7546fcfd2cee38e4b7c25c60ecce9efca 100644 (file)
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -688,11 +688,13 @@ struct pg_pool_t {
   enum {
     TYPE_REP = 1,     // replication
     TYPE_RAID4 = 2,   // raid4 (never implemented)
+    TYPE_ERASURE = 3,      // erasure-coded
   };
   static const char *get_type_name(int t) {
     switch (t) {
     case TYPE_REP: return "rep";
     case TYPE_RAID4: return "raid4";
+    case TYPE_ERASURE: return "erasure";
     default: return "???";
     }
   }
@@ -844,6 +846,7 @@ public:
 
   bool is_rep()   const { return get_type() == TYPE_REP; }
   bool is_raid4() const { return get_type() == TYPE_RAID4; }
+  bool is_erasure() const { return get_type() == TYPE_ERASURE; }
 
   unsigned get_pg_num() const { return pg_num; }
   unsigned get_pgp_num() const { return pgp_num; }