From 5eaf998391492a9a67dddd672239e30a26a05d79 Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Fri, 16 Aug 2024 14:36:59 -0400
Subject: [PATCH] Remove greenlet, and change 'confluent' to asyncio

---
 confluent_server/bin/confluent                   | 13 +++++++------
 confluent_server/bin/confluent_selfcheck         |  1 -
 confluent_server/confluent/collective/manager.py |  3 ---
 confluent_server/confluent/main.py               |  8 --------
 4 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/confluent_server/bin/confluent b/confluent_server/bin/confluent
index 88b3ea81..e5a0c3bf 100755
--- a/confluent_server/bin/confluent
+++ b/confluent_server/bin/confluent
@@ -18,10 +18,10 @@
 import asyncio
 import sys
 import os
-import eventlet
-import eventlet.hubs
-eventlet.hubs.use_hub("eventlet.hubs.asyncio")
-from eventlet.asyncio import spawn_for_awaitable
+#import eventlet
+#import eventlet.hubs
+#eventlet.hubs.use_hub("eventlet.hubs.asyncio")
+#from eventlet.asyncio import spawn_for_awaitable
 
 
 path = os.path.dirname(os.path.realpath(__file__))
@@ -43,8 +43,9 @@ async def main():
 if __name__ == '__main__':
     #multiprocessing.freeze_support()
     #asyncio.get_event_loop().run_until_complete(main())
-    gt = spawn_for_awaitable(confluent.main.run(sys.argv))
-    gt.wait()
+    asyncio.get_event_loop().run_until_complete(main())
+    #gt = spawn_for_awaitable(confluent.main.run(sys.argv))
+    #gt.wait()
 #except:
 #   pass
 #p.disable()
diff --git a/confluent_server/bin/confluent_selfcheck b/confluent_server/bin/confluent_selfcheck
index 90ded52d..c805a240 100755
--- a/confluent_server/bin/confluent_selfcheck
+++ b/confluent_server/bin/confluent_selfcheck
@@ -19,7 +19,6 @@ import confluent.config.configmanager as configmanager
 import confluent.netutil as netutil
 import tempfile
 import shutil
-import greenlet
 import pwd
 import signal
 import confluent.collective.manager as collective
diff --git a/confluent_server/confluent/collective/manager.py b/confluent_server/confluent/collective/manager.py
index c3d5457e..3a327f0a 100644
--- a/confluent_server/confluent/collective/manager.py
+++ b/confluent_server/confluent/collective/manager.py
@@ -28,7 +28,6 @@ import ssl
 import confluent.sortutil as sortutil
 import ctypes
 import ctypes.util
-import greenlet
 import random
 import time
 import sys
@@ -208,8 +207,6 @@ async def follow_leader(remote, leader):
     try:
         exitcause = await cfm.follow_channel(remote)
         newleader = exitcause.get('newleader', None)
-    except greenlet.GreenletExit:
-        cleanexit = True
     finally:
         if cleanexit:
             log.log({'info': 'Previous following cleanly closed',
diff --git a/confluent_server/confluent/main.py b/confluent_server/confluent/main.py
index 470a5600..4cd45bff 100644
--- a/confluent_server/confluent/main.py
+++ b/confluent_server/confluent/main.py
@@ -59,7 +59,6 @@ except ImportError:
 #import multiprocessing
 import asyncio
 import gc
-from greenlet import greenlet
 import sys
 import os
 import glob
@@ -203,13 +202,6 @@ def dumptrace(signalname, frame):
     ht = open('/var/log/confluent/hangtraces', 'a')
     ht.write('Dumping active trace on ' + time.strftime('%X %x\n'))
     ht.write(''.join(traceback.format_stack(frame)))
-    for o in gc.get_objects():
-        if not isinstance(o, greenlet):
-            continue
-        if not o:
-            continue
-        ht.write('Thread trace: ({0})\n'.format(id(o)))
-        ht.write(''.join(traceback.format_stack(o.gr_frame)))
     for atask in asyncio.all_tasks():
         ht.write('Async trace: ({0})\n'.format(id(atask)))
         ht.write(''.join([x for x in format_stack(atask)]))