From 1b0bf4e73539992188001b0d11bb6361f9f5bafc Mon Sep 17 00:00:00 2001 From: gecong1973 Date: Sat, 15 Jul 2017 05:10:07 -0400 Subject: [PATCH] Fix message claim expires problem in swift storage In swift storage, message can't be claimed after claim expires, this patch fix it. Change-Id: I10fd37d46c7afbbd519c641cf8c94bbb70a194f7 --- zaqar/storage/swift/messages.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/zaqar/storage/swift/messages.py b/zaqar/storage/swift/messages.py index dffa09c2..21d3e072 100644 --- a/zaqar/storage/swift/messages.py +++ b/zaqar/storage/swift/messages.py @@ -121,9 +121,11 @@ class MessageController(storage.Message): raise def is_claimed(msg, headers): - if include_claimed: + if include_claimed or msg['claim_id'] is None: return False - return msg['claim_id'] is not None + claim_obj = self.driver.claim_controller._get( + queue, msg['claim_id'], project) + return claim_obj is not None and claim_obj['ttl'] > 0 def is_echo(msg, headers): if echo: