From 9369a6e3ddc541e3d00188740c49bd8b294e9c9d Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <tim@corelight.com>
Date: Thu, 8 May 2025 13:46:54 -0700
Subject: [PATCH] Merge branch 'topic/timw/switch-broker-error-to-error'

* topic/timw/switch-broker-error-to-error:
  Downgrade broker clone FatalError to an Error

(cherry picked from commit 2c17c85f557245b6163ced014fc1d8089e1fcdf2)
---
 CHANGES               | 6 ++++++
 VERSION               | 2 +-
 src/broker/Manager.cc | 6 ++++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index bace82cb18..341b35798d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+7.2.0-rc1.16 | 2025-05-08 13:47:36 -0700
+
+  * Downgrade broker clone FatalError to an Error (Tim Wojtulewicz, Corelight)
+
+    (cherry picked from commit 2c17c85f557245b6163ced014fc1d8089e1fcdf2)
+
 7.2.0-rc1.14 | 2025-05-07 14:11:04 -0700
 
   * Fix Broker metrics naming bugs that snuck in w/ last-minute renaming [skip ci] (Christian Kreibich, Corelight)
diff --git a/VERSION b/VERSION
index fd11253d71..e6d2ae3e32 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-7.2.0-rc1.14
+7.2.0-rc1.16
diff --git a/src/broker/Manager.cc b/src/broker/Manager.cc
index d7fd09323d..08792336eb 100644
--- a/src/broker/Manager.cc
+++ b/src/broker/Manager.cc
@@ -2086,8 +2086,10 @@ detail::StoreHandleVal* Manager::MakeClone(const string& name, double resync_int
     auto handle = new detail::StoreHandleVal{*result};
     Ref(handle);
 
-    if ( ! handle->proxy.valid() )
-        reporter->FatalError("Failed to create clone for data store %s", name.c_str());
+    if ( ! handle->proxy.valid() ) {
+        reporter->Error("Failed to create clone for data store %s", name.c_str());
+        return nullptr;
+    }
 
     data_stores.emplace(name, handle);
     if ( ! iosource_mgr->RegisterFd(handle->proxy.mailbox().descriptor(), this) )