From cf9d2a43e8b56c4fc77dc87db695505b0c3f459e Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Wed, 10 Oct 2018 09:44:06 -0400
Subject: [PATCH] Revert "Provide fallback for unexpected reply in collective
 show"

This reverts commit 2f566fb81ddfdd14b3b623ee6d1ff48d67e636b4.
---
 confluent_server/bin/collective               |  2 +-
 .../confluent/config/configmanager.py         | 21 +++++++++----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/confluent_server/bin/collective b/confluent_server/bin/collective
index c8d31e62..5f0c78f6 100644
--- a/confluent_server/bin/collective
+++ b/confluent_server/bin/collective
@@ -68,7 +68,7 @@ def join_collective(server, invitation):
     res = tlvdata.recv(s)
     res = res.get('collective',
                   {'status': 'Unknown response: ' + repr(res)})
-    print(res.get('status', res.get('error', repr(res))))
+    print(res.get('status', res['error']))
 
 
 def show_collective():
diff --git a/confluent_server/confluent/config/configmanager.py b/confluent_server/confluent/config/configmanager.py
index cf01c73e..bc114426 100644
--- a/confluent_server/confluent/config/configmanager.py
+++ b/confluent_server/confluent/config/configmanager.py
@@ -63,7 +63,6 @@ import eventlet
 import eventlet.event as event
 import eventlet.green.select as select
 import eventlet.green.threading as gthread
-import eventlet.greenpool as gpool
 import fnmatch
 import json
 import operator
@@ -948,7 +947,7 @@ class ConfigManager(object):
             os.getenv('SystemDrive'), '\\ProgramData', 'confluent', 'cfg')
     else:
         _cfgdir = "/etc/confluent/cfg"
-    _cfgwriter = gpool.GreenPool(1)
+    _cfgwriter = None
     _writepending = False
     _syncrunning = False
     _syncstate = threading.RLock()
@@ -2046,9 +2045,11 @@ class ConfigManager(object):
 
     @classmethod
     def wait_for_sync(cls, fullsync=False):
-        cls._cfgwriter.waitall()
+        if cls._cfgwriter is not None:
+            cls._cfgwriter.join()
         cls._bg_sync_to_file(fullsync)
-        cls._cfgwriter.waitall()
+        if cls._cfgwriter is not None:
+            cls._cfgwriter.join()
 
     @classmethod
     def shutdown(cls):
@@ -2064,13 +2065,11 @@ class ConfigManager(object):
                 cls._writepending = True
                 return
             cls._syncrunning = True
-        cls._cfgwriter.spawn_n(cls._g_sync_to_file, fullsync)
-
-    @classmethod
-    def _g_sync_to_file(cls, fullsync):
-        cls._sync_to_file(fullsync)
-
-
+        # if the thread is exiting, join it to let it close, just in case
+        if cls._cfgwriter is not None:
+            cls._cfgwriter.join()
+        cls._cfgwriter = threading.Thread(target=cls._sync_to_file, args=(fullsync,))
+        cls._cfgwriter.start()
 
     @classmethod
     def _sync_to_file(cls, fullsync=False):