Merge "[eventlet-removal] Remove the usage of eventlet from the periodic worker"

doc/source/eventlet_deprecation/index.rst

@@ -136,8 +136,8 @@ The Neutron API consists of the following executables:
 
 .. note::
 
-  Right now, only the API server and the OVN maintenance task are running
-  without eventlet.
+  Right now, the API server, the OVN maintenance task and the periodic workers
+  taks are running without eventlet.
 
 
 ML2/OVN

neutron/cmd/eventlet/server/__init__.py

@@ -11,13 +11,8 @@
 #    under the License.
 
 from neutron import server
-from neutron.server import periodic_eventlet
 from neutron.server import wsgi_eventlet
 
 
 def main():
     server.boot_server(wsgi_eventlet.eventlet_wsgi_server)
-
-
-def main_periodic_eventlet():
-    server.boot_server(periodic_eventlet.eventlet_periodic_workers)

neutron/cmd/server/__init__.py

@@ -21,6 +21,7 @@ service.init_backend(service.BackendType.THREADING)
 from neutron import server  # noqa: E402
 from neutron.server import api  # noqa: E402
 from neutron.server import ovn_maintenance  # noqa: E402
+from neutron.server import periodic  # noqa: E402
 from neutron.server import rpc  # noqa: E402
 
 
@@ -34,3 +35,7 @@ def main_ovn_maintenance():
 
 def main_rpc():
     server.boot_server(rpc.rpc_server)
+
+
+def main_periodic():
+    server.boot_server(periodic.periodic_workers)

neutron/server/periodic.py

@@ -23,8 +23,8 @@ from neutron import service
 LOG = log.getLogger(__name__)
 
 
-def eventlet_periodic_workers():
-    LOG.info('Eventlet based periodic workers process starting...')
+def periodic_workers():
+    LOG.info('Periodic workers process starting...')
 
     try:
         manager.init()

requirements.txt

@@ -37,7 +37,7 @@ oslo.privsep>=2.3.0 # Apache-2.0
 oslo.reports>=1.18.0 # Apache-2.0
 oslo.rootwrap>=5.15.0 # Apache-2.0
 oslo.serialization>=5.5.0 # Apache-2.0
-oslo.service[threading]>=4.2.0 # Apache-2.0
+oslo.service[threading]>=4.2.1 # Apache-2.0
 oslo.upgradecheck>=1.3.0 # Apache-2.0
 oslo.utils>=7.3.0 # Apache-2.0
 oslo.versionedobjects>=1.35.1 # Apache-2.0

setup.cfg

@@ -50,7 +50,7 @@ console_scripts =
     neutron-metering-agent = neutron.cmd.services.metering_agent:main
     neutron-sriov-nic-agent = neutron.cmd.plugins.sriov_nic_neutron_agent:main
     neutron-sanity-check = neutron.cmd.sanity_check:main
-    neutron-periodic-workers = neutron.cmd.eventlet.server:main_periodic_eventlet
+    neutron-periodic-workers = neutron.cmd.server:main_periodic
     neutron-status = neutron.cmd.status:main
     neutron-ovn-agent = neutron.cmd.agents.ovn_neutron_agent:main
     neutron-ovn-maintenance-worker = neutron.cmd.server:main_ovn_maintenance