ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From atk...@apache.org
Subject git commit: AMBARI-7972 Remove "required value" for hive.zookeeper.quorum property in hive-site. (atkach)
Date Sat, 25 Oct 2014 22:33:28 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-1.7.0 eec97e12b -> a1a9860db


AMBARI-7972 Remove "required value" for hive.zookeeper.quorum property in hive-site. (atkach)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a1a9860d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a1a9860d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a1a9860d

Branch: refs/heads/branch-1.7.0
Commit: a1a9860dbc2adb104bf1e1d006d956723cd3fc88
Parents: eec97e1
Author: atkach <atkach@hortonworks.com>
Authored: Sun Oct 26 01:33:09 2014 +0300
Committer: atkach <atkach@hortonworks.com>
Committed: Sun Oct 26 01:33:09 2014 +0300

----------------------------------------------------------------------
 ambari-web/app/controllers/main/service/add_controller.js | 4 +++-
 ambari-web/app/data/HDP2.2/site_properties.js             | 1 +
 ambari-web/app/models/service_config.js                   | 6 ++++++
 3 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/a1a9860d/ambari-web/app/controllers/main/service/add_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/add_controller.js b/ambari-web/app/controllers/main/service/add_controller.js
index 44e8cf1..d2b1dd6 100644
--- a/ambari-web/app/controllers/main/service/add_controller.js
+++ b/ambari-web/app/controllers/main/service/add_controller.js
@@ -135,12 +135,14 @@ App.AddServiceController = App.WizardController.extend({
     var installedComponents = App.HostComponent.find();
 
     obj.forEach(function (_component) {
+      var installedComponent = installedComponents.findProperty('componentName', _component.component_name);
       masterComponentHosts.push({
         display_name: _component.display_name,
         component: _component.component_name,
         hostName: _component.selectedHost,
         serviceId: _component.serviceId,
-        isInstalled: installedComponents.someProperty('componentName', _component.component_name)
+        isInstalled: !!installedComponent,
+        workStatus: installedComponent && installedComponent.get('workStatus')
       });
     });
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/a1a9860d/ambari-web/app/data/HDP2.2/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2.2/site_properties.js b/ambari-web/app/data/HDP2.2/site_properties.js
index a3f1d2c..f27d15d 100644
--- a/ambari-web/app/data/HDP2.2/site_properties.js
+++ b/ambari-web/app/data/HDP2.2/site_properties.js
@@ -43,6 +43,7 @@ hdp22properties.push(
     "displayName": "hive.zookeeper.quorum",
     "defaultValue": "localhost:2181",
     "displayType": "multiLine",
+    "isRequired": false,
     "isVisible": true,
     "serviceName": "HIVE",
     "category": "Advanced hive-site"

http://git-wip-us.apache.org/repos/asf/ambari/blob/a1a9860d/ambari-web/app/models/service_config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/service_config.js b/ambari-web/app/models/service_config.js
index 2d15301..5454223 100644
--- a/ambari-web/app/models/service_config.js
+++ b/ambari-web/app/models/service_config.js
@@ -501,6 +501,12 @@ App.ServiceConfigProperty = Ember.Object.extend({
       case 'hadoop.registry.zk.quorum':
       case 'hive.cluster.delegation.token.store.zookeeper.connectString':
         var zkHosts = masterComponentHostsInDB.filterProperty('component', 'ZOOKEEPER_SERVER').mapProperty('hostName');
+        if (this.get('name') === 'hive.zookeeper.quorum') {
+          zkHosts = masterComponentHostsInDB.
+            filterProperty('component', 'ZOOKEEPER_SERVER').
+            filterProperty('workStatus', 'STARTED').
+            mapProperty('hostName');
+        }
         var zkHostPort = zkHosts;
         var regex = "\\w*:(\\d+)";   //regex to fetch the port
         var portValue = this.get('defaultValue').match(new RegExp(regex));


Mime
View raw message