making healtcheck without kafka reading
Change-Id: I465e553cdc4718efa9194349b1caab907545ba4a
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
diff --git a/Dockerfile.local b/Dockerfile.local
index 07c0f2e..7c4684f 100644
--- a/Dockerfile.local
+++ b/Dockerfile.local
@@ -84,5 +84,5 @@
# Run app.py when the container launches
CMD ["python3", "lcm.py"]
-# HEALTHCHECK --interval=30 --timeout=140 --retries=1 \
+# HEALTHCHECK --interval=120s --timeout=15s --retries=1 \
# CMD python3 lcm.py --health-check || exit 1
diff --git a/osm_lcm/lcm.py b/osm_lcm/lcm.py
index 25d7559..a42f1cb 100644
--- a/osm_lcm/lcm.py
+++ b/osm_lcm/lcm.py
@@ -27,6 +27,7 @@
import ns
import vim_sdn
import netslice
+from time import time, sleep
from lcm_utils import versiontuple, LcmException, TaskRegistry, LcmExceptionExit
# from osm_lcm import version as lcm_version, version_date as lcm_version_date, ROclient
@@ -44,8 +45,9 @@
min_n2vc_version = "0.0.2"
min_common_version = "0.1.11"
# uncomment if LCM is installed as library and installed, and get them from __init__.py
-lcm_version = '0.1.34'
+lcm_version = '0.1.35'
lcm_version_date = '2019-01-31'
+health_check_file = path.expanduser("~") + "/time_last_ping" # TODO find better location for this file
class Lcm:
@@ -241,6 +243,11 @@
if topic == "admin":
if command == "ping" and params["to"] == "lcm" and params["from"] == "lcm":
self.pings_not_received = 0
+ try:
+ with open(health_check_file, "w") as f:
+ f.write(str(time()))
+ except Exception as e:
+ self.logger.error("Cannot write into '{}' for healthcheck: {}".format(health_check_file, e))
return
elif topic == "ns":
if command == "instantiate":
@@ -410,27 +417,6 @@
# self.logger.debug("Task kafka_read terminating")
self.logger.debug("Task kafka_read exit")
- def health_check(self):
-
- global exit_code
- task = None
- exit_code = 1
-
- def health_check_callback(topic, command, params):
- global exit_code
- print("receiving callback {} {} {}".format(topic, command, params))
- if topic == "admin" and command == "ping" and params["to"] == "lcm" and params["from"] == "lcm":
- # print("received LCM ping")
- exit_code = 0
- task.cancel()
-
- try:
- task = asyncio.ensure_future(self.msg.aioread(("admin",), self.loop, health_check_callback))
- self.loop.run_until_complete(task)
- except Exception:
- pass
- exit(exit_code)
-
def start(self):
# check RO version
@@ -502,13 +488,29 @@
# --log-socket-port PORT: send logs using this port (default: 9022)")
+def health_check():
+ retry = 2
+ while retry:
+ retry -= 1
+ try:
+ with open(health_check_file, "r") as f:
+ last_received_ping = f.read()
+
+ if time() - float(last_received_ping) < Lcm.ping_interval_pace + 10:
+ exit(0)
+ except Exception:
+ pass
+ if retry:
+ sleep(6)
+ exit(1)
+
+
if __name__ == '__main__':
try:
# load parameters and configuration
opts, args = getopt.getopt(sys.argv[1:], "hc:", ["config=", "help", "health-check"])
# TODO add "log-socket-host=", "log-socket-port=", "log-file="
config_file = None
- health_check = None
for o, a in opts:
if o in ("-h", "--help"):
usage()
@@ -516,7 +518,7 @@
elif o in ("-c", "--config"):
config_file = a
elif o == "--health-check":
- health_check = True
+ health_check()
# elif o == "--log-socket-port":
# log_socket_port = a
# elif o == "--log-socket-host":
@@ -537,10 +539,7 @@
print("No configuration file 'lcm.cfg' found neither at local folder nor at /etc/osm/", file=sys.stderr)
exit(1)
lcm = Lcm(config_file)
- if health_check:
- lcm.health_check()
- else:
- lcm.start()
+ lcm.start()
except (LcmException, getopt.GetoptError) as e:
print(str(e), file=sys.stderr)
# usage()