Changeset 6843d14 for fedd/federation

Timestamp:

Aug 23, 2012 4:12:54 PM (12 years ago)

Author:

Ted Faber <faber@…>

Branches:

master

Children:

be1742d

Parents:

b90c44d (diff), d4946da (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 tardis.deterlab.net:/var/local/git/fedd

Location:

fedd/federation

Files:

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

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

@@ -46 +46 @@
 
         # 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