You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by mg...@apache.org on 2018/05/15 15:32:29 UTC

[ambari] 03/03: AMBARI-23794 Fix WebHCat property in kerberize.json in HDP 2.5

This is an automated email from the ASF dual-hosted git repository.

mgergely pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git

commit 1b900a0cce34fb8788de39558a924f563bae05ab
Author: Miklos Gergely <mg...@hortonworks.com>
AuthorDate: Tue May 15 15:12:46 2018 +0200

    AMBARI-23794 Fix WebHCat property in kerberize.json in HDP 2.5
---
 .../java/org/apache/ambari/server/upgrade/UpgradeCatalog270.java   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog270.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog270.java
index 66dde7d..200b967 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog270.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog270.java
@@ -1057,15 +1057,16 @@ public class UpgradeCatalog270 extends AbstractUpgradeCatalog {
       }
     }
 
-    final boolean updatedWebHCatHostsInHadoopProxyuserHttpHostsForHive = updateWebHCatHostsInHadoopProxyuserHttpHostsForHive(kerberosDescriptor);
+    final boolean updateWebHCatHostKerberosDescriptor = updateWebHCatHostKerberosDescriptor(kerberosDescriptor);
 
-    if (ambariInfraService != null || updatedWebHCatHostsInHadoopProxyuserHttpHostsForHive) {
+    if (ambariInfraService != null || updateWebHCatHostKerberosDescriptor) {
       artifactEntity.setArtifactData(kerberosDescriptor.toMap());
       artifactDAO.merge(artifactEntity);
     }
   }
 
-  private boolean updateWebHCatHostsInHadoopProxyuserHttpHostsForHive(KerberosDescriptor kerberosDescriptor) {
+  // some command json elements were modified from ..._host to ..._hosts, kerberos related properties must be adjusted accordingly
+  private boolean updateWebHCatHostKerberosDescriptor(KerberosDescriptor kerberosDescriptor) {
     boolean updated = false;
     final KerberosServiceDescriptor hiveService = kerberosDescriptor.getServices().get(HiveServiceValidator.HIVE_SERVICE);
     if (hiveService != null) {

-- 
To stop receiving notification emails like this one, please contact
mgergely@apache.org.