Skip to content

Commit ae4867a

Browse files
authored
Revert "Health check responder (#2636)" (#2638)
This reverts commit 164fefb.
1 parent 164fefb commit ae4867a

File tree

6 files changed

+0
-149
lines changed

6 files changed

+0
-149
lines changed

configs/test/gce/linux-init-ml-with-gpu.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ bootcmd:
3131
- echo never > /sys/kernel/mm/transparent_hugepage/defrag
3232
- echo core > /proc/sys/kernel/core_pattern # for AFL
3333
- swapon -a
34-
- iptables -w -A INPUT -p tcp --dport 7123 -j ACCEPT # health check port
3534

3635
# Note that NVIDIA_DRIVER_VERSION can be used with a particular CUDA version
3736
# only, e.g. CUDA 9.0 needs drivers version 384.130. CUDA and TensorFlow are

configs/test/gce/linux-init.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ bootcmd:
3131
- echo never > /sys/kernel/mm/transparent_hugepage/defrag
3232
- echo core > /proc/sys/kernel/core_pattern # for AFL
3333
- swapon -a
34-
- iptables -w -A INPUT -p tcp --dport 7123 -j ACCEPT # health check port
3534

3635
write_files:
3736
- path: /etc/systemd/system/clusterfuzz.service

src/clusterfuzz/_internal/system/process_handler.py

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -649,16 +649,3 @@ def terminate_processes_matching_cmd_line(match_strings,
649649
if any(x in process_path for x in match_strings):
650650
if not any([x in process_path for x in exclude_strings]):
651651
terminate_process(process_info['pid'], kill)
652-
653-
654-
def scripts_are_running(expected_scripts):
655-
"""Check if all target scripts are running as expected."""
656-
scripts_left = expected_scripts.copy()
657-
for process in psutil.process_iter():
658-
for expected_script in scripts_left:
659-
if any(expected_script == os.path.basename(cmdline)
660-
for cmdline in process.cmdline()):
661-
scripts_left.remove(expected_script)
662-
if not scripts_left:
663-
return True
664-
return False

src/clusterfuzz/_internal/tests/core/bot/startup/health_check_responder_test.py

Lines changed: 0 additions & 84 deletions
This file was deleted.

src/python/bot/startup/health_check_responder.py

Lines changed: 0 additions & 46 deletions
This file was deleted.

src/python/bot/startup/heartbeat.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
import sys
2626
import time
2727

28-
from health_check_responder import run_server as run_health_responder_server
29-
3028
from clusterfuzz._internal.base import dates
3129
from clusterfuzz._internal.base import tasks
3230
from clusterfuzz._internal.datastore import data_handler
@@ -115,8 +113,6 @@ def main():
115113
except Exception:
116114
logs.log_error('Failed to beat.')
117115

118-
run_health_responder_server()
119-
120116
time.sleep(data_types.HEARTBEAT_WAIT_INTERVAL)
121117

122118

0 commit comments

Comments
 (0)