index_already_exists_exception was renamed to resource_already_exists…

…_exception elastic/elasticsearch#21494
dimagi · Nov 29, 2023 · 34e3c99 · 34e3c99
1 parent c721a2d
commit 34e3c99
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/corehq/apps/es/tests/test_client.py b/corehq/apps/es/tests/test_client.py
@@ -267,21 +267,14 @@ def _clear_cluster_routing(self, verify=False):
         a transient setting once its set without restarting the cluster, so we
         explicitly set the default value (`all`) instead.
         """
-        self.adapter.cluster_routing(enabled=True)  # default value
+        try:
+            self.adapter._cluster_put_settings({"cluster.routing.allocation.enable": None})
+        except TransportError:
+            # TransportError(400, 'action_request_validation_exception', 'Validation Failed: 1: no settings to update;')  # noqa: E501
+            pass
         if verify:
             settings = self.adapter._es.cluster.get_settings(flat_settings=True)
-            self.assertEqual(settings["transient"]["cluster.routing.allocation.enable"], "all")
-        #
-        # The code below is better. Use it instead when able Elastic v5+
-        #
-        #try:
-        #    self.adapter._cluster_put_settings({"cluster.routing.allocation.enable": None})
-        #except TransportError:
-        #    # TransportError(400, 'action_request_validation_exception', 'Validation Failed: 1: no settings to update;')  # noqa: E501
-        #    pass
-        #if verify:
-        #    settings = self.adapter._es.cluster.get_settings(flat_settings=True)
-        #    self.assertIsNone(settings["transient"].get("cluster.routing.allocation.enable"))
+            self.assertIsNone(settings["transient"].get("cluster.routing.allocation.enable"))
 
     def test_get_node_info(self):
         info = self.adapter._es.nodes.info()

diff --git a/corehq/apps/es/tests/test_migration_operations.py b/corehq/apps/es/tests/test_migration_operations.py
@@ -138,7 +138,10 @@ def test_fails_if_index_exists(self):
         migration = TestMigration(CreateIndex(*self.create_index_args))
         with self.assertRaises(RequestError) as context:
             migration.apply()
-        self.assertEqual(context.exception.error, "index_already_exists_exception")
+        if manager.elastic_major_version >= 6:
+            self.assertEqual(context.exception.error, "resource_already_exists_exception")
+        else:
+            self.assertEqual(context.exception.error, "index_already_exists_exception")
 
     def test_reverse_deletes_index(self):
         migration = TestMigration(CreateIndex(*self.create_index_args))
@@ -443,7 +446,10 @@ def test_reverse_fails_if_index_exists(self):
         )
         with self.assertRaises(RequestError) as context:
             migration.unapply()
-        self.assertEqual(context.exception.error, "index_already_exists_exception")
+        if manager.elastic_major_version >= 6:
+            self.assertEqual(context.exception.error, "resource_already_exists_exception")
+        else:
+            self.assertEqual(context.exception.error, "index_already_exists_exception")
 
     def test_describe(self):
         operation = DeleteIndex(self.index)