diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeCreateResponse.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeCreateResponse.java index 9d8de4bbb202..075dad5ee03f 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeCreateResponse.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeCreateResponse.java @@ -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 @@ -31,13 +29,8 @@ 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; @@ -45,33 +38,12 @@ /** * 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() @@ -79,10 +51,10 @@ public void testAddToDBBatch() throws Exception { .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() @@ -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) @@ -125,6 +98,4 @@ void testAddToDBBatchNoOp() throws Exception { assertEquals(0, omMetadataManager.countRowsInTable( omMetadataManager.getVolumeTable())); } - - } diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeDeleteResponse.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeDeleteResponse.java index 70dd23a7b047..e4b938811370 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeDeleteResponse.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeDeleteResponse.java @@ -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 @@ -30,14 +28,9 @@ .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; @@ -45,33 +38,12 @@ /** * 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() @@ -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); @@ -107,7 +79,7 @@ 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))); @@ -115,7 +87,8 @@ public void testAddToDBBatch() throws Exception { @Test public void testAddToDBBatchNoOp() { - + OMMetadataManager omMetadataManager = getOmMetadataManager(); + BatchOperation batchOperation = getBatchOperation(); OMResponse omResponse = OMResponse.newBuilder() .setCmdType(OzoneManagerProtocolProtos.Type.DeleteVolume) .setStatus(OzoneManagerProtocolProtos.Status.VOLUME_NOT_FOUND) @@ -127,5 +100,4 @@ public void testAddToDBBatchNoOp() { omResponse); assertDoesNotThrow(() -> omVolumeDeleteResponse.checkAndUpdateDB(omMetadataManager, batchOperation)); } - } diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeResponse.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeResponse.java new file mode 100644 index 000000000000..7edbaedf2dd5 --- /dev/null +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeResponse.java @@ -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 + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * 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; + +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; + } +} diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeSetOwnerResponse.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeSetOwnerResponse.java index aa640067ca45..00da2029c1e6 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeSetOwnerResponse.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeSetOwnerResponse.java @@ -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 @@ -30,14 +28,9 @@ .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; @@ -45,34 +38,12 @@ /** * 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() @@ -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); @@ -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) @@ -155,6 +126,4 @@ void testAddToDBBatchNoOp() throws Exception { assertEquals(0, omMetadataManager.countRowsInTable( omMetadataManager.getVolumeTable())); } - - } diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeSetQuotaResponse.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeSetQuotaResponse.java index fbc8e3c944d9..c33e9d174a92 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeSetQuotaResponse.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeSetQuotaResponse.java @@ -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 @@ -29,14 +27,9 @@ import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos .OMResponse; 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; @@ -44,34 +37,12 @@ /** * This class tests OMVolumeCreateResponse. */ -public class TestOMVolumeSetQuotaResponse { - - @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 TestOMVolumeSetQuotaResponse extends TestOMVolumeResponse { @Test public void testAddToDBBatch() throws Exception { - + OMMetadataManager omMetadataManager = getOmMetadataManager(); + BatchOperation batchOperation = getBatchOperation(); String volumeName = UUID.randomUUID().toString(); String userName = "user1"; @@ -107,7 +78,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_NOT_FOUND) @@ -123,6 +95,4 @@ void testAddToDBBatchNoOp() throws Exception { assertEquals(0, omMetadataManager.countRowsInTable( omMetadataManager.getVolumeTable())); } - - }