Fix cluster upgrade

Author: mkleen

tests/bwc/test_recovery.py

@@ -15,24 +15,24 @@ def test(self):
         self._run_tests(
             [
                 UpgradePath('4.2.x', '4.3.x'),
-                UpgradePath('4.3.0', '4.3.0'),
+                UpgradePath('4.3.0', 'latest-nightly'),
             ],
             [
-                self._test_recovery_with_concurrent_indexing,
-                self._test_recovery,
-                self._test_update_docs,
-                self._test_recovery_closed_index,
-                self._test_closed_index_during_rolling_upgrade,
-                self._test_auto_expand_indices_during_rolling_upgrade,
-                self._test_retention_leases_established_when_promoting_primary,
-                self._test_closed_index_noop_recovery,
-                self._test_relocation_with_concurrent_indexing
+                 self._test_recovery_with_concurrent_indexing,
+                 self._test_recovery,
+                 self._test_update_docs,
+                 self._test_recovery_closed_index,
+                 self._test_closed_index_during_rolling_upgrade,
+                 self._test_auto_expand_indices_during_rolling_upgrade,
+                 self._test_retention_leases_established_when_promoting_primary,
+                 self._test_closed_index_noop_recovery,
+                 self._test_relocation_with_concurrent_indexing
             ]
         )
 
     def test_from_43(self):
         self._run_tests(
-            [UpgradePath('4.3.0', '4.3.x')],
+            [UpgradePath('4.3.0', 'latest-nightly')],
             [
                 self._test_turnoff_translog_retention_after_upgraded,
                 self._test_operation_based_recovery
@@ -92,16 +92,15 @@ def _upgrade_cluster(self, cluster, version, number_of_nodes_to_upgrade):
         Upgrades a given number of nodes in the cluster to the provided version
         in randomized order.
         """
-
         assert number_of_nodes_to_upgrade <= len(cluster._nodes)
+        # let's find the minimum version in the cluster to make sure we don't
+        # upgrade nodes twice to the new version in case of a mixed cluster
+        min_version = min([n.version for n in cluster._nodes])
         for idx, node in sample(list(enumerate(cluster)), number_of_nodes_to_upgrade):
-            if self._getversion(node) < version:
+            if node.version == min_version:
                 new_node = self.upgrade_node(node, version)
                 cluster[idx] = new_node
 
-    def _getversion(self, node):
-        return '.'.join(map(str, node.version))
-
     def _test_recovery_with_concurrent_indexing(self, path, nodes):
         """
         This test creates a new table and insert data at every stage of the
@@ -386,11 +385,6 @@ def _test_closed_index_noop_recovery(self, path, nodes):
 
             self._assert_is_closed(conn, 'doc', 'test')
 
-            # add assert for _assert_noop_recoveries
-
-    def _assert_noop_recoveries(self, conn, table_name, schema):
-        pass
-
     def _test_update_docs(self, path, nodes):
         """
         This test creates a new table, insert data and updates data at every state at every stage of the