Changeset 9d40cc9 for fedd

Timestamp:

Aug 26, 2012 1:04:57 PM (12 years ago)

Author:

ABDULLA ALWABEL <abdullaalwabel@…>

Branches:

master

Children:

2f45140

Parents:

d070d9f (diff), eb117fe (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​git://fedd.deterlab.net/fedd

Location:

fedd/federation

Files:

• emulab_access.py (modified) (2 diffs)
• emulab_segment.py (modified) (2 diffs, 1 prop)
• experiment_partition.py (modified) (4 diffs)

fedd/federation/emulab_access.py

@@ -1052 +1052 @@
             raise service_error(service_error.internal, 
                     "Can't find experiment name for %s" % aid)
+        
         stopper = self.stop_segment(keyfile=self.ssh_privkey_file,
                 debug=self.create_debug, boss=self.boss, ops=self.ops,
@@ -1058 +1059 @@
         self.log.info("TerminateSegment succeeded for %s %s %s" % \
                 (fid, proj, ename))
+        self.state_lock.acquire()
+        # Remove the started flag/info - the segment is no longer started
+        if aid in self.allocation:
+            del self.allocation[aid]['started']
+            self.write_state()
+        self.state_lock.release()
         return { 'allocID': req['allocID'], 'proof': proof.to_dict() }
 

fedd/federation/emulab_segment.py

@@ -30 +30 @@
         # Configuration directories on the remote machine
         proj_dir = "/proj/%s/exp/%s/tmp" % (pid, eid)
-        softdir = "/proj/%s/software/%s" % (pid, eid)
+        softdir_root = "/proj/%s/software/" % pid
+        softdir = "%s/%s" % (softdir_root, eid)
         # Local software dir
         lsoftdir = "%s/software" % tmpdir
@@ -46 +47 @@
 
         # Script the filesystem changes
+        
+        # Set umask to 007.  Since we are operating
+        # within /proj, we want to permit all proj users
+        # read and write.  This is especially necessary
+        # since creating directory hierarchy (mkdir -p).
+        print >>scriptfile, "umask 007"
         print >>scriptfile, "/bin/rm -rf %s" % proj_dir
         # Clear and create the software directory
         print >>scriptfile, "/bin/rm -rf %s/*" % softdir
-        print >>scriptfile, 'mkdir -p %s' % proj_dir
+        print >>scriptfile, 'mkdir %s' % proj_dir
+        print >>scriptfile, 'chmod 0770 %s' % proj_dir
         if os.path.isdir(lsoftdir):
-            print >>scriptfile, 'mkdir -p %s' % softdir
+            print >>scriptfile, 'mkdir %s' % softdir_root
+            print >>scriptfile, 'chmod 0770 %s' % softdir_root
+            print >>scriptfile, 'mkdir %s' % softdir
             print >>scriptfile, 'chmod 0770 %s' % softdir
         print >>scriptfile, "rm -f %s" % scriptbase

fedd/federation/experiment_partition.py

@@ -453 +453 @@
                         new_portal = True
                         portal_type = "experiment"
-                        myname = "%stunnel%d" % (dname.lower(),
+                        myname = "%s%stunnel%d" % (sname.lower(), dname.lower(),
                                 len(portals[st][dt]))
-                        desthost = "%stunnel%d" % (sname.lower(), 
-                                len(portals[st][dt]))
+                        desthost = "%s%stunnel%d" % (dname.lower(),
+                                sname.lower(), len(portals[st][dt]))
                     else:
                         new_i = topdl.Interface(
@@ -472 +472 @@
                     new_portal = True
                     portals[st][dt] = [ ]
-                    myname = "%stunnel%d" % (dname.lower(),
+                    myname = "%s%stunnel%d" % (sname.lower(), dname.lower(),
                             len(portals[st][dt]))
-                    desthost = "%stunnel%d" % (sname.lower(),
+                    desthost = "%s%stunnel%d" % (dname.lower(), sname.lower(),
                             len(portals[st][dt]))
 
@@ -500 +500 @@
         tsubstrate, segment_element = \
                 self.new_portal_substrate(st, dt, eid, tbparams, expid)
-        myname = "%stunnel" % dt
-        desthost = "%stunnel" % st
+        myname = "%s%stunnel" % (st, dt)
+        desthost = "%s%stunnel" % (dt, st)
 
         portal, info = self.new_portal_node(st, dt, tbparams, masters,
@@ -518 +518 @@
             substrate, tbparams, expid, tb_name):
         # Add to the master testbed
-        if testbed_suffix(dt): myname = "%stunnel" % "-".join(split_testbed(dt))
-        else: myname = "%stunnel" % dt
+        if testbed_suffix(dt): myname = "%s%stunnel" % \
+                ("-".join(split_testbed(dt)), st)
+        else: myname = "%s%stunnel" % (dt, st)
 
         desthost = "%s" % ip_addr(dip)