HDDS-12549. refactor ratis request to common place #8059
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| /* | ||
| * 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 OMGateway { | ||
|
sumitagrawl marked this conversation as resolved.
Outdated
|
||
| private static final Logger LOG = LoggerFactory.getLogger(OMGateway.class); | ||
|
|
||
| private final OzoneManager ozoneManager; | ||
| private final OMPerformanceMetrics perfMetrics; | ||
|
|
||
| public OMGateway(OzoneManager om) throws IOException { | ||
|
sumitagrawl marked this conversation as resolved.
Outdated
|
||
| this.ozoneManager = om; | ||
| this.perfMetrics = ozoneManager.getPerfMetrics(); | ||
| } | ||
|
|
||
| public void start() { | ||
| // TODO: with pre-ratis execution flow, this is required to manage flow | ||
|
Contributor
There was a problem hiding this comment. Could you give some example services that need to be started?
Contributor
Author
There was a problem hiding this comment. In new flow, request executor will start set of threads. so to start and stop, this is required, such as request batching thread before submit to ratis.
Contributor
There was a problem hiding this comment. Let's add the
Contributor
Author
There was a problem hiding this comment. Updated... removed start/stop. |
||
| } | ||
|
|
||
| public void stop() { | ||
| } | ||
|
|
||
| /** | ||
| * 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; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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.getOmGateway().submitInternal(omRequest, clientId, callId); | ||
|
Contributor
There was a problem hiding this comment. We have
Contributor
Author
There was a problem hiding this comment.
OM keeps track of OmRatisServer as resource, instead of keeping member variable with ozoneManager.getOmRatisServer() value, I think using getter is better. Please share your opinion over this if any thing to change... |
||
| } | ||
|
|
||
| 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(); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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