add support for cookie changes

src/ClusterManagers.jl

@@ -1,7 +1,14 @@
 module ClusterManagers
 
-export launch, manage, kill, init_worker, connect 
+export launch, manage, kill, init_worker, connect
 import Base: launch, manage, kill, init_worker, connect
+
+if VERSION >= v"0.5.0-dev+4047"
+    worker_arg = `--worker $(Base.cluster_cookie())`
+else
+    worker_arg = `--worker`
+end
+
 # PBS doesn't have the same semantics as SGE wrt to file accumulate,
 # a different solution will have to be found
 include("qsub.jl")

src/affinity.jl

@@ -35,7 +35,7 @@ function launch(manager::LocalAffinityManager, params::Dict, launched::Array, c:
 
     for core_id in manager.affinities
         io, pobj = open(detach(
-            setenv(`taskset -c $core_id $(Base.julia_cmd(exename)) $exeflags --worker`, dir=dir)), "r")
+            setenv(`taskset -c $core_id $(Base.julia_cmd(exename)) $exeflags $worker_arg`, dir=dir)), "r")
         wconfig = WorkerConfig()
         wconfig.process = pobj
         wconfig.io = io

src/condor.jl

@@ -19,7 +19,7 @@ function condor_script(portnum::Integer, np::Integer, params::Dict)
     scriptf = open("$tdir/$jobname.sh", "w")
     println(scriptf, "#!/bin/sh")
     println(scriptf, "cd $(Base.shell_escape(dir))")
-    println(scriptf, "$(Base.shell_escape(exename)) --worker | /usr/bin/telnet $(Base.shell_escape(hostname)) $portnum")
+    println(scriptf, "$(Base.shell_escape(exename)) $(Base.shell_escape(worker_arg)) | /usr/bin/telnet $(Base.shell_escape(hostname)) $portnum")
     close(scriptf)
 
     subf = open("$tdir/$jobname.sub", "w")

src/qsub.jl

@@ -38,7 +38,7 @@ function launch(manager::Union{PBSManager, SGEManager}, params::Dict, instances_
 
         jobname = `julia-$(getpid())`
 
-        cmd = `cd $dir && $exename $exeflags --worker`
+        cmd = `cd $dir && $exename $exeflags $worker_arg`
         qsub_cmd = pipeline(`echo $(Base.shell_escape(cmd))` , (isPBS ? `qsub -N $jobname -j oe -k o -t 1-$np $queue $qsub_env` : `qsub -N $jobname -terse -j y -t 1-$np $queue $qsub_env`))
         out,qsub_proc = open(qsub_cmd)
         if !success(qsub_proc)

src/scyld.jl

@@ -19,7 +19,7 @@ function launch(manager::ScyldManager, params::Dict, instances_arr::Array, c::Co
         end
         nodes = split(chomp(readline(out)),':')
         for (i,node) in enumerate(nodes)
-            cmd = `cd $dir && $exename $exeflags --worker`
+            cmd = `cd $dir && $exename $exeflags $worker_arg`
             cmd = detach(`bpsh $node sh -l -c $(Base.shell_escape(cmd))`)
             config = WorkerConfig()
 

src/slurm.jl

@@ -41,7 +41,7 @@ function launch(manager::SlurmManager, params::Dict, instances_arr::Array,
 
         np = manager.np
         jobname = "julia-$(getpid())"
-        srun_cmd = `srun -J $jobname -n $np -o "job%4t.out" -D $exehome $(srunargs) $exename $exeflags --worker`
+        srun_cmd = `srun -J $jobname -n $np -o "job%4t.out" -D $exehome $(srunargs) $exename $exeflags $worker_arg`
         out, srun_proc = open(srun_cmd)
         for i = 0:np - 1
             print("connecting to worker $(i + 1) out of $np\r")