[ARVADOS] updated: 1.3.0-962-g3549e6484
Git user
git at public.curoverse.com
Tue May 28 18:07:19 UTC 2019
Summary of changes:
services/api/lib/update_priority.rb | 9 +++++++--
services/api/test/unit/update_priority_test.rb | 6 +++---
2 files changed, 10 insertions(+), 5 deletions(-)
via 3549e6484287a327750882a83c5c5ce15647d585 (commit)
via 96609221d1133eb1340c4ef5efb27303181c0b73 (commit)
via 435a5df3e505dfbf67467bd02073f97e63c4c61d (commit)
from 2ea6b118074ed5ca90754e20afd6b3621631e27d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 3549e6484287a327750882a83c5c5ce15647d585
Merge: 2ea6b1180 96609221d
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date: Tue May 28 14:05:47 2019 -0400
Merge branch '14878-priority-race'
fixes #14878
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>
commit 96609221d1133eb1340c4ef5efb27303181c0b73
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date: Tue May 28 14:05:05 2019 -0400
14878: Add comment.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>
diff --git a/services/api/lib/update_priority.rb b/services/api/lib/update_priority.rb
index 8bf3e150d..c688ac008 100644
--- a/services/api/lib/update_priority.rb
+++ b/services/api/lib/update_priority.rb
@@ -12,6 +12,11 @@ module UpdatePriority
#
# If container priority=0 but there are committed container requests
# for it with priority>0, update priority.
+ #
+ # Normally, update_priority is a no-op if another thread/process is
+ # already updating. Test cases that need to check priorities after
+ # updating can force a (possibly overlapping) update in the current
+ # thread/transaction by setting the "nolock" flag. See #14878.
def self.update_priority(nolock: false)
if !File.owned?(Rails.root.join('tmp'))
Rails.logger.warn("UpdatePriority: not owner of #{Rails.root}/tmp, skipping")
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list