bharatviswa504 commented on a change in pull request #2491:
URL: https://github.com/apache/ozone/pull/2491#discussion_r696421176
##########
File path:
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
##########
@@ -1373,6 +1411,64 @@ public void restart() throws IOException {
omState = State.RUNNING;
}
+ private void checkConfigBeforeBootstrap() throws IOException {
+ List<OMNodeDetails> omsWihtoutNewConfig = new ArrayList<>();
+ for (Map.Entry<String, OMNodeDetails> entry : peerNodesMap.entrySet()) {
+ String remoteNodeId = entry.getKey();
+ OMNodeDetails remoteNodeDetails = entry.getValue();
+ try (OMMetadataProtocolClientSideImpl omMetadataProtocolClient =
+ new OMMetadataProtocolClientSideImpl(configuration,
+ getRemoteUser(), remoteNodeId,
+ remoteNodeDetails.getRpcAddress())) {
+
+ OMMetadata remoteOMMetadata = omMetadataProtocolClient.getOMMetadata();
+ boolean exists = checkOMexistsInRemoteOMConfig(remoteOMMetadata);
+ if (!exists) {
+ LOG.error("Remote OM " + remoteNodeId + ":" +
+ remoteNodeDetails.getHostAddress() + " does not have the " +
+ "bootstrapping OM(" + getOMNodeId() + ") information on " +
+ "reloading configs.");
+ omsWihtoutNewConfig.add(remoteNodeDetails);
+ }
+ } catch (IOException ioe) {
+ LOG.error("Remote OM config check before bootstrap failed on OM {}",
+ remoteNodeId, ioe);
+ omsWihtoutNewConfig.add(remoteNodeDetails);
+ }
+ }
+ if (!omsWihtoutNewConfig.isEmpty()) {
+ StringBuilder errorMsgBuilder = new StringBuilder();
+ errorMsgBuilder.append("OM(s) [")
+ .append(omsWihtoutNewConfig.get(0).getOMPrintInfo());
+ for (int i = 1; i < omsWihtoutNewConfig.size(); i++) {
+ errorMsgBuilder.append(",")
+ .append(omsWihtoutNewConfig.get(i).getOMPrintInfo());
+ }
+ errorMsgBuilder.append("] do not have the bootstrapping OM information."
+
+ " Update their ozone-site.xml with new node details before " +
+ "proceeding.");
+ shutdown(errorMsgBuilder.toString());
+ }
+ }
+
+ /**
+ * Check whether current OM information exists in the remote OM's reloaded
+ * configs.
+ */
+ private boolean checkOMexistsInRemoteOMConfig(OMMetadata remoteOMMetadata) {
+ List<OMNodeDetails> omNodesInNewConf = remoteOMMetadata
+ .getOmNodesInNewConf();
+ for (OMNodeDetails omNodeInRemoteOM : omNodesInNewConf) {
Review comment:
If we need only reloaded conf, then why do we need to pass inMemory conf
also?
As we trust that on new node we believe it has old OM confs, as we use that
and contact old OMs.
##########
File path:
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OMMetadataProtocolServerSideImpl.java
##########
@@ -0,0 +1,66 @@
+/*
+ * 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.protocolPB;
+
+import com.google.protobuf.RpcController;
+import com.google.protobuf.ServiceException;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.hadoop.ozone.om.OzoneManager;
+import org.apache.hadoop.ozone.om.helpers.OMNodeDetails;
+import org.apache.hadoop.ozone.om.protocolPB.OMMetadataProtocolPB;
+import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerMetadataProtocolProtos.OMMetadataInfoRequest;
+import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerMetadataProtocolProtos.OMMetadataInfoResponse;
+import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerMetadataProtocolProtos.OMNodeInfo;
+
+/**
+ * This class is the server-side translator that forwards requests received on
+ * {@link OMMetadataProtocolPB} to the OMMetadata server implementation.
+ */
+public class OMMetadataProtocolServerSideImpl implements OMMetadataProtocolPB {
+
+ private final OzoneManager ozoneManager;
+
+ public OMMetadataProtocolServerSideImpl(OzoneManager om) {
+ this.ozoneManager = om;
+ }
+
+ @Override
+ public OMMetadataInfoResponse getOMMetadataInfo(RpcController controller,
+ OMMetadataInfoRequest request) throws ServiceException {
+
+ List<OMNodeDetails> oldOMNodesList = ozoneManager.getAllOMNodesInMemory();
+ List<OMNodeDetails> newOMNodesList = ozoneManager.getAllOMNodesInNewConf();
+
+ List<OMNodeInfo> omNodesInMemory = new ArrayList<>(oldOMNodesList.size());
+ for (OMNodeDetails omNodeDetails : oldOMNodesList) {
+ omNodesInMemory.add(omNodeDetails.getProtobuf());
+ }
+
+ List<OMNodeInfo> omNodesInNewConf =
+ new ArrayList<>(newOMNodesList.size());
+ for (OMNodeDetails omNodeDetails : newOMNodesList) {
+ omNodesInNewConf.add(omNodeDetails.getProtobuf());
Review comment:
Do we need to have not null check here?
Lets say node id is present, but rpc addr for specific nodeid not found we
return null.
And when we add null to proto, we get NPE
##########
File path:
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
##########
@@ -1373,6 +1411,64 @@ public void restart() throws IOException {
omState = State.RUNNING;
}
+ private void checkConfigBeforeBootstrap() throws IOException {
+ List<OMNodeDetails> omsWihtoutNewConfig = new ArrayList<>();
+ for (Map.Entry<String, OMNodeDetails> entry : peerNodesMap.entrySet()) {
+ String remoteNodeId = entry.getKey();
+ OMNodeDetails remoteNodeDetails = entry.getValue();
+ try (OMMetadataProtocolClientSideImpl omMetadataProtocolClient =
+ new OMMetadataProtocolClientSideImpl(configuration,
+ getRemoteUser(), remoteNodeId,
+ remoteNodeDetails.getRpcAddress())) {
+
+ OMMetadata remoteOMMetadata = omMetadataProtocolClient.getOMMetadata();
+ boolean exists = checkOMexistsInRemoteOMConfig(remoteOMMetadata);
+ if (!exists) {
+ LOG.error("Remote OM " + remoteNodeId + ":" +
+ remoteNodeDetails.getHostAddress() + " does not have the " +
+ "bootstrapping OM(" + getOMNodeId() + ") information on " +
+ "reloading configs.");
+ omsWihtoutNewConfig.add(remoteNodeDetails);
+ }
+ } catch (IOException ioe) {
+ LOG.error("Remote OM config check before bootstrap failed on OM {}",
+ remoteNodeId, ioe);
+ omsWihtoutNewConfig.add(remoteNodeDetails);
+ }
+ }
+ if (!omsWihtoutNewConfig.isEmpty()) {
+ StringBuilder errorMsgBuilder = new StringBuilder();
+ errorMsgBuilder.append("OM(s) [")
+ .append(omsWihtoutNewConfig.get(0).getOMPrintInfo());
+ for (int i = 1; i < omsWihtoutNewConfig.size(); i++) {
+ errorMsgBuilder.append(",")
+ .append(omsWihtoutNewConfig.get(i).getOMPrintInfo());
+ }
+ errorMsgBuilder.append("] do not have the bootstrapping OM information."
+
+ " Update their ozone-site.xml with new node details before " +
+ "proceeding.");
+ shutdown(errorMsgBuilder.toString());
+ }
+ }
+
+ /**
+ * Check whether current OM information exists in the remote OM's reloaded
+ * configs.
+ */
+ private boolean checkOMexistsInRemoteOMConfig(OMMetadata remoteOMMetadata) {
+ List<OMNodeDetails> omNodesInNewConf = remoteOMMetadata
Review comment:
not null check missing here, as in exception case. we return null
```
catch (ServiceException e) {
LOG.error("Failed to retrieve metadata information of OM {}", omNodeID,
e);
}
return null;
```
##########
File path:
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
##########
@@ -1373,6 +1411,64 @@ public void restart() throws IOException {
omState = State.RUNNING;
}
+ private void checkConfigBeforeBootstrap() throws IOException {
+ List<OMNodeDetails> omsWihtoutNewConfig = new ArrayList<>();
+ for (Map.Entry<String, OMNodeDetails> entry : peerNodesMap.entrySet()) {
+ String remoteNodeId = entry.getKey();
+ OMNodeDetails remoteNodeDetails = entry.getValue();
+ try (OMMetadataProtocolClientSideImpl omMetadataProtocolClient =
+ new OMMetadataProtocolClientSideImpl(configuration,
+ getRemoteUser(), remoteNodeId,
+ remoteNodeDetails.getRpcAddress())) {
+
+ OMMetadata remoteOMMetadata = omMetadataProtocolClient.getOMMetadata();
+ boolean exists = checkOMexistsInRemoteOMConfig(remoteOMMetadata);
+ if (!exists) {
+ LOG.error("Remote OM " + remoteNodeId + ":" +
+ remoteNodeDetails.getHostAddress() + " does not have the " +
+ "bootstrapping OM(" + getOMNodeId() + ") information on " +
+ "reloading configs.");
+ omsWihtoutNewConfig.add(remoteNodeDetails);
+ }
+ } catch (IOException ioe) {
+ LOG.error("Remote OM config check before bootstrap failed on OM {}",
+ remoteNodeId, ioe);
+ omsWihtoutNewConfig.add(remoteNodeDetails);
+ }
+ }
+ if (!omsWihtoutNewConfig.isEmpty()) {
+ StringBuilder errorMsgBuilder = new StringBuilder();
+ errorMsgBuilder.append("OM(s) [")
+ .append(omsWihtoutNewConfig.get(0).getOMPrintInfo());
+ for (int i = 1; i < omsWihtoutNewConfig.size(); i++) {
+ errorMsgBuilder.append(",")
+ .append(omsWihtoutNewConfig.get(i).getOMPrintInfo());
+ }
+ errorMsgBuilder.append("] do not have the bootstrapping OM information."
+
+ " Update their ozone-site.xml with new node details before " +
+ "proceeding.");
+ shutdown(errorMsgBuilder.toString());
+ }
+ }
+
+ /**
+ * Check whether current OM information exists in the remote OM's reloaded
+ * configs.
+ */
+ private boolean checkOMexistsInRemoteOMConfig(OMMetadata remoteOMMetadata) {
+ List<OMNodeDetails> omNodesInNewConf = remoteOMMetadata
+ .getOmNodesInNewConf();
+ for (OMNodeDetails omNodeInRemoteOM : omNodesInNewConf) {
Review comment:
And also to make it simple just passing new OM host node id, and
returning that from existing OM's can also be done
--
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]
