osd: traverse pg_log_entry_t in read_log

Signed-off-by: yaoning <yaoning@unitedstack.com>

src/osd/PGLog.cc

@@ -17,6 +17,7 @@
 
 #include "PGLog.h"
 #include "PG.h"
+#include "osd_types.h"
 #include "SnapMapper.h"
 #include "../include/unordered_map.h"
 
@@ -1006,14 +1007,34 @@ void PGLog::read_log(ObjectStore *store, coll_t pg_coll,
 	bv);
       if (r >= 0) {
 	object_info_t oi(bv);
+
 	if (oi.version < i->version) {
 	  ldpp_dout(dpp, 15) << "read_log  missing " << *i
-			     << " (have " << oi.version << ")" << dendl;
+			     << " (have " << oi.version << ")"
+			     << " unmodified_omap " << i->unmodified_omap
+			     << " unmodified_extents " << i->unmodified_extents << dendl;
 	  missing.add(i->soid, i->version, oi.version);
+          missing.missing[i->soid].unmodified_omap = i->unmodified_omap;
+          missing.missing[i->soid].unmodified_extents.insert(i->unmodified_extents);
+          list<pg_log_entry_t>::const_iterator piter = log.log.end();
+          map<hobject_t, pg_missing_t::item, hobject_t::ComparatorWithDefault>::iterator miter
+            = missing.missing.find(i->soid);
+          if (i->prior_version >= log.tail)
+            piter = log.find_entry(i->prior_version);
+          while(piter != log.log.end()) {
+            miter->second.unmodified_omap = miter->second.unmodified_omap && piter->unmodified_omap;
+            miter->second.unmodified_extents.intersection_of(piter->unmodified_extents);
+            eversion_t prior_version = piter->prior_version;
+            piter = log.find_entry(prior_version);
+          }
 	}
       } else {
-	ldpp_dout(dpp, 15) << "read_log  missing " << *i << dendl;
+	ldpp_dout(dpp, 15) << "read_log  missing " << *i 
+			   << " unmodified_omap " << i->unmodified_omap
+			   << " unmodified_extents " << i->unmodified_extents << dendl;
 	missing.add(i->soid, i->version, eversion_t());
+        missing.missing[i->soid].unmodified_omap = i->unmodified_omap;
+        missing.missing[i->soid].unmodified_extents.insert(i->unmodified_extents);
       }
     }
     for (map<eversion_t, hobject_t>::reverse_iterator i =

src/osd/osd_types.h

@@ -2667,6 +2667,26 @@ struct pg_log_t {
     return head.version - tail.version;
   }
 
+  list<pg_log_entry_t>::const_iterator find_entry(eversion_t v) const {
+    int fromhead = head.version - v.version;
+    int fromtail = v.version - tail.version;
+    list<pg_log_entry_t>::const_iterator p;
+    if (fromhead < fromtail) {
+      p = log.end();
+      --p;
+      while (p->version > v)
+	--p;
+    } else {
+      p = log.begin();
+      while (p->version < v)
+	++p;
+    }
+    if (p->version == v)
+      return p;
+    else
+      return log.end();
+  }
+
   static void filter_log(spg_t import_pgid, const OSDMap &curmap,
     const string &hit_set_namespace, const pg_log_t &in,
     pg_log_t &out, pg_log_t &reject);