openstack/zaqar
Code Issues Proposed changes

Merge "Fix write concern check for py34"

Browse Source
This commit is contained in:
Jenkins 2015-11-18 17:58:10 +00:00 committed by Gerrit Code Review
commit 7918734f82
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zaqar/storage/mongodb/driver.py
View File

@ -98,8 +98,16 @@ class DataDriver(storage.DataDriverBase):
else: else:
_mongo_wc = conn.write_concern.document.get('w') _mongo_wc = conn.write_concern.document.get('w')
durable = (_mongo_wc == 'majority' or # NOTE(flwang): mongo client is using None as the default value of
_mongo_wc >= 2) # write concern. But in Python 3.x we can't compare by order
# different types of operands like in Python 2.x.
# And we can't set the write concern value when create the
# connection since it will fail with norepl if mongodb version
# below 2.6. Besides it doesn't make sense to create the
# connection again after getting the version.
durable = (_mongo_wc is not None and
(_mongo_wc == 'majority' or _mongo_wc >= 2)
)
if not self.conf.unreliable and not durable: if not self.conf.unreliable and not durable:
raise RuntimeError(_('Using a write concern other than ' raise RuntimeError(_('Using a write concern other than '