Fixed missing object address reset before retry.

While fixing #360

objectstore/ArchiveQueueAlgorithms.cpp

@@ -158,6 +158,8 @@ void ContainerTraits<ArchiveQueue>::getLockedAndFetchedNoCreate(Container& cont,
     }
     //emptyQueueCleanupTime += localEmptyCleanupQueueTime = t.secs(utils::Timer::resetCounter);
     attemptCount++;
+    // Reset the address so we can reuse the in-memory object with potentially ane address.
+    cont.resetAddress();
     goto retry;
   }
 }

objectstore/ArchiveQueueAlgorithms.hpp

@@ -289,6 +289,8 @@ getLockedAndFetchedNoCreate(Container& cont, ScopedExclusiveLock& contLock, cons
     }
     //emptyQueueCleanupTime += localEmptyCleanupQueueTime = t.secs(utils::Timer::resetCounter);
     attemptCount++;
+    // Reset the address so we can reuse the in-memory object with potentially ane address.
+    cont.resetAddress();
     goto retry;
   }
 }

objectstore/RepackQueueAlgorithms.hpp

@@ -283,6 +283,8 @@ getLockedAndFetchedNoCreate(Container& cont, ScopedExclusiveLock& contLock, cons
     }
     //emptyQueueCleanupTime += localEmptyCleanupQueueTime = t.secs(utils::Timer::resetCounter);
     attemptCount++;
+    // Reset the address so we can reuse the in-memory object with potentially ane address.
+    cont.resetAddress();
     goto retry;
   }
 }

objectstore/RetrieveQueueAlgorithms.hpp

@@ -258,6 +258,8 @@ retry:
       lc.log(log::DEBUG, "In ContainerTraits<RetrieveQueue,C>::getLockedAndFetchedNoCreate(): could not dereference missing queue from root entry: already done.");
     }
     attemptCount++;
+    // Reset the address so we can reuse the in-memory object with potentially ane address.
+    cont.resetAddress();
     goto retry;
   }
 }