From c925353f026ec1e273feec6bbc2ae28ddeca6e71 Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Thu, 12 Jul 2018 10:01:32 -0400
Subject: [PATCH] Fix rollback

First the data was not actually being staged in the rollback area.
Secondly, there wasn't an assurance that the disk wouldn't have rollback
committed...
---
 confluent_server/confluent/config/configmanager.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/confluent_server/confluent/config/configmanager.py b/confluent_server/confluent/config/configmanager.py
index 91b2b483..e6739af0 100644
--- a/confluent_server/confluent/config/configmanager.py
+++ b/confluent_server/confluent/config/configmanager.py
@@ -509,11 +509,16 @@ def rollback_clear():
     _cfgstore = _oldcfgstore
     _oldtxcount = 0
     _oldcfgstore = None
+    ConfigManager._bg_sync_to_file()
 
 
 def clear_configuration():
     global _cfgstore
     global _txcount
+    global _oldcfgstore
+    global _oldtxcount
+    _oldcfgstore = _cfgstore
+    _oldtxcount = _txcount
     _cfgstore = {}
     _txcount = 0