openstack/freezer-api
Code Issues Proposed changes

Remove version string from elk documents

Browse Source 
Remove the version string from job, sessions and action documents

Change-Id: I36ad9375e528746effd8f7b4f5a5d3d67b8853e2
Closes-Bug: #1587140
This commit is contained in:
Saad Zaher
2016-05-30 16:47:17 +00:00
parent 0b5f4fc1a2
commit fe2a5cf8a8
2 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
freezer_api/storage/elastic.py
View File

@@ -180,11 +180,10 @@ class JobTypeManager(TypeManager):
return {'query': {'filtered': query_filter}}
def update(self, job_id, job_update_doc):
version = job_update_doc.pop('_version', 0)
update_doc = {"doc": job_update_doc}
try:
res = self.es.update(index=self.index, doc_type=self.doc_type,
id=job_id, body=update_doc, version=version)
id=job_id, body=update_doc)
version = res['_version']
self.es.indices.refresh(index=self.index)
except elasticsearch.TransportError as e:
@@ -213,12 +212,10 @@ class ActionTypeManager(TypeManager):
return {'query': {'filtered': query_filter}}
def update(self, action_id, action_update_doc):
version = action_update_doc.pop('_version', 0)
update_doc = {"doc": action_update_doc}
try:
res = self.es.update(index=self.index, doc_type=self.doc_type,
id=action_id, body=update_doc,
version=version)
id=action_id, body=update_doc)
version = res['_version']
self.es.indices.refresh(index=self.index)
except elasticsearch.TransportError as e:
@@ -247,12 +244,10 @@ class SessionTypeManager(TypeManager):
return {'query': {'filtered': query_filter}}
def update(self, session_id, session_update_doc):
version = session_update_doc.pop('_version', 0)
update_doc = {"doc": session_update_doc}
try:
res = self.es.update(index=self.index, doc_type=self.doc_type,
id=session_id, body=update_doc,
version=version)
id=session_id, body=update_doc)
version = res['_version']
self.es.indices.refresh(index=self.index)
except elasticsearch.TransportError as e:

15
freezer_api/tests/unit/test_elastic.py
View File

@@ -236,13 +236,12 @@ class JobTypeManager(unittest.TestCase):
u'_version': 3
}
res = self.job_manager.update(job_id=fake_job_0_job_id,
job_update_doc={'status': 'sleepy', '_version': 12})
job_update_doc={'status': 'sleepy'})
self.assertEqual(res, 3)
self.mock_es.update.assert_called_with(index=self.job_manager.index,
doc_type=self.job_manager.doc_type,
id=fake_job_0_job_id,
body={"doc": {'status': 'sleepy'}},
version=12)
body={"doc": {'status': 'sleepy'}})
def test_update_raise_DocumentNotFound_when_not_found(self):
self.mock_es.update.side_effect = TransportError('regular test failure', 1)
@@ -296,13 +295,12 @@ class ActionTypeManager(unittest.TestCase):
u'_version': 3
}
res = self.action_manager.update(action_id='poiuuiop7890',
action_update_doc={'status': 'sleepy', '_version': 12})
action_update_doc={'status': 'sleepy'})
self.assertEqual(res, 3)
self.mock_es.update.assert_called_with(index=self.action_manager.index,
doc_type=self.action_manager.doc_type,
id='poiuuiop7890',
body={"doc": {'status': 'sleepy'}},
version=12)
body={"doc": {'status': 'sleepy'}})
def test_update_raise_DocumentNotFound_when_not_found(self):
self.mock_es.update.side_effect = TransportError('regular test failure', 1)
@@ -356,13 +354,12 @@ class SessionTypeManager(unittest.TestCase):
u'_version': 3
}
res = self.session_manager.update(session_id='poiuuiop7890',
session_update_doc={'status': 'sleepy', '_version': 12})
session_update_doc={'status': 'sleepy'})
self.assertEqual(res, 3)
self.mock_es.update.assert_called_with(index=self.session_manager.index,
doc_type=self.session_manager.doc_type,
id='poiuuiop7890',
body={"doc": {'status': 'sleepy'}},
version=12)
body={"doc": {'status': 'sleepy'}})
def test_update_raise_DocumentNotFound_when_not_found(self):
self.mock_es.update.side_effect = TransportError('regular test failure', 1)