Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix log based replication deletion #9660

Merged
merged 1 commit into from
Apr 15, 2024
Merged

Fix log based replication deletion #9660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ocs_ci/ocs/bucket_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2005,6 +2005,8 @@ def update_replication_policy(bucket_name, replication_policy_dict):
"spec": {
"additionalConfig": {
"replicationPolicy": json.dumps(replication_policy_dict)
if replication_policy_dict
else ""
}
}
}
Expand Down
7 changes: 3 additions & 4 deletions tests/cross_functional/system_test/test_mcg_replication_with_disruptions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ def test_log_based_replication_with_disruptions(
num_of_buckets=5,
object_amount=5,
is_disruptive=True,
skip_any_features=["nsfs", "rgw kafka", "caching", "replication"],
skip_any_features=["nsfs", "rgw kafka", "caching"],
)

mockup_logger, source_bucket, target_bucket = aws_log_based_replication_setup()
Expand Down Expand Up @@ -371,9 +371,8 @@ def test_log_based_replication_with_disruptions(

# Remove replication policy and upload some objects to the bucket
# make sure the replication itself doesn't take place
disable_replication = source_bucket.replication_policy
disable_replication["rules"] = []
update_replication_policy(source_bucket.name, dict())
source_bucket.replication_policy = ""
update_replication_policy(source_bucket.name, None)

logger.info("Uploading test objects and waiting for replication to complete")
mockup_logger.upload_test_objs_and_log(source_bucket.name)
Expand Down
Loading