Fault tolerance (#82)

pgrill · renzodgc · web-flow · commit bf82aadeeff2 · 2020-11-20T09:33:05.000-03:00
* Add fault tolerance in Area and Video processing.

* Include docker healthcheck in containers.

* Change start_services.bash with supervisord.

* Use supervisorctl in healthcheck.

* Removing empty line in dockerfile. Fixing comment.

* Update libs/area_reporting.py

Co-authored-by: Renzo Gambone &lt;42361379+renzodgc@users.noreply.github.com&gt;

* Include max_retries in threads restarts.

* Add MaxThreadRestarts parameter in the config files.

* Reset the restarts counter when last restart is previous than 1 minute ago.

Co-authored-by: Renzo Gambone &lt;42361379+renzodgc@users.noreply.github.com&gt;
diff --git a/README.md b/README.md
@@ -227,6 +227,8 @@ All the configurations are grouped in *sections* and some of them can vary depen
   - `DashboardURL`: Sets the url where the frontend is running. Unless you are using a custom domain, you should keep this value as https://beta.lanthorn.ai/.
   - `EnableSlackNotifications`: A boolean parameter to enable/disable the Slack integration for notifications and daily reports. We recommend not editing this parameter directly and manage it from the [UI](https://beta.lanthorn.ai) to configure your workspace correctly.
   - `SlackChannel`: Configures the slack channel used by the notifications. The chosen slack channel must exist in the configured workspace.
+  - `OccupancyAlertsMinInterval`:  Sets the desired interval (in seconds) between occupancy alerts.
+  - `MaxThreadRestarts`: Defines the number of restarts allowed per thread.
 
 - `[Api]`
   - `Host`: Configures the host IP of the processor's API (inside docker). We recommend don't change that value and keep it as *0.0.0.0*.
diff --git a/amd64-usbtpu.Dockerfile b/amd64-usbtpu.Dockerfile
@@ -83,6 +83,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 	python3-requests \
         build-essential \
         libedgetpu1-std \
+        supervisor \
     && rm -rf /var/lib/apt/lists/* \
     && python3 -m pip install --upgrade pip setuptools==41.0.0 wheel && pip install -r /requirements.txt \
 	https://dl.google.com/coral/python/tflite_runtime-2.1.0.post1-cp37-cp37m-linux_x86_64.whl \
@@ -99,8 +100,9 @@ RUN cd / && apt-get update && apt-get install -y git python3-edgetpu && git clon
     https://github.com/google-coral/project-posenet.git && sed -i 's/sudo / /g' \
     /project-posenet/install_requirements.sh && sh /project-posenet/install_requirements.sh
 ENV PYTHONPATH=$PYTHONPATH:/project-posenet
+ENV CONFIG_FILE=config-coral.ini
 
 COPY . /repo
 WORKDIR /repo
-ENTRYPOINT ["bash", "start_services.bash"]
-CMD ["config-coral.ini"]
+HEALTHCHECK --interval=30s --retries=2 --start-period=15s CMD bash healthcheck.bash
+CMD supervisord -c supervisord.conf -n
diff --git a/config-coral.ini b/config-coral.ini
@@ -11,6 +11,8 @@ EnableSlackNotifications = no
 SlackChannel = lanthorn-notifications
 ; OccupancyAlertsMinInterval time is measured in seconds (if interval < 0 then no occupancy alerts are triggered)
 OccupancyAlertsMinInterval = 180
+MaxThreadRestarts = 5
+
 
 [API]
 Host = 0.0.0.0
diff --git a/config-jetson.ini b/config-jetson.ini
@@ -14,6 +14,7 @@ EnableSlackNotifications = no
 SlackChannel = lanthorn-notifications
 ; OccupancyAlertsMinInterval time is measured in seconds (if interval < 0 then no occupancy alerts are triggered)
 OccupancyAlertsMinInterval = 180
+MaxThreadRestarts = 5
 
 [API]
 Host = 0.0.0.0
diff --git a/config-x86-gpu.ini b/config-x86-gpu.ini
@@ -23,6 +23,8 @@ DashboardURL = http://0.0.0.0:8000
 ScreenshotsDirectory = /repo/data/processor/static/screenshots
 EnableSlackNotifications = no
 SlackChannel = lanthorn-notifications
+OccupancyAlertsMinInterval = 180
+MaxThreadRestarts = 5
 
 [Area_0]
 Id = area0
diff --git a/config-x86-openvino.ini b/config-x86-openvino.ini
@@ -25,6 +25,7 @@ EnableSlackNotifications = no
 SlackChannel = lanthorn-notifications
 ; OccupancyAlertsMinInterval time is measured in seconds (if interval < 0 then no occupancy alerts are triggered)
 OccupancyAlertsMinInterval = 180
+MaxThreadRestarts = 5
 
 [Area_0]
 Id = area0
diff --git a/config-x86.ini b/config-x86.ini
@@ -25,6 +25,7 @@ EnableSlackNotifications = no
 SlackChannel = lanthorn-notifications
 ; OccupancyAlertsMinInterval time is measured in seconds (if interval < 0 then no occupancy alerts are triggered)
 OccupancyAlertsMinInterval = 180
+MaxThreadRestarts = 5
 
 [Area_0]
 Id = area0
diff --git a/coral-dev-board.Dockerfile b/coral-dev-board.Dockerfile
@@ -67,6 +67,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         python3-pip \
         python3-scipy \
         python3-wget \
+        supervisor \
     && rm -rf /var/lib/apt/lists/* \
     && python3 -m pip install --upgrade pip setuptools==41.0.0 && pip install -r /requirements.txt \
         https://dl.google.com/coral/python/tflite_runtime-2.1.0.post1-cp37-cp37m-linux_aarch64.whl \
@@ -82,9 +83,10 @@ RUN cd / && apt-get update && apt-get install -y git python3-edgetpu && git clon
     https://github.com/google-coral/project-posenet.git && sed -i 's/sudo / /g' \
     /project-posenet/install_requirements.sh && sh /project-posenet/install_requirements.sh
 ENV PYTHONPATH=$PYTHONPATH:/project-posenet
-
+ENV CONFIG_FILE=config-coral.ini
 # Also if you use opencv: LD_PRELOAD="/usr/lib/aarch64-linux-gnu/libgomp.so.1.0.0"
+
 COPY . /repo
 WORKDIR /repo
-ENTRYPOINT ["bash", "start_services.bash"]
-CMD ["config-coral.ini"]
+HEALTHCHECK --interval=30s --retries=2 --start-period=15s CMD bash healthcheck.bash
+CMD supervisord -c supervisord.conf -n
diff --git a/healthcheck.bash b/healthcheck.bash
@@ -0,0 +1,6 @@
+#!/bin/bash
+if fatalError=$(supervisorctl -c supervisord.conf status all | grep -i "FATAL\|UNKNOWN"); then
+    exit 1;
+else
+    exit 0;
+fi
diff --git a/jetson-nano.Dockerfile b/jetson-nano.Dockerfile
@@ -82,6 +82,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         python3-pip \
         python3-scipy \
         python3-wget \
+        supervisor \
     && rm -rf /var/lib/apt/lists/* \
     && ln -sf $(which gcc) /usr/local/bin/gcc-aarch64-linux-gnu \
     && ln -sf $(which g++) /usr/local/bin/g++-aarch64-linux-gnu \
@@ -96,8 +97,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 ENV DEV_ALLOW_ALL_ORIGINS=true
 ENV AWS_SHARED_CREDENTIALS_FILE=/repo/.aws/credentials
 ENV AWS_CONFIG_FILE=/repo/.aws/config
+ENV CONFIG_FILE=config-jetson.ini
 
 COPY . /repo/
 WORKDIR /repo
-ENTRYPOINT ["bash", "start_services.bash"]
-CMD ["config-jetson.ini"]
+HEALTHCHECK --interval=30s --retries=2 --start-period=15s CMD bash healthcheck.bash
+CMD supervisord -c supervisord.conf -n
diff --git a/jetson-tx2.Dockerfile b/jetson-tx2.Dockerfile
@@ -80,6 +80,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         python3-pip \
         python3-scipy \
         python3-wget \
+        supervisor \
     && rm -rf /var/lib/apt/lists/* \
     && ln -sf $(which gcc) /usr/local/bin/gcc-aarch64-linux-gnu \
     && ln -sf $(which g++) /usr/local/bin/g++-aarch64-linux-gnu \
@@ -92,8 +93,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 ENV DEV_ALLOW_ALL_ORIGINS=true
 ENV AWS_SHARED_CREDENTIALS_FILE=/repo/.aws/credentials
 ENV AWS_CONFIG_FILE=/repo/.aws/config
+ENV CONFIG_FILE=config-jetson.ini
 
 COPY . /repo/
 WORKDIR /repo
-ENTRYPOINT ["bash", "start_services.bash"]
-CMD ["config-jetson.ini"]
+HEALTHCHECK --interval=30s --retries=2 --start-period=15s CMD bash healthcheck.bash
+CMD supervisord -c supervisord.conf -n
diff --git a/jetson-web-gui.Dockerfile b/jetson-web-gui.Dockerfile
diff --git a/libs/area_reporting.py b/libs/area_reporting.py
@@ -30,8 +30,10 @@ def __init__(self, config, area):
             camera['file_path'] = os.path.join(self.log_dir, camera['id'], "objects_log")
             camera['last_processed_time'] = time.time()
 
-        self.mail_service = MailService(config)
-        self.slack_service = SlackService(config)
+        if self.should_send_email_notifications:
+            self.mail_service = MailService(config)
+        if self.should_send_slack_notifications:
+            self.slack_service = SlackService(config)
 
     def process_area(self):
         # Sleep for a while so cameras start processing
diff --git a/libs/area_threading.py b/libs/area_threading.py
@@ -1,7 +1,11 @@
 import os
+import logging
+
+import time
+
+from datetime import datetime
 from threading import Thread
 from libs.area_reporting import AreaReporting as AreaEngine
-import logging
 
 logger = logging.getLogger(__name__)
 
@@ -33,7 +37,24 @@ def __init__(self, config, area):
 
     def run(self):
         self.engine = AreaEngine(self.config, self.area)
-        self.engine.process_area()
+        restarts = 0
+        max_restarts = int(self.config.get_section_dict("App")["MaxThreadRestarts"])
+        while True:
+            try:
+                last_restart_time = datetime.now()
+                self.engine.process_area()
+            except Exception as e:
+                logging.error(e, exc_info=True)
+                logging.info(f"Exception processing area {self.area['name']}")
+                if (datetime.now() - last_restart_time).total_seconds() > 60:
+                    # If the last restart was previous than 1 minute ago, restart the counter.
+                    restarts = 0
+                if restarts == max_restarts:
+                    raise e
+                # Sleep the thread for 5 seconds and try to process the area again
+                time.sleep(5)
+                logging.info("Restarting the area processing")
+                restarts += 1
 
     def stop(self):
         self.engine.stop_process_area()
diff --git a/libs/engine_threading.py b/libs/engine_threading.py
@@ -1,8 +1,11 @@
 import os
+import logging
+import time
+
+from datetime import datetime
 from shutil import rmtree
 from threading import Thread
 from libs.distancing import Distancing as CvEngine
-import logging
 
 logger = logging.getLogger(__name__)
 
@@ -43,7 +46,24 @@ def __init__(self, config, source, live_feed_enabled=True):
 
     def run(self):
         self.engine = CvEngine(self.config, self.source['section'], self.live_feed_enabled)
-        self.engine.process_video(self.source['url'])
+        restarts = 0
+        max_restarts = int(self.config.get_section_dict("App")["MaxThreadRestarts"])
+        while True:
+            try:
+                last_restart_time = datetime.now()
+                self.engine.process_video(self.source['url'])
+            except Exception as e:
+                logging.error(e, exc_info=True)
+                logging.info(f"Exception processing video for source {self.source['name']}")
+                if (datetime.now() - last_restart_time).total_seconds() > 60:
+                    # If the last restart was previous than 1 minute ago, restart the counter.
+                    restarts = 0
+                if restarts == max_restarts:
+                    raise e
+                # Sleep the thread for 5 seconds and try to process the video again
+                time.sleep(5)
+                logging.info("Restarting the video processing")
+                restarts += 1
 
     def stop(self):
         self.engine.stop_process_video()
diff --git a/sample_startup.bash b/sample_startup.bash
@@ -3,7 +3,7 @@ config="$1"
 
 # check if video file exists, if not download it
 line=$(cat $config | grep VideoPath)
-videoPath="$(cut -d'=' -f2 <<<"$line")"
+videoPath="$(cut -d'=' -f2 <<<"$line" | xargs)"
 if [ ! -f "$videoPath" ]; then
     echo "video file at $videoPath not exists, downloading..."
     sh '/repo/download_sample_video.sh'
diff --git a/start_services.bash b/start_services.bash
diff --git a/supervisord.conf b/supervisord.conf
@@ -0,0 +1,42 @@
+[supervisord]
+
+[unix_http_server]
+file=/var/run/supervisor.sock
+chmod=0700
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[supervisorctl]
+serverurl=unix:///var/run/supervisor.sock
+
+[program:api]
+command=python3 run_processor_api.py --config %(ENV_CONFIG_FILE)s
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+autorestart=true
+
+[program:core]
+command=python3 run_processor_core.py --config %(ENV_CONFIG_FILE)s
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+autorestart=true
+
+[program:startup]
+command=/repo/sample_startup.bash %(ENV_CONFIG_FILE)s
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+
+[program:reports]
+command=python3 create_reports.py --config %(ENV_CONFIG_FILE)s
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+autorestart=true
diff --git a/x86-gpu.Dockerfile b/x86-gpu.Dockerfile
@@ -68,6 +68,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         python3-pip \
         python3-scipy \
         python3-wget \
+        supervisor \
     && rm -rf /var/lib/apt/lists/* \
     && python3 -m pip install --upgrade pip setuptools==41.0.0 && pip install -r /requirements.txt \
     && apt-get purge -y \
@@ -80,7 +81,10 @@ ENV DEV_ALLOW_ALL_ORIGINS=true
 ENV AWS_SHARED_CREDENTIALS_FILE=/repo/.aws/credentials
 ENV AWS_CONFIG_FILE=/repo/.aws/config
 ENV TF_FORCE_GPU_ALLOW_GROWTH=true
+ENV CONFIG_FILE=config-x86-gpu.ini
+
 COPY . /repo
 WORKDIR /repo
-ENTRYPOINT ["bash", "start_services.bash"]
-CMD ["config-x86-gpu.ini"]
+
+HEALTHCHECK --interval=30s --retries=2 --start-period=15s CMD bash healthcheck.bash
+CMD supervisord -c supervisord.conf -n
diff --git a/x86-openvino.Dockerfile b/x86-openvino.Dockerfile
@@ -69,6 +69,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         python3-pip \
         python3-scipy \
         python3-wget \
+        supervisor \
     && rm -rf /var/lib/apt/lists/* \
     && python3 -m pip install --upgrade pip setuptools==41.0.0 wheel && pip install -r /requirements.txt \
     && apt-get purge -y \
@@ -82,7 +83,10 @@ ADD docker/x86-openvino/openvino_setupvars.py /opt/openvino_setupvars.py
 ENV DEV_ALLOW_ALL_ORIGINS=true
 ENV AWS_SHARED_CREDENTIALS_FILE=/repo/.aws/credentials
 ENV AWS_CONFIG_FILE=/repo/.aws/config
+ENV CONFIG_FILE=config-x86-openvino.ini
 
 COPY . /repo
 WORKDIR /repo
-CMD env `python3 /opt/openvino_setupvars.py` bash start_services.bash config-x86-openvino.ini
+
+HEALTHCHECK --interval=30s --retries=2 --start-period=15s CMD bash healthcheck.bash
+CMD env `python3 /opt/openvino_setupvars.py` supervisord -c supervisord.conf -n
diff --git a/x86.Dockerfile b/x86.Dockerfile
@@ -68,6 +68,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         python3-pip \
         python3-scipy \
         python3-wget \
+        supervisor \
     && rm -rf /var/lib/apt/lists/* \
     && python3 -m pip install --upgrade pip setuptools==41.0.0 && pip install -r /requirements.txt \
     && apt-get purge -y \
@@ -79,8 +80,10 @@ RUN apt-get update && apt-get install -y python3-dev && pip3 install torch==1.5
 ENV DEV_ALLOW_ALL_ORIGINS=true
 ENV AWS_SHARED_CREDENTIALS_FILE=/repo/.aws/credentials
 ENV AWS_CONFIG_FILE=/repo/.aws/config
+ENV CONFIG_FILE=config-x86.ini
 
 COPY . /repo
 WORKDIR /repo
-ENTRYPOINT ["bash", "start_services.bash"]
-CMD ["config-x86.ini"]
+
+HEALTHCHECK --interval=30s --retries=2 --start-period=15s CMD bash healthcheck.bash
+CMD supervisord -c supervisord.conf -n

-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +#!/bin/bash
 +if fatalError=$(supervisorctl -c supervisord.conf status all | grep -i "FATAL\|UNKNOWN"); then
 +    exit 1;
 +else
 +    exit 0;
 +fi