adding additional updates with Reload fnction tests

Author: miledxz

internal/mode/static/manager.go

@@ -210,6 +210,8 @@ func StartManager(cfg config.Config) error {
 			ngxPlusClient,
 			ngxruntimeCollector,
 			cfg.Logger.WithName("nginxRuntimeManager"),
+			nil,
+			nil,
 		),
 		statusUpdater:                 statusUpdater,
 		eventRecorder:                 recorder,

internal/mode/static/nginx/runtime/manager.go

@@ -17,25 +17,33 @@ import (
 )
 
 const (
-	pidFile            = "/var/run/nginx/nginx.pid"
+	PidFile            = "/var/run/nginx/nginx.pid"
 	pidFileTimeout     = 10000 * time.Millisecond
 	nginxReloadTimeout = 60000 * time.Millisecond
 )
 
 type (
-	readFileFunc  func(string) ([]byte, error)
-	checkFileFunc func(string) (fs.FileInfo, error)
+	ReadFileFunc  func(string) ([]byte, error)
+	CheckFileFunc func(string) (fs.FileInfo, error)
 )
 
 var childProcPathFmt = "/proc/%[1]v/task/%[1]v/children"
 
-//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . NginxPlusClient
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . nginxPlusClient
 
-type NginxPlusClient interface {
+type nginxPlusClient interface {
 	UpdateHTTPServers(upstream string, servers []ngxclient.UpstreamServer) (added []ngxclient.UpstreamServer, deleted []ngxclient.UpstreamServer, updated []ngxclient.UpstreamServer, err error)
 	GetUpstreams() (*ngxclient.Upstreams, error)
 }
 
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . processHandler
+
+type processHandler interface {
+	FindMainProcess(ctx context.Context, checkFile CheckFileFunc, readFile ReadFileFunc, timeout time.Duration) (int, error)
+	ReadFile(file string) ([]byte, error)
+	SysCallKill(pid int, signum syscall.Signal) error
+}
+
 //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Manager
 
 // Manager manages the runtime of NGINX.
@@ -52,6 +60,8 @@ type Manager interface {
 	GetUpstreams() (ngxclient.Upstreams, error)
 }
 
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . MetricsCollector
+
 // MetricsCollector is an interface for the metrics of the NGINX runtime manager.
 type MetricsCollector interface {
 	IncReloadCount()
@@ -61,23 +71,27 @@ type MetricsCollector interface {
 
 // ManagerImpl implements Manager.
 type ManagerImpl struct {
-	verifyClient     *verifyClient
+	verifyClient     verifyClient
 	metricsCollector MetricsCollector
-	ngxPlusClient    NginxPlusClient
+	ngxPlusClient    nginxPlusClient
 	logger           logr.Logger
+	process          processHandler
 }
 
 // NewManagerImpl creates a new ManagerImpl.
 func NewManagerImpl(
-	ngxPlusClient NginxPlusClient,
+	ngxPlusClient nginxPlusClient,
 	collector MetricsCollector,
 	logger logr.Logger,
+	process processHandler,
+	verifyClient verifyClient,
 ) *ManagerImpl {
 	return &ManagerImpl{
-		verifyClient:     newVerifyClient(nginxReloadTimeout),
+		verifyClient:     verifyClient,
 		metricsCollector: collector,
 		ngxPlusClient:    ngxPlusClient,
 		logger:           logger,
+		process:          process,
 	}
 }
 
@@ -89,25 +103,25 @@ func (m *ManagerImpl) IsPlus() bool {
 func (m *ManagerImpl) Reload(ctx context.Context, configVersion int) error {
 	start := time.Now()
 	// We find the main NGINX PID on every reload because it will change if the NGINX container is restarted.
-	pid, err := findMainProcess(ctx, os.Stat, os.ReadFile, pidFileTimeout)
+	pid, err := m.process.FindMainProcess(ctx, os.Stat, os.ReadFile, pidFileTimeout)
 	if err != nil {
 		return fmt.Errorf("failed to find NGINX main process: %w", err)
 	}
 
 	childProcFile := fmt.Sprintf(childProcPathFmt, pid)
-	previousChildProcesses, err := os.ReadFile(childProcFile)
+	previousChildProcesses, err := m.process.ReadFile(childProcFile)
 	if err != nil {
 		return err
 	}
 
 	// send HUP signal to the NGINX main process reload configuration
 	// See https://nginx.org/en/docs/control.html
-	if err := syscall.Kill(pid, syscall.SIGHUP); err != nil {
+	if err := m.process.SysCallKill(pid, syscall.SIGHUP); err != nil {
 		m.metricsCollector.IncReloadErrors()
 		return fmt.Errorf("failed to send the HUP signal to NGINX main: %w", err)
 	}
 
-	if err = m.verifyClient.waitForCorrectVersion(
+	if err = m.verifyClient.WaitForCorrectVersion(
 		ctx,
 		configVersion,
 		childProcFile,
@@ -160,16 +174,16 @@ func (m *ManagerImpl) GetUpstreams() (ngxclient.Upstreams, error) {
 
 // EnsureNginxRunning ensures NGINX is running by locating the main process.
 func EnsureNginxRunning(ctx context.Context) error {
-	if _, err := findMainProcess(ctx, os.Stat, os.ReadFile, pidFileTimeout); err != nil {
+	if _, err := FindMainProcess(ctx, os.Stat, os.ReadFile, pidFileTimeout); err != nil {
 		return fmt.Errorf("failed to find NGINX main process: %w", err)
 	}
 	return nil
 }
 
-func findMainProcess(
+func FindMainProcess(
 	ctx context.Context,
-	checkFile checkFileFunc,
-	readFile readFileFunc,
+	checkFile CheckFileFunc,
+	readFile ReadFileFunc,
 	timeout time.Duration,
 ) (int, error) {
 	ctx, cancel := context.WithTimeout(ctx, timeout)
@@ -180,7 +194,7 @@ func findMainProcess(
 		500*time.Millisecond,
 		true, /* poll immediately */
 		func(_ context.Context) (bool, error) {
-			_, err := checkFile(pidFile)
+			_, err := checkFile(PidFile)
 			if err == nil {
 				return true, nil
 			}
@@ -193,7 +207,7 @@ func findMainProcess(
 		return 0, err
 	}
 
-	content, err := readFile(pidFile)
+	content, err := readFile(PidFile)
 	if err != nil {
 		return 0, err
 	}
@@ -205,3 +219,21 @@ func findMainProcess(
 
 	return pid, nil
 }
+
+func ReadFile(file string) ([]byte, error) {
+	content, err := os.ReadFile(file)
+	if err != nil {
+		return nil, err
+	}
+
+	return content, nil
+}
+
+func SysCallKill(pid int, signum syscall.Signal) error {
+	err := syscall.Kill(pid, syscall.SIGHUP)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}