handle error: storage belongs to different cluster

Author: BalabaDmitri

tests/integration/ha_tests/test_self_healing.py

@@ -624,7 +624,7 @@ async def test_deploy_zero_units(ops_test: OpsTest, charm):
     logger.info("check test database data")
     await validate_test_data(connection_string)
 
-    logger.info("scaling database to tow unit using foreign cluster")
+    logger.info("database scaling up to two units using third-party cluster storage")
     new_unit = await add_unit_with_storage(ops_test, app=app, storage=second_storage, is_blocked=True)
 
     logger.info(f"remove unit {new_unit.name} with storage from application {SECOND_APPLICATION}")
@@ -635,34 +635,34 @@ async def test_deploy_zero_units(ops_test: OpsTest, charm):
     logger.info("check test database data")
     await validate_test_data(connection_string)
 
-    # # Scale up to two units.
-    # logger.info("scaling database to two unit")
-    # prev_units = [unit.name for unit in ops_test.model.applications[app].units]
-    # await scale_application(ops_test, application_name=app, count=2)
-    # unit = await get_last_added_unit(ops_test, app, prev_units)
-    #
-    # logger.info(f"check test database data of unit name {unit.name}")
-    # connection_string, _ = await get_db_connection(
-    #     ops_test, dbname=dbname, is_primary=False, replica_unit_name=unit.name
-    # )
-    # await validate_test_data(connection_string)
-    # assert await reused_replica_storage(
-    #     ops_test, unit_name=unit.name
-    # ), "attached storage not properly re-used by Postgresql."
-    #
-    # # Scale up to three units.
-    # logger.info("scaling database to three unit")
-    # prev_units = [unit.name for unit in ops_test.model.applications[app].units]
-    # await scale_application(ops_test, application_name=app, count=3)
-    # unit = await get_last_added_unit(ops_test, app, prev_units)
-    #
-    # logger.info(f"check test database data of unit name {unit.name}")
-    # connection_string, _ = await get_db_connection(
-    #     ops_test, dbname=dbname, is_primary=False, replica_unit_name=unit.name
-    # )
-    # await validate_test_data(connection_string)
-    # assert await reused_replica_storage(
-    #     ops_test, unit_name=unit.name
-    # ), "attached storage not properly re-used by Postgresql."
-    #
-    # await check_writes(ops_test)
+    # Scale up to two units.
+    logger.info("scaling database to two unit")
+    prev_units = [unit.name for unit in ops_test.model.applications[app].units]
+    await scale_application(ops_test, application_name=app, count=2)
+    unit = await get_last_added_unit(ops_test, app, prev_units)
+
+    logger.info(f"check test database data of unit name {unit.name}")
+    connection_string, _ = await get_db_connection(
+        ops_test, dbname=dbname, is_primary=False, replica_unit_name=unit.name
+    )
+    await validate_test_data(connection_string)
+    assert await reused_replica_storage(
+        ops_test, unit_name=unit.name
+    ), "attached storage not properly re-used by Postgresql."
+
+    # Scale up to three units.
+    logger.info("scaling database to three unit")
+    prev_units = [unit.name for unit in ops_test.model.applications[app].units]
+    await scale_application(ops_test, application_name=app, count=3)
+    unit = await get_last_added_unit(ops_test, app, prev_units)
+
+    logger.info(f"check test database data of unit name {unit.name}")
+    connection_string, _ = await get_db_connection(
+        ops_test, dbname=dbname, is_primary=False, replica_unit_name=unit.name
+    )
+    await validate_test_data(connection_string)
+    assert await reused_replica_storage(
+        ops_test, unit_name=unit.name
+    ), "attached storage not properly re-used by Postgresql."
+
+    await check_writes(ops_test)