From 8d96a767b86889e5aefe4c3979078bc0746cee5d Mon Sep 17 00:00:00 2001 From: Jonathan Cobb Date: Wed, 8 Jan 2020 05:18:31 -0500 Subject: [PATCH] deadlock is in seconds --- .../java/org/cobbzilla/wizard/cache/redis/RedisService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/wizard-server/src/main/java/org/cobbzilla/wizard/cache/redis/RedisService.java b/wizard-server/src/main/java/org/cobbzilla/wizard/cache/redis/RedisService.java index 7b6e5cf..69ccd33 100644 --- a/wizard-server/src/main/java/org/cobbzilla/wizard/cache/redis/RedisService.java +++ b/wizard-server/src/main/java/org/cobbzilla/wizard/cache/redis/RedisService.java @@ -220,10 +220,12 @@ public class RedisService { String lockVal = get(key); final long start = now(); while ((lockVal == null || !lockVal.equals(uuid)) && (now() - start < lockTimeout)) { - set(key, uuid, NX, EX, deadlockTimeout); + set(key, uuid, NX, EX, deadlockTimeout/1000); lockVal = get(key); } - if (lockVal == null || !lockVal.equals(uuid)) return die("lock: timeout locking "+key); + if (lockVal == null || !lockVal.equals(uuid)) { + return die("lock: timeout locking "+key); + } log.info("lock: LOCKED "+key); return uuid; }