[ambari] branch branch-2.7 updated: AMBARI-25248. Hive service check is failing after moving Hive Metastore from node to another using system tests. (ababiichuk)

[ababiichuk]

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

ababiichuk pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-2.7 by this push:
     new 8ed83a0  AMBARI-25248. Hive service check is failing after moving Hive 
Metastore from node to another using system tests. (ababiichuk)
8ed83a0 is described below

commit 8ed83a02e000eb6137ee96be7fa61c0c86f96ab9
Author: aBabiichuk <ababiic...@hortonworks.com>
AuthorDate: Tue Apr 16 13:21:40 2019 +0300

    AMBARI-25248. Hive service check is failing after moving Hive Metastore 
from node to another using system tests. (ababiichuk)
---
 .../main/service/reassign/step3_controller.js        | 20 +++++++++++++++++++-
 .../controllers/main/service/reassign_controller.js  |  2 +-
 .../app/utils/configs/move_hm_config_initializer.js  | 18 ++++++++----------
 3 files changed, 28 insertions(+), 12 deletions(-)

diff --git 
a/ambari-web/app/controllers/main/service/reassign/step3_controller.js 
b/ambari-web/app/controllers/main/service/reassign/step3_controller.js
index 8d09745..58f799e 100644
--- a/ambari-web/app/controllers/main/service/reassign/step3_controller.js
+++ b/ambari-web/app/controllers/main/service/reassign/step3_controller.js
@@ -371,13 +371,14 @@ App.ReassignMasterWizardStep3Controller = 
Em.Controller.extend({
           this.get('propertiesToChange')[type].forEach(function (property) {
             var propertyName = property.name,
               stackProperty = 
App.configsCollection.getConfigByName(propertyName, type) || {},
+              displayName = self.getDisplayName(stackProperty.displayName, 
propertyName, type, serviceName),
               displayedProperty = App.ServiceConfigProperty.create({
                 name: propertyName,
-                displayName: propertyName,
                 fileName: type
               }, stackProperty, {
                 value: configs[type][propertyName],
                 category: serviceName,
+                displayName,
                 isEditable: Boolean(stackProperty.isEditable !== false && 
!property.isSecure)
               });
             displayedConfigs.push(displayedProperty);
@@ -392,6 +393,23 @@ App.ReassignMasterWizardStep3Controller = 
Em.Controller.extend({
     });
   },
 
+  getDisplayName: function (stackDisplayName, propertyName, type, serviceName) 
{
+    let displayName = stackDisplayName || propertyName;
+    const keys = Em.keys(this.get('propertiesToChange'));
+    for (let i = 0; i < keys.length; i++) {
+      const fileName = keys[i],
+          service = App.config.get('serviceByConfigTypeMap')[fileName];
+      if (fileName !== type && service && service.get('serviceName') === 
serviceName) {
+        const configs = this.get('propertiesToChange')[fileName];
+        if (configs.someProperty('name', propertyName)) {
+          displayName = `${type}/${propertyName}`;
+          break;
+        }
+      }
+    }
+    return displayName;
+  },
+
   onLoadConfigs: function (data) {
     // Find hawq-site.xml location
     var hawqSiteIndex = -1;
diff --git a/ambari-web/app/controllers/main/service/reassign_controller.js 
b/ambari-web/app/controllers/main/service/reassign_controller.js
index 1f97a50..bf1e2ab 100644
--- a/ambari-web/app/controllers/main/service/reassign_controller.js
+++ b/ambari-web/app/controllers/main/service/reassign_controller.js
@@ -158,7 +158,7 @@ App.ReassignMasterController = App.WizardController.extend({
     'APP_TIMELINE_SERVER': ['yarn-site', 'yarn-env'],
     'OOZIE_SERVER': ['oozie-site', 'core-site', 'oozie-env'],
     'HIVE_SERVER': ['hive-site', 'webhcat-site', 'hive-env', 'core-site'],
-    'HIVE_METASTORE': ['hive-site', 'webhcat-site', 'hive-env', 'core-site'],
+    'HIVE_METASTORE': ['hive-site', 'webhcat-site', 'hive-env', 'core-site', 
'hive-interactive-site'],
     'MYSQL_SERVER': ['hive-site'],
     'HISTORYSERVER': ['mapred-site'],
     'TIMELINE_READER' : ['yarn-site']
diff --git a/ambari-web/app/utils/configs/move_hm_config_initializer.js 
b/ambari-web/app/utils/configs/move_hm_config_initializer.js
index 527ba70..e6529f2 100644
--- a/ambari-web/app/utils/configs/move_hm_config_initializer.js
+++ b/ambari-web/app/utils/configs/move_hm_config_initializer.js
@@ -47,20 +47,18 @@ App.MoveHmConfigInitializer = 
App.MoveHiveComponentConfigInitializerClass.create
    * @method _initHiveMetastoreUris
    */
   _initHiveMetastoreUris: function (configProperty, localDB, dependencies) {
-    if (App.config.getConfigTagFromFileName(Em.get(configProperty, 
'filename')) === 'hive-site') {
-      var hiveMSHosts = this.__getHmHostsConsideringMoved(localDB, 
dependencies);
+    var hiveMSHosts = this.__getHmHostsConsideringMoved(localDB, dependencies);
 
-      var value = Em.get(configProperty, 'value');
+    var value = Em.get(configProperty, 'value');
 
-      var port = value.match(/:[0-9]{2,4}/);
-      port = port ? port[0].slice(1) : '9083';
+    var port = value.match(/:[0-9]{2,4}/);
+    port = port ? port[0].slice(1) : '9083';
 
-      value = hiveMSHosts.uniq().map(function (hiveMSHost) {
-        return 'thrift://' + hiveMSHost + ':' + port;
-      }).join(',');
+    value = hiveMSHosts.uniq().map(function (hiveMSHost) {
+      return 'thrift://' + hiveMSHost + ':' + port;
+    }).join(',');
 
-      Em.set(configProperty, 'value', value);
-    }
+    Em.set(configProperty, 'value', value);
     return configProperty;
   },