From 4996506a6b4ab309110039ea29a075f14d09a379 Mon Sep 17 00:00:00 2001
From: Brad Hubbard <bhubbard@redhat.com>
Date: Thu, 2 Aug 2018 10:33:42 +1000
Subject: [PATCH] mgr/MgrClient: Protect daemon_health_metrics

Without holiding the lock update_daemon_health() can race with
send_report() corrupting the daemon_health_metrics vector.

Fixes: http://tracker.ceph.com/issues/23352

Signed-off-by: Kjetil Joergensen <kjetil@medallia.com>
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
---
 src/mgr/MgrClient.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/mgr/MgrClient.cc b/src/mgr/MgrClient.cc
index f1a10f0bd1713..06d2810d82771 100644
--- a/src/mgr/MgrClient.cc
+++ b/src/mgr/MgrClient.cc
@@ -510,6 +510,7 @@ int MgrClient::service_daemon_update_status(
 
 void MgrClient::update_daemon_health(std::vector<DaemonHealthMetric>&& metrics)
 {
+  Mutex::Locker l(lock);
   daemon_health_metrics = std::move(metrics);
 }
 
-- 
2.39.5