X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Fsubscriptions.py;h=711455e77d7029f31e34423c70e07a87067adf37;hp=64fc2bfbd3f0fd7f63279485b4bbdf3b4ad5e429;hb=refs%2Fchanges%2F25%2F9025%2F1;hpb=932499c09d729d235ccd1fc002156b8b23e9f165 diff --git a/osm_nbi/subscriptions.py b/osm_nbi/subscriptions.py index 64fc2bf..711455e 100644 --- a/osm_nbi/subscriptions.py +++ b/osm_nbi/subscriptions.py @@ -27,7 +27,7 @@ from http import HTTPStatus from osm_common import dbmongo, dbmemory, msglocal, msgkafka from osm_common.dbbase import DbException from osm_common.msgbase import MsgException -from engine import EngineException +from osm_nbi.engine import EngineException __author__ = "Alfonso Tierno " @@ -48,21 +48,73 @@ class SubscriptionThread(threading.Thread): :param engine: an instance of Engine class, used for deleting instances """ threading.Thread.__init__(self) - + self.to_terminate = False self.config = config self.db = None self.msg = None self.engine = engine self.loop = None self.logger = logging.getLogger("nbi.subscriptions") - self.aiomain_task = None # asyncio task for receiving kafka bus + self.aiomain_task_admin = None # asyncio task for receiving admin actions from kafka bus + self.aiomain_task = None # asyncio task for receiving normal actions from kafka bus self.internal_session = { # used for a session to the engine methods - "_id": "subscription", - "id": "subscription", - "project_id": "admin", - "admin": True + "project_id": (), + "set_project": (), + "admin": True, + "force": False, + "public": None, + "method": "delete", } + async def start_kafka(self): + # timeout_wait_for_kafka = 3*60 + kafka_working = True + while not self.to_terminate: + try: + # bug 710 635. The library aiokafka does not recieve anything when the topci at kafka has not been + # created. + # Before subscribe, send dummy messages + await self.msg.aiowrite("admin", "echo", "dummy message", loop=self.loop) + await self.msg.aiowrite("ns", "echo", "dummy message", loop=self.loop) + await self.msg.aiowrite("nsi", "echo", "dummy message", loop=self.loop) + if not kafka_working: + self.logger.critical("kafka is working again") + kafka_working = True + if not self.aiomain_task_admin: + await asyncio.sleep(10, loop=self.loop) + self.logger.debug("Starting admin subscription task") + self.aiomain_task_admin = asyncio.ensure_future(self.msg.aioread(("admin",), loop=self.loop, + group_id=False, + aiocallback=self._msg_callback), + loop=self.loop) + if not self.aiomain_task: + await asyncio.sleep(10, loop=self.loop) + self.logger.debug("Starting non-admin subscription task") + self.aiomain_task = asyncio.ensure_future(self.msg.aioread(("ns", "nsi"), loop=self.loop, + aiocallback=self._msg_callback), + loop=self.loop) + done, _ = await asyncio.wait([self.aiomain_task, self.aiomain_task_admin], + timeout=None, loop=self.loop, return_when=asyncio.FIRST_COMPLETED) + try: + if self.aiomain_task_admin in done: + exc = self.aiomain_task_admin.exception() + self.logger.error("admin subscription task exception: {}".format(exc)) + self.aiomain_task_admin = None + if self.aiomain_task in done: + exc = self.aiomain_task.exception() + self.logger.error("non-admin subscription task exception: {}".format(exc)) + self.aiomain_task = None + except asyncio.CancelledError: + pass + except Exception as e: + if self.to_terminate: + return + if kafka_working: + # logging only first time + self.logger.critical("Error accessing kafka '{}'. Retrying ...".format(e)) + kafka_working = False + await asyncio.sleep(10, loop=self.loop) + def run(self): """ Start of the thread @@ -97,22 +149,21 @@ class SubscriptionThread(threading.Thread): raise SubscriptionException(str(e), http_code=e.http_code) self.logger.debug("Starting") - while True: + while not self.to_terminate: try: - self.aiomain_task = asyncio.ensure_future(self.msg.aioread("ns", loop=self.loop, - callback=self._msg_callback), - loop=self.loop) - self.loop.run_until_complete(self.aiomain_task) - except asyncio.CancelledError: - break # if cancelled it should end, breaking loop + + self.loop.run_until_complete(asyncio.ensure_future(self.start_kafka(), loop=self.loop)) + # except asyncio.CancelledError: + # break # if cancelled it should end, breaking loop except Exception as e: - self.logger.exception("Exception '{}' at messaging read loop".format(e), exc_info=True) + if not self.to_terminate: + self.logger.exception("Exception '{}' at messaging read loop".format(e), exc_info=True) self.logger.debug("Finishing") self._stop() self.loop.close() - def _msg_callback(self, topic, command, params): + async def _msg_callback(self, topic, command, params): """ Callback to process a received message from kafka :param topic: topic received @@ -120,14 +171,44 @@ class SubscriptionThread(threading.Thread): :param params: rest of parameters :return: None """ + msg_to_send = [] try: if topic == "ns": - if command == "terminated": + if command == "terminated" and params["operationState"] in ("COMPLETED", "PARTIALLY_COMPLETED"): self.logger.debug("received ns terminated {}".format(params)) if params.get("autoremove"): - self.engine.del_item(self.internal_session, "nsrs", _id=params["nsr_id"]) + self.engine.del_item(self.internal_session, "nsrs", _id=params["nsr_id"], + not_send_msg=msg_to_send) self.logger.debug("ns={} deleted from database".format(params["nsr_id"])) - return + elif topic == "nsi": + if command == "terminated" and params["operationState"] in ("COMPLETED", "PARTIALLY_COMPLETED"): + self.logger.debug("received nsi terminated {}".format(params)) + if params.get("autoremove"): + self.engine.del_item(self.internal_session, "nsis", _id=params["nsir_id"], + not_send_msg=msg_to_send) + self.logger.debug("nsis={} deleted from database".format(params["nsir_id"])) + elif topic == "admin": + self.logger.debug("received {} {} {}".format(topic, command, params)) + if command in ["echo", "ping"]: # ignored commands + pass + elif command == "revoke_token": + if params: + if isinstance(params, dict) and "_id" in params: + tid = params.get("_id") + self.engine.authenticator.tokens_cache.pop(tid, None) + self.logger.debug("token '{}' removed from token_cache".format(tid)) + else: + self.logger.debug("unrecognized params in command '{} {}': {}" + .format(topic, command, params)) + else: + self.engine.authenticator.tokens_cache.clear() + self.logger.debug("token_cache cleared") + else: + self.logger.debug("unrecognized command '{} {}'".format(topic, command)) + # writing to kafka must be done with our own loop. For this reason it is not allowed Engine to do that, + # but content to be written is stored at msg_to_send + for msg in msg_to_send: + await self.msg.aiowrite(*msg, loop=self.loop) except (EngineException, DbException, MsgException) as e: self.logger.error("Error while processing topic={} command={}: {}".format(topic, command, e)) except Exception as e: @@ -153,4 +234,8 @@ class SubscriptionThread(threading.Thread): but not immediately. :return: None """ - self.loop.call_soon_threadsafe(self.aiomain_task.cancel) + self.to_terminate = True + if self.aiomain_task: + self.loop.call_soon_threadsafe(self.aiomain_task.cancel) + if self.aiomain_task_admin: + self.loop.call_soon_threadsafe(self.aiomain_task_admin.cancel)