Code cleanup. Setting resource state through specific functions
[nepi.git] / src / nepi / resources / linux / ccn / ccnr.py
index 5103719..378f93c 100644 (file)
 
 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
+from nepi.execution.resource import clsinit_copy, ResourceState, \
+    ResourceAction, reschedule_delay
 from nepi.resources.linux.application import LinuxApplication
 from nepi.resources.linux.ccn.ccnd import LinuxCCND
-from nepi.util.timefuncs import strfnow, strfdiff
+from nepi.util.timefuncs import tnow
 
 import os
 
-reschedule_delay = "0.5s"
-
 @clsinit_copy
 class LinuxCCNR(LinuxApplication):
     _rtype = "LinuxCCNR"
@@ -148,6 +146,11 @@ class LinuxCCNR(LinuxApplication):
             "Sets the CCNS_SYNC_SCOPE environmental variable. ",
             flags = Flags.ExecReadOnly)
 
+        repo_file = Attribute("repoFile1",
+            "The Repository uses $CCNR_DIRECTORY/repoFile1 for "
+            "persistent storage of CCN Content Objects",
+            flags = Flags.ExecReadOnly)
+
         cls._register_attribute(max_fanout)
         cls._register_attribute(max_leaf_entries)
         cls._register_attribute(max_node_bytes)
@@ -174,6 +177,7 @@ class LinuxCCNR(LinuxApplication):
         cls._register_attribute(ccns_root_advise_lifetime)
         cls._register_attribute(ccns_stable_enabled)
         cls._register_attribute(ccns_sync_scope)
+        cls._register_attribute(repo_file)
 
     @classmethod
     def _register_traces(cls):
@@ -185,9 +189,6 @@ class LinuxCCNR(LinuxApplication):
         super(LinuxCCNR, self).__init__(ec, guid)
         self._home = "ccnr-%s" % self.guid
 
-        # Marks whether ccnr is running
-        self._running = False
-
     @property
     def ccnd(self):
         ccnd = self.get_connected(LinuxCCND.rtype())
@@ -200,59 +201,78 @@ class LinuxCCNR(LinuxApplication):
         return None
 
     def deploy(self):
-        if not self.get("command"):
-            self.set("command", self._default_command)
-        
-        if not self.get("env"):
-            self.set("env", self._default_environment)
-
-        # Wait until associated ccnd is provisioned
-        ccnd = self.ccnd
-
-        if not ccnd or ccnd.state < ResourceState.READY:
+        if not self.ccnd or self.ccnd.state < ResourceState.READY:
+            self.debug("---- RESCHEDULING DEPLOY ---- CCND state %s " % self.ccnd.state )
+            
             # ccnr needs to wait until ccnd is deployed and running
             self.ec.schedule(reschedule_delay, self.deploy)
         else:
-            # Invoke the actual deployment
-            super(LinuxCCNR, self).deploy()
+            try:
+                if not self.get("command"):
+                    self.set("command", self._start_command)
+
+                if not self.get("env"):
+                    self.set("env", self._environment)
 
-            # As soon as deployment is finished, we launch the ccnr
-            # command ( we don't want to lose time ccnr later on )
-            if self._state == ResourceState.READY:
-                self._start_in_background()
-                self._running = True
+                command = self.get("command")
+
+                self.info("Deploying command '%s' " % command)
+
+                self.discover()
+                self.provision()
+            except:
+                self.fail()
+                raise
+            self.debug("----- READY ---- ")
+            self.set_ready()
+
+    def upload_start_command(self):
+        command = self.get("command")
+        env = self.get("env")
+
+        if self.get("repoFile1"):
+            # upload repoFile1
+            local_file = self.get("repoFile1")
+            remote_file = "${RUN_HOME}/repoFile1"
+            remote_file = self.replace_paths(remote_file)
+            self.node.upload(local_file,
+                    remote_file,
+                    overwrite = False)
+
+        # We want to make sure the repository is running
+        # before the experiment starts.
+        # Run the command as a bash script in background,
+        # in the host ( but wait until the command has
+        # finished to continue )
+        env = self.replace_paths(env)
+        command = self.replace_paths(command)
+
+        shfile = os.path.join(self.app_home, "start.sh")
+        self.node.run_and_wait(command, self.run_home,
+                shfile = shfile,
+                overwrite = False,
+                env = env,
+                raise_on_error = True)
 
     def start(self):
-        # CCND should already be started by now.
-        # Nothing to do but to set the state to STARTED
-        if self._running:
-            self._start_time = strfnow()
-            self._state = ResourceState.STARTED
+        if self.state == ResourceState.READY:
+            command = self.get("command")
+            self.info("Starting command '%s'" % command)
+
+            self.set_started()
         else:
             msg = " Failed to execute command '%s'" % command
             self.error(msg, out, err)
-            self._state = ResourceState.FAILED
+            self.fail()
             raise RuntimeError, msg
 
     @property
-    def state(self):
-        state = super(LinuxCCNR, self).state
-        if self._state in [ResourceState.FINISHED, ResourceState.FAILED]:
-            self._running = False
-
-        if self._state == ResourceState.READY:
-            # CCND is really deployed only when ccn daemon is running 
-            if not self._running:
-                return ResourceState.PROVISIONED
-        return self._state
-
-    @property
-    def _default_command(self):
-        return "ccnr"
+    def _start_command(self):
+        return "ccnr &"
 
     @property
-    def _default_environment(self):
+    def _environment(self):
         envs = dict({
             "maxFanout": "CCNR_BTREE_MAX_FANOUT",
             "maxLeafEntries": "CCNR_BTREE_MAX_LEAF_ENTRIES",
@@ -282,10 +302,10 @@ class LinuxCCNR(LinuxApplication):
             "ccnsSyncScope": "CCNS_SYNC_SCOPE",
             })
 
-        env = "PATH=$PATH:${EXP_HOME}/ccnx/bin "
+        env = self.ccnd.path
         env += " ".join(map(lambda k: "%s=%s" % (envs.get(k), self.get(k)) \
             if self.get(k) else "", envs.keys()))
-        
+       
         return env            
         
     def valid_connection(self, guid):