From 71d6608570f357a649850e52e09ddca5b1c3a688 Mon Sep 17 00:00:00 2001 From: chungen0126 Date: Wed, 18 Dec 2024 21:51:13 +0800 Subject: [PATCH 1/2] fix TestQuotaRepairTask --- .../hadoop/ozone/om/service/TestQuotaRepairTask.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestQuotaRepairTask.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestQuotaRepairTask.java index 06b8beacb39a..6ea668f11e20 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestQuotaRepairTask.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestQuotaRepairTask.java @@ -24,6 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -38,6 +39,7 @@ import org.apache.hadoop.ozone.om.helpers.OmBucketInfo; import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs; +import org.apache.hadoop.ozone.om.ratis.OzoneManagerRatisServer; import org.apache.hadoop.ozone.om.request.OMRequestTestUtils; import org.apache.hadoop.ozone.om.request.key.TestOMKeyRequest; import org.apache.hadoop.ozone.om.request.volume.OMQuotaRepairRequest; @@ -57,16 +59,16 @@ public class TestQuotaRepairTask extends TestOMKeyRequest { @Test public void testQuotaRepair() throws Exception { - when(ozoneManager.isRatisEnabled()).thenReturn(false); + when(ozoneManager.isRatisEnabled()).thenReturn(true); OzoneManagerProtocolProtos.OMResponse respMock = mock(OzoneManagerProtocolProtos.OMResponse.class); when(respMock.getSuccess()).thenReturn(true); - OzoneManagerProtocolServerSideTranslatorPB serverMock = mock(OzoneManagerProtocolServerSideTranslatorPB.class); + OzoneManagerRatisServer ratisServerMock = mock(OzoneManagerRatisServer.class); AtomicReference ref = new AtomicReference<>(); doAnswer(invocation -> { - ref.set(invocation.getArgument(1, OzoneManagerProtocolProtos.OMRequest.class)); + ref.set(invocation.getArgument(0, OzoneManagerProtocolProtos.OMRequest.class)); return respMock; - }).when(serverMock).submitRequest(any(), any()); - when(ozoneManager.getOmServerProtocol()).thenReturn(serverMock); + }).when(ratisServerMock).submitRequest(any(), any(), anyLong()); + when(ozoneManager.getOmRatisServer()).thenReturn(ratisServerMock); OMRequestTestUtils.addVolumeAndBucketToDB(volumeName, bucketName, omMetadataManager, BucketLayout.OBJECT_STORE); From 5f082db94587f421bfe5737ec66d13c97872143f Mon Sep 17 00:00:00 2001 From: chungen0126 Date: Wed, 18 Dec 2024 21:57:32 +0800 Subject: [PATCH 2/2] fix TestQuotaRepairTask --- .../hadoop/ozone/om/service/TestQuotaRepairTask.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestQuotaRepairTask.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestQuotaRepairTask.java index 6ea668f11e20..18625fe5c440 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestQuotaRepairTask.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestQuotaRepairTask.java @@ -46,7 +46,6 @@ import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.om.response.volume.OMQuotaRepairResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos; -import org.apache.hadoop.ozone.protocolPB.OzoneManagerProtocolServerSideTranslatorPB; import org.apache.hadoop.util.Time; import org.junit.jupiter.api.Test; @@ -137,16 +136,16 @@ public void testQuotaRepair() throws Exception { @Test public void testQuotaRepairForOldVersionVolumeBucket() throws Exception { - when(ozoneManager.isRatisEnabled()).thenReturn(false); + when(ozoneManager.isRatisEnabled()).thenReturn(true); OzoneManagerProtocolProtos.OMResponse respMock = mock(OzoneManagerProtocolProtos.OMResponse.class); when(respMock.getSuccess()).thenReturn(true); - OzoneManagerProtocolServerSideTranslatorPB serverMock = mock(OzoneManagerProtocolServerSideTranslatorPB.class); + OzoneManagerRatisServer ratisServerMock = mock(OzoneManagerRatisServer.class); AtomicReference ref = new AtomicReference<>(); doAnswer(invocation -> { - ref.set(invocation.getArgument(1, OzoneManagerProtocolProtos.OMRequest.class)); + ref.set(invocation.getArgument(0, OzoneManagerProtocolProtos.OMRequest.class)); return respMock; - }).when(serverMock).submitRequest(any(), any()); - when(ozoneManager.getOmServerProtocol()).thenReturn(serverMock); + }).when(ratisServerMock).submitRequest(any(), any(), anyLong()); + when(ozoneManager.getOmRatisServer()).thenReturn(ratisServerMock); // add volume with -2 value OmVolumeArgs omVolumeArgs = OmVolumeArgs.newBuilder().setCreationTime(Time.now())