HDDS-684. Fix HDDS-4 branch after HDDS-490 and HADOOP-15832. Contributed by Xiaoyu Yao.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/72468986 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/72468986 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/72468986 Branch: refs/heads/HDDS-4 Commit: 724689864b6723a2ada9ccb925f9b828c19f305b Parents: 950a473 Author: Xiaoyu Yao <x...@apache.org> Authored: Wed Oct 24 15:46:34 2018 -0700 Committer: Xiaoyu Yao <x...@apache.org> Committed: Thu Nov 29 11:57:46 2018 -0800 ---------------------------------------------------------------------- hadoop-ozone/dist/dev-support/bin/dist-layout-stitching | 2 +- .../dist/src/main/compose/ozonesecure/docker-config | 1 + .../ozonesecure/docker-image/runner/scripts/starter.sh | 4 ++-- .../java/org/apache/hadoop/ozone/om/OzoneManager.java | 12 ++++++------ 4 files changed, 10 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/72468986/hadoop-ozone/dist/dev-support/bin/dist-layout-stitching ---------------------------------------------------------------------- diff --git a/hadoop-ozone/dist/dev-support/bin/dist-layout-stitching b/hadoop-ozone/dist/dev-support/bin/dist-layout-stitching index e736065..2a4f0ad 100755 --- a/hadoop-ozone/dist/dev-support/bin/dist-layout-stitching +++ b/hadoop-ozone/dist/dev-support/bin/dist-layout-stitching @@ -111,5 +111,5 @@ run cp "${ROOT}/hadoop-ozone/objectstore-service/target/hadoop-ozone-objectstore cp -r "${ROOT}/hadoop-hdds/docs/target/classes/docs" ./ #Copy docker compose files -run cp -p -r "${ROOT}/hadoop-ozone/dist/src/main/compose" . +run cp -p -R "${ROOT}/hadoop-ozone/dist/src/main/compose" . run cp -p -r "${ROOT}/hadoop-ozone/dist/src/main/smoketest" . http://git-wip-us.apache.org/repos/asf/hadoop/blob/72468986/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config ---------------------------------------------------------------------- diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config b/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config index 704dc7b..36f05ae 100644 --- a/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config +++ b/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config @@ -37,6 +37,7 @@ HDFS-SITE.XML_dfs.datanode.kerberos.principal=dn/_h...@example.com HDFS-SITE.XML_dfs.datanode.keytab.file=/etc/security/keytabs/dn.keytab HDFS-SITE.XML_dfs.web.authentication.kerberos.principal=HTTP/_h...@example.com HDFS-SITE.XML_dfs.web.authentication.kerberos.keytab=/etc/security/keytabs/HTTP.keytab +OZONE-SITE.XML_hdds.datanode.dir=/data/hdds HDFS-SITE.XML_dfs.datanode.address=0.0.0.0:1019 HDFS-SITE.XML_dfs.datanode.http.address=0.0.0.0:1012 CORE-SITE.XML_dfs.data.transfer.protection=authentication http://git-wip-us.apache.org/repos/asf/hadoop/blob/72468986/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-image/runner/scripts/starter.sh ---------------------------------------------------------------------- diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-image/runner/scripts/starter.sh b/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-image/runner/scripts/starter.sh index 04cd49d..eec7ce9 100755 --- a/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-image/runner/scripts/starter.sh +++ b/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-image/runner/scripts/starter.sh @@ -82,7 +82,7 @@ fi if [ -n "$ENSURE_SCM_INITIALIZED" ]; then if [ ! -f "$ENSURE_SCM_INITIALIZED" ]; then - /opt/hadoop/bin/ozone scm -init + /opt/hadoop/bin/ozone scm --init fi fi @@ -92,7 +92,7 @@ if [ -n "$ENSURE_OM_INITIALIZED" ]; then # Could be removed after HDFS-13203 echo "Waiting 15 seconds for SCM startup" sleep 15 - /opt/hadoop/bin/ozone om -createObjectStore + /opt/hadoop/bin/ozone om --init fi fi http://git-wip-us.apache.org/repos/asf/hadoop/blob/72468986/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java index 7fc6aee..a5cec20 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java @@ -259,17 +259,17 @@ public final class OzoneManager extends ServiceRuntimeInfoImpl /** - * Login KSM service user if security and Kerberos are enabled. + * Login OM service user if security and Kerberos are enabled. * * @param conf * @throws IOException, AuthenticationException */ - private static void loginKSMUser(OzoneConfiguration conf) + private static void loginOMUser(OzoneConfiguration conf) throws IOException, AuthenticationException { if (SecurityUtil.getAuthenticationMethod(conf).equals (AuthenticationMethod.KERBEROS)) { - LOG.debug("Ozone security is enabled. Attempting login for KSM user. " + LOG.debug("Ozone security is enabled. Attempting login for OM user. " + "Principal: {},keytab: {}", conf.get( OZONE_OM_KERBEROS_PRINCIPAL_KEY), conf.get(OZONE_OM_KERBEROS_KEYTAB_FILE_KEY)); @@ -281,10 +281,10 @@ public final class OzoneManager extends ServiceRuntimeInfoImpl OZONE_OM_KERBEROS_PRINCIPAL_KEY, socAddr.getHostName()); } else { throw new AuthenticationException(SecurityUtil.getAuthenticationMethod - (conf) + " authentication method not supported. KSM user login " + (conf) + " authentication method not supported. OM user login " + "failed."); } - LOG.info("KSM login successful."); + LOG.info("Ozone Manager login successful."); } /** @@ -440,7 +440,7 @@ public final class OzoneManager extends ServiceRuntimeInfoImpl } // Authenticate KSM if security is enabled if (conf.getBoolean(OzoneConfigKeys.OZONE_SECURITY_ENABLED_KEY, true)) { - loginKSMUser(conf); + loginOMUser(conf); } switch (startOpt) { case INIT: --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org