-
Notifications
You must be signed in to change notification settings - Fork 594
HDDS-12549. refactor ratis request to common place #8059
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.
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
Changes from 4 commits
8a27f93
bf88b7e
3aa52b1
a1774c3
cb7d2cc
31800dd
6e05ce5
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| /* | ||
| * 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.execution; | ||
|
|
||
| import static org.apache.hadoop.ozone.util.MetricUtil.captureLatencyNs; | ||
|
|
||
| import com.google.protobuf.ServiceException; | ||
| import java.io.IOException; | ||
| import org.apache.hadoop.ozone.om.OMPerformanceMetrics; | ||
| import org.apache.hadoop.ozone.om.OzoneManager; | ||
| import org.apache.hadoop.ozone.om.helpers.OMAuditLogger; | ||
| import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerRatisUtils; | ||
| import org.apache.hadoop.ozone.om.request.OMClientRequest; | ||
| import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRequest; | ||
| import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; | ||
| import org.apache.ratis.protocol.ClientId; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| /** | ||
| * entry for execution flow for write request. | ||
| */ | ||
| public class OMExecutionFlow { | ||
| private static final Logger LOG = LoggerFactory.getLogger(OMExecutionFlow.class); | ||
|
|
||
| private final OzoneManager ozoneManager; | ||
| private final OMPerformanceMetrics perfMetrics; | ||
|
|
||
| public OMExecutionFlow(OzoneManager om) { | ||
| this.ozoneManager = om; | ||
| this.perfMetrics = ozoneManager.getPerfMetrics(); | ||
| } | ||
|
|
||
| /** | ||
| * External request handling. | ||
| * | ||
| * @param omRequest the request | ||
| * @return OMResponse the response of execution | ||
| * @throws ServiceException the exception on execution | ||
| */ | ||
| public OMResponse submit(OMRequest omRequest) throws ServiceException { | ||
| // TODO: currently have only execution after ratis submission, but with new flow can have switch later | ||
| return submitExecutionToRatis(omRequest); | ||
| } | ||
|
|
||
| /** | ||
| * Internal request to be directly executed. | ||
| * | ||
| * @param omRequest the request | ||
| * @param clientId clientId of request | ||
| * @param callId callId of request | ||
| * @return the response of execution | ||
| * @throws ServiceException the exception on execution | ||
| */ | ||
| public OMResponse submitInternal(OMRequest omRequest, ClientId clientId, long callId) throws ServiceException { | ||
| return ozoneManager.getOmRatisServer().submitRequest(omRequest, clientId, callId); | ||
| } | ||
|
|
||
| private OMResponse submitExecutionToRatis(OMRequest request) throws ServiceException { | ||
| // 1. create client request and preExecute | ||
| OMClientRequest omClientRequest = null; | ||
| final OMRequest requestToSubmit; | ||
| try { | ||
| omClientRequest = OzoneManagerRatisUtils.createClientRequest(request, ozoneManager); | ||
| assert (omClientRequest != null); | ||
| final OMClientRequest finalOmClientRequest = omClientRequest; | ||
| requestToSubmit = captureLatencyNs(perfMetrics.getPreExecuteLatencyNs(), | ||
| () -> finalOmClientRequest.preExecute(ozoneManager)); | ||
| } catch (IOException ex) { | ||
| if (omClientRequest != null) { | ||
| OMAuditLogger.log(omClientRequest.getAuditBuilder()); | ||
| omClientRequest.handleRequestFailure(ozoneManager); | ||
| } | ||
| return OzoneManagerRatisUtils.createErrorResponse(request, ex); | ||
| } | ||
|
|
||
| // 2. submit request to ratis | ||
| OMResponse response = ozoneManager.getOmRatisServer().submitRequest(requestToSubmit); | ||
| if (!response.getSuccess()) { | ||
| omClientRequest.handleRequestFailure(ozoneManager); | ||
| } | ||
| return response; | ||
| } | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| /* | ||
| * 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. | ||
| */ | ||
|
|
||
| /** | ||
| * This package contains classes for the OM execution implementation. | ||
| */ | ||
| package org.apache.hadoop.ozone.om.execution; |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -515,6 +515,22 @@ public static GrpcTlsConfig createServerTlsConfig(SecurityConfig conf, | |
|
|
||
| public static OzoneManagerProtocolProtos.OMResponse submitRequest( | ||
| OzoneManager om, OMRequest omRequest, ClientId clientId, long callId) throws ServiceException { | ||
| return om.getOmRatisServer().submitRequest(omRequest, clientId, callId); | ||
| return om.getOmExecutionFlow().submitInternal(omRequest, clientId, callId); | ||
|
||
| } | ||
|
|
||
| public static OzoneManagerProtocolProtos.OMResponse createErrorResponse( | ||
| OMRequest omRequest, IOException exception) { | ||
| // Added all write command types here, because in future if any of the | ||
| // preExecute is changed to return IOException, we can return the error | ||
| // OMResponse to the client. | ||
| OzoneManagerProtocolProtos.OMResponse.Builder omResponse = OzoneManagerProtocolProtos.OMResponse.newBuilder() | ||
| .setStatus(OzoneManagerRatisUtils.exceptionToResponseStatus(exception)) | ||
| .setCmdType(omRequest.getCmdType()) | ||
| .setTraceID(omRequest.getTraceID()) | ||
| .setSuccess(false); | ||
| if (exception.getMessage() != null) { | ||
| omResponse.setMessage(exception.getMessage()); | ||
| } | ||
| return omResponse.build(); | ||
| } | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -38,6 +38,7 @@ | |
| import org.apache.hadoop.ozone.om.OmMetadataManagerImpl; | ||
| import org.apache.hadoop.ozone.om.OzoneManager; | ||
| import org.apache.hadoop.ozone.om.exceptions.OMException; | ||
| import org.apache.hadoop.ozone.om.execution.OMExecutionFlow; | ||
| import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs; | ||
| import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerRatisUtils; | ||
| import org.apache.hadoop.ozone.om.request.OMRequestTestUtils; | ||
|
|
@@ -109,6 +110,8 @@ public void testUnknownRequestHandling() | |
| omMetadataManager = new OmMetadataManagerImpl(ozoneConfiguration, | ||
| ozoneManager); | ||
| when(ozoneManager.getMetadataManager()).thenReturn(omMetadataManager); | ||
| OMExecutionFlow omGateway = new OMExecutionFlow(ozoneManager); | ||
|
||
| when(ozoneManager.getOmExecutionFlow()).thenReturn(omGateway); | ||
| when(ozoneManager.getConfiguration()).thenReturn(ozoneConfiguration); | ||
| final OmConfig omConfig = ozoneConfiguration.getObject(OmConfig.class); | ||
| when(ozoneManager.getConfig()).thenReturn(omConfig); | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
gateway -> execution flow