neils-dev commented on a change in pull request #2601: URL: https://github.com/apache/ozone/pull/2601#discussion_r704822394
########## File path: hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/GrpcOzoneManagerServer.java ########## @@ -0,0 +1,97 @@ +/** + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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; + +import java.io.IOException; +import java.util.concurrent.TimeUnit; + +import org.apache.hadoop.hdds.conf.Config; +import org.apache.hadoop.hdds.conf.ConfigGroup; +import org.apache.hadoop.hdds.conf.ConfigTag; +import org.apache.hadoop.ozone.OzoneConsts; +import org.apache.hadoop.ozone.protocolPB.OzoneManagerProtocolServerSideTranslatorPB; +import io.grpc.Server; +import io.grpc.netty.NettyServerBuilder; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Separated network server for gRPC transport OzoneManagerService s3g->OM. + */ +public class GrpcOzoneManagerServer { + private static final Logger LOG = + LoggerFactory.getLogger(GrpcOzoneManagerServer.class); + + private Server server; + private final String host = "0.0.0.0"; Review comment: @kerneltime, thanks for reviewing and for your comments. Removing unnecessary host String variable, not used. Changes are in latest commit. ########## File path: hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/GrpcOzoneManagerServer.java ########## @@ -0,0 +1,97 @@ +/** + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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; + +import java.io.IOException; +import java.util.concurrent.TimeUnit; + +import org.apache.hadoop.hdds.conf.Config; +import org.apache.hadoop.hdds.conf.ConfigGroup; +import org.apache.hadoop.hdds.conf.ConfigTag; +import org.apache.hadoop.ozone.OzoneConsts; +import org.apache.hadoop.ozone.protocolPB.OzoneManagerProtocolServerSideTranslatorPB; +import io.grpc.Server; +import io.grpc.netty.NettyServerBuilder; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Separated network server for gRPC transport OzoneManagerService s3g->OM. + */ +public class GrpcOzoneManagerServer { + private static final Logger LOG = + LoggerFactory.getLogger(GrpcOzoneManagerServer.class); + + private Server server; + private final String host = "0.0.0.0"; + private int port = 8981; + + public GrpcOzoneManagerServer(GrpcOzoneManagerServerConfig omServerConfig, + OzoneManagerProtocolServerSideTranslatorPB + omTranslator) { + this.port = omServerConfig.getPort(); + init(omTranslator); + } + + public void init(OzoneManagerProtocolServerSideTranslatorPB omTranslator) { + NettyServerBuilder nettyServerBuilder = NettyServerBuilder.forPort(port) + .maxInboundMessageSize(OzoneConsts.OZONE_SCM_CHUNK_MAX_SIZE) + .addService(new OzoneManagerServiceGrpc(omTranslator)); + + server = nettyServerBuilder.build(); + } + + public void start() throws IOException { + server.start(); + LOG.info("{} is started using port {}", getClass().getSimpleName(), + server.getPort()); + port = server.getPort(); + } + + public void stop() { + try { + server.shutdown().awaitTermination(10L, TimeUnit.SECONDS); Review comment: Added info log to shutdown indicating server stopped; on failure raise exception and error logged as warn. ########## File path: hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/GrpcOzoneManagerServer.java ########## @@ -0,0 +1,97 @@ +/** + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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; + +import java.io.IOException; +import java.util.concurrent.TimeUnit; + +import org.apache.hadoop.hdds.conf.Config; +import org.apache.hadoop.hdds.conf.ConfigGroup; +import org.apache.hadoop.hdds.conf.ConfigTag; +import org.apache.hadoop.ozone.OzoneConsts; +import org.apache.hadoop.ozone.protocolPB.OzoneManagerProtocolServerSideTranslatorPB; +import io.grpc.Server; +import io.grpc.netty.NettyServerBuilder; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Separated network server for gRPC transport OzoneManagerService s3g->OM. + */ +public class GrpcOzoneManagerServer { + private static final Logger LOG = + LoggerFactory.getLogger(GrpcOzoneManagerServer.class); + + private Server server; + private final String host = "0.0.0.0"; + private int port = 8981; + + public GrpcOzoneManagerServer(GrpcOzoneManagerServerConfig omServerConfig, + OzoneManagerProtocolServerSideTranslatorPB + omTranslator) { + this.port = omServerConfig.getPort(); + init(omTranslator); + } + + public void init(OzoneManagerProtocolServerSideTranslatorPB omTranslator) { + NettyServerBuilder nettyServerBuilder = NettyServerBuilder.forPort(port) + .maxInboundMessageSize(OzoneConsts.OZONE_SCM_CHUNK_MAX_SIZE) + .addService(new OzoneManagerServiceGrpc(omTranslator)); + + server = nettyServerBuilder.build(); + } + + public void start() throws IOException { + server.start(); + LOG.info("{} is started using port {}", getClass().getSimpleName(), + server.getPort()); + port = server.getPort(); + } + + public void stop() { + try { + server.shutdown().awaitTermination(10L, TimeUnit.SECONDS); + } catch (InterruptedException ex) { + LOG.warn("{} couldn't be stopped gracefully", getClass().getSimpleName()); + } + } + + public int getPort() { + return port; } Review comment: cleaned up (typo backspace?). ########## File path: hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManagerServiceGrpc.java ########## @@ -0,0 +1,78 @@ +/** + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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; + +import com.google.protobuf.RpcController; +import com.google.protobuf.ServiceException; +import org.apache.hadoop.ipc.ClientId; +import org.apache.hadoop.ipc.RPC; +import org.apache.hadoop.ipc.Server; +import org.apache.hadoop.ozone.protocol.proto.OzoneManagerServiceGrpc.OzoneManagerServiceImplBase; +import org.apache.hadoop.ozone.protocolPB.OzoneManagerProtocolServerSideTranslatorPB; +import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.concurrent.atomic.AtomicInteger; + +/** + * Grpc Service for handling S3 gateway OzoneManagerProtocol client requests. + */ +public class OzoneManagerServiceGrpc extends OzoneManagerServiceImplBase { + private static final Logger LOG = + LoggerFactory.getLogger(OzoneManagerServiceGrpc.class); + /** + * RpcController is not used and hence is set to null. + */ + private static final RpcController NULL_RPC_CONTROLLER = null; + private OzoneManagerProtocolServerSideTranslatorPB omTranslator; + + OzoneManagerServiceGrpc( + OzoneManagerProtocolServerSideTranslatorPB omTranslator) { + this.omTranslator = omTranslator; + } + + @Override + public void submitRequest(org.apache.hadoop.ozone.protocol.proto. + OzoneManagerProtocolProtos. + OMRequest request, + io.grpc.stub.StreamObserver<org.apache. + hadoop.ozone.protocol.proto. + OzoneManagerProtocolProtos.OMResponse> + responseObserver) { + LOG.debug("GrpcOzoneManagerServer: OzoneManagerServiceImplBase " + Review comment: Added the request command type name to debug log for OMRequest to aid in debugging processed requests. Full displaying full OMRequest may be too verbose. ########## File path: hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManagerServiceGrpc.java ########## @@ -0,0 +1,78 @@ +/** + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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; + +import com.google.protobuf.RpcController; +import com.google.protobuf.ServiceException; +import org.apache.hadoop.ipc.ClientId; +import org.apache.hadoop.ipc.RPC; +import org.apache.hadoop.ipc.Server; +import org.apache.hadoop.ozone.protocol.proto.OzoneManagerServiceGrpc.OzoneManagerServiceImplBase; +import org.apache.hadoop.ozone.protocolPB.OzoneManagerProtocolServerSideTranslatorPB; +import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.concurrent.atomic.AtomicInteger; + +/** + * Grpc Service for handling S3 gateway OzoneManagerProtocol client requests. + */ +public class OzoneManagerServiceGrpc extends OzoneManagerServiceImplBase { + private static final Logger LOG = + LoggerFactory.getLogger(OzoneManagerServiceGrpc.class); + /** + * RpcController is not used and hence is set to null. + */ + private static final RpcController NULL_RPC_CONTROLLER = null; + private OzoneManagerProtocolServerSideTranslatorPB omTranslator; + + OzoneManagerServiceGrpc( + OzoneManagerProtocolServerSideTranslatorPB omTranslator) { + this.omTranslator = omTranslator; + } + + @Override + public void submitRequest(org.apache.hadoop.ozone.protocol.proto. + OzoneManagerProtocolProtos. + OMRequest request, + io.grpc.stub.StreamObserver<org.apache. + hadoop.ozone.protocol.proto. + OzoneManagerProtocolProtos.OMResponse> + responseObserver) { + LOG.debug("GrpcOzoneManagerServer: OzoneManagerServiceImplBase " + + "processing s3g client submit request"); + AtomicInteger callCount = new AtomicInteger(0); + try { + // need to look into handling the error path, trapping exception Review comment: Added handling exception for processing OMRequest. Error handling through returning an error OMResponse with success:false and message detailing exception. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
