osd: Add ECTypes and add ec_align_t to it

Move out the common types for new and old EC into ECTypes. These are mainly for use in interfaces, with ECUtils reerved for utilities.

More will be added later.

Signed-off-by: Alex Ainscow <[email protected]>

Author: aainscow

src/osd/ECBackendL.cc

@@ -23,6 +23,7 @@
 #include "messages/MOSDECSubOpRead.h"
 #include "messages/MOSDECSubOpReadReply.h"
 #include "ECMsgTypes.h"
+#include "ECTypes.h"
 
 #include "PrimaryLogPG.h"
 #include "osd_tracer.h"
@@ -195,8 +196,8 @@ struct RecoveryMessages {
     const map<pg_shard_t, vector<pair<int, int>>> &need,
     bool attrs)
   {
-    list<ECCommonL::ec_align_t> to_read;
-    to_read.emplace_back(ECCommonL::ec_align_t{off, len, 0});
+    list<ec_align_t> to_read;
+    to_read.emplace_back(ec_align_t{off, len, 0});
     ceph_assert(!recovery_reads.count(hoid));
     want_to_read.insert(make_pair(hoid, std::move(_want_to_read)));
     recovery_reads.insert(
@@ -463,7 +464,7 @@ struct RecoveryReadCompleter : ECCommonL::ReadCompleter {
   void finish_single_request(
     const hobject_t &hoid,
     ECCommonL::read_result_t &res,
-    list<ECCommonL::ec_align_t>,
+    list<ec_align_t>,
     set<int> wanted_to_read) override
   {
     if (!(res.r == 0 && res.errors.empty())) {
@@ -1567,7 +1568,7 @@ int ECBackendL::objects_read_sync(
 
 void ECBackendL::objects_read_async(
   const hobject_t &hoid,
-  const list<pair<ECCommonL::ec_align_t,
+  const list<pair<ec_align_t,
                   pair<bufferlist*, Context*>>> &to_read,
   Context *on_complete,
   bool fast_read)
@@ -1599,14 +1600,14 @@ void ECBackendL::objects_read_async(
   struct cb {
     ECBackendL *ec;
     hobject_t hoid;
-    list<pair<ECCommonL::ec_align_t,
+    list<pair<ec_align_t,
 	      pair<bufferlist*, Context*> > > to_read;
     unique_ptr<Context> on_complete;
     cb(const cb&) = delete;
     cb(cb &&) = default;
     cb(ECBackendL *ec,
        const hobject_t &hoid,
-       const list<pair<ECCommonL::ec_align_t,
+       const list<pair<ec_align_t,
                   pair<bufferlist*, Context*> > > &to_read,
        Context *on_complete)
       : ec(ec),
@@ -1680,7 +1681,7 @@ void ECBackendL::objects_read_async(
 
 void ECBackendL::objects_read_and_reconstruct(
   const map<hobject_t,
-    std::list<ECBackendL::ec_align_t>
+    std::list<ec_align_t>
   > &reads,
   bool fast_read,
   GenContextURef<ECCommonL::ec_extents_t &&> &&func)

src/osd/ECBackendL.h

@@ -140,13 +140,13 @@ class ECBackendL : public PGBackend, public ECCommonL {
    * check_recovery_sources.
    */
   void objects_read_and_reconstruct(
-    const std::map<hobject_t, std::list<ECCommonL::ec_align_t>> &reads,
+    const std::map<hobject_t, std::list<ec_align_t>> &reads,
     bool fast_read,
     GenContextURef<ECCommonL::ec_extents_t &&> &&func) override;
 
   void objects_read_async(
     const hobject_t &hoid,
-    const std::list<std::pair<ECCommonL::ec_align_t,
+    const std::list<std::pair<ec_align_t,
                               std::pair<ceph::buffer::list*, Context*>>> &to_read,
     Context *on_complete,
     bool fast_read = false) override;

src/osd/ECCommonL.cc

@@ -77,13 +77,6 @@ ostream &operator<<(ostream &lhs, const ECCommonL::RMWPipeline::pipeline_state_t
   return lhs; // unreachable
 }
 
-ostream &operator<<(ostream &lhs, const ECCommonL::ec_align_t &rhs)
-{
-  return lhs << rhs.offset << ","
-	     << rhs.size << ","
-	     << rhs.flags;
-}
-
 ostream &operator<<(ostream &lhs, const ECCommonL::ec_extent_t &rhs)
 {
   return lhs << rhs.err << ","
@@ -517,7 +510,7 @@ struct ClientReadCompleter : ECCommonL::ReadCompleter {
   void finish_single_request(
     const hobject_t &hoid,
     ECCommonL::read_result_t &res,
-    list<ECCommonL::ec_align_t> to_read,
+    list<ec_align_t> to_read,
     set<int> wanted_to_read) override
   {
     auto* cct = read_pipeline.cct;
@@ -606,7 +599,7 @@ static ostream& _prefix(std::ostream *_dout, ClientReadCompleter *read_completer
 }
 
 void ECCommonL::ReadPipeline::objects_read_and_reconstruct(
-  const map<hobject_t, std::list<ECCommonL::ec_align_t>> &reads,
+  const map<hobject_t, std::list<ec_align_t>> &reads,
   bool fast_read,
   GenContextURef<ECCommonL::ec_extents_t &&> &&func)
 {

src/osd/ECCommonL.h

@@ -21,6 +21,7 @@
 #include "common/sharedptr_registry.hpp"
 #include "erasure-code/ErasureCodeInterface.h"
 #include "ECUtilL.h"
+#include "ECTypes.h"
 #if WITH_SEASTAR
 #include "ECExtentCacheL.h"
 #include "crimson/osd/object_context.h"
@@ -209,12 +210,6 @@ struct ECListener {
 };
 
 struct ECCommonL {
-  struct ec_align_t {
-    uint64_t offset;
-    uint64_t size;
-    uint32_t flags;
-  };
-  friend std::ostream &operator<<(std::ostream &lhs, const ec_align_t &rhs);
 
   struct ec_extent_t {
     int err;
@@ -285,7 +280,7 @@ struct ECCommonL {
     virtual void finish_single_request(
       const hobject_t &hoid,
       read_result_t &res,
-      std::list<ECCommonL::ec_align_t> to_read,
+      std::list<ec_align_t> to_read,
       std::set<int> wanted_to_read) = 0;
 
     virtual void finish(int priority) && = 0;

src/osd/ECTypes.h

@@ -0,0 +1,27 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+/*
+ * Ceph - scalable distributed file system
+ *
+ * Copyright (C) 2013 Inktank Storage, Inc.
+ *
+ * This is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software
+ * Foundation.  See file COPYING.
+ *
+ */
+
+#pragma once
+
+struct ec_align_t {
+  uint64_t offset;
+  uint64_t size;
+  uint32_t flags;
+  friend std::ostream &operator<<(std::ostream &lhs, const ec_align_t &rhs) {
+    return lhs << rhs.offset << ","
+               << rhs.size << ","
+               << rhs.flags;
+  }
+};
+

src/osd/PGBackend.h

@@ -585,7 +585,7 @@ typedef std::shared_ptr<const OSDMap> OSDMapRef;
 
    virtual void objects_read_async(
      const hobject_t &hoid,
-     const std::list<std::pair<ECCommonL::ec_align_t,
+     const std::list<std::pair<ec_align_t,
 		std::pair<ceph::buffer::list*, Context*> > > &to_read,
      Context *on_complete, bool fast_read = false) = 0;
 

src/osd/PrimaryLogPG.cc

@@ -295,11 +295,11 @@ void PrimaryLogPG::OpContext::start_async_reads(PrimaryLogPG *pg)
 	    pair<bufferlist*, Context*> > > in;
   in.swap(pending_async_reads);
   // TODO: drop the converter
-  list<pair<ECCommonL::ec_align_t,
+  list<pair<ec_align_t,
 	    pair<bufferlist*, Context*> > > in_native;
   for (auto [align_tuple, ctx_pair] : in) {
     in_native.emplace_back(
-      ECCommonL::ec_align_t{
+      ec_align_t{
         align_tuple.get<0>(), align_tuple.get<1>(), align_tuple.get<2>()
       },
       std::move(ctx_pair));

src/osd/ReplicatedBackend.cc

@@ -297,7 +297,7 @@ int ReplicatedBackend::objects_readv_sync(
 
 void ReplicatedBackend::objects_read_async(
   const hobject_t &hoid,
-  const list<pair<ECCommonL::ec_align_t,
+  const list<pair<ec_align_t,
 		  pair<bufferlist*, Context*> > > &to_read,
   Context *on_complete,
   bool fast_read)

src/osd/ReplicatedBackend.h

@@ -148,7 +148,7 @@ class ReplicatedBackend : public PGBackend {
 
   void objects_read_async(
     const hobject_t &hoid,
-    const std::list<std::pair<ECCommonL::ec_align_t,
+    const std::list<std::pair<ec_align_t,
 	       std::pair<ceph::buffer::list*, Context*> > > &to_read,
                Context *on_complete,
                bool fast_read = false) override;