From c721c302cd9c96bee25a20b3862dad347345648a Mon Sep 17 00:00:00 2001
From: Jean Flach <jean-marcel.flach@icinga.com>
Date: Fri, 31 Aug 2018 13:11:50 +0200
Subject: [PATCH] Shuffle items before config validation

---
 lib/config/configitem.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/config/configitem.cpp b/lib/config/configitem.cpp
index 47b7e327c..9ac4fddaf 100644
--- a/lib/config/configitem.cpp
+++ b/lib/config/configitem.cpp
@@ -39,6 +39,8 @@
 #include <boost/algorithm/string/join.hpp>
 #include <sstream>
 #include <fstream>
+#include <algorithm>
+#include <random>
 
 using namespace icinga;
 
@@ -437,6 +439,10 @@ bool ConfigItem::CommitNewItems(const ActivationContext::Ptr& context, WorkQueue
 	if (items.empty())
 		return true;
 
+	// Shuffle all items to evenly distribute them over the threads of the workqueue. This increases perfomance
+	// noticably in environments with lots of objects and available threads.
+	std::shuffle(std::begin(items), std::end(items), std::default_random_engine {});
+
 	for (const auto& ip : items)
 		newItems.push_back(ip.first);