Skip to content

HDDS-6219. Switch to RATIS ReplicationType from STAND_ALONE in our tests. #3014

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
fapifta merged 1 commit into from
Jan 27, 2022
Merged

HDDS-6219. Switch to RATIS ReplicationType from STAND_ALONE in our tests. #3014

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: 1 addition & 1 deletion hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestDataUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public static OzoneBucket createVolumeAndBucket(MiniOzoneCluster cluster,
public static void createKey(OzoneBucket bucket, String keyName,
String content) throws IOException {
createKey(bucket, keyName, ReplicationFactor.ONE,
ReplicationType.STAND_ALONE, content);
ReplicationType.RATIS, content);
}

public static void createKey(OzoneBucket bucket, String keyName,
Expand Down
2 changes: 2 additions & 0 deletions ...e/integration-test/src/test/java/org/apache/hadoop/ozone/TestStorageContainerManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,6 +369,7 @@ public void testBlockDeletingThrottling() throws Exception {
.setNumDatanodes(1)
.build();
cluster.waitForClusterToBeReady();
cluster.waitForPipelineTobeReady(HddsProtos.ReplicationFactor.ONE, 30000);

try {
DeletedBlockLog delLog = cluster.getStorageContainerManager()
Expand Down Expand Up @@ -746,6 +747,7 @@ public void testCloseContainerCommandOnRestart() throws Exception {
.setNumDatanodes(1)
.build();
cluster.waitForClusterToBeReady();
cluster.waitForPipelineTobeReady(HddsProtos.ReplicationFactor.ONE, 30000);

try {
TestStorageContainerManagerHelper helper =
Expand Down
12 changes: 6 additions & 6 deletions ...tion-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneAtRestEncryption.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@

import static org.apache.hadoop.hdds.HddsConfigKeys.OZONE_METADATA_DIRS;
import static org.apache.hadoop.hdds.client.ReplicationFactor.ONE;
import static org.apache.hadoop.hdds.client.ReplicationType.STAND_ALONE;
import static org.apache.hadoop.hdds.client.ReplicationType.RATIS;

import org.junit.AfterClass;
import org.junit.Assert;
Expand Down Expand Up @@ -235,7 +235,7 @@ private void createAndVerifyKeyData(OzoneBucket bucket) throws Exception {
String value = "sample value";
try (OzoneOutputStream out = bucket.createKey(keyName,
value.getBytes(StandardCharsets.UTF_8).length,
ReplicationType.STAND_ALONE,
ReplicationType.RATIS,
ReplicationFactor.ONE, new HashMap<>())) {
out.write(value.getBytes(StandardCharsets.UTF_8));
}
Expand All @@ -259,7 +259,7 @@ private void createAndVerifyKeyData(OzoneBucket bucket) throws Exception {

Assert.assertEquals(len, value.length());
Assert.assertTrue(verifyRatisReplication(bucket.getVolumeName(),
bucket.getName(), keyName, ReplicationType.STAND_ALONE,
bucket.getName(), keyName, ReplicationType.RATIS,
ReplicationFactor.ONE));
Assert.assertEquals(value, new String(fileContent, StandardCharsets.UTF_8));
Assert.assertFalse(key.getCreationTime().isBefore(testStartTime));
Expand Down Expand Up @@ -323,7 +323,7 @@ public void testKeyWithEncryptionAndGdpr() throws Exception {
keyMetadata.put(OzoneConsts.GDPR_FLAG, "true");
try (OzoneOutputStream out = bucket.createKey(keyName,
value.getBytes(StandardCharsets.UTF_8).length,
ReplicationType.STAND_ALONE,
ReplicationType.RATIS,
ReplicationFactor.ONE, keyMetadata)) {
out.write(value.getBytes(StandardCharsets.UTF_8));
}
Expand All @@ -340,7 +340,7 @@ public void testKeyWithEncryptionAndGdpr() throws Exception {

Assert.assertEquals(len, value.length());
Assert.assertTrue(verifyRatisReplication(volumeName, bucketName,
keyName, ReplicationType.STAND_ALONE,
keyName, ReplicationType.RATIS,
ReplicationFactor.ONE));
Assert.assertEquals(value, new String(fileContent, StandardCharsets.UTF_8));
Assert.assertFalse(key.getCreationTime().isBefore(testStartTime));
Expand Down Expand Up @@ -463,7 +463,7 @@ public void testMultipartUploadWithEncryption(OzoneBucket bucket,
String keyName = "mpu_test_key_" + numParts;

// Initiate multipart upload
String uploadID = initiateMultipartUpload(bucket, keyName, STAND_ALONE,
String uploadID = initiateMultipartUpload(bucket, keyName, RATIS,
ONE);

// Upload Parts
Expand Down
42 changes: 21 additions & 21 deletions ...c/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneClientMultipartUploadWithFSO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
import java.util.UUID;

import static org.apache.hadoop.hdds.client.ReplicationFactor.ONE;
import static org.apache.hadoop.hdds.client.ReplicationType.STAND_ALONE;
import static org.apache.hadoop.hdds.client.ReplicationType.RATIS;
import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.NO_SUCH_MULTIPART_UPLOAD_ERROR;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
Expand Down Expand Up @@ -161,7 +161,7 @@ public void testInitiateMultipartUploadWithReplicationInformationSet() throws
volume.createBucket(bucketName);
OzoneBucket bucket = volume.getBucket(bucketName);
OmMultipartInfo multipartInfo = bucket.initiateMultipartUpload(keyName,
STAND_ALONE, ONE);
RATIS, ONE);

Assert.assertNotNull(multipartInfo);
String uploadID = multipartInfo.getUploadID();
Expand All @@ -173,7 +173,7 @@ public void testInitiateMultipartUploadWithReplicationInformationSet() throws
// Call initiate multipart upload for the same key again, this should
// generate a new uploadID.
multipartInfo = bucket.initiateMultipartUpload(keyName,
STAND_ALONE, ONE);
RATIS, ONE);

Assert.assertNotNull(multipartInfo);
Assert.assertEquals(volumeName, multipartInfo.getVolumeName());
Expand Down Expand Up @@ -227,7 +227,7 @@ public void testUploadPartWithNoOverride() throws IOException {
volume.createBucket(bucketName);
OzoneBucket bucket = volume.getBucket(bucketName);
OmMultipartInfo multipartInfo = bucket.initiateMultipartUpload(keyName,
STAND_ALONE, ONE);
RATIS, ONE);

Assert.assertNotNull(multipartInfo);
String uploadID = multipartInfo.getUploadID();
Expand Down Expand Up @@ -321,7 +321,7 @@ public void testMultipartUploadWithPartsLessThanMinSize() throws Exception {
OzoneBucket bucket = volume.getBucket(bucketName);

// Initiate multipart upload
String uploadID = initiateMultipartUpload(bucket, keyName, STAND_ALONE,
String uploadID = initiateMultipartUpload(bucket, keyName, RATIS,
ONE);

// Upload Parts
Expand Down Expand Up @@ -352,7 +352,7 @@ public void testMultipartUploadWithPartsMisMatchWithListSizeDifferent()
volume.createBucket(bucketName);
OzoneBucket bucket = volume.getBucket(bucketName);

String uploadID = initiateMultipartUpload(bucket, keyName, STAND_ALONE,
String uploadID = initiateMultipartUpload(bucket, keyName, RATIS,
ONE);

// We have not uploaded any parts, but passing some list it should throw
Expand All @@ -376,7 +376,7 @@ public void testMultipartUploadWithPartsMisMatchWithIncorrectPartName()
volume.createBucket(bucketName);
OzoneBucket bucket = volume.getBucket(bucketName);

String uploadID = initiateMultipartUpload(bucket, keyName, STAND_ALONE,
String uploadID = initiateMultipartUpload(bucket, keyName, RATIS,
ONE);

uploadPart(bucket, keyName, uploadID, 1, "data".getBytes(UTF_8));
Expand All @@ -400,7 +400,7 @@ public void testMultipartUploadWithMissingParts() throws Exception {
volume.createBucket(bucketName);
OzoneBucket bucket = volume.getBucket(bucketName);

String uploadID = initiateMultipartUpload(bucket, keyName, STAND_ALONE,
String uploadID = initiateMultipartUpload(bucket, keyName, RATIS,
ONE);

uploadPart(bucket, keyName, uploadID, 1, "data".getBytes(UTF_8));
Expand All @@ -426,7 +426,7 @@ public void testCommitPartAfterCompleteUpload() throws Exception {
OzoneBucket bucket = volume.getBucket(bucketName);

OmMultipartInfo omMultipartInfo = bucket.initiateMultipartUpload(keyName,
STAND_ALONE, ONE);
RATIS, ONE);

Assert.assertNotNull(omMultipartInfo.getUploadID());

Expand Down Expand Up @@ -505,7 +505,7 @@ public void testAbortUploadFailWithInProgressPartUpload() throws Exception {
OzoneBucket bucket = volume.getBucket(bucketName);

OmMultipartInfo omMultipartInfo = bucket.initiateMultipartUpload(keyName,
STAND_ALONE, ONE);
RATIS, ONE);

Assert.assertNotNull(omMultipartInfo.getUploadID());

Expand Down Expand Up @@ -540,7 +540,7 @@ public void testAbortUploadSuccessWithOutAnyParts() throws Exception {
volume.createBucket(bucketName);
OzoneBucket bucket = volume.getBucket(bucketName);

String uploadID = initiateMultipartUpload(bucket, keyName, STAND_ALONE,
String uploadID = initiateMultipartUpload(bucket, keyName, RATIS,
ONE);
bucket.abortMultipartUpload(keyName, uploadID);
}
Expand All @@ -563,7 +563,7 @@ public void testAbortUploadSuccessWithParts() throws Exception {
ozoneManager.getMetadataManager().getBucketTable().get(buckKey);
BucketLayout bucketLayout = buckInfo.getBucketLayout();

String uploadID = initiateMultipartUpload(bucket, keyName, STAND_ALONE,
String uploadID = initiateMultipartUpload(bucket, keyName, RATIS,
ONE);
String partName = uploadPart(bucket, keyName, uploadID, 1,
"data".getBytes(UTF_8));
Expand Down Expand Up @@ -603,7 +603,7 @@ public void testListMultipartUploadParts() throws Exception {
OzoneBucket bucket = volume.getBucket(bucketName);

Map<Integer, String> partsMap = new TreeMap<>();
String uploadID = initiateMultipartUpload(bucket, keyName, STAND_ALONE,
String uploadID = initiateMultipartUpload(bucket, keyName, RATIS,
ONE);
String partName1 = uploadPart(bucket, keyName, uploadID, 1,
generateData(OzoneConsts.OM_MULTIPART_MIN_SIZE, (byte)97));
Expand All @@ -620,7 +620,7 @@ public void testListMultipartUploadParts() throws Exception {
OzoneMultipartUploadPartListParts ozoneMultipartUploadPartListParts =
bucket.listParts(keyName, uploadID, 0, 3);

Assert.assertEquals(STAND_ALONE,
Assert.assertEquals(RATIS,
ozoneMultipartUploadPartListParts.getReplicationType());
Assert.assertEquals(3,
ozoneMultipartUploadPartListParts.getPartInfoList().size());
Expand Down Expand Up @@ -705,7 +705,7 @@ public void testListMultipartUploadPartsWithContinuation()
OzoneBucket bucket = volume.getBucket(bucketName);

Map<Integer, String> partsMap = new TreeMap<>();
String uploadID = initiateMultipartUpload(bucket, keyName, STAND_ALONE,
String uploadID = initiateMultipartUpload(bucket, keyName, RATIS,
ONE);
String partName1 = uploadPart(bucket, keyName, uploadID, 1,
generateData(OzoneConsts.OM_MULTIPART_MIN_SIZE, (byte)97));
Expand All @@ -722,7 +722,7 @@ public void testListMultipartUploadPartsWithContinuation()
OzoneMultipartUploadPartListParts ozoneMultipartUploadPartListParts =
bucket.listParts(keyName, uploadID, 0, 2);

Assert.assertEquals(STAND_ALONE,
Assert.assertEquals(RATIS,
ozoneMultipartUploadPartListParts.getReplicationType());

Assert.assertEquals(2,
Expand Down Expand Up @@ -808,7 +808,7 @@ public void testListPartsWithPartMarkerGreaterThanPartCount()
OzoneBucket bucket = volume.getBucket(bucketName);


String uploadID = initiateMultipartUpload(bucket, keyName, STAND_ALONE,
String uploadID = initiateMultipartUpload(bucket, keyName, RATIS,
ONE);
uploadPart(bucket, keyName, uploadID, 1,
generateData(OzoneConsts.OM_MULTIPART_MIN_SIZE, (byte)97));
Expand All @@ -821,7 +821,7 @@ public void testListPartsWithPartMarkerGreaterThanPartCount()

Assert.assertEquals(0,
ozoneMultipartUploadPartListParts.getPartInfoList().size());
Assert.assertEquals(STAND_ALONE,
Assert.assertEquals(RATIS,
ozoneMultipartUploadPartListParts.getReplicationType());

// As we don't have any parts with greater than partNumberMarker and list
Expand Down Expand Up @@ -866,11 +866,11 @@ public void testListMultipartUpload() throws Exception {
OzoneBucket bucket = volume.getBucket(bucketName);

// Initiate multipart upload
String uploadID1 = initiateMultipartUpload(bucket, key1, STAND_ALONE,
String uploadID1 = initiateMultipartUpload(bucket, key1, RATIS,
ONE);
String uploadID2 = initiateMultipartUpload(bucket, key2, STAND_ALONE,
String uploadID2 = initiateMultipartUpload(bucket, key2, RATIS,
ONE);
String uploadID3 = initiateMultipartUpload(bucket, key3, STAND_ALONE,
String uploadID3 = initiateMultipartUpload(bucket, key3, RATIS,
ONE);

// Upload Parts
Expand Down
Loading