(ozone) branch master updated: HDDS-11868. Enable OM Ratis in TestQuotaRepairTask (#7593)

[adoroszlai]

This is an automated email from the ASF dual-hosted git repository.

adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git


The following commit(s) were added to refs/heads/master by this push:
     new f5ff2f05a5 HDDS-11868. Enable OM Ratis in TestQuotaRepairTask (#7593)
f5ff2f05a5 is described below

commit f5ff2f05a5ddd3f74350e0e908b095816d4d947c
Author: Chung En Lee <wfps1...@gmail.com>
AuthorDate: Thu Dec 19 02:48:24 2024 +0800

    HDDS-11868. Enable OM Ratis in TestQuotaRepairTask (#7593)
---
 .../ozone/om/service/TestQuotaRepairTask.java      | 23 +++++++++++-----------
 1 file changed, 12 insertions(+), 11 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 06b8beacb3..18625fe5c4 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.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor
 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,13 +39,13 @@ import org.apache.hadoop.ozone.om.helpers.BucketLayout;
 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;
 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;
 
@@ -57,16 +58,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<OzoneManagerProtocolProtos.OMRequest> 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);
 
@@ -135,16 +136,16 @@ public class TestQuotaRepairTask extends TestOMKeyRequest 
{
 
   @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<OzoneManagerProtocolProtos.OMRequest> 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())


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@ozone.apache.org
For additional commands, e-mail: commits-h...@ozone.apache.org