Merge "Add an option to the health probe to test all pids"

nova/templates/bin/_health-probe.py.tpl

@@ -94,7 +94,7 @@ def tcp_socket_status(process, port):
                 if parentId == 0:
                     parentId = p.pid
                 else:
-                    if p.ppid() == parentId:
+                    if p.ppid() == parentId and not cfg.CONF.check_all_pids:
                         continue
                 pcon = p.connections()
                 for con in pcon:
@@ -174,6 +174,8 @@ def test_rpc_liveness():
     cfg.CONF.register_cli_opt(cfg.StrOpt('service-queue-name'))
     cfg.CONF.register_cli_opt(cfg.BoolOpt('liveness-probe', default=False,
                                           required=False))
+    cfg.CONF.register_cli_opt(cfg.BoolOpt('check-all-pids', default=False,
+                                          required=False))
 
     cfg.CONF(sys.argv[1:])
 

nova/templates/deployment-scheduler.yaml

@@ -69,6 +69,7 @@ spec:
               - /etc/nova/nova.conf
               - --service-queue-name
               - scheduler
+              - --check-all-pids
             initialDelaySeconds: 80
             periodSeconds: 90
             timeoutSeconds: 70
@@ -82,6 +83,7 @@ spec:
               - --service-queue-name
               - scheduler
               - --liveness-probe
+              - --check-all-pids
             initialDelaySeconds: 120
             periodSeconds: 90
             timeoutSeconds: 70