bharatviswa504 commented on a change in pull request #2822:
URL: https://github.com/apache/ozone/pull/2822#discussion_r750739453
##########
File path:
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
##########
@@ -198,17 +198,7 @@
import static org.apache.hadoop.hdds.utils.HAUtils.getScmInfo;
import static org.apache.hadoop.ozone.OmUtils.MAX_TRXN_ID;
import static org.apache.hadoop.ozone.OzoneAcl.AclScope.ACCESS;
-import static
org.apache.hadoop.ozone.OzoneConfigKeys.DFS_CONTAINER_RATIS_ENABLED_DEFAULT;
-import static
org.apache.hadoop.ozone.OzoneConfigKeys.DFS_CONTAINER_RATIS_ENABLED_KEY;
-import static
org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ACL_AUTHORIZER_CLASS;
-import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ACL_ENABLED;
-import static
org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ACL_ENABLED_DEFAULT;
-import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ADMINISTRATORS;
-import static
org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ADMINISTRATORS_WILDCARD;
-import static
org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_KEY_PREALLOCATION_BLOCKS_MAX;
-import static
org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_KEY_PREALLOCATION_BLOCKS_MAX_DEFAULT;
-import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_SCM_BLOCK_SIZE;
-import static
org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_SCM_BLOCK_SIZE_DEFAULT;
+import static org.apache.hadoop.ozone.OzoneConfigKeys.*;
Review comment:
can we avoid import with *?
##########
File path:
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
##########
@@ -2601,6 +2592,10 @@ public OzoneManagerHttpServer getHttpServer() {
ServiceInfo.Builder peerOmServiceInfoBuilder = ServiceInfo.newBuilder()
.setNodeType(HddsProtos.NodeType.OM)
.setHostname(peerNode.getHostName())
+ // For now assume peer is at the same version.
+ // This field needs to be fetched from peer when rolling upgrades
+ // are implemented.
+ .setOmClientProtocolVersion(OZONE_OM_CLIENT_PROTOCOL_VERSION)
Review comment:
Why we need this based on config value, why can't we do this based on
version which we run.
As here if OM is not returning version means, newer S3G cannot talk to it,
if any version is being returned it can talk to OM.
##########
File path:
hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java
##########
@@ -200,6 +199,22 @@ public RpcClient(ConfigurationSource conf, String
omServiceId)
// requests serviced by this client will need S3 Auth set.
ozoneManagerProtocolClientSideTranslatorPB.setS3AuthCheck(
conf.getBoolean(S3Auth.S3_AUTH_CHECK, false));
+ String omVersion = conf.get(OZONE_OM_CLIENT_PROTOCOL_VERSION_KEY);
Review comment:
Do we need a config key OZONE_OM_CLIENT_PROTOCOL_VERSION_KEY here?
Can we do something like this.
if (conf.getBoolean(S3Auth.S3_AUTH_CHECK, false)) {
// Only work when version is as expected
}
And also we need this only when RpcClient is used from S3G. So, using that
flag should be good I believe.
--
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]
