diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-05-31 05:48:00 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-05-31 05:48:00 +0000 |
commit | cf0ee0b0c7a9fcbd9c3920613f679506c2fa957a (patch) | |
tree | 73dd215a5d4e29a9c45a74ea15be1e92833f1629 | |
parent | 4cc49cf217a1b6d0397efd1f9b03b397803a1cf5 (diff) | |
parent | 5f3c1325239bace46c6adfe775f544467af44b03 (diff) | |
download | taskflow-cf0ee0b0c7a9fcbd9c3920613f679506c2fa957a.tar.gz |
Merge "do not allow redis job reclaim by same owner"
-rw-r--r-- | taskflow/jobs/backends/impl_redis.py | 8 | ||||
-rw-r--r-- | taskflow/tests/unit/jobs/test_redis_job.py | 23 |
2 files changed, 26 insertions, 5 deletions
diff --git a/taskflow/jobs/backends/impl_redis.py b/taskflow/jobs/backends/impl_redis.py index a0ebe00..fca2699 100644 --- a/taskflow/jobs/backends/impl_redis.py +++ b/taskflow/jobs/backends/impl_redis.py @@ -410,12 +410,10 @@ if redis.call("hexists", listings_key, job_key) == 1 then -- Owner is the same, leave it alone... redis.call("set", last_modified_key, last_modified_blob) apply_ttl(owner_key, ms_expiry) - result["status"] = "${ok}" - else - result["status"] = "${error}" - result["reason"] = "${already_claimed}" - result["owner"] = owner end + result["status"] = "${error}" + result["reason"] = "${already_claimed}" + result["owner"] = owner else redis.call("set", owner_key, expected_owner) redis.call("set", last_modified_key, last_modified_blob) diff --git a/taskflow/tests/unit/jobs/test_redis_job.py b/taskflow/tests/unit/jobs/test_redis_job.py index f988788..2bde77f 100644 --- a/taskflow/tests/unit/jobs/test_redis_job.py +++ b/taskflow/tests/unit/jobs/test_redis_job.py @@ -20,6 +20,7 @@ from oslo_utils import uuidutils import six import testtools +from taskflow import exceptions as excp from taskflow.jobs.backends import impl_redis from taskflow import states from taskflow import test @@ -76,6 +77,28 @@ class RedisJobboardTest(test.TestCase, base.BoardTestMixin): possible_jobs = list(self.board.iterjobs(only_unclaimed=True)) self.assertEqual(1, len(possible_jobs)) + def test_posting_claim_same_owner(self): + with base.connect_close(self.board): + with self.flush(self.client): + self.board.post('test', p_utils.temporary_log_book()) + + self.assertEqual(1, self.board.job_count) + possible_jobs = list(self.board.iterjobs(only_unclaimed=True)) + self.assertEqual(1, len(possible_jobs)) + j = possible_jobs[0] + self.assertEqual(states.UNCLAIMED, j.state) + + with self.flush(self.client): + self.board.claim(j, self.board.name) + + possible_jobs = list(self.board.iterjobs()) + self.assertEqual(1, len(possible_jobs)) + with self.flush(self.client): + self.assertRaises(excp.UnclaimableJob, self.board.claim, + possible_jobs[0], self.board.name) + possible_jobs = list(self.board.iterjobs(only_unclaimed=True)) + self.assertEqual(0, len(possible_jobs)) + def setUp(self): super(RedisJobboardTest, self).setUp() self.client, self.board = self.create_board() |