Skip to content

HDDS-12295. Allow updating OM default replication config for tests #7974

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

Merged
adoroszlai merged 3 commits into from
Mar 5, 2025
Merged

HDDS-12295. Allow updating OM default replication config for tests #7974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
28c8be9
HDDS-12295. Allow updating OM default replication config for tests
adoroszlai Feb 26, 2025
cc51d35
add imports in NonHATests
adoroszlai Feb 26, 2025
2cc627a
convert and refactor TestReplicationConfigPreference
adoroszlai Feb 26, 2025
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
11 changes: 11 additions & 0 deletions ...op-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/TestHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import java.util.concurrent.TimeoutException;
import org.apache.hadoop.hdds.client.ReplicationConfig;
import org.apache.hadoop.hdds.client.ReplicationType;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
import org.apache.hadoop.hdds.ratis.RatisHelper;
Expand Down Expand Up @@ -444,4 +445,14 @@ public static void waitForReplicaCount(long containerID, int count,
GenericTestUtils.waitFor(() -> countReplicas(containerID, cluster) == count,
200, 30000);
}

/** Helper to set config even if {@code value} is null, which
* {@link OzoneConfiguration#set(String, String) does not allow. */
public static void setConfig(OzoneConfiguration conf, String key, String value) {
if (value == null) {
conf.unset(key);
} else {
conf.set(key, value);
}
}
}
Loading