Merge "DB: Fix result set locking with periodics"

ironic/db/sqlalchemy/api.py

@@ -532,9 +532,20 @@ class Connection(api.Connection):
 
         query = sa.select(*columns)
         query = self._add_nodes_filters(query, filters)
-        return _paginate_query(models.Node, limit, marker,
+        # TODO(TheJulia): Why are we paginating this?!?!?!
-                               sort_key, sort_dir, query,
+        # If we are not using sorting, or any other query magic,
-                               return_base_tuple=True)
+        # we could likely just do a query execution and
+        # prepare the tuple responses.
+        results = _paginate_query(models.Node, limit, marker,
+                                  sort_key, sort_dir, query,
+                                  return_base_tuple=True)
+        # Need to copy the data to close out the _paginate_query
+        # object.
+        new_result = [tuple([ent for ent in r]) for r in results]
+        # Explicitly free results so we don't hang on to it.
+        del results
+
+        return new_result
 
     def get_node_list(self, filters=None, limit=None, marker=None,
                       sort_key=None, sort_dir=None, fields=None):

ironic/tests/unit/db/test_nodes.py

@@ -174,24 +174,24 @@ class DbNodeTestCase(base.DbTestCase):
         self.assertEqual([node2.id], [r[0] for r in res])
 
         res = self.dbapi.get_nodeinfo_list(filters={'maintenance': True})
-        self.assertEqual([node2.id], [r.id for r in res])
+        self.assertEqual([node2.id], [r[0] for r in res])
 
         res = self.dbapi.get_nodeinfo_list(filters={'maintenance': False})
         self.assertEqual(sorted([node1.id, node3.id]),
-                         sorted([r.id for r in res]))
+                         sorted([r[0] for r in res]))
 
         res = self.dbapi.get_nodeinfo_list(filters={'fault': 'boom'})
-        self.assertEqual([node2.id], [r.id for r in res])
+        self.assertEqual([node2.id], [r[0] for r in res])
 
         res = self.dbapi.get_nodeinfo_list(filters={'fault': 'moob'})
         self.assertEqual([], [r.id for r in res])
 
         res = self.dbapi.get_nodeinfo_list(filters={'resource_class': 'foo'})
-        self.assertEqual([node2.id], [r.id for r in res])
+        self.assertEqual([node2.id], [r[0] for r in res])
 
         res = self.dbapi.get_nodeinfo_list(
             filters={'conductor_group': 'group1'})
-        self.assertEqual([node2.id], [r.id for r in res])
+        self.assertEqual([node2.id], [r[0] for r in res])
 
         res = self.dbapi.get_nodeinfo_list(
             filters={'conductor_group': 'group2'})
@@ -201,13 +201,13 @@ class DbNodeTestCase(base.DbTestCase):
             filters={'reserved_by_any_of': ['fake-host',
                                             'another-fake-host']})
         self.assertEqual(sorted([node1.id, node3.id]),
-                         sorted([r.id for r in res]))
+                         sorted([r[0] for r in res]))
 
         res = self.dbapi.get_nodeinfo_list(filters={'id': node1.id})
-        self.assertEqual([node1.id], [r.id for r in res])
+        self.assertEqual([node1.id], [r[0] for r in res])
 
         res = self.dbapi.get_nodeinfo_list(filters={'uuid': node1.uuid})
-        self.assertEqual([node1.id], [r.id for r in res])
+        self.assertEqual([node1.id], [r[0] for r in res])
 
         # ensure unknown filters explode
         filters = {'bad_filter': 'foo'}

releasenotes/notes/fix-sqlite-locks-with-periodics-362de3c63bc23e4b.yaml

@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes issues with locks related to the execution of periodic tasks where
+    the task has a lingering transaction. For more information please see
+    `bug 2027405 <https://bugs.launchpad.net/ironic/+bug/2027405>`_.