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

Jump to bottom

HDDS-11480. Refactor OM volume response tests #7265

Merged
merged 2 commits into from
Oct 3, 2024
Merged

HDDS-11480. Refactor OM volume response tests #7265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
318c1f3
Extract bootstrap methods to a superclass and let those tests extends…
harryteng9527 Oct 2, 2024
9fa2f97
Add license header and resolve checkstyle
harryteng9527 Oct 3, 2024
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
49 changes: 10 additions & 39 deletions .../src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeCreateResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,8 @@

package org.apache.hadoop.ozone.om.response.volume;

import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.ozone.om.OMConfigKeys;
import org.apache.hadoop.hdds.utils.db.BatchOperation;
import org.apache.hadoop.ozone.om.OMMetadataManager;
import org.apache.hadoop.ozone.om.OmMetadataManagerImpl;
import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos
Expand All @@ -31,58 +29,32 @@
import org.apache.hadoop.ozone.storage.proto.
OzoneManagerStorageProtos.PersistedUserVolumeInfo;
import org.apache.hadoop.util.Time;
import org.apache.hadoop.hdds.utils.db.BatchOperation;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;

import java.nio.file.Path;
import java.util.UUID;

import static org.junit.jupiter.api.Assertions.assertEquals;

/**
* This class tests OMVolumeCreateResponse.
*/
public class TestOMVolumeCreateResponse {

@TempDir
private Path folder;

private OMMetadataManager omMetadataManager;
private BatchOperation batchOperation;

@BeforeEach
public void setup() throws Exception {
OzoneConfiguration ozoneConfiguration = new OzoneConfiguration();
ozoneConfiguration.set(OMConfigKeys.OZONE_OM_DB_DIRS,
folder.toAbsolutePath().toString());
omMetadataManager = new OmMetadataManagerImpl(ozoneConfiguration, null);
batchOperation = omMetadataManager.getStore().initBatchOperation();
}

@AfterEach
public void tearDown() {
if (batchOperation != null) {
batchOperation.close();
}
}
public class TestOMVolumeCreateResponse extends TestOMVolumeResponse {

@Test
public void testAddToDBBatch() throws Exception {

OMMetadataManager omMetadataManager = getOmMetadataManager();
BatchOperation batchOperation = getBatchOperation();
String volumeName = UUID.randomUUID().toString();
String userName = "user1";
PersistedUserVolumeInfo volumeList = PersistedUserVolumeInfo.newBuilder()
.setObjectID(1).setUpdateID(1)
.addVolumeNames(volumeName).build();

OMResponse omResponse = OMResponse.newBuilder()
.setCmdType(OzoneManagerProtocolProtos.Type.CreateVolume)
.setStatus(OzoneManagerProtocolProtos.Status.OK)
.setSuccess(true)
.setCreateVolumeResponse(CreateVolumeResponse.getDefaultInstance())
.setCmdType(OzoneManagerProtocolProtos.Type.CreateVolume)
.setStatus(OzoneManagerProtocolProtos.Status.OK)
.setSuccess(true)
.setCreateVolumeResponse(CreateVolumeResponse.getDefaultInstance())
.build();

OmVolumeArgs omVolumeArgs = OmVolumeArgs.newBuilder()
Expand All @@ -109,7 +81,8 @@ public void testAddToDBBatch() throws Exception {

@Test
void testAddToDBBatchNoOp() throws Exception {

OMMetadataManager omMetadataManager = getOmMetadataManager();
BatchOperation batchOperation = getBatchOperation();
OMResponse omResponse = OMResponse.newBuilder()
.setCmdType(OzoneManagerProtocolProtos.Type.CreateVolume)
.setStatus(OzoneManagerProtocolProtos.Status.VOLUME_ALREADY_EXISTS)
Expand All @@ -125,6 +98,4 @@ void testAddToDBBatchNoOp() throws Exception {
assertEquals(0, omMetadataManager.countRowsInTable(
omMetadataManager.getVolumeTable()));
}


}
44 changes: 8 additions & 36 deletions .../src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeDeleteResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,8 @@

package org.apache.hadoop.ozone.om.response.volume;

import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.ozone.om.OMConfigKeys;
import org.apache.hadoop.hdds.utils.db.BatchOperation;
import org.apache.hadoop.ozone.om.OMMetadataManager;
import org.apache.hadoop.ozone.om.OmMetadataManagerImpl;
import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos
Expand All @@ -30,48 +28,22 @@
.OMResponse;
import org.apache.hadoop.ozone.storage.proto.OzoneManagerStorageProtos.PersistedUserVolumeInfo;
import org.apache.hadoop.util.Time;
import org.apache.hadoop.hdds.utils.db.BatchOperation;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;

import java.util.UUID;
import java.nio.file.Path;

import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertNull;

/**
* This class tests OMVolumeCreateResponse.
*/
public class TestOMVolumeDeleteResponse {

@TempDir
private Path folder;

private OMMetadataManager omMetadataManager;
private BatchOperation batchOperation;

@BeforeEach
public void setup() throws Exception {
OzoneConfiguration ozoneConfiguration = new OzoneConfiguration();
ozoneConfiguration.set(OMConfigKeys.OZONE_OM_DB_DIRS,
folder.toAbsolutePath().toString());
omMetadataManager = new OmMetadataManagerImpl(ozoneConfiguration, null);
batchOperation = omMetadataManager.getStore().initBatchOperation();
}

@AfterEach
public void tearDown() {
if (batchOperation != null) {
batchOperation.close();
}
}
public class TestOMVolumeDeleteResponse extends TestOMVolumeResponse {

@Test
public void testAddToDBBatch() throws Exception {

OMMetadataManager omMetadataManager = getOmMetadataManager();
BatchOperation batchOperation = getBatchOperation();
String volumeName = UUID.randomUUID().toString();
String userName = "user1";
PersistedUserVolumeInfo volumeList = PersistedUserVolumeInfo.newBuilder()
Expand All @@ -95,7 +67,7 @@ public void testAddToDBBatch() throws Exception {
// As we are deleting updated volume list should be empty.
PersistedUserVolumeInfo updatedVolumeList =
PersistedUserVolumeInfo.newBuilder()
.setObjectID(1).setUpdateID(1).build();
.setObjectID(1).setUpdateID(1).build();
OMVolumeDeleteResponse omVolumeDeleteResponse =
new OMVolumeDeleteResponse(omResponse, volumeName, userName,
updatedVolumeList);
Expand All @@ -107,15 +79,16 @@ public void testAddToDBBatch() throws Exception {
omMetadataManager.getStore().commitBatchOperation(batchOperation);

assertNull(omMetadataManager.getVolumeTable().get(
omMetadataManager.getVolumeKey(volumeName)));
omMetadataManager.getVolumeKey(volumeName)));

assertNull(omMetadataManager.getUserTable().get(
omMetadataManager.getUserKey(userName)));
}

@Test
public void testAddToDBBatchNoOp() {

OMMetadataManager omMetadataManager = getOmMetadataManager();
BatchOperation batchOperation = getBatchOperation();
OMResponse omResponse = OMResponse.newBuilder()
.setCmdType(OzoneManagerProtocolProtos.Type.DeleteVolume)
.setStatus(OzoneManagerProtocolProtos.Status.VOLUME_NOT_FOUND)
Expand All @@ -127,5 +100,4 @@ public void testAddToDBBatchNoOp() {
omResponse);
assertDoesNotThrow(() -> omVolumeDeleteResponse.checkAndUpdateDB(omMetadataManager, batchOperation));
}

}
64 changes: 64 additions & 0 deletions ...anager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.apache.hadoop.ozone.om.response.volume;
ivandika3 marked this conversation as resolved.
Show resolved Hide resolved

import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.utils.db.BatchOperation;
import org.apache.hadoop.ozone.om.OMConfigKeys;
import org.apache.hadoop.ozone.om.OMMetadataManager;
import org.apache.hadoop.ozone.om.OmMetadataManagerImpl;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.io.TempDir;

import java.nio.file.Path;

/**
* Base test class for OM volume response.
*/
public class TestOMVolumeResponse {
@TempDir
private Path folder;

private OMMetadataManager omMetadataManager;
private BatchOperation batchOperation;

@BeforeEach
public void setup() throws Exception {
OzoneConfiguration ozoneConfiguration = new OzoneConfiguration();
ozoneConfiguration.set(OMConfigKeys.OZONE_OM_DB_DIRS,
folder.toAbsolutePath().toString());
omMetadataManager = new OmMetadataManagerImpl(ozoneConfiguration, null);
batchOperation = omMetadataManager.getStore().initBatchOperation();
}

@AfterEach
public void tearDown() {
if (batchOperation != null) {
batchOperation.close();
}
}

protected OMMetadataManager getOmMetadataManager() {
return omMetadataManager;
}
protected BatchOperation getBatchOperation() {
return batchOperation;
}
}
57 changes: 13 additions & 44 deletions ...rc/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeSetOwnerResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,8 @@

package org.apache.hadoop.ozone.om.response.volume;

import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.ozone.om.OMConfigKeys;
import org.apache.hadoop.hdds.utils.db.BatchOperation;
import org.apache.hadoop.ozone.om.OMMetadataManager;
import org.apache.hadoop.ozone.om.OmMetadataManagerImpl;
import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos
Expand All @@ -30,49 +28,22 @@
.OMResponse;
import org.apache.hadoop.ozone.storage.proto.OzoneManagerStorageProtos.PersistedUserVolumeInfo;
import org.apache.hadoop.util.Time;
import org.apache.hadoop.hdds.utils.db.BatchOperation;
import org.apache.hadoop.hdds.utils.db.Table;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;

import java.nio.file.Path;
import java.util.UUID;

import static org.junit.jupiter.api.Assertions.assertEquals;

/**
* This class tests OMVolumeCreateResponse.
*/
public class TestOMVolumeSetOwnerResponse {

@TempDir
private Path folder;

private OMMetadataManager omMetadataManager;
private BatchOperation batchOperation;

@BeforeEach
public void setup() throws Exception {
OzoneConfiguration ozoneConfiguration = new OzoneConfiguration();
ozoneConfiguration.set(OMConfigKeys.OZONE_OM_DB_DIRS,
folder.toAbsolutePath().toString());
omMetadataManager = new OmMetadataManagerImpl(ozoneConfiguration, null);
batchOperation = omMetadataManager.getStore().initBatchOperation();
}

@AfterEach
public void tearDown() {
if (batchOperation != null) {
batchOperation.close();
}
}

public class TestOMVolumeSetOwnerResponse extends TestOMVolumeResponse {

@Test
public void testAddToDBBatch() throws Exception {

OMMetadataManager omMetadataManager = getOmMetadataManager();
BatchOperation batchOperation = getBatchOperation();
String volumeName = UUID.randomUUID().toString();
String oldOwner = "user1";
PersistedUserVolumeInfo volumeList = PersistedUserVolumeInfo.newBuilder()
Expand All @@ -94,25 +65,24 @@ public void testAddToDBBatch() throws Exception {
new OMVolumeCreateResponse(omResponse, omVolumeArgs, volumeList);



String newOwner = "user2";
PersistedUserVolumeInfo newOwnerVolumeList =
PersistedUserVolumeInfo.newBuilder()
.setObjectID(1)
.setUpdateID(1)
.addVolumeNames(volumeName).build();
.setObjectID(1)
.setUpdateID(1)
.addVolumeNames(volumeName).build();
PersistedUserVolumeInfo oldOwnerVolumeList =
PersistedUserVolumeInfo.newBuilder()
.setObjectID(2)
.setUpdateID(2)
.build();
.setObjectID(2)
.setUpdateID(2)
.build();
OmVolumeArgs newOwnerVolumeArgs = OmVolumeArgs.newBuilder()
.setOwnerName(newOwner).setAdminName(newOwner)
.setVolume(volumeName).setCreationTime(omVolumeArgs.getCreationTime())
.build();

OMVolumeSetOwnerResponse omVolumeSetOwnerResponse =
new OMVolumeSetOwnerResponse(omResponse, oldOwner, oldOwnerVolumeList,
new OMVolumeSetOwnerResponse(omResponse, oldOwner, oldOwnerVolumeList,
newOwnerVolumeList, newOwnerVolumeArgs);

omVolumeCreateResponse.addToDBBatch(omMetadataManager, batchOperation);
Expand All @@ -139,7 +109,8 @@ public void testAddToDBBatch() throws Exception {

@Test
void testAddToDBBatchNoOp() throws Exception {

OMMetadataManager omMetadataManager = getOmMetadataManager();
BatchOperation batchOperation = getBatchOperation();
OMResponse omResponse = OMResponse.newBuilder()
.setCmdType(OzoneManagerProtocolProtos.Type.SetVolumeProperty)
.setStatus(OzoneManagerProtocolProtos.Status.VOLUME_NOT_FOUND)
Expand All @@ -155,6 +126,4 @@ void testAddToDBBatchNoOp() throws Exception {
assertEquals(0, omMetadataManager.countRowsInTable(
omMetadataManager.getVolumeTable()));
}


}
Loading