From 9893b1c9588384b080bc34821f1c93badf8f17df Mon Sep 17 00:00:00 2001
From: Alex Deiter <alex.deiter@gmail.com>
Date: Thu, 16 Jul 2020 20:46:00 +0000
Subject: [PATCH] Race in Cinder backup manager

Fix for a race in Cinder Backup Manager.

Closes-Bug: 1887859
Change-Id: Ia135b2057118960bb9a395297efaadd0e7ba2720
---
 cinder/backup/manager.py                                    | 2 --
 .../notes/bug-1887859-backup-manager-fb8dbf289eedc4b0.yaml  | 6 ++++++
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/bug-1887859-backup-manager-fb8dbf289eedc4b0.yaml

diff --git a/cinder/backup/manager.py b/cinder/backup/manager.py
index 203ce129871..0026f218e71 100644
--- a/cinder/backup/manager.py
+++ b/cinder/backup/manager.py
@@ -1089,8 +1089,6 @@ class BackupManager(manager.SchedulerDependentManager):
         self._publish_service_capabilities(context)
 
     def _report_driver_status(self, context):
-        if not self.is_working():
-            self.setup_backup_backend(context)
         backup_stats = {
             'backend_state': self.is_working(),
             'driver_name': self.driver_name,
diff --git a/releasenotes/notes/bug-1887859-backup-manager-fb8dbf289eedc4b0.yaml b/releasenotes/notes/bug-1887859-backup-manager-fb8dbf289eedc4b0.yaml
new file mode 100644
index 00000000000..4609b78a90c
--- /dev/null
+++ b/releasenotes/notes/bug-1887859-backup-manager-fb8dbf289eedc4b0.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    `Bug #1887859 <https://bugs.launchpad.net/cinder/+bug/1887859>`_:
+    Fix for a race in Cinder Backup Manager with double initialization
+    of backup driver.