Author: srimanth
Date: Thu May 23 23:51:04 2013
New Revision: 1485901
URL: http://svn.apache.org/r1485901
Log:
AMBARI-2193. Remove zookeeper dependency for HIVE and HCAT. (srimanth)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.2.0/services/ZOOKEEPER/metainfo.xml
incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.2.1/services/ZOOKEEPER/metainfo.xml
incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.3.0/services/ZOOKEEPER/metainfo.xml
incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/ZOOKEEPER/metainfo.xml
incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDPLocal/1.2.0/services/ZOOKEEPER/metainfo.xml
incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDPLocal/1.2.1/services/ZOOKEEPER/metainfo.xml
incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDPLocal/1.3.0/services/ZOOKEEPER/metainfo.xml
incubator/ambari/trunk/ambari-server/src/test/resources/stacks/HDP/0.2/services/ZOOKEEPER/metainfo.xml
incubator/ambari/trunk/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/ZOOKEEPER/metainfo.xml
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step4_controller.js
incubator/ambari/trunk/ambari-web/app/data/services.js
incubator/ambari/trunk/ambari-web/app/messages.js
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1485901&r1=1485900&r2=1485901&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Thu May 23 23:51:04 2013
@@ -895,6 +895,8 @@ Trunk (unreleased changes):
BUG FIXES
+ AMBARI-2193. Remove zookeeper dependency for HIVE and HCAT. (srimanth)
+
AMBARI-2184. Install progress gets stuck at 33% and displays incorrect
status upon refresh. (smohanty)
Modified:
incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.2.0/services/ZOOKEEPER/metainfo.xml
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.2.0/services/ZOOKEEPER/metainfo.xml?rev=1485901&r1=1485900&r2=1485901&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.2.0/services/ZOOKEEPER/metainfo.xml
(original)
+++
incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.2.0/services/ZOOKEEPER/metainfo.xml
Thu May 23 23:51:04 2013
@@ -17,7 +17,7 @@
-->
<metainfo>
<user>root</user>
- <comment>This is comment for ZOOKEEPER service</comment>
+ <comment>Centralized service which provides highly reliable distributed
coordination</comment>
<version>3.4.5</version>
<components>
Modified:
incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.2.1/services/ZOOKEEPER/metainfo.xml
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.2.1/services/ZOOKEEPER/metainfo.xml?rev=1485901&r1=1485900&r2=1485901&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.2.1/services/ZOOKEEPER/metainfo.xml
(original)
+++
incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.2.1/services/ZOOKEEPER/metainfo.xml
Thu May 23 23:51:04 2013
@@ -17,7 +17,7 @@
-->
<metainfo>
<user>root</user>
- <comment>This is comment for ZOOKEEPER service</comment>
+ <comment>Centralized service which provides highly reliable distributed
coordination</comment>
<version>3.4.5</version>
<components>
Modified:
incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.3.0/services/ZOOKEEPER/metainfo.xml
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.3.0/services/ZOOKEEPER/metainfo.xml?rev=1485901&r1=1485900&r2=1485901&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.3.0/services/ZOOKEEPER/metainfo.xml
(original)
+++
incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.3.0/services/ZOOKEEPER/metainfo.xml
Thu May 23 23:51:04 2013
@@ -17,7 +17,7 @@
-->
<metainfo>
<user>root</user>
- <comment>This is comment for ZOOKEEPER service</comment>
+ <comment>Centralized service which provides highly reliable distributed
coordination</comment>
<version>3.4.5.1.3.0.0</version>
<components>
Modified:
incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/ZOOKEEPER/metainfo.xml
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/ZOOKEEPER/metainfo.xml?rev=1485901&r1=1485900&r2=1485901&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/ZOOKEEPER/metainfo.xml
(original)
+++
incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/ZOOKEEPER/metainfo.xml
Thu May 23 23:51:04 2013
@@ -17,7 +17,7 @@
-->
<metainfo>
<user>root</user>
- <comment>This is comment for ZOOKEEPER service</comment>
+ <comment>Centralized service which provides highly reliable distributed
coordination</comment>
<version>3.4.5.22-1</version>
<components>
Modified:
incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDPLocal/1.2.0/services/ZOOKEEPER/metainfo.xml
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDPLocal/1.2.0/services/ZOOKEEPER/metainfo.xml?rev=1485901&r1=1485900&r2=1485901&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDPLocal/1.2.0/services/ZOOKEEPER/metainfo.xml
(original)
+++
incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDPLocal/1.2.0/services/ZOOKEEPER/metainfo.xml
Thu May 23 23:51:04 2013
@@ -17,7 +17,7 @@
-->
<metainfo>
<user>root</user>
- <comment>This is comment for ZOOKEEPER service</comment>
+ <comment>Centralized service which provides highly reliable distributed
coordination</comment>
<version>3.4.5</version>
<components>
Modified:
incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDPLocal/1.2.1/services/ZOOKEEPER/metainfo.xml
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDPLocal/1.2.1/services/ZOOKEEPER/metainfo.xml?rev=1485901&r1=1485900&r2=1485901&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDPLocal/1.2.1/services/ZOOKEEPER/metainfo.xml
(original)
+++
incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDPLocal/1.2.1/services/ZOOKEEPER/metainfo.xml
Thu May 23 23:51:04 2013
@@ -17,7 +17,7 @@
-->
<metainfo>
<user>root</user>
- <comment>This is comment for ZOOKEEPER service</comment>
+ <comment>Centralized service which provides highly reliable distributed
coordination</comment>
<version>3.4.5</version>
<components>
Modified:
incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDPLocal/1.3.0/services/ZOOKEEPER/metainfo.xml
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDPLocal/1.3.0/services/ZOOKEEPER/metainfo.xml?rev=1485901&r1=1485900&r2=1485901&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDPLocal/1.3.0/services/ZOOKEEPER/metainfo.xml
(original)
+++
incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDPLocal/1.3.0/services/ZOOKEEPER/metainfo.xml
Thu May 23 23:51:04 2013
@@ -17,7 +17,7 @@
-->
<metainfo>
<user>root</user>
- <comment>This is comment for ZOOKEEPER service</comment>
+ <comment>Centralized service which provides highly reliable distributed
coordination</comment>
<version>3.4.5.1.3.0.0</version>
<components>
Modified:
incubator/ambari/trunk/ambari-server/src/test/resources/stacks/HDP/0.2/services/ZOOKEEPER/metainfo.xml
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/test/resources/stacks/HDP/0.2/services/ZOOKEEPER/metainfo.xml?rev=1485901&r1=1485900&r2=1485901&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-server/src/test/resources/stacks/HDP/0.2/services/ZOOKEEPER/metainfo.xml
(original)
+++
incubator/ambari/trunk/ambari-server/src/test/resources/stacks/HDP/0.2/services/ZOOKEEPER/metainfo.xml
Thu May 23 23:51:04 2013
@@ -17,7 +17,7 @@
-->
<metainfo>
<user>root</user>
- <comment>This is comment for ZOOKEEPER service</comment>
+ <comment>Centralized service which provides highly reliable distributed
coordination</comment>
<version>1.0</version>
Modified:
incubator/ambari/trunk/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/ZOOKEEPER/metainfo.xml
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/ZOOKEEPER/metainfo.xml?rev=1485901&r1=1485900&r2=1485901&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/ZOOKEEPER/metainfo.xml
(original)
+++
incubator/ambari/trunk/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/ZOOKEEPER/metainfo.xml
Thu May 23 23:51:04 2013
@@ -17,7 +17,7 @@
-->
<metainfo>
<user>root</user>
- <comment>This is comment for ZOOKEEPER service</comment>
+ <comment>Centralized service which provides highly reliable distributed
coordination</comment>
<version>3.4.5</version>
<components>
Modified:
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step4_controller.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/wizard/step4_controller.js?rev=1485901&r1=1485900&r2=1485901&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step4_controller.js
(original)
+++
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step4_controller.js
Thu May 23 23:51:04 2013
@@ -17,6 +17,7 @@
*/
var App = require('app');
+var stringUtils = require('utils/string_utils');
App.WizardStep4Controller = Em.ArrayController.extend({
@@ -53,7 +54,13 @@ App.WizardStep4Controller = Em.ArrayCont
// prevent against getting error when not all elements have been loaded yet
if (hbase && zookeeper && hive && hcatalog && webhcat) {
- zookeeper.set('isSelected', hbase.get('isSelected') ||
hive.get('isSelected'));
+ if (stringUtils.compareVersions(App.get('currentStackVersionNumber'),
"2.0") === -1) {
+ zookeeper.set('isSelected', hbase.get('isSelected') ||
hive.get('isSelected'));
+ }else{
+ if (!zookeeper.get('isSelected')) {
+ zookeeper.set('isSelected', hbase.get('isSelected'));
+ }
+ }
hcatalog.set('isSelected', hive.get('isSelected'));
webhcat.set('isSelected', hive.get('isSelected'));
}
Modified: incubator/ambari/trunk/ambari-web/app/data/services.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/data/services.js?rev=1485901&r1=1485900&r2=1485901&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/data/services.js (original)
+++ incubator/ambari/trunk/ambari-web/app/data/services.js Thu May 23 23:51:04
2013
@@ -77,7 +77,7 @@ module.exports = [
},
{
serviceName: 'HIVE',
- displayName: 'Hive + HCat + ZooKeeper',
+ displayName: 'Hive + HCat',
isDisabled: false,
isSelected: true,
canBeSelected: true,
@@ -101,7 +101,7 @@ module.exports = [
},
{
serviceName: 'HBASE',
- displayName: 'HBase + ZooKeeper',
+ displayName: 'HBase',
isDisabled: false,
isSelected: true,
canBeSelected: true,
@@ -137,7 +137,7 @@ module.exports = [
isDisabled: false,
isSelected: true,
canBeSelected: true,
- isHidden: true
+ description: Em.I18n.t('services.zookeeper.description')
},
{
serviceName: 'HUE',
Modified: incubator/ambari/trunk/ambari-web/app/messages.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/messages.js?rev=1485901&r1=1485900&r2=1485901&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/messages.js (original)
+++ incubator/ambari/trunk/ambari-web/app/messages.js Thu May 23 23:51:04 2013
@@ -188,7 +188,7 @@ Em.I18n.translations = {
'services.pig.description':'Scripting platform for analyzing large datasets',
'services.hive.description':'Data warehouse system for ad-hoc queries &
analysis of large datasets and table & storage management service',
'services.oozie.description':'System for workflow coordination and execution
of Apache Hadoop jobs',
- 'services.zookeeper.description':'ZooKeeper desc',
+ 'services.zookeeper.description':'Centralized service which provides highly
reliable distributed coordination',
'services.hbase.description':'Non-relational distributed database and
centralized service for configuration management & synchronization',
'services.hive.databaseComponent':'Database Server',
'services.mapreduce2.description':'Apache Hadoop NextGen MapReduce (client
libraries)',
