X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Fnepi%2Fexecution%2Fresource.py;h=16b434fbddb8c730010f329a842ea011756c9b38;hb=0f3a2841944186b6076a8c230b98eb8b20d7ae45;hp=e82ced043a006ebc4ba0b32a7de5e42388a4573f;hpb=6be239a7c874733f31bd0d1085f5d52072ee411d;p=nepi.git diff --git a/src/nepi/execution/resource.py b/src/nepi/execution/resource.py index e82ced04..16b434fb 100644 --- a/src/nepi/execution/resource.py +++ b/src/nepi/execution/resource.py @@ -31,8 +31,6 @@ import sys import threading import weakref -reschedule_delay = "1s" - class ResourceAction: """ Action that a user can order to a Resource Manager @@ -47,16 +45,18 @@ class ResourceState: """ NEW = 0 DISCOVERED = 1 - PROVISIONED = 2 - READY = 3 - STARTED = 4 - STOPPED = 5 - FAILED = 6 - RELEASED = 7 + RESERVED = 2 + PROVISIONED = 3 + READY = 4 + STARTED = 5 + STOPPED = 6 + FAILED = 7 + RELEASED = 8 ResourceState2str = dict({ ResourceState.NEW : "NEW", ResourceState.DISCOVERED : "DISCOVERED", + ResourceState.RESERVED : "RESERVED", ResourceState.PROVISIONED : "PROVISIONED", ResourceState.READY : "READY", ResourceState.STARTED : "STARTED", @@ -106,18 +106,20 @@ def clsinit_copy(cls): def failtrap(func): """ Decorator function for instance methods that should set the RM state to FAILED when an error is raised. The methods that must be - decorated are: discover, provision, deploy, start, stop. + decorated are: discover, reserved, provision, deploy, start, stop. """ def wrapped(self, *args, **kwargs): try: return func(self, *args, **kwargs) except: + self.fail() + import traceback err = traceback.format_exc() - self.error(err) - self.debug("SETTING guid %d to state FAILED" % self.guid) - self.fail() + logger = Logger(self._rtype) + logger.error(err) + logger.error("SETTING guid %d to state FAILED" % self.guid) raise return wrapped @@ -127,19 +129,20 @@ class ResourceManager(Logger): """ Base clase for all ResourceManagers. A ResourceManger is specific to a resource type (e.g. Node, - Switch, Application, etc) on a specific backend (e.g. PlanetLab, + Switch, Application, etc) on a specific platform (e.g. PlanetLab, OMF, etc). The ResourceManager instances are responsible for interacting with and controlling concrete (physical or virtual) resources in the - experimental backends. + experimental platforms. """ _rtype = "Resource" _attributes = None _traces = None _help = None - _backend = None + _platform = None + _reschedule_delay = "0.5s" @classmethod def _register_attribute(cls, attr): @@ -289,12 +292,12 @@ class ResourceManager(Logger): return cls._help @classmethod - def get_backend(cls): - """ Returns the identified of the backend (i.e. testbed, environment) + def get_platform(cls): + """ Returns the identified of the platform (i.e. testbed type) for the Resource """ - return cls._backend + return cls._platform @classmethod def get_global(cls, name): @@ -343,6 +346,7 @@ class ResourceManager(Logger): self._start_time = None self._stop_time = None self._discover_time = None + self._reserved_time = None self._provision_time = None self._ready_time = None self._release_time = None @@ -395,6 +399,11 @@ class ResourceManager(Logger): """ Returns the discover time of the RM as a timestamp """ return self._discover_time + @property + def reserved_time(self): + """ Returns the resreved time of the RM as a timestamp """ + return self._reserved_time + @property def provision_time(self): """ Returns the provision time of the RM as a timestamp """ @@ -420,6 +429,11 @@ class ResourceManager(Logger): """ Get the current state of the RM """ return self._state + @property + def reschedule_delay(self): + """ Returns default reschedule delay """ + return self._reschedule_delay + def log_message(self, msg): """ Returns the log message formatted with added information. @@ -473,6 +487,21 @@ class ResourceManager(Logger): if self._state != ResourceState.RELEASED: self.do_discover() + @failtrap + def reserve(self): + """ Performs resource reserve. + + This method is responsible for reserving an individual resource + matching user requirements. + + This method should not be overriden directly. Specific functionality + should be added in the do_reserved method. + + """ + with self._release_lock: + if self._state != ResourceState.RELEASED: + self.do_reserve() + @failtrap def provision(self): """ Performs resource provisioning. @@ -560,11 +589,14 @@ class ResourceManager(Logger): try: self.do_release() except: + self.set_released() + import traceback err = traceback.format_exc() - self.error(err) - - self.set_released() + msg = " %s guid %d ----- FAILED TO RELEASE ----- \n %s " % ( + self._rtype, self.guid, err) + logger = Logger(self._rtype) + logger.debug(msg) def fail(self): """ Sets the RM to state FAILED. @@ -615,7 +647,7 @@ class ResourceManager(Logger): :rtype: str """ attr = self._attrs[name] - return attr.has_changed() + return attr.has_changed def has_flag(self, name, flag): """ Returns true if the attribute has the flag 'flag' @@ -749,6 +781,18 @@ class ResourceManager(Logger): connected.append(rm) return connected + def is_rm_instance(self, rtype): + """ Returns True if the RM is instance of 'rtype' + + :param rtype: Type of the RM we look for + :type rtype: str + :return: True|False + """ + rclass = ResourceFactory.get_resource_type(rtype) + if isinstance(self, rclass): + return True + return False + @failtrap def _needs_reschedule(self, group, state, time): """ Internal method that verify if 'time' has elapsed since @@ -767,7 +811,7 @@ class ResourceManager(Logger): """ reschedule = False - delay = reschedule_delay + delay = self.reschedule_delay # check state and time elapsed on all RMs for guid in group: @@ -792,7 +836,9 @@ class ResourceManager(Logger): if time: if state == ResourceState.DISCOVERED: t = rm.discover_time - if state == ResourceState.PROVISIONED: + elif state == ResourceState.RESERVED: + t = rm.reserved_time + elif state == ResourceState.PROVISIONED: t = rm.provision_time elif state == ResourceState.READY: t = rm.ready_time @@ -836,7 +882,7 @@ class ResourceManager(Logger): """ reschedule = False - delay = reschedule_delay + delay = self.reschedule_delay ## evaluate if set conditions are met @@ -861,7 +907,7 @@ class ResourceManager(Logger): #import pdb;pdb.set_trace() reschedule = False - delay = reschedule_delay + delay = self.reschedule_delay ## evaluate if conditions to start are met @@ -903,7 +949,7 @@ class ResourceManager(Logger): """ reschedule = False - delay = reschedule_delay + delay = self.reschedule_delay ## evaluate if conditions to stop are met if self.ec.abort: @@ -936,15 +982,15 @@ class ResourceManager(Logger): """ reschedule = False - delay = reschedule_delay + delay = self.reschedule_delay ## evaluate if conditions to deploy are met if self.ec.abort: return # only can deploy when RM is either NEW, DISCOVERED or PROVISIONED - if self.state not in [ResourceState.NEW, ResourceState.DISCOVERED, - ResourceState.PROVISIONED]: + if self.state not in [ResourceState.NEW, ResourceState.DISCOVERED, + ResourceState.RESERVED, ResourceState.PROVISIONED]: #### XXX: A.Q. IT SHOULD FAIL IF DEPLOY IS CALLED IN OTHER STATES! reschedule = True self.debug("---- RESCHEDULING DEPLOY ---- state %s " % self.state ) @@ -1001,6 +1047,9 @@ class ResourceManager(Logger): def do_discover(self): self.set_discovered() + def do_reserve(self): + self.set_reserved() + def do_provision(self): self.set_provisioned() @@ -1038,18 +1087,29 @@ class ResourceManager(Logger): def set_released(self, time = None): """ Mark ResourceManager as REALEASED """ self.set_state(ResourceState.RELEASED, "_release_time", time) - self.debug("----- RELEASED ---- ") + + msg = " %s guid %d ----- RELEASED ----- " % (self._rtype, self.guid) + logger = Logger(self._rtype) + logger.debug(msg) def set_failed(self, time = None): """ Mark ResourceManager as FAILED """ self.set_state(ResourceState.FAILED, "_failed_time", time) - self.debug("----- FAILED ---- ") + + msg = " %s guid %d ----- FAILED ----- " % (self._rtype, self.guid) + logger = Logger(self._rtype) + logger.debug(msg) def set_discovered(self, time = None): """ Mark ResourceManager as DISCOVERED """ self.set_state(ResourceState.DISCOVERED, "_discover_time", time) self.debug("----- DISCOVERED ---- ") + def set_reserved(self, time = None): + """ Mark ResourceManager as RESERVED """ + self.set_state(ResourceState.RESERVED, "_reserved_time", time) + self.debug("----- RESERVED ---- ") + def set_provisioned(self, time = None): """ Mark ResourceManager as PROVISIONED """ self.set_state(ResourceState.PROVISIONED, "_provision_time", time)