Advertisement
Guest User

Untitled

a guest
Apr 27th, 2018
74
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 1.69 KB | None | 0 0
  1. diff --git a/src/config/api-server/vnc_cfg_api_server/vnc_cfg_types.py b/src/config/api-server/vnc_cfg_api_server/vnc_cfg_types.py
  2. index 286316cde..9201c2f16 100644
  3. --- a/src/config/api-server/vnc_cfg_api_server/vnc_cfg_types.py
  4. +++ b/src/config/api-server/vnc_cfg_api_server/vnc_cfg_types.py
  5. @@ -529,8 +529,8 @@ class SecurityResourceBase(Resource):
  6.                  ':'.join(scope_fq_name),
  7.              ),
  8.          )
  9. -        if not scope_lock.acquire(blocking=False):
  10. -            contenders = scope_lock.contenders()
  11. +        contenders = scope_lock.contenders()
  12. +        if contenders:
  13.              action_in_progress = '<unknown action>'
  14.              if len(contenders) > 0 and contenders[0]:
  15.                  _, _, action_in_progress = contenders[0].partition(' ')
  16. @@ -540,7 +540,6 @@ class SecurityResourceBase(Resource):
  17.                      ':'.join(scope_fq_name), scope_uuid,
  18.                      cls.object_type.replace('_', ' ').title()))
  19.              return False, (400, msg)
  20. -        scope_lock.release()
  21.  
  22.          if not delta_obj_dict:
  23.              delta_obj_dict = {}
  24. diff --git a/src/config/common/tests/test_utils.py b/src/config/common/tests/test_utils.py
  25. index 1614bbb0c..3356c007e 100644
  26. --- a/src/config/common/tests/test_utils.py
  27. +++ b/src/config/common/tests/test_utils.py
  28. @@ -1215,8 +1215,8 @@ class FakeKazooClient(object):
  29.              lock.release()
  30.  
  31.          def contenders(self):
  32. -            _, contender = self._locks[self._path]
  33. -            return [contender]
  34. +            lock, contender = self._locks[self._path]
  35. +            return [contender] if lock.locked() else []
  36.  
  37.          def destroy(self):
  38.              self._locks.pop(self._path, None)
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement