From 7bba841c33c0f7fc6bb0b578011dcdb29e49d2cd Mon Sep 17 00:00:00 2001 From: xBis7 Date: Tue, 11 Oct 2022 16:19:08 +0300 Subject: [PATCH 01/11] OM_S3_GRPC default flag set to true --- .../src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java index e72630a32486..f08ad1754635 100644 --- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java +++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java @@ -325,7 +325,7 @@ private OMConfigKeys() { public static final String OZONE_OM_S3_GPRC_SERVER_ENABLED = "ozone.om.s3.grpc.server_enabled"; public static final boolean OZONE_OM_S3_GRPC_SERVER_ENABLED_DEFAULT = - false; + true; /** * Configuration properties for OMAdminProtcol service. */ From 3987afb137d4f5d36ec7f9cb4ded7423e10b0ee7 Mon Sep 17 00:00:00 2001 From: xBis7 Date: Tue, 11 Oct 2022 16:54:54 +0300 Subject: [PATCH 02/11] OZONE_OM_TRANSPORT_CLASS_DEFAULT changed --- .../src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java index f08ad1754635..e0c9be755eb4 100644 --- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java +++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java @@ -340,7 +340,7 @@ private OMConfigKeys() { "ozone.om.transport.class"; public static final String OZONE_OM_TRANSPORT_CLASS_DEFAULT = "org.apache.hadoop.ozone.om.protocolPB" - + ".Hadoop3OmTransportFactory"; + + ".GrpcOmTransportFactory"; public static final String OZONE_OM_UNFLUSHED_TRANSACTION_MAX_COUNT = "ozone.om.unflushed.transaction.max.count"; public static final int OZONE_OM_UNFLUSHED_TRANSACTION_MAX_COUNT_DEFAULT From 5d304648feca4fb8766814214110ca785234e29e Mon Sep 17 00:00:00 2001 From: xBis7 Date: Tue, 11 Oct 2022 16:56:44 +0300 Subject: [PATCH 03/11] space cleanup --- .../src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java index e0c9be755eb4..35bd334d1daa 100644 --- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java +++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java @@ -340,7 +340,7 @@ private OMConfigKeys() { "ozone.om.transport.class"; public static final String OZONE_OM_TRANSPORT_CLASS_DEFAULT = "org.apache.hadoop.ozone.om.protocolPB" - + ".GrpcOmTransportFactory"; + + ".GrpcOmTransportFactory"; public static final String OZONE_OM_UNFLUSHED_TRANSACTION_MAX_COUNT = "ozone.om.unflushed.transaction.max.count"; public static final int OZONE_OM_UNFLUSHED_TRANSACTION_MAX_COUNT_DEFAULT From 8907dbef6f3bab7d5f17842f35c5baece74371ac Mon Sep 17 00:00:00 2001 From: xBis7 Date: Tue, 11 Oct 2022 18:35:59 +0300 Subject: [PATCH 04/11] docker-config --- hadoop-ozone/dist/src/main/compose/ozone/docker-config | 1 + .../dist/src/main/compose/ozonesecure-ha/docker-config | 2 ++ .../dist/src/main/compose/ozonesecure-mr/docker-config | 4 ++++ hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config | 2 ++ 4 files changed, 9 insertions(+) diff --git a/hadoop-ozone/dist/src/main/compose/ozone/docker-config b/hadoop-ozone/dist/src/main/compose/ozone/docker-config index f63a784a60f5..f1bdfe1b80a8 100644 --- a/hadoop-ozone/dist/src/main/compose/ozone/docker-config +++ b/hadoop-ozone/dist/src/main/compose/ozone/docker-config @@ -40,6 +40,7 @@ OZONE-SITE.XML_ozone.datanode.pipeline.limit=1 OZONE-SITE.XML_hdds.scmclient.max.retry.timeout=30s OZONE-SITE.XML_hdds.container.report.interval=60s OZONE-SITE.XML_ozone.om.s3.grpc.server_enabled=true +OZONE-SITE.XML_ozone.om.transport.class=org.apache.hadoop.ozone.om.protocolPB.GrpcOmTransportFactory OZONE-SITE.XML_ozone.scm.stale.node.interval=30s OZONE-SITE.XML_ozone.scm.dead.node.interval=45s OZONE-SITE.XML_hdds.heartbeat.interval=5s diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/docker-config b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/docker-config index c9577874aa4e..7df23d0de74f 100644 --- a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/docker-config +++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/docker-config @@ -53,6 +53,8 @@ OZONE-SITE.XML_hdds.scmclient.max.retry.timeout=30s OZONE-SITE.XML_hdds.container.report.interval=60s OZONE-SITE.XML_ozone.om.s3.grpc.server_enabled=true +OZONE-SITE.XML_ozone.om.transport.class=org.apache.hadoop.ozone.om.protocolPB.GrpcOmTransportFactory + OZONE-SITE.XML_ozone.recon.om.snapshot.task.interval.delay=1m OZONE-SITE.XML_ozone.recon.db.dir=/data/metadata/recon OZONE-SITE.XML_ozone.recon.om.snapshot.task.initial.delay=20s diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-config b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-config index 2db9b4109e67..d68d16e12a6b 100644 --- a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-config +++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-config @@ -47,6 +47,10 @@ OZONE-SITE.XML_hdds.datanode.http.auth.kerberos.keytab=/etc/security/keytabs/HTT OZONE-SITE.XML_ozone.s3g.http.auth.kerberos.keytab=/etc/security/keytabs/s3g.keytab OZONE-SITE.XML_ozone.s3g.http.auth.kerberos.principal=HTTP/s3g@EXAMPLE.COM OZONE-SITE.XML_hdds.grpc.tls.enabled=true +OZONE-SITE.XML_ozone.om.s3.grpc.server_enabled=true + +OZONE-SITE.XML_ozone.om.transport.class=org.apache.hadoop.ozone.om.protocolPB.GrpcOmTransportFactory + OZONE-SITE.XML_ozone.s3g.kerberos.keytab.file=/etc/security/keytabs/s3g.keytab OZONE-SITE.XML_ozone.s3g.kerberos.principal=s3g/s3g@EXAMPLE.COM diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config b/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config index 030cd79ec26c..82ad503fa9ef 100644 --- a/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config +++ b/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config @@ -73,6 +73,8 @@ OZONE-SITE.XML_ozone.scm.dead.node.interval=45s OZONE-SITE.XML_hdds.container.report.interval=60s OZONE-SITE.XML_ozone.om.s3.grpc.server_enabled=true +OZONE-SITE.XML_ozone.om.transport.class=org.apache.hadoop.ozone.om.protocolPB.GrpcOmTransportFactory + HDFS-SITE.XML_dfs.datanode.kerberos.principal=dn/dn@EXAMPLE.COM HDFS-SITE.XML_dfs.datanode.kerberos.keytab.file=/etc/security/keytabs/dn.keytab HDFS-SITE.XML_dfs.web.authentication.kerberos.principal=HTTP/ozone@EXAMPLE.COM From bdd1857612344f4bb68eb69bfe9dc6671d83494a Mon Sep 17 00:00:00 2001 From: xBis7 Date: Wed, 12 Oct 2022 14:12:46 +0300 Subject: [PATCH 05/11] integration tests fixed --- .../ozone/om/protocolPB/OmTransportFactory.java | 2 +- ....hadoop.ozone.om.protocolPB.OmTransportFactory | 15 +++++++++++++++ .../src/test/resources/ozone-site.xml | 5 +++++ 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 hadoop-ozone/integration-test/src/test/resources/META-INF/services/org.apache.hadoop.ozone.om.protocolPB.OmTransportFactory diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/OmTransportFactory.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/OmTransportFactory.java index 2ba8536e18be..576c34d538c3 100644 --- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/OmTransportFactory.java +++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/OmTransportFactory.java @@ -46,7 +46,7 @@ static OmTransportFactory createFactory(ConfigurationSource conf) throws IOException { try { // if configured transport class is different than the default - // OmTransportFactory (Hadoop3OmTransportFactory), then + // OmTransportFactory (GrpcOmTransportFactory), then // check service loader for transport class and instantiate it if (conf .get(OZONE_OM_TRANSPORT_CLASS, diff --git a/hadoop-ozone/integration-test/src/test/resources/META-INF/services/org.apache.hadoop.ozone.om.protocolPB.OmTransportFactory b/hadoop-ozone/integration-test/src/test/resources/META-INF/services/org.apache.hadoop.ozone.om.protocolPB.OmTransportFactory new file mode 100644 index 000000000000..c8b28178c8ef --- /dev/null +++ b/hadoop-ozone/integration-test/src/test/resources/META-INF/services/org.apache.hadoop.ozone.om.protocolPB.OmTransportFactory @@ -0,0 +1,15 @@ +# 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. +org.apache.hadoop.ozone.om.protocolPB.Hadoop3OmTransportFactory \ No newline at end of file diff --git a/hadoop-ozone/integration-test/src/test/resources/ozone-site.xml b/hadoop-ozone/integration-test/src/test/resources/ozone-site.xml index 0c5ae1fa8845..1c2974a8a2ba 100644 --- a/hadoop-ozone/integration-test/src/test/resources/ozone-site.xml +++ b/hadoop-ozone/integration-test/src/test/resources/ozone-site.xml @@ -31,4 +31,9 @@ 4 + + ozone.om.transport.class + org.apache.hadoop.ozone.om.protocolPB.Hadoop3OmTransportFactory + + From 000a8dd3c20c86fcb78f7075eabe54fedcf719b9 Mon Sep 17 00:00:00 2001 From: xBis7 Date: Wed, 12 Oct 2022 15:46:35 +0300 Subject: [PATCH 06/11] integration tests fixes --- .../integration-test/src/test/resources/ozone-site.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hadoop-ozone/integration-test/src/test/resources/ozone-site.xml b/hadoop-ozone/integration-test/src/test/resources/ozone-site.xml index 1c2974a8a2ba..9f5968b2dd56 100644 --- a/hadoop-ozone/integration-test/src/test/resources/ozone-site.xml +++ b/hadoop-ozone/integration-test/src/test/resources/ozone-site.xml @@ -31,6 +31,11 @@ 4 + + ozone.om.s3.grpc.server_enabled + false + + ozone.om.transport.class org.apache.hadoop.ozone.om.protocolPB.Hadoop3OmTransportFactory From 1fea1257d636e683ceefa6440e360aa39a4b9b22 Mon Sep 17 00:00:00 2001 From: xBis7 Date: Wed, 12 Oct 2022 18:14:55 +0300 Subject: [PATCH 07/11] smoketest docker-config changes --- hadoop-ozone/dist/src/main/compose/ozone-ha/docker-config | 1 + .../dist/src/main/compose/ozonesecure-mr/docker-config | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/hadoop-ozone/dist/src/main/compose/ozone-ha/docker-config b/hadoop-ozone/dist/src/main/compose/ozone-ha/docker-config index c22505ff9a42..274b686061c8 100644 --- a/hadoop-ozone/dist/src/main/compose/ozone-ha/docker-config +++ b/hadoop-ozone/dist/src/main/compose/ozone-ha/docker-config @@ -39,6 +39,7 @@ OZONE-SITE.XML_hdds.scmclient.max.retry.timeout=30s OZONE-SITE.XML_ozone.scm.primordial.node.id=scm1 OZONE-SITE.XML_hdds.container.report.interval=60s OZONE-SITE.XML_ozone.om.s3.grpc.server_enabled=true +OZONE-SITE.XML_ozone.om.transport.class=org.apache.hadoop.ozone.om.protocolPB.GrpcOmTransportFactory OZONE-SITE.XML_ozone.recon.db.dir=/data/metadata/recon OZONE-SITE.XML_ozone.recon.address=recon:9891 OZONE-SITE.XML_ozone.recon.http-address=0.0.0.0:9888 diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-config b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-config index d68d16e12a6b..2db9b4109e67 100644 --- a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-config +++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-config @@ -47,10 +47,6 @@ OZONE-SITE.XML_hdds.datanode.http.auth.kerberos.keytab=/etc/security/keytabs/HTT OZONE-SITE.XML_ozone.s3g.http.auth.kerberos.keytab=/etc/security/keytabs/s3g.keytab OZONE-SITE.XML_ozone.s3g.http.auth.kerberos.principal=HTTP/s3g@EXAMPLE.COM OZONE-SITE.XML_hdds.grpc.tls.enabled=true -OZONE-SITE.XML_ozone.om.s3.grpc.server_enabled=true - -OZONE-SITE.XML_ozone.om.transport.class=org.apache.hadoop.ozone.om.protocolPB.GrpcOmTransportFactory - OZONE-SITE.XML_ozone.s3g.kerberos.keytab.file=/etc/security/keytabs/s3g.keytab OZONE-SITE.XML_ozone.s3g.kerberos.principal=s3g/s3g@EXAMPLE.COM From 5beac65254238116caef03435451cb02c5dc1375 Mon Sep 17 00:00:00 2001 From: xBis7 Date: Thu, 13 Oct 2022 15:42:56 +0300 Subject: [PATCH 08/11] test fixes --- hadoop-hdds/common/src/main/resources/ozone-default.xml | 8 ++++++++ .../java/org/apache/hadoop/ozone/om/OMConfigKeys.java | 2 +- .../hadoop/ozone/om/protocolPB/OmTransportFactory.java | 2 +- hadoop-ozone/dist/src/main/compose/ozone-ha/docker-config | 1 - hadoop-ozone/dist/src/main/compose/ozone/docker-config | 2 -- .../dist/src/main/compose/ozonesecure-ha/docker-config | 3 --- .../dist/src/main/compose/ozonesecure/docker-config | 3 --- .../apache/hadoop/ozone/TestOzoneConfigurationFields.java | 1 + ...g.apache.hadoop.ozone.om.protocolPB.OmTransportFactory | 2 +- .../integration-test/src/test/resources/ozone-site.xml | 8 ++++---- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/hadoop-hdds/common/src/main/resources/ozone-default.xml b/hadoop-hdds/common/src/main/resources/ozone-default.xml index 4d059d2d6024..bb43b1826ad6 100644 --- a/hadoop-hdds/common/src/main/resources/ozone-default.xml +++ b/hadoop-hdds/common/src/main/resources/ozone-default.xml @@ -2506,6 +2506,14 @@ for Ozone Manager Admin protocol. + + ozone.om.transport.class + org.apache.hadoop.ozone.om.protocolPB.GrpcOmTransportFactory + OM, MANAGEMENT + + Enable Ozone Manager S3G Grpc channel. + + ozone.recon.http.enabled true diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java index 35bd334d1daa..f08ad1754635 100644 --- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java +++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java @@ -340,7 +340,7 @@ private OMConfigKeys() { "ozone.om.transport.class"; public static final String OZONE_OM_TRANSPORT_CLASS_DEFAULT = "org.apache.hadoop.ozone.om.protocolPB" - + ".GrpcOmTransportFactory"; + + ".Hadoop3OmTransportFactory"; public static final String OZONE_OM_UNFLUSHED_TRANSACTION_MAX_COUNT = "ozone.om.unflushed.transaction.max.count"; public static final int OZONE_OM_UNFLUSHED_TRANSACTION_MAX_COUNT_DEFAULT diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/OmTransportFactory.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/OmTransportFactory.java index 576c34d538c3..2ba8536e18be 100644 --- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/OmTransportFactory.java +++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/OmTransportFactory.java @@ -46,7 +46,7 @@ static OmTransportFactory createFactory(ConfigurationSource conf) throws IOException { try { // if configured transport class is different than the default - // OmTransportFactory (GrpcOmTransportFactory), then + // OmTransportFactory (Hadoop3OmTransportFactory), then // check service loader for transport class and instantiate it if (conf .get(OZONE_OM_TRANSPORT_CLASS, diff --git a/hadoop-ozone/dist/src/main/compose/ozone-ha/docker-config b/hadoop-ozone/dist/src/main/compose/ozone-ha/docker-config index 274b686061c8..c22505ff9a42 100644 --- a/hadoop-ozone/dist/src/main/compose/ozone-ha/docker-config +++ b/hadoop-ozone/dist/src/main/compose/ozone-ha/docker-config @@ -39,7 +39,6 @@ OZONE-SITE.XML_hdds.scmclient.max.retry.timeout=30s OZONE-SITE.XML_ozone.scm.primordial.node.id=scm1 OZONE-SITE.XML_hdds.container.report.interval=60s OZONE-SITE.XML_ozone.om.s3.grpc.server_enabled=true -OZONE-SITE.XML_ozone.om.transport.class=org.apache.hadoop.ozone.om.protocolPB.GrpcOmTransportFactory OZONE-SITE.XML_ozone.recon.db.dir=/data/metadata/recon OZONE-SITE.XML_ozone.recon.address=recon:9891 OZONE-SITE.XML_ozone.recon.http-address=0.0.0.0:9888 diff --git a/hadoop-ozone/dist/src/main/compose/ozone/docker-config b/hadoop-ozone/dist/src/main/compose/ozone/docker-config index f1bdfe1b80a8..2733e0789990 100644 --- a/hadoop-ozone/dist/src/main/compose/ozone/docker-config +++ b/hadoop-ozone/dist/src/main/compose/ozone/docker-config @@ -39,8 +39,6 @@ OZONE-SITE.XML_ozone.recon.om.snapshot.task.interval.delay=1m OZONE-SITE.XML_ozone.datanode.pipeline.limit=1 OZONE-SITE.XML_hdds.scmclient.max.retry.timeout=30s OZONE-SITE.XML_hdds.container.report.interval=60s -OZONE-SITE.XML_ozone.om.s3.grpc.server_enabled=true -OZONE-SITE.XML_ozone.om.transport.class=org.apache.hadoop.ozone.om.protocolPB.GrpcOmTransportFactory OZONE-SITE.XML_ozone.scm.stale.node.interval=30s OZONE-SITE.XML_ozone.scm.dead.node.interval=45s OZONE-SITE.XML_hdds.heartbeat.interval=5s diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/docker-config b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/docker-config index 7df23d0de74f..bc634c5d810a 100644 --- a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/docker-config +++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/docker-config @@ -51,9 +51,6 @@ OZONE-SITE.XML_hdds.grpc.tls.enabled=true OZONE-SITE.XML_ozone.replication=3 OZONE-SITE.XML_hdds.scmclient.max.retry.timeout=30s OZONE-SITE.XML_hdds.container.report.interval=60s -OZONE-SITE.XML_ozone.om.s3.grpc.server_enabled=true - -OZONE-SITE.XML_ozone.om.transport.class=org.apache.hadoop.ozone.om.protocolPB.GrpcOmTransportFactory OZONE-SITE.XML_ozone.recon.om.snapshot.task.interval.delay=1m OZONE-SITE.XML_ozone.recon.db.dir=/data/metadata/recon diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config b/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config index 82ad503fa9ef..b740b707c51b 100644 --- a/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config +++ b/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config @@ -71,9 +71,6 @@ OZONE-SITE.XML_hdds.scm.replication.event.timeout=10s OZONE-SITE.XML_ozone.scm.stale.node.interval=30s OZONE-SITE.XML_ozone.scm.dead.node.interval=45s OZONE-SITE.XML_hdds.container.report.interval=60s -OZONE-SITE.XML_ozone.om.s3.grpc.server_enabled=true - -OZONE-SITE.XML_ozone.om.transport.class=org.apache.hadoop.ozone.om.protocolPB.GrpcOmTransportFactory HDFS-SITE.XML_dfs.datanode.kerberos.principal=dn/dn@EXAMPLE.COM HDFS-SITE.XML_dfs.datanode.kerberos.keytab.file=/etc/security/keytabs/dn.keytab diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java index 137ae08daded..88f8e7b9abe8 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java @@ -66,6 +66,7 @@ public void initializeMemberVariables() { xmlPrefixToSkipCompare.add("ipc.client.rpc-timeout.ms"); xmlPropsToSkipCompare.add("ozone.om.leader.election.minimum.timeout" + ".duration"); // Deprecated config + xmlPropsToSkipCompare.add("ozone.om.transport.class"); configurationPropsToSkipCompare .add(ScmConfig.ConfigStrings.HDDS_SCM_INIT_DEFAULT_LAYOUT_VERSION); // Currently replication and type configs moved to server side. diff --git a/hadoop-ozone/integration-test/src/test/resources/META-INF/services/org.apache.hadoop.ozone.om.protocolPB.OmTransportFactory b/hadoop-ozone/integration-test/src/test/resources/META-INF/services/org.apache.hadoop.ozone.om.protocolPB.OmTransportFactory index c8b28178c8ef..21669f5982a7 100644 --- a/hadoop-ozone/integration-test/src/test/resources/META-INF/services/org.apache.hadoop.ozone.om.protocolPB.OmTransportFactory +++ b/hadoop-ozone/integration-test/src/test/resources/META-INF/services/org.apache.hadoop.ozone.om.protocolPB.OmTransportFactory @@ -12,4 +12,4 @@ # 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. -org.apache.hadoop.ozone.om.protocolPB.Hadoop3OmTransportFactory \ No newline at end of file +org.apache.hadoop.ozone.om.protocolPB.Hadoop3OmTransportFactory diff --git a/hadoop-ozone/integration-test/src/test/resources/ozone-site.xml b/hadoop-ozone/integration-test/src/test/resources/ozone-site.xml index 9f5968b2dd56..576e7b5ba7f1 100644 --- a/hadoop-ozone/integration-test/src/test/resources/ozone-site.xml +++ b/hadoop-ozone/integration-test/src/test/resources/ozone-site.xml @@ -27,8 +27,8 @@ - dfs.container.ratis.num.write.chunk.threads.per.volume - 4 + ozone.om.transport.class + org.apache.hadoop.ozone.om.protocolPB.Hadoop3OmTransportFactory @@ -37,8 +37,8 @@ - ozone.om.transport.class - org.apache.hadoop.ozone.om.protocolPB.Hadoop3OmTransportFactory + dfs.container.ratis.num.write.chunk.threads.per.volume + 4 From 51ca10d500a5e006d689f3185d672295d4e685a9 Mon Sep 17 00:00:00 2001 From: xBis7 Date: Fri, 14 Oct 2022 10:08:30 +0300 Subject: [PATCH 09/11] OmTransportFactory file under hadoop-ozone/tools/META-INF/services --- ....hadoop.ozone.om.protocolPB.OmTransportFactory | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 hadoop-ozone/tools/src/main/resources/META-INF/services/org.apache.hadoop.ozone.om.protocolPB.OmTransportFactory diff --git a/hadoop-ozone/tools/src/main/resources/META-INF/services/org.apache.hadoop.ozone.om.protocolPB.OmTransportFactory b/hadoop-ozone/tools/src/main/resources/META-INF/services/org.apache.hadoop.ozone.om.protocolPB.OmTransportFactory new file mode 100644 index 000000000000..21669f5982a7 --- /dev/null +++ b/hadoop-ozone/tools/src/main/resources/META-INF/services/org.apache.hadoop.ozone.om.protocolPB.OmTransportFactory @@ -0,0 +1,15 @@ +# 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. +org.apache.hadoop.ozone.om.protocolPB.Hadoop3OmTransportFactory From bbfd2775268a2a47f0e0de3ed1cd4549078afbc0 Mon Sep 17 00:00:00 2001 From: xBis7 Date: Mon, 31 Oct 2022 14:55:54 +0200 Subject: [PATCH 10/11] TestOzoneConfigurationFields cleanup --- .../org/apache/hadoop/ozone/TestOzoneConfigurationFields.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java index 88f8e7b9abe8..ea56b1f327c4 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java @@ -66,7 +66,6 @@ public void initializeMemberVariables() { xmlPrefixToSkipCompare.add("ipc.client.rpc-timeout.ms"); xmlPropsToSkipCompare.add("ozone.om.leader.election.minimum.timeout" + ".duration"); // Deprecated config - xmlPropsToSkipCompare.add("ozone.om.transport.class"); configurationPropsToSkipCompare .add(ScmConfig.ConfigStrings.HDDS_SCM_INIT_DEFAULT_LAYOUT_VERSION); // Currently replication and type configs moved to server side. @@ -125,7 +124,6 @@ private void addPropertiesNotInXml() { ReconServerConfigKeys.RECON_OM_SNAPSHOT_TASK_FLUSH_PARAM, OMConfigKeys.OZONE_OM_RATIS_SNAPSHOT_AUTO_TRIGGER_THRESHOLD_KEY, OMConfigKeys.OZONE_OM_HA_PREFIX, - OMConfigKeys.OZONE_OM_TRANSPORT_CLASS, OMConfigKeys.OZONE_OM_GRPC_PORT_KEY, // TODO HDDS-2856 OMConfigKeys.OZONE_RANGER_OM_IGNORE_SERVER_CERT, From 9c1489532d8395a459da9427c58084f5e08c217d Mon Sep 17 00:00:00 2001 From: xBis7 Date: Tue, 28 Mar 2023 21:10:25 +0300 Subject: [PATCH 11/11] remove META-INF/services directory under integration-test --- ....hadoop.ozone.om.protocolPB.OmTransportFactory | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 hadoop-ozone/integration-test/src/test/resources/META-INF/services/org.apache.hadoop.ozone.om.protocolPB.OmTransportFactory diff --git a/hadoop-ozone/integration-test/src/test/resources/META-INF/services/org.apache.hadoop.ozone.om.protocolPB.OmTransportFactory b/hadoop-ozone/integration-test/src/test/resources/META-INF/services/org.apache.hadoop.ozone.om.protocolPB.OmTransportFactory deleted file mode 100644 index 21669f5982a7..000000000000 --- a/hadoop-ozone/integration-test/src/test/resources/META-INF/services/org.apache.hadoop.ozone.om.protocolPB.OmTransportFactory +++ /dev/null @@ -1,15 +0,0 @@ -# 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. -org.apache.hadoop.ozone.om.protocolPB.Hadoop3OmTransportFactory