ReplicatedPG::already_(complete|ack) should skip temp object ops

We clearly won't get dup ops on these repops, and they don't
have meaningful versions since they don't carry log
entries.

Fixes: #7682
Signed-off-by: Samuel Just <sam.just@inktank.com>

diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h
index 1c9bf24db414c7b7243d7fc205ef11d3e370f517..8a45177fd1d0464fac38fc12d13a653c0bc63049 100644 (file)
--- a/src/osd/ReplicatedPG.h
+++ b/src/osd/ReplicatedPG.h
@@ -774,6 +774,9 @@ protected:
     for (xlist<RepGather*>::iterator i = repop_queue.begin();
         !i.end();
         ++i) {
+      // skip copy from temp object ops
+      if ((*i)->v == eversion_t())
+       continue;
       if ((*i)->v > v)
         break;
       if (!(*i)->all_committed)
@@ -786,6 +789,9 @@ protected:
     for (xlist<RepGather*>::iterator i = repop_queue.begin();
         !i.end();
         ++i) {
+      // skip copy from temp object ops
+      if ((*i)->v == eversion_t())
+       continue;
       if ((*i)->v > v)
         break;
       if (!(*i)->all_applied)