Cleanup

Author: mkleen

tests/bwc/test_recovery.py

@@ -60,14 +60,6 @@ def _assert_is_closed(self, conn, schema, table_name):
         c.execute('select closed from information_schema.tables where table_name=? and table_schema=?', (table_name, schema))
         self.assertTrue(c.fetchone()[0], True)
 
-    def _assert_shards_are_started(self, conn, schema, table_name):
-        c = conn.cursor()
-        c.execute('select routing_state from sys.shards where table_name=? and schema_name=?', (table_name, schema))
-        routing_states = c.fetchall()
-        self.assertTrue(routing_states)
-        for routing_state in routing_states:
-            self.assertIn(routing_state, ['STARTED', 'RELOCATING', 'RELOCATED'])
-
     def _assert_checkpoints(self, conn, table_name):
         c = conn.cursor()
         c.execute('''
@@ -79,7 +71,8 @@ def _assert_checkpoints(self, conn, table_name):
                     ''', (table_name,))
         res = c.fetchall()
         self.assertGreater(len(res), 0)
-        # check that the checkpoints are in sync with max_seq_no for each shard and replica
+        # check that the checkpoints are in sync with max_seq_no for each shard
+        # and replica
         for r in res:
             global_checkpoint = r[1]
             local_checkpoint = r[2]
@@ -106,7 +99,6 @@ def _test_recovery_with_concurrent_indexing(self, path, nodes):
         This test creates a new table and insert data at every stage of the
         rolling upgrade.
         """
-
         cluster = self._new_cluster(path.from_version, nodes)
         cluster.start()
 
@@ -530,7 +522,7 @@ def _test_turnoff_translog_retention_after_upgraded(self, path, nodes):
             self._assert_is_green(conn, 'doc', 'test')
             c.execute('refresh table doc.test')
 
-            # check translog stats for the shard on each node
+            # check for the shard on each node that the translog is empty
             c.execute('''select translog_stats['number_of_operations'], translog_stats['uncommitted_operations']
                         from sys.shards where table_name='test' ''')
             res = c.fetchall()