Raise MarkerNotFound if BuildRequestList.get_by_filters doesn't find markernewton-eol14.1.0stable/newton

For some reason, probably because build requests are meant to be short lived
and we don't get a lot of bugs about paging misbehavior, when paging instances
with a marker, we didn't raise MarkerNotFound if we didn't find the marker in
the list of build requests. Doing so would match what we do when paging over
cells and listing instances using a marker. Once we find the marker, be that
in build_requests, or one of the cells, we need to set the marker to None to
stop looking for it elsewhere if we have more space to fill our limit.

For example, see change I8a957bebfcecd6ac712103c346e028d80f1ecd7c.

This patch fixes the issue by raising MarkerNotFound from BuildRequestList
get_by_filters if there is a marker and we didn't find a build request for
it. The compute API get_all() method handles that as normal and continues
looking for the marker in one of the cells.

Change-Id: I1aa3ca6cc70cef65d24dec1e7db9491c9b73f7ab
Closes-Bug: #1737856
(cherry picked from commit 1706e3989157f912bce99beb99c75216a064eb2d)
(cherry picked from commit 344029b94ad7ff4667403a851d33c3ddb4e97b4b)
(cherry picked from commit b00b2fe9be4394e7c9cf73c168d435a2333d12f6)

4 files changed, 31 insertions, 11 deletions

diff --git a/nova/compute/api.py b/nova/compute/api.py
index 6eb269d303..35d0c82cd8 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -2315,9 +2315,17 @@ class API(base.Base):
         # [sorted instances with no host] + [sorted instances with host].
         # This means BuildRequest and cell0 instances first, then cell
         # instances
-        build_requests = objects.BuildRequestList.get_by_filters(
-            context, filters, limit=limit, marker=marker, sort_keys=sort_keys,
-            sort_dirs=sort_dirs)
+        try:
+            build_requests = objects.BuildRequestList.get_by_filters(
+                context, filters, limit=limit, marker=marker,
+                sort_keys=sort_keys, sort_dirs=sort_dirs)
+            # If we found the marker in we need to set it to None
+            # so we don't expect to find it in the cells below.
+            marker = None
+        except exception.MarkerNotFound:
+            # If we didn't find the marker in the build requests then keep
+            # looking for it in the cells.
+            build_requests = objects.BuildRequestList()
         build_req_instances = objects.InstanceList(
             objects=[build_req.instance for build_req in build_requests])
         # Only subtract from limit if it is not None
diff --git a/nova/objects/build_request.py b/nova/objects/build_request.py
index e0f2c6a81a..9404e1ba1c 100644
--- a/nova/objects/build_request.py
+++ b/nova/objects/build_request.py
@@ -370,7 +370,8 @@ class BuildRequestList(base.ObjectListBase, base.NovaObject):
 
             filtered_build_reqs.append(build_req)
 
-        if (len(filtered_build_reqs) < 2) or (not sort_keys):
+        if (((len(filtered_build_reqs) < 2) or (not sort_keys))
+                and not marker):
             # No need to sort
             return cls(context, objects=filtered_build_reqs)
 
@@ -383,6 +384,8 @@ class BuildRequestList(base.ObjectListBase, base.NovaObject):
                 if build_req.instance.uuid == marker:
                     marker_index = i
                     break
+            else:
+                raise exception.MarkerNotFound(marker=marker)
         len_build_reqs = len(sorted_build_reqs)
         limit_index = len_build_reqs
         if limit:
diff --git a/nova/tests/functional/db/test_build_request.py b/nova/tests/functional/db/test_build_request.py
index c3a60f0e1b..d65ab41fff 100644
--- a/nova/tests/functional/db/test_build_request.py
+++ b/nova/tests/functional/db/test_build_request.py
@@ -526,6 +526,13 @@ class BuildRequestListTestCase(test.NoDBTestCase):
             objects.base.obj_equal_prims(req.instance,
                                          req_list[i].instance)
 
+    def test_get_by_filters_marker_not_found(self):
+        self._create_req()
+        self.assertRaises(exception.MarkerNotFound,
+                          build_request.BuildRequestList.get_by_filters,
+                          self.context, {}, marker=uuidutils.generate_uuid(),
+                          sort_keys=['id'], sort_dirs=['asc'])
+
     def test_get_by_filters_limit(self):
         reqs = [self._create_req(),
                 self._create_req(),
diff --git a/nova/tests/unit/compute/test_compute_api.py b/nova/tests/unit/compute/test_compute_api.py
index 190803721a..05f3ebd053 100644
--- a/nova/tests/unit/compute/test_compute_api.py
+++ b/nova/tests/unit/compute/test_compute_api.py
@@ -4345,7 +4345,7 @@ class _ComputeAPIUnitTestMixIn(object):
                 self.context, {'foo': 'bar'}, limit=None, marker='fake-marker',
                 sort_keys=['baz'], sort_dirs=['desc'])
             mock_inst_get.assert_called_once_with(
-                self.context, {'foo': 'bar'}, limit=None, marker='fake-marker',
+                self.context, {'foo': 'bar'}, limit=None, marker=None,
                 expected_attrs=None, sort_keys=['baz'], sort_dirs=['desc'])
             for i, instance in enumerate(build_req_instances + cell_instances):
                 self.assertEqual(instance, instances[i])
@@ -4379,7 +4379,7 @@ class _ComputeAPIUnitTestMixIn(object):
                 self.context, {'foo': 'bar'}, limit=None, marker='fake-marker',
                 sort_keys=['baz'], sort_dirs=['desc'])
             mock_inst_get.assert_called_once_with(
-                self.context, {'foo': 'bar'}, limit=None, marker='fake-marker',
+                self.context, {'foo': 'bar'}, limit=None, marker=None,
                 expected_attrs=None, sort_keys=['baz'], sort_dirs=['desc'])
             for i, instance in enumerate(build_req_instances + cell_instances):
                 self.assertEqual(instance, instances[i])
@@ -4413,14 +4413,15 @@ class _ComputeAPIUnitTestMixIn(object):
                 self.context, {'foo': 'bar'}, limit=10, marker='fake-marker',
                 sort_keys=['baz'], sort_dirs=['desc'])
             mock_inst_get.assert_called_once_with(
-                self.context, {'foo': 'bar'}, limit=8, marker='fake-marker',
+                self.context, {'foo': 'bar'}, limit=8, marker=None,
                 expected_attrs=None, sort_keys=['baz'], sort_dirs=['desc'])
             for i, instance in enumerate(build_req_instances + cell_instances):
                 self.assertEqual(instance, instances[i])
 
     @mock.patch.object(context, 'target_cell')
     @mock.patch.object(objects.BuildRequestList, 'get_by_filters',
-                       return_value=objects.BuildRequestList(objects=[]))
+                       side_effect=exception.MarkerNotFound(
+                           marker='fake-marker'))
     @mock.patch.object(objects.CellMapping, 'get_by_uuid')
     def test_get_all_includes_cell0(self, mock_cell_mapping_get,
                                     mock_buildreq_get, mock_target_cell):
@@ -4496,11 +4497,11 @@ class _ComputeAPIUnitTestMixIn(object):
             mock_target_cell.assert_called_once_with(self.context,
                                                      cell_mapping)
             inst_get_calls = [mock.call(self.context, {'foo': 'bar'},
-                                        limit=8, marker='fake-marker',
+                                        limit=8, marker=None,
                                         expected_attrs=None, sort_keys=['baz'],
                                         sort_dirs=['desc']),
                               mock.call(self.context, {'foo': 'bar'},
-                                        limit=6, marker='fake-marker',
+                                        limit=6, marker=None,
                                         expected_attrs=None, sort_keys=['baz'],
                                         sort_dirs=['desc'])
                               ]
@@ -4513,7 +4514,8 @@ class _ComputeAPIUnitTestMixIn(object):
 
     @mock.patch.object(context, 'target_cell')
     @mock.patch.object(objects.BuildRequestList, 'get_by_filters',
-                       return_value=objects.BuildRequestList(objects=[]))
+                       side_effect=exception.MarkerNotFound(
+                           marker=uuids.marker))
     @mock.patch.object(objects.CellMapping, 'get_by_uuid')
     def test_get_all_cell0_marker_not_found(self, mock_cell_mapping_get,
                                             mock_buildreq_get,