Changeset 9d40cc9 for fedd/federation


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • fedd/federation/emulab_access.py

    rd070d9f r9d40cc9  
    10521052            raise service_error(service_error.internal,
    10531053                    "Can't find experiment name for %s" % aid)
     1054       
    10541055        stopper = self.stop_segment(keyfile=self.ssh_privkey_file,
    10551056                debug=self.create_debug, boss=self.boss, ops=self.ops,
     
    10581059        self.log.info("TerminateSegment succeeded for %s %s %s" % \
    10591060                (fid, proj, ename))
     1061        self.state_lock.acquire()
     1062        # Remove the started flag/info - the segment is no longer started
     1063        if aid in self.allocation:
     1064            del self.allocation[aid]['started']
     1065            self.write_state()
     1066        self.state_lock.release()
    10601067        return { 'allocID': req['allocID'], 'proof': proof.to_dict() }
    10611068
  • fedd/federation/emulab_segment.py

    • Property mode changed from 100644 to 100755
    rd070d9f r9d40cc9  
    3030        # Configuration directories on the remote machine
    3131        proj_dir = "/proj/%s/exp/%s/tmp" % (pid, eid)
    32         softdir = "/proj/%s/software/%s" % (pid, eid)
     32        softdir_root = "/proj/%s/software/" % pid
     33        softdir = "%s/%s" % (softdir_root, eid)
    3334        # Local software dir
    3435        lsoftdir = "%s/software" % tmpdir
     
    4647
    4748        # Script the filesystem changes
     49       
     50        # Set umask to 007.  Since we are operating
     51        # within /proj, we want to permit all proj users
     52        # read and write.  This is especially necessary
     53        # since creating directory hierarchy (mkdir -p).
     54        print >>scriptfile, "umask 007"
    4855        print >>scriptfile, "/bin/rm -rf %s" % proj_dir
    4956        # Clear and create the software directory
    5057        print >>scriptfile, "/bin/rm -rf %s/*" % softdir
    51         print >>scriptfile, 'mkdir -p %s' % proj_dir
     58        print >>scriptfile, 'mkdir %s' % proj_dir
     59        print >>scriptfile, 'chmod 0770 %s' % proj_dir
    5260        if os.path.isdir(lsoftdir):
    53             print >>scriptfile, 'mkdir -p %s' % softdir
     61            print >>scriptfile, 'mkdir %s' % softdir_root
     62            print >>scriptfile, 'chmod 0770 %s' % softdir_root
     63            print >>scriptfile, 'mkdir %s' % softdir
    5464            print >>scriptfile, 'chmod 0770 %s' % softdir
    5565        print >>scriptfile, "rm -f %s" % scriptbase
  • fedd/federation/experiment_partition.py

    rd070d9f r9d40cc9  
    453453                        new_portal = True
    454454                        portal_type = "experiment"
    455                         myname = "%stunnel%d" % (dname.lower(),
     455                        myname = "%s%stunnel%d" % (sname.lower(), dname.lower(),
    456456                                len(portals[st][dt]))
    457                         desthost = "%stunnel%d" % (sname.lower(),
    458                                 len(portals[st][dt]))
     457                        desthost = "%s%stunnel%d" % (dname.lower(),
     458                                sname.lower(), len(portals[st][dt]))
    459459                    else:
    460460                        new_i = topdl.Interface(
     
    472472                    new_portal = True
    473473                    portals[st][dt] = [ ]
    474                     myname = "%stunnel%d" % (dname.lower(),
     474                    myname = "%s%stunnel%d" % (sname.lower(), dname.lower(),
    475475                            len(portals[st][dt]))
    476                     desthost = "%stunnel%d" % (sname.lower(),
     476                    desthost = "%s%stunnel%d" % (dname.lower(), sname.lower(),
    477477                            len(portals[st][dt]))
    478478
     
    500500        tsubstrate, segment_element = \
    501501                self.new_portal_substrate(st, dt, eid, tbparams, expid)
    502         myname = "%stunnel" % dt
    503         desthost = "%stunnel" % st
     502        myname = "%s%stunnel" % (st, dt)
     503        desthost = "%s%stunnel" % (dt, st)
    504504
    505505        portal, info = self.new_portal_node(st, dt, tbparams, masters,
     
    518518            substrate, tbparams, expid, tb_name):
    519519        # Add to the master testbed
    520         if testbed_suffix(dt): myname = "%stunnel" % "-".join(split_testbed(dt))
    521         else: myname = "%stunnel" % dt
     520        if testbed_suffix(dt): myname = "%s%stunnel" % \
     521                ("-".join(split_testbed(dt)), st)
     522        else: myname = "%s%stunnel" % (dt, st)
    522523
    523524        desthost = "%s" % ip_addr(dip)
Note: See TracChangeset for help on using the changeset viewer.