[supervisord] fix 1sec delay (#24190)

Why I did it
supervisord has 1 sec delay at init. This PR partially addresses #13765

Work item tracking
Microsoft ADO (number only):
How I did it
On init make the polling non blocking in supervisord

How to verify it
Boot the image, check time between supervisord start and first process start. There should be no 1 sec delay.

Author: stepanblyschak

.gitmodules

@@ -142,3 +142,6 @@
 [submodule "platform/marvell-teralynx/mrvl-teralynx"]
 	path = platform/marvell-teralynx/mrvl-teralynx
 	url = https://github.com/Marvell-switching/mrvl-teralynx.git
+[submodule "src/supervisor"]
+	path = src/supervisor
+	url = https://github.com/Supervisor/supervisor

dockers/docker-base-bookworm/Dockerfile.j2

@@ -60,12 +60,17 @@ COPY ["pip.conf", "/etc/pip.conf"]
 RUN pip3 install --upgrade pip
 RUN apt purge -y python3-pip
 
+{% if docker_base_bookworm_whls.strip() -%}
+# Copy locally-built Python wheel dependencies
+{{ copy_files("python-wheels/", docker_base_bookworm_whls.split(' '), "/python-wheels/") }}
+
+# Install locally-built Python wheel dependencies
+{{ install_python_wheels(docker_base_bookworm_whls.split(' ')) }}
+{% endif %}
+
 # For templating
 RUN pip3 install j2cli
 
-# Install supervisor
-RUN pip3 install supervisor==4.2.5
-
 # Add support for supervisord to handle startup dependencies
 RUN pip3 install supervisord-dependent-startup==1.4.0
 

rules/docker-base-bookworm.mk

@@ -16,6 +16,8 @@ ifeq ($(INCLUDE_FIPS), y)
 $(DOCKER_BASE_BOOKWORM)_DEPENDS += $(FIPS_OPENSSL_LIBSSL) $(FIPS_OPENSSL_LIBSSL_DEV) $(FIPS_OPENSSL) $(SYMCRYPT_OPENSSL) $(FIPS_KRB5)
 endif
 
+$(DOCKER_BASE_BOOKWORM)_PYTHON_WHEELS += $(SUPERVISOR)
+
 $(DOCKER_BASE_BOOKWORM)_DBG_IMAGE_PACKAGES += $(GDB) $(GDBSERVER) $(VIM) $(OPENSSH) $(SSHPASS) $(STRACE)
 
 SONIC_DOCKER_IMAGES += $(DOCKER_BASE_BOOKWORM)

rules/supervisor.dep

@@ -0,0 +1,10 @@
+SPATH       := $($(SUPERVISOR)_SRC_PATH)
+DEP_FILES   := $(SONIC_COMMON_FILES_LIST) rules/supervisor.mk rules/supervisor.dep
+DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
+SMDEP_FILES := $(addprefix $(SPATH)/,$(shell cd $(SPATH) && git ls-files -- ':!:doc/*'))
+
+$(SUPERVISOR)_CACHE_MODE  := GIT_CONTENT_SHA
+$(SUPERVISOR)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
+$(SUPERVISOR)_DEP_FILES   := $(DEP_FILES)
+$(SUPERVISOR)_SMDEP_FILES := $(SMDEP_FILES)
+$(SUPERVISOR)_SMDEP_PATHS := $(SPATH)

rules/supervisor.mk

@@ -0,0 +1,6 @@
+# supervisor python3 wheel
+
+SUPERVISOR = supervisor-4.2.5-py2.py3-none-any.whl
+$(SUPERVISOR)_SRC_PATH = $(SRC_PATH)/supervisor
+$(SUPERVISOR)_PYTHON_VERSION = 3
+SONIC_PYTHON_WHEELS += $(SUPERVISOR)

src/supervisor

@@ -0,0 +1,36 @@
+From 87cef0051125ee068f38a17b0cab8f65f9b422e2 Mon Sep 17 00:00:00 2001
+From: Stepan Blyschak <[email protected]>
+Date: Wed, 24 Sep 2025 16:04:54 +0000
+Subject: [PATCH] First poll is non blocking
+
+Signed-off-by: Stepan Blyschak <[email protected]>
+---
+ supervisor/supervisord.py | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/supervisor/supervisord.py b/supervisor/supervisord.py
+index 0a4f3e6..8857274 100755
+--- a/supervisor/supervisord.py
++++ b/supervisor/supervisord.py
+@@ -173,11 +173,17 @@ class Supervisor:
+ 
+     def runforever(self):
+         events.notify(events.SupervisorRunningEvent())
+-        timeout = 1 # this cannot be fewer than the smallest TickEvent (5)
++        first_poll = True
+ 
+         socket_map = self.options.get_socket_map()
+ 
+         while 1:
++            if first_poll:
++                timeout = 0
++                first_poll = False
++            else:
++                timeout = 1 # this cannot not be fewer than the smallest TickEvent (5)
++
+             combined_map = {}
+             combined_map.update(socket_map)
+             combined_map.update(self.get_process_map())
+-- 
+2.39.5
+

src/supervisor.patch/0001-First-poll-is-non-blocking.patch

@@ -0,0 +1 @@
+0001-First-poll-is-non-blocking.patch