1 files changed, 19 insertions, 28 deletions

diff --git a/searchlib/src/tests/transactionlog/translogclient_test.cpp b/searchlib/src/tests/transactionlog/translogclient_test.cpp
index 5740eeb610d..d3c3af3a9ca 100644
--- a/searchlib/src/tests/transactionlog/translogclient_test.cpp
+++ b/searchlib/src/tests/transactionlog/translogclient_test.cpp
@@ -7,6 +7,7 @@
 #include <vespa/searchlib/index/dummyfileheadercontext.h>
 #include <vespa/document/util/bytebuffer.h>
 #include <vespa/vespalib/util/exceptions.h>
+#include <vespa/vespalib/util/destructor_callbacks.h>
 #include <vespa/fastos/file.h>
 #include <thread>
 
@@ -316,43 +317,33 @@ fillDomainTest(Session * s1, size_t numPackets, size_t numEntries)
     }
 }
 
-using Counter = std::atomic<size_t>;
-
-class CountDone : public IDestructorCallback {
-public:
-    explicit CountDone(Counter & inFlight) noexcept : _inFlight(inFlight) { ++_inFlight; }
-    ~CountDone() override { --_inFlight; }
-private:
-    Counter & _inFlight;
-};
-
 void
-fillDomainTest(TransLogServer & s1, const vespalib::string & domain, size_t numPackets, size_t numEntries)
+fillDomainTest(IDestructorCallback::SP onDone, TransLogServer & tls, const vespalib::string & domain, size_t numPackets, size_t numEntries)
 {
     size_t value(0);
-    Counter inFlight(0);
-    auto domainWriter = s1.getWriter(domain);
-    for(size_t i=0; i < numPackets; i++) {
-        std::unique_ptr<Packet> p(new Packet(DEFAULT_PACKET_SIZE));
-        for(size_t j=0; j < numEntries; j++, value++) {
-            Packet::Entry e(value+1, j+1, vespalib::ConstBufferRef((const char *)&value, sizeof(value)));
+    auto domainWriter = tls.getWriter(domain);
+
+    for (size_t i = 0; i < numPackets; i++) {
+        auto p = std::make_unique<Packet>(DEFAULT_PACKET_SIZE);
+        for (size_t j = 0; j < numEntries; j++, value++) {
+            Packet::Entry e(value + 1, j + 1, vespalib::ConstBufferRef((const char *) &value, sizeof(value)));
             p->add(e);
-            if ( p->sizeBytes() > DEFAULT_PACKET_SIZE ) {
-                domainWriter->append(*p, std::make_shared<CountDone>(inFlight));
+            if (p->sizeBytes() > DEFAULT_PACKET_SIZE) {
+                domainWriter->append(*p, onDone);
                 p = std::make_unique<Packet>(DEFAULT_PACKET_SIZE);
             }
         }
-        domainWriter->append(*p, std::make_shared<CountDone>(inFlight));
-        auto keep = domainWriter->startCommit(Writer::DoneCallback());
-        LOG(info, "Inflight %ld", inFlight.load());
-    }
-    while (inFlight.load() != 0) {
-        std::this_thread::sleep_for(10ms);
-        LOG(info, "Waiting for inflight %ld to reach zero", inFlight.load());
+        domainWriter->append(*p, onDone);
+        auto keep = domainWriter->startCommit(onDone);
     }
-
 }
 
+void
+fillDomainTest(TransLogServer & tls, const vespalib::string & domain, size_t numPackets, size_t numEntries) {
+    vespalib::Gate gate;
+    fillDomainTest(std::make_shared<vespalib::GateCallback>(gate), tls, domain, numPackets, numEntries);
+    gate.await();
+}
 
 void
 fillDomainTest(Session * s1, size_t numPackets, size_t numEntries, size_t entrySize)
@@ -545,7 +536,7 @@ partialUpdateTest(const vespalib::string & testDir) {
     ASSERT_TRUE( visitor->visit(5, 7) );
     for (size_t i(0); ! ca._eof && (i < 1000); i++ ) { std::this_thread::sleep_for(10ms); }
     ASSERT_TRUE( ca._eof );
-    ASSERT_TRUE( ca.map().size() == 1);
+    ASSERT_EQUAL(1u, ca.map().size());
     ASSERT_TRUE( ca.hasSerial(7) );
 
     CallBackUpdate ca1;