X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_lcm%2Flcm_utils.py;h=357b4d4ec92f4643b0267aaf7c0ae81cb41f4ca4;hb=79cd8adb7ebf8300ff8af5e1b3aab2f45c1d0c9e;hp=2779a2560c1c09b15ca0e07cd70ad9a7ebd80aaa;hpb=62b2cd737713afe8cf2e169047f08f4d507e3d61;p=osm%2FLCM.git diff --git a/osm_lcm/lcm_utils.py b/osm_lcm/lcm_utils.py index 2779a25..357b4d4 100644 --- a/osm_lcm/lcm_utils.py +++ b/osm_lcm/lcm_utils.py @@ -18,6 +18,7 @@ import asyncio from collections import OrderedDict +from time import time # from osm_common.dbbase import DbException __author__ = "Alfonso Tierno" @@ -71,6 +72,8 @@ class LcmBase: """ if not _desc: return + now = time() + _desc["_admin.modified"] = now self.db.set_one(item, {"_id": _id}, _desc) _desc.clear() # except DbException as e: @@ -248,12 +251,15 @@ class TaskRegistry(LcmBase): else: # NS/NSI if self._is_service_type_HA(topic): + now = time() starttime_this_op = db_lcmop.get("startTime") instance_id_label = self.topic2instid_dict.get(topic) instance_id = db_lcmop.get(instance_id_label) _filter = {instance_id_label: instance_id, 'operationState': 'PROCESSING', - 'startTime.lt': starttime_this_op} + 'startTime.lt': starttime_this_op, + "_admin.modified.gt": now - 2*3600, # ignore if tow hours of inactivity + } # VIM/WIM/SDN elif self._is_account_type_HA(topic): _, op_index = self._get_account_and_op_HA(op_id)