[KubeSonic] Add bmp container watchdog

FengPan-Frank · FengPan-Frank · commit f86251a2002e · 2025-04-17T13:14:18.000Z
diff --git a/dockers/docker-bmp-watchdog/Dockerfile.j2 b/dockers/docker-bmp-watchdog/Dockerfile.j2
@@ -0,0 +1,39 @@
+FROM docker-config-engine-bookworm-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}} AS builder
+
+# Update apt's cache of available packages
+RUN apt-get update && apt-get install -y \
+    build-essential
+
+# Install Rust/Cargo via rustup
+ARG RUST_ROOT=/usr/.cargo
+RUN RUSTUP_HOME=$RUST_ROOT CARGO_HOME=$RUST_ROOT bash -c \
+    'curl --proto "=https" -sSf https://sh.rustup.rs | sh -s -- --default-toolchain 1.79.0 -y'
+ENV RUSTUP_HOME=$RUST_ROOT
+ENV PATH $PATH:$RUST_ROOT/bin
+
+# Copy watchdog source into /watchdog
+WORKDIR /watchdog
+COPY watchdog/ ./
+
+# Build from within /watchdog
+RUN cargo build --release
+
+FROM docker-config-engine-bookworm-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
+
+ARG docker_container_name
+ARG image_version
+RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf
+
+ENV DEBIAN_FRONTEND=noninteractive
+ENV IMAGE_VERSION=$image_version
+
+RUN apt-get update
+
+# Copy supervisord.conf into final stage
+COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
+
+# Copy the compiled Rust binary from the builder stage
+COPY --from=builder /watchdog/target/release/watchdog /usr/bin/bmp_watchdog
+RUN chmod +x /usr/bin/bmp_watchdog
+
+ENTRYPOINT ["/usr/local/bin/supervisord"]
diff --git a/dockers/docker-bmp-watchdog/supervisord.conf b/dockers/docker-bmp-watchdog/supervisord.conf
@@ -0,0 +1,37 @@
+[supervisord]
+logfile_maxbytes=1MB
+logfile_backups=2
+nodaemon=true
+
+[eventlistener:dependent-startup]
+command=python3 -m supervisord_dependent_startup
+autostart=true
+autorestart=unexpected
+startretries=0
+exitcodes=0,3
+events=PROCESS_STATE
+buffer_size=1024
+
+[program:rsyslogd]
+command=/usr/sbin/rsyslogd -n -iNONE
+priority=1
+autostart=false
+autorestart=unexpected
+stdout_logfile=NONE
+stdout_syslog=true
+stderr_logfile=NONE
+stderr_syslog=true
+dependent_startup=true
+
+[program:bmp_watchdog]
+command=/usr/bin/bmp_watchdog
+priority=3
+autostart=false
+autorestart=false
+startsecs=0
+stdout_logfile=NONE
+stdout_syslog=true
+stderr_logfile=NONE
+stderr_syslog=true
+dependent_startup=true
+dependent_startup_wait_for=rsyslogd:running
diff --git a/dockers/docker-bmp-watchdog/watchdog/Cargo.lock b/dockers/docker-bmp-watchdog/watchdog/Cargo.lock
diff --git a/dockers/docker-bmp-watchdog/watchdog/Cargo.toml b/dockers/docker-bmp-watchdog/watchdog/Cargo.toml
@@ -0,0 +1,17 @@
+[package]
+name = "bmp_watchdog"
+version = "0.1.0"
+edition = "2021"
+description = "watchdog for bmp container"
+license = "MIT"
+authors = ["Feng Pan"]
+
+[dependencies]
+daemonize = "0.5"
+chrono = "0.4"
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+
+[[bin]]
+name = "bmp_watchdog"
+path = "src/main.rs"
diff --git a/dockers/docker-bmp-watchdog/watchdog/Makefile b/dockers/docker-bmp-watchdog/watchdog/Makefile
@@ -0,0 +1,27 @@
+.ONESHELL:
+SHELL = /bin/bash
+.SHELLFLAGS += -e
+
+#
+# Debug build targets
+#
+build:
+	cargo build --all
+
+test:
+	cargo test --all
+
+clean:
+	cargo clean
+
+#
+# Release build targets
+#
+build-release:
+	cargo build --release --all
+
+test-release:
+	cargo test --release --all
+
+clean-release:
+	cargo clean --release
diff --git a/dockers/docker-bmp-watchdog/watchdog/debian/changelog b/dockers/docker-bmp-watchdog/watchdog/debian/changelog
@@ -0,0 +1,5 @@
+sonic (1.0.0) stable; urgency=medium
+
+  * Initial release
+
+ -- Feng Pan <fenpan@microsoft.com>  Tue, 15 Apr 2025 03:13:12 +0000
diff --git a/dockers/docker-bmp-watchdog/watchdog/debian/compat b/dockers/docker-bmp-watchdog/watchdog/debian/compat
@@ -0,0 +1 @@
+11
diff --git a/dockers/docker-bmp-watchdog/watchdog/debian/control b/dockers/docker-bmp-watchdog/watchdog/debian/control
@@ -0,0 +1,9 @@
+Source: sonic
+Maintainer: Feng Pan <fenpan@microsoft.com>
+Section: net
+Priority: optional
+Standards-Version: 1.0.0
+
+Package: sonic-bmp-watchdog
+Architecture: any
+Description: bmp watchdog for KubeSONiC project
diff --git a/dockers/docker-bmp-watchdog/watchdog/debian/install b/dockers/docker-bmp-watchdog/watchdog/debian/install
@@ -0,0 +1 @@
+target/release/watchdog /usr/bin
diff --git a/dockers/docker-bmp-watchdog/watchdog/debian/rules b/dockers/docker-bmp-watchdog/watchdog/debian/rules
@@ -0,0 +1,17 @@
+#!/usr/bin/make -f
+# See debhelper(7) (uncomment to enable)
+# output every command that modifies files on the build system.
+#export DH_VERBOSE = 1
+
+%:
+	dh $@
+
+override_dh_auto_build:
+	cargo build --release --all
+
+override_dh_auto_clean:
+	cargo clean --release
+
+override_dh_auto_test:
+	# do nothing
+	:
diff --git a/dockers/docker-bmp-watchdog/watchdog/src/main.rs b/dockers/docker-bmp-watchdog/watchdog/src/main.rs
@@ -0,0 +1,88 @@
+use std::io::{BufRead, BufReader, Write};
+use std::net::TcpListener;
+use std::process::Command;
+ 
+use serde::Serialize;
+ 
+#[derive(Serialize)]
+struct HealthStatus {
+    check_bmp_supervisorctl: String,
+    check_bmp_db: String,
+    check_bmp_port: String,
+}
+ 
+fn check_bmp_supervisorctl() -> String {
+    // TODO: Replace with real health check
+    "OK".to_string()
+}
+ 
+fn check_bmp_db() -> String {
+    // TODO: Replace with real health check
+    "OK".to_string()
+}
+ 
+fn check_bmp_port() -> String {
+    // TODO: Replace with real health check
+    "OK".to_string()
+}
+ 
+fn main() {
+    // Start a HTTP server listening on port 50058
+    let listener = TcpListener::bind("127.0.0.1:50058")
+    .expect("Failed to bind to 127.0.0.1:50058");
+
+    println!("Watchdog HTTP server running on http://127.0.0.1:50058");
+
+    for stream_result in listener.incoming() {
+        match stream_result {
+            Ok(mut stream) => {
+                let mut reader = BufReader::new(&stream);
+                let mut request_line = String::new();
+ 
+                if let Ok(_) = reader.read_line(&mut request_line) {
+                    println!("Received request: {}", request_line.trim_end());
+ 
+                    if !request_line.starts_with("GET /") {
+                        let response = "HTTP/1.1 405 Method Not Allowed\r\n\r\n";
+                        stream.write_all(response.as_bytes()).ok();
+                        continue;
+                    }
+ 
+                    let supervisorctl_result = check_bmp_supervisorctl();
+                    let db_result = check_bmp_db();
+                    let port_result = check_bmp_port();
+ 
+                    let status = HealthStatus {
+                        check_bmp_supervisorctl: supervisorctl_result.clone(),
+                        check_bmp_db: db_result.clone(),
+                        check_bmp_port: port_result.clone(),
+                    };
+ 
+                    let json_body = serde_json::to_string(&status).unwrap();
+                    let all_passed = [supervisorctl_result, db_result, port_result]
+                        .iter()
+                        .all(|s| s.starts_with("OK"));
+ 
+                    let status_line = if all_passed {
+                        "HTTP/1.1 200 OK"
+                    } else {
+                        "HTTP/1.1 500 Internal Server Error"
+                    };
+ 
+                    let response = format!(
+                        "{status_line}\r\nContent-Type: application/json\r\nContent-Length: {}\r\n\r\n{}",
+                        json_body.len(),
+                        json_body
+                    );
+ 
+                    if let Err(e) = stream.write_all(response.as_bytes()) {
+                        eprintln!("Failed to write response: {}", e);
+                    }
+                }
+            }
+            Err(e) => {
+                eprintln!("Error accepting connection: {}", e);
+            }
+        }
+    }
+}
diff --git a/rules/docker-bmp-watchdog.dep b/rules/docker-bmp-watchdog.dep
@@ -0,0 +1,10 @@
+DPATH       := $($(DOCKER_BMP_WATCHDOG)_PATH)
+DEP_FILES   := $(SONIC_COMMON_FILES_LIST) rules/docker-bmp-watchdog.mk rules/docker-bmp-watchdog.dep
+DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
+DEP_FILES   += $(shell git ls-files $(DPATH))
+
+$(DOCKER_BMP_WATCHDOG)_CACHE_MODE  := GIT_CONTENT_SHA
+$(DOCKER_BMP_WATCHDOG)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
+$(DOCKER_BMP_WATCHDOG)_DEP_FILES   := $(DEP_FILES)
+
+$(eval $(call add_dbg_docker,$(DOCKER_BMP_WATCHDOG),$(DOCKER_BMP_WATCHDOG_DBG)))
diff --git a/rules/docker-bmp-watchdog.mk b/rules/docker-bmp-watchdog.mk
@@ -0,0 +1,28 @@
+# docker image for bmp watchdog
+
+DOCKER_BMP_WATCHDOG_STEM = docker-bmp-watchdog
+DOCKER_BMP_WATCHDOG = $(DOCKER_BMP_WATCHDOG_STEM).gz
+DOCKER_BMP_WATCHDOG_DBG = $(DOCKER_BMP_WATCHDOG_STEM)-$(DBG_IMAGE_MARK).gz
+
+$(DOCKER_BMP_WATCHDOG)_LOAD_DOCKERS = $(DOCKER_CONFIG_ENGINE_BOOKWORM)
+
+$(DOCKER_BMP_WATCHDOG)_PATH = $(DOCKERS_PATH)/$(DOCKER_BMP_WATCHDOG_STEM)
+
+$(DOCKER_BMP_WATCHDOG)_VERSION = 1.0.0
+$(DOCKER_BMP_WATCHDOG)_PACKAGE_NAME = bmp_watchdog
+
+SONIC_DOCKER_IMAGES += $(DOCKER_BMP_WATCHDOG)
+SONIC_BOOKWORM_DOCKERS += $(DOCKER_BMP_WATCHDOG)
+SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_BMP_WATCHDOG)
+
+SONIC_DOCKER_DBG_IMAGES += $(DOCKER_BMP_WATCHDOG_DBG)
+SONIC_BOOKWORM_DBG_DOCKERS += $(DOCKER_BMP_WATCHDOG_DBG)
+SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_BMP_WATCHDOG_DBG)
+
+$(DOCKER_BMP_WATCHDOG)_CONTAINER_NAME = bmp_watchdog
+$(DOCKER_BMP_WATCHDOG)_RUN_OPT += -t --privileged --pid=host
+$(DOCKER_BMP_WATCHDOG)_RUN_OPT += -v /lib/systemd/system:/lib/systemd/system:rw
+$(DOCKER_BMP_WATCHDOG)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
+$(DOCKER_BMP_WATCHDOG)_RUN_OPT += -v /etc/localtime:/etc/localtime:ro
+
+$(DOCKER_BMP_WATCHDOG)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +sonic (1.0.0) stable; urgency=medium
++
 +  * Initial release
++
 + -- Feng Pan <[email protected]>  Tue, 15 Apr 2025 03:13:12 +0000