Refactor specifiedReadConsistency

Author: ivandika3

hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OmUtils.java

@@ -38,6 +38,7 @@
 import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_NODES_KEY;
 import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_PORT_DEFAULT;
 import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_SERVICE_IDS_KEY;
+import static org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.ReadConsistencyProto.READ_CONSISTENCY_UNSPECIFIED;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
@@ -1149,4 +1150,10 @@ public static void resolveOmHost(String omHost, int omPort)
       throw e;
     }
   }
+
+  public static boolean specifiedReadConsistency(OMRequest request) {
+    return request.hasReadConsistencyHint()
+        && request.getReadConsistencyHint().hasReadConsistency()
+        && request.getReadConsistencyHint().getReadConsistency() != READ_CONSISTENCY_UNSPECIFIED;
+  }
 }

hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerRatisServer.java

@@ -56,6 +56,7 @@
 import org.apache.hadoop.hdds.security.x509.certificate.client.CertificateClient;
 import org.apache.hadoop.hdds.tracing.TracingUtil;
 import org.apache.hadoop.ipc_.ProtobufRpcEngine.Server;
+import org.apache.hadoop.ozone.OmUtils;
 import org.apache.hadoop.ozone.om.OMConfigKeys;
 import org.apache.hadoop.ozone.om.OMPerformanceMetrics;
 import org.apache.hadoop.ozone.om.OzoneManager;
@@ -69,7 +70,6 @@
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRequest;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse;
-import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.ReadConsistencyProto;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.Status;
 import org.apache.ratis.conf.Parameters;
 import org.apache.ratis.conf.RaftProperties;
@@ -521,8 +521,7 @@ private RaftClientRequest createRaftRequestImpl(OMRequest omRequest, boolean isW
   }
 
   private static RaftClientRequest.Type getRaftReadRequestType(OMRequest omRequest) {
-    if (!omRequest.hasReadConsistencyHint() || !omRequest.getReadConsistencyHint().hasReadConsistency() ||
-        omRequest.getReadConsistencyHint().getReadConsistency() == ReadConsistencyProto.READ_CONSISTENCY_UNSPECIFIED) {
+    if (!OmUtils.specifiedReadConsistency(omRequest)) {
       // If there is no consistency hint, we simply follow the Raft server read option
       return RaftClientRequest.readRequestType();
     }

hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerProtocolServerSideTranslatorPB.java

@@ -20,7 +20,6 @@
 import static org.apache.hadoop.ozone.om.ratis.OzoneManagerRatisServer.RaftServerStatus.LEADER_AND_READY;
 import static org.apache.hadoop.ozone.om.ratis.OzoneManagerRatisServer.RaftServerStatus.NOT_LEADER;
 import static org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerRatisUtils.createErrorResponse;
-import static org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.ReadConsistencyProto.READ_CONSISTENCY_UNSPECIFIED;
 import static org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.Type.PrepareStatus;
 import static org.apache.hadoop.ozone.util.MetricUtil.captureLatencyNs;
 
@@ -229,8 +228,7 @@ private OMResponse submitReadRequestToOM(OMRequest request)
       return handler.handleReadRequest(request);
     }
 
-    if (!request.hasReadConsistencyHint() || !request.getReadConsistencyHint().hasReadConsistency() ||
-        request.getReadConsistencyHint().getReadConsistency() == READ_CONSISTENCY_UNSPECIFIED) {
+    if (!OmUtils.specifiedReadConsistency(request)) {
       return submitReadRequestToOmWithoutHint(request);
     } else {
       // If read consistency hint is specified, we should try to respect it although