Wait on merges in apply-load

src/main/CheckMergingWork.cpp

@@ -0,0 +1,35 @@
+// Copyright 2024 Stellar Development Foundation and contributors. Licensed
+// under the Apache License, Version 2.0. See the COPYING file at the root
+// of this distribution or at http://www.apache.org/licenses/LICENSE-2.0
+
+#include "main/CheckMergingWork.h"
+#include "bucket/BucketList.h"
+#include "bucket/BucketManager.h"
+
+namespace stellar
+{
+
+CheckMergingWork::CheckMergingWork(Application& app)
+    : BasicWork(app, "check-merging-work", BasicWork::RETRY_NEVER)
+{
+}
+
+BasicWork::State
+CheckMergingWork::onRun()
+{
+    auto& bl = mApp.getBucketManager().getBucketList();
+    bl.resolveAnyReadyFutures();
+    if (bl.futuresAllResolved())
+    {
+        return State::WORK_SUCCESS;
+    }
+    return State::WORK_RUNNING;
+}
+
+bool
+CheckMergingWork::onAbort()
+{
+    return mApp.getBucketManager().getBucketList().futuresAllResolved();
+}
+
+}

src/main/CheckMergingWork.h

@@ -0,0 +1,21 @@
+// Copyright 2024 Stellar Development Foundation and contributors. Licensed
+// under the Apache License, Version 2.0. See the COPYING file at the root
+// of this distribution or at http://www.apache.org/licenses/LICENSE-2.0
+
+#pragma once
+
+#include "work/BasicWork.h"
+
+namespace stellar
+{
+
+class CheckMergingWork : public BasicWork
+{
+  public:
+    CheckMergingWork(Application& app);
+
+  protected:
+    State onRun() override;
+    bool onAbort() override;
+};
+}

src/main/CommandLine.cpp

@@ -20,6 +20,7 @@
 #include "ledger/LedgerManager.h"
 #include "main/Application.h"
 #include "main/ApplicationUtils.h"
+#include "main/CheckMergingWork.h"
 #include "main/Config.h"
 #include "main/Diagnostics.h"
 #include "main/ErrorMessages.h"
@@ -1884,6 +1885,7 @@ runApplyLoad(CommandLineArgs const& args)
         [&] {
             auto config = configOption.getConfig();
             config.RUN_STANDALONE = true;
+            config.MANUAL_CLOSE = true;
             config.USE_CONFIG_FOR_GENESIS = true;
             config.TESTING_UPGRADE_MAX_TX_SET_SIZE = 1000;
             config.LEDGER_PROTOCOL_VERSION =
@@ -1926,6 +1928,11 @@ runApplyLoad(CommandLineArgs const& args)
 
                 for (size_t i = 0; i < 100; ++i)
                 {
+                    auto checkMergingWork =
+                        app.getWorkScheduler().executeWork<CheckMergingWork>();
+                    releaseAssert(checkMergingWork->getState() ==
+                                  BasicWork::State::WORK_SUCCESS);
+
                     al.benchmark();
                 }