[ARVADOS] created: 0c0a0d85245d94b7bd82b8ab96fbbae6c6fb2342

[Git user]

        at  0c0a0d85245d94b7bd82b8ab96fbbae6c6fb2342 (commit)


commit 0c0a0d85245d94b7bd82b8ab96fbbae6c6fb2342
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Fri May 26 15:49:32 2017 -0400

    11769: HasUuid::UUID_REGEX matches anything that looks like an Arvados uuid.
    As a result, if crunchv1 and crunchv2 dispatchers are on the same cluster,
    crunch-dispatch.rb will try to scancel containers thinking they are "orphan
    jobs".  Tighten the regex to only match job uuids.

diff --git a/services/api/lib/crunch_dispatch.rb b/services/api/lib/crunch_dispatch.rb
index 2ae99f0..3ef1803 100644
--- a/services/api/lib/crunch_dispatch.rb
+++ b/services/api/lib/crunch_dispatch.rb
@@ -892,7 +892,7 @@ class CrunchDispatch
 
   def check_orphaned_slurm_jobs
     act_as_system_user do
-      squeue_uuids = squeue_jobs.select{|uuid| uuid.match(HasUuid::UUID_REGEX)}.
+      squeue_uuids = squeue_jobs.select{|uuid| uuid.match(/^[0-9a-z]{5}-8i9sb-[0-9a-z]{15}$/)}.
                                   select{|uuid| !@running.has_key?(uuid)}
 
       return if squeue_uuids.size == 0

-----------------------------------------------------------------------


hooks/post-receive
--