from nepi.execution.attribute import Attribute, Flags, Types
from nepi.execution.trace import Trace, TraceAttr
from nepi.execution.resource import ResourceManager, clsinit_copy, \
- ResourceState, ResourceAction, failtrap
+ ResourceState, ResourceAction
from nepi.util.sshfuncs import ProcStatus
import os
@classmethod
def _register_attributes(cls):
- trace_name = Attribute("traceName", "Name of the trace to be collected",
- flags = Flags.ExecReadOnly)
- store_dir = Attribute("storeDir", "Path to local directory to store trace results",
+ trace_name = Attribute("traceName",
+ "Name of the trace to be collected",
+ flags = Flags.Design)
+
+ store_dir = Attribute("storeDir",
+ "Path to local directory to store trace results",
default = tempfile.gettempdir(),
- flags = Flags.ExecReadOnly)
- sub_dir = Attribute("subDir", "Sub directory to collect traces into",
- flags = Flags.ExecReadOnly)
- rename = Attribute("rename", "Name to give to the collected trace file",
- flags = Flags.ExecReadOnly)
+ flags = Flags.Design)
+
+ use_run_id = Attribute("useRunId",
+ "If set to True stores traces into a sub directory named after "
+ "the RUN ID assigned by the EC",
+ type = Types.Bool,
+ default = False,
+ flags = Flags.Design)
+
+ sub_dir = Attribute("subDir",
+ "Sub directory to collect traces into",
+ flags = Flags.Design)
+
+ rename = Attribute("rename",
+ "Name to give to the collected trace file",
+ flags = Flags.Design)
cls._register_attribute(trace_name)
cls._register_attribute(store_dir)
cls._register_attribute(sub_dir)
cls._register_attribute(rename)
+ cls._register_attribute(use_run_id)
def __init__(self, ec, guid):
super(Collector, self).__init__(ec, guid)
def store_path(self):
return self._store_path
- @failtrap
- def provision(self):
+ def do_provision(self):
trace_name = self.get("traceName")
if not trace_name:
self.fail()
self.error(msg)
raise RuntimeError, msg
- store_dir = self.get("storeDir")
- self._store_path = os.path.join(store_dir, self.ec.exp_id, self.ec.run_id)
+ self._store_path = self.get("storeDir")
+
+ if self.get("useRunId"):
+ self._store_path = os.path.join(self._store_path, self.ec.run_id)
subdir = self.get("subDir")
if subdir:
self._store_path = os.path.join(self._store_path, subdir)
msg = "Creating local directory at %s to store %s traces " % (
- store_dir, trace_name)
+ self._store_path, trace_name)
self.info(msg)
try:
except OSError:
pass
- super(Collector, self).provision()
+ super(Collector, self).do_provision()
- @failtrap
- def deploy(self):
- self.discover()
- self.provision()
+ def do_deploy(self):
+ self.do_discover()
+ self.do_provision()
- super(Collector, self).deploy()
+ super(Collector, self).do_deploy()
- def release(self):
- try:
- trace_name = self.get("traceName")
- rename = self.get("rename") or trace_name
-
- msg = "Collecting '%s' traces to local directory %s" % (
- trace_name, self.store_path)
- self.info(msg)
-
- rms = self.get_connected()
- for rm in rms:
- result = self.ec.trace(rm.guid, trace_name)
- fpath = os.path.join(self.store_path, "%d.%s" % (rm.guid,
- rename))
- try:
- f = open(fpath, "w")
- f.write(result)
- f.close()
- except:
- msg = "Couldn't retrieve trace %s for %d at %s " % (trace_name,
- rm.guid, fpath)
- self.error(msg)
- continue
- except:
- import traceback
- err = traceback.format_exc()
- self.error(err)
-
- super(Collector, self).release()
+ def do_release(self):
+ trace_name = self.get("traceName")
+ rename = self.get("rename") or trace_name
+
+ msg = "Collecting '%s' traces to local directory %s" % (
+ trace_name, self.store_path)
+ self.info(msg)
+
+ rms = self.get_connected()
+ for rm in rms:
+ result = self.ec.trace(rm.guid, trace_name)
+ fpath = os.path.join(self.store_path, "%d.%s" % (rm.guid,
+ rename))
+ try:
+ f = open(fpath, "w")
+ f.write(result)
+ f.close()
+ except:
+ import traceback
+ err = traceback.format_exc()
+ msg = "Couldn't retrieve trace %s for %d at %s " % (trace_name,
+ rm.guid, fpath)
+ self.error(msg, out = "", err = err)
+ continue
+
+ super(Collector, self).do_release()
def valid_connection(self, guid):
# TODO: Validate!