x
/
delimiter
Code Issues Proposed changes

Fix consuming a single amount

This commit is contained in:
Joshua Harlow 2016-05-13 17:41:42 -07:00
parent 4197b10c11
commit f1fcf62268
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
delimiter/drivers/zookeeper.py
View File

@ -115,7 +115,10 @@ class ZookeeperQuotaEngine(engine.QuotaEngine):
"Unsupported kind '%s' encountered"
" for resource '%s' owned by '%s'"
% (kind, resource, for_who))
return processor.process(stored['details'], amount)
return {
'kind': kind,
'details': processor.process(stored['details'], amount),
}
def consume_many(self, for_who, resources, amounts):
who_path = paths.join(self.uri.path, for_who)
@ -139,8 +142,8 @@ class ZookeeperQuotaEngine(engine.QuotaEngine):
who_path = paths.join(self.uri.path, for_who)
resource_path = paths.join(who_path, resource)
blob, znode = self.client.get(resource_path)
new_stored = self._try_consume(for_who, resource,
json.loads(blob), amount)
new_stored = self._try_consume(
for_who, resource, json.loads(blob), amount)
# Ensure we pass in the version that we read this on so
# that if it was changed by some other actor that we can
# avoid overwriting that value (and retry, or handle in some