Merge branch 'master' into master
This commit is contained in:
Myles Penner
GitHub
@@ -648,7 +648,7 @@ class CephRGWTest(test_utils.BaseCharmTest):
|
||||
|
||||
This Testset is not idempotent, because we don't support scale down from
|
||||
multisite to singlesite (yet). Tests can be performed independently.
|
||||
However, If test_004 has completed migration, retriggering the test-set
|
||||
However, If test_100 has completed migration, retriggering the test-set
|
||||
would cause a time-out in test_003.
|
||||
"""
|
||||
|
||||
@@ -840,13 +840,12 @@ class CephRGWTest(test_utils.BaseCharmTest):
|
||||
:param unit_name: Unit name for which RGW endpoint is required.
|
||||
:type unit_name: str
|
||||
"""
|
||||
unit = zaza_model.get_unit_from_name(unit_name)
|
||||
unit_address = zaza_model.get_unit_public_address(
|
||||
unit,
|
||||
self.model_name
|
||||
)
|
||||
# Get address "public" network binding.
|
||||
unit_address = zaza_model.run_on_unit(
|
||||
unit_name, "network-get public --bind-address"
|
||||
).get('Stdout', '').strip()
|
||||
|
||||
logging.debug("Unit: {}, Endpoint: {}".format(unit_name, unit_address))
|
||||
logging.info("Unit: {}, Endpoint: {}".format(unit_name, unit_address))
|
||||
if unit_address is None:
|
||||
return None
|
||||
# Evaluate port
|
||||
@@ -878,6 +877,33 @@ class CephRGWTest(test_utils.BaseCharmTest):
|
||||
}
|
||||
)
|
||||
|
||||
def configure_rgw_multisite_relation(self):
|
||||
"""Configure multi-site relation between primary and secondary apps."""
|
||||
multisite_relation = zaza_model.get_relation_id(
|
||||
self.primary_rgw_app, self.secondary_rgw_app,
|
||||
remote_interface_name='secondary'
|
||||
)
|
||||
if multisite_relation is None:
|
||||
logging.info('Configuring Multisite')
|
||||
self.configure_rgw_apps_for_multisite()
|
||||
zaza_model.add_relation(
|
||||
self.primary_rgw_app,
|
||||
self.primary_rgw_app + ":primary",
|
||||
self.secondary_rgw_app + ":secondary"
|
||||
)
|
||||
zaza_model.block_until_unit_wl_status(
|
||||
self.secondary_rgw_unit, "waiting"
|
||||
)
|
||||
|
||||
zaza_model.block_until_unit_wl_status(
|
||||
self.secondary_rgw_unit, "active"
|
||||
)
|
||||
zaza_model.block_until_unit_wl_status(
|
||||
self.primary_rgw_unit, "active"
|
||||
)
|
||||
zaza_model.wait_for_unit_idle(self.secondary_rgw_unit)
|
||||
zaza_model.wait_for_unit_idle(self.primary_rgw_unit)
|
||||
|
||||
def clean_rgw_multisite_config(self, app_name):
|
||||
"""Clear Multisite Juju config values to default.
|
||||
|
||||
@@ -1066,7 +1092,209 @@ class CephRGWTest(test_utils.BaseCharmTest):
|
||||
zaza_model.block_until_unit_wl_status(self.secondary_rgw_unit,
|
||||
'active')
|
||||
|
||||
def test_004_migration_and_multisite_failover(self):
|
||||
def test_004_multisite_directional_sync_policy(self):
|
||||
"""Verify Multisite Directional Sync Policy."""
|
||||
# Skip multisite tests if not compatible with bundle.
|
||||
if not self.multisite:
|
||||
logging.info('Skipping multisite sync policy verification')
|
||||
return
|
||||
|
||||
container_name = 'zaza-container'
|
||||
primary_obj_name = 'primary-testfile'
|
||||
primary_obj_data = 'Primary test data'
|
||||
secondary_directional_obj_name = 'secondary-directional-testfile'
|
||||
secondary_directional_obj_data = 'Secondary directional test data'
|
||||
secondary_symmetrical_obj_name = 'secondary-symmetrical-testfile'
|
||||
secondary_symmetrical_obj_data = 'Secondary symmetrical test data'
|
||||
|
||||
logging.info('Verifying multisite directional sync policy')
|
||||
|
||||
# Set default sync policy to "allowed", which allows buckets to sync,
|
||||
# but the sync is disabled by default in the zone group. Also, set the
|
||||
# secondary zone sync policy flow type policy to "directional".
|
||||
zaza_model.set_application_config(
|
||||
self.primary_rgw_app,
|
||||
{
|
||||
"sync-policy-state": "allowed",
|
||||
}
|
||||
)
|
||||
zaza_model.set_application_config(
|
||||
self.secondary_rgw_app,
|
||||
{
|
||||
"sync-policy-flow-type": "directional",
|
||||
}
|
||||
)
|
||||
zaza_model.wait_for_unit_idle(self.secondary_rgw_unit)
|
||||
zaza_model.wait_for_unit_idle(self.primary_rgw_unit)
|
||||
|
||||
# Setup multisite relation.
|
||||
self.configure_rgw_multisite_relation()
|
||||
|
||||
logging.info('Waiting for Data and Metadata to Synchronize')
|
||||
# NOTE: We only check the secondary zone, because the sync policy flow
|
||||
# type is set to "directional" between the primary and secondary zones.
|
||||
self.wait_for_status(self.secondary_rgw_app, is_primary=False)
|
||||
|
||||
# Create bucket on primary RGW zone.
|
||||
logging.info('Creating bucket on primary zone')
|
||||
primary_endpoint = self.get_rgw_endpoint(self.primary_rgw_unit)
|
||||
self.assertNotEqual(primary_endpoint, None)
|
||||
|
||||
access_key, secret_key = self.get_client_keys()
|
||||
primary_client = boto3.resource("s3",
|
||||
verify=False,
|
||||
endpoint_url=primary_endpoint,
|
||||
aws_access_key_id=access_key,
|
||||
aws_secret_access_key=secret_key)
|
||||
primary_client.Bucket(container_name).create()
|
||||
|
||||
# Enable sync on the bucket.
|
||||
logging.info('Enabling sync on the bucket from the primary zone')
|
||||
zaza_model.run_action_on_leader(
|
||||
self.primary_rgw_app,
|
||||
'enable-buckets-sync',
|
||||
action_params={
|
||||
'buckets': container_name,
|
||||
},
|
||||
raise_on_failure=True,
|
||||
)
|
||||
|
||||
# Check that sync cannot be enabled using secondary Juju RGW app.
|
||||
with self.assertRaises(zaza_model.ActionFailed):
|
||||
zaza_model.run_action_on_leader(
|
||||
self.secondary_rgw_app,
|
||||
'enable-buckets-sync',
|
||||
action_params={
|
||||
'buckets': container_name,
|
||||
},
|
||||
raise_on_failure=True,
|
||||
)
|
||||
|
||||
logging.info('Waiting for Data and Metadata to Synchronize')
|
||||
self.wait_for_status(self.secondary_rgw_app, is_primary=False)
|
||||
|
||||
# Perform IO on primary zone bucket.
|
||||
logging.info('Performing IO on primary zone bucket')
|
||||
primary_object = primary_client.Object(
|
||||
container_name,
|
||||
primary_obj_name
|
||||
)
|
||||
primary_object.put(Body=primary_obj_data)
|
||||
|
||||
# Verify that the object is replicated to the secondary zone.
|
||||
logging.info('Verifying that the object is replicated to the '
|
||||
'secondary zone')
|
||||
secondary_endpoint = self.get_rgw_endpoint(self.secondary_rgw_unit)
|
||||
self.assertNotEqual(secondary_endpoint, None)
|
||||
|
||||
secondary_client = boto3.resource("s3",
|
||||
verify=False,
|
||||
endpoint_url=secondary_endpoint,
|
||||
aws_access_key_id=access_key,
|
||||
aws_secret_access_key=secret_key)
|
||||
secondary_data = self.fetch_rgw_object(
|
||||
secondary_client,
|
||||
container_name,
|
||||
primary_obj_name
|
||||
)
|
||||
self.assertEqual(secondary_data, primary_obj_data)
|
||||
|
||||
# Write object to the secondary zone bucket, when the sync policy
|
||||
# flow type is set to "directional" between the zones.
|
||||
logging.info('Writing object to the secondary zone bucket, which '
|
||||
'should not be replicated to the primary zone')
|
||||
secondary_object = secondary_client.Object(
|
||||
container_name,
|
||||
secondary_directional_obj_name
|
||||
)
|
||||
secondary_object.put(Body=secondary_directional_obj_data)
|
||||
|
||||
# Verify that the object is not replicated to the primary zone.
|
||||
logging.info('Verifying that the object is not replicated to the '
|
||||
'primary zone')
|
||||
with self.assertRaises(botocore.exceptions.ClientError):
|
||||
self.fetch_rgw_object(
|
||||
primary_client,
|
||||
container_name,
|
||||
secondary_directional_obj_name
|
||||
)
|
||||
|
||||
logging.info('Setting sync policy flow to "symmetrical" on the '
|
||||
'secondary RGW zone')
|
||||
zaza_model.set_application_config(
|
||||
self.secondary_rgw_app,
|
||||
{
|
||||
"sync-policy-flow-type": "symmetrical",
|
||||
}
|
||||
)
|
||||
zaza_model.wait_for_unit_idle(self.secondary_rgw_unit)
|
||||
zaza_model.wait_for_unit_idle(self.primary_rgw_unit)
|
||||
|
||||
# Write another object to the secondary zone bucket.
|
||||
logging.info('Writing another object to the secondary zone bucket.')
|
||||
secondary_object = secondary_client.Object(
|
||||
container_name,
|
||||
secondary_symmetrical_obj_name
|
||||
)
|
||||
secondary_object.put(Body=secondary_symmetrical_obj_data)
|
||||
|
||||
logging.info('Waiting for Data and Metadata to Synchronize')
|
||||
# NOTE: This time, we check both the primary and secondary zones,
|
||||
# because the sync policy flow type is set to "symmetrical" between
|
||||
# the zones.
|
||||
self.wait_for_status(self.secondary_rgw_app, is_primary=False)
|
||||
self.wait_for_status(self.primary_rgw_app, is_primary=True)
|
||||
|
||||
# Verify that all objects are replicated to the primary zone.
|
||||
logging.info('Verifying that all objects are replicated to the '
|
||||
'primary zone (including older objects).')
|
||||
test_cases = [
|
||||
{
|
||||
'obj_name': primary_obj_name,
|
||||
'obj_data': primary_obj_data,
|
||||
},
|
||||
{
|
||||
'obj_name': secondary_directional_obj_name,
|
||||
'obj_data': secondary_directional_obj_data,
|
||||
},
|
||||
{
|
||||
'obj_name': secondary_symmetrical_obj_name,
|
||||
'obj_data': secondary_symmetrical_obj_data,
|
||||
},
|
||||
]
|
||||
for tc in test_cases:
|
||||
logging.info('Verifying that object "{}" is replicated'.format(
|
||||
tc['obj_name']))
|
||||
primary_data = self.fetch_rgw_object(
|
||||
primary_client,
|
||||
container_name,
|
||||
tc['obj_name']
|
||||
)
|
||||
self.assertEqual(primary_data, tc['obj_data'])
|
||||
|
||||
# Cleanup.
|
||||
logging.info('Cleaning up buckets after test case')
|
||||
self.purge_bucket(self.primary_rgw_app, container_name)
|
||||
self.purge_bucket(self.secondary_rgw_app, container_name)
|
||||
|
||||
logging.info('Waiting for Data and Metadata to Synchronize')
|
||||
self.wait_for_status(self.secondary_rgw_app, is_primary=False)
|
||||
self.wait_for_status(self.primary_rgw_app, is_primary=True)
|
||||
|
||||
# Set multisite sync policy state to "enabled" on the primary RGW app.
|
||||
# Paired with "symmetrical" sync policy flow on the secondary RGW app,
|
||||
# this enables bidirectional sync between the zones (which is the
|
||||
# default behaviour without multisite sync policies configured).
|
||||
logging.info('Setting sync policy state to "enabled".')
|
||||
zaza_model.set_application_config(
|
||||
self.primary_rgw_app,
|
||||
{
|
||||
"sync-policy-state": "enabled",
|
||||
}
|
||||
)
|
||||
zaza_model.wait_for_unit_idle(self.primary_rgw_unit)
|
||||
|
||||
def test_100_migration_and_multisite_failover(self):
|
||||
"""Perform multisite migration and verify failover."""
|
||||
container_name = 'zaza-container'
|
||||
obj_data = 'Test data from Zaza'
|
||||
@@ -1093,24 +1321,8 @@ class CephRGWTest(test_utils.BaseCharmTest):
|
||||
).put(Body=obj_data)
|
||||
|
||||
# If Primary/Secondary relation does not exist, add it.
|
||||
if zaza_model.get_relation_id(
|
||||
self.primary_rgw_app, self.secondary_rgw_app,
|
||||
remote_interface_name='secondary'
|
||||
) is None:
|
||||
logging.info('Configuring Multisite')
|
||||
self.configure_rgw_apps_for_multisite()
|
||||
zaza_model.add_relation(
|
||||
self.primary_rgw_app,
|
||||
self.primary_rgw_app + ":primary",
|
||||
self.secondary_rgw_app + ":secondary"
|
||||
)
|
||||
zaza_model.block_until_unit_wl_status(
|
||||
self.secondary_rgw_unit, "waiting"
|
||||
)
|
||||
self.configure_rgw_multisite_relation()
|
||||
|
||||
zaza_model.block_until_unit_wl_status(
|
||||
self.secondary_rgw_unit, "active"
|
||||
)
|
||||
logging.info('Waiting for Data and Metadata to Synchronize')
|
||||
self.wait_for_status(self.secondary_rgw_app, is_primary=False)
|
||||
self.wait_for_status(self.primary_rgw_app, is_primary=True)
|
||||
@@ -1167,6 +1379,10 @@ class CephRGWTest(test_utils.BaseCharmTest):
|
||||
'Body'
|
||||
].read().decode('UTF-8')
|
||||
|
||||
# Wait for Sites to be syncronised.
|
||||
self.wait_for_status(self.primary_rgw_app, is_primary=False)
|
||||
self.wait_for_status(self.secondary_rgw_app, is_primary=True)
|
||||
|
||||
# Recovery scenario, reset ceph-rgw as primary.
|
||||
self.promote_rgw_to_primary(self.primary_rgw_app)
|
||||
self.wait_for_status(self.primary_rgw_app, is_primary=True)
|
||||
@@ -1224,7 +1440,7 @@ class CephRGWTest(test_utils.BaseCharmTest):
|
||||
self.purge_bucket(self.secondary_rgw_app, 'zaza-container')
|
||||
self.purge_bucket(self.secondary_rgw_app, 'failover-container')
|
||||
|
||||
def test_005_virtual_hosted_bucket(self):
|
||||
def test_101_virtual_hosted_bucket(self):
|
||||
"""Test virtual hosted bucket."""
|
||||
primary_rgw_unit = zaza_model.get_unit_from_name(self.primary_rgw_unit)
|
||||
if primary_rgw_unit.workload_status != "active":
|
||||
|
||||
@@ -44,8 +44,15 @@ class BaseDesignateTest(test_utils.OpenStackBaseTest):
|
||||
model_alias = model_alias or ""
|
||||
super(BaseDesignateTest, cls).setUpClass(application_name, model_alias)
|
||||
os_release = openstack_utils.get_os_release
|
||||
current_release = os_release()
|
||||
|
||||
if os_release() >= os_release('bionic_rocky'):
|
||||
if current_release >= os_release('jammy_caracal'):
|
||||
cls.designate_svcs = [
|
||||
'designate-api', 'designate-central',
|
||||
'designate-mdns', 'designate-worker', 'designate-sink',
|
||||
'designate-producer',
|
||||
]
|
||||
elif current_release >= os_release('bionic_rocky'):
|
||||
cls.designate_svcs = [
|
||||
'designate-agent', 'designate-api', 'designate-central',
|
||||
'designate-mdns', 'designate-worker', 'designate-sink',
|
||||
|
||||
Reference in New Issue
Block a user