You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2013/05/31 00:14:32 UTC
svn commit: r1488039 [1/10] - in /incubator/ambari/branches/branch-1.2.4: ./
ambari-agent/ ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/
ambari-agent/src/main/puppet/modules/hdp-ganglia/templates/
ambari-agent/src/main/puppet/modules/hdp-...
Author: yusaku
Date: Thu May 30 22:14:29 2013
New Revision: 1488039
URL: http://svn.apache.org/r1488039
Log:
Backporting for branch-1.2.4
Added:
incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCEv2/
incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCEv2/configuration/
incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCEv2/configuration/container-executor.cfg
incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCEv2/configuration/core-site.xml
incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCEv2/configuration/mapred-queue-acls.xml
incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCEv2/configuration/mapred-site.xml
incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCEv2/metainfo.xml
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version122/HBASE.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version122/HCATALOG.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version122/HDFS.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version122/HIVE.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version122/MAPREDUCE.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version122/OOZIE.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version122/WEBHCAT.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version122/ZOOKEEPER.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version130/HBASE.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version130/HCATALOG.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version130/HDFS.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version130/HIVE.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version130/HUE.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version130/MAPREDUCE.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version130/OOZIE.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version130/WEBHCAT.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version130/ZOOKEEPER.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version130/global.json
Removed:
incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hbase/files/hbaseSmokeVerify.sh
incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hbase/templates/hbase-smoke.sh.erb
incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/2.0.1/metainfo.xml
incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCE2/configuration/container-executor.cfg
incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCE2/configuration/core-site.xml
incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCE2/configuration/mapred-queue-acls.xml
incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCE2/configuration/mapred-site.xml
incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCE2/metainfo.xml
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version/1.2.1.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version/2.0.1.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version1.2.1/HBASE.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version1.2.1/HCATALOG.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version1.2.1/HDFS.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version1.2.1/HIVE.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version1.2.1/MAPREDUCE.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version1.2.1/OOZIE.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version1.2.1/WEBHCAT.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version1.2.1/ZOOKEEPER.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version1.3.0/GANGLIA.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version1.3.0/HBASE.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version1.3.0/HCATALOG.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version1.3.0/HDFS.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version1.3.0/HIVE.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version1.3.0/HUE.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version1.3.0/MAPREDUCE.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version1.3.0/NAGIOS.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version1.3.0/OOZIE.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version1.3.0/PIG.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version1.3.0/SQOOP.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version1.3.0/WEBHCAT.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version1.3.0/ZOOKEEPER.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version1.3.0/global.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/GANGLIA.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/HBASE.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/HCATALOG.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/HDFS.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/HIVE.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/HUE.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/MAPREDUCE2.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/NAGIOS.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/OOZIE.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/PIG.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/SQOOP.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/TEZ.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/WEBHCAT.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/YARN.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/ZOOKEEPER.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/global.json
incubator/ambari/branches/branch-1.2.4/ambari-web/app/data/HDP2/config_mapping.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/data/HDP2/config_properties.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/templates/main/dashboard/service/mapreduce2.hbs
incubator/ambari/branches/branch-1.2.4/ambari-web/app/templates/main/service/info/summary/mapreduce2.hbs
incubator/ambari/branches/branch-1.2.4/ambari-web/app/views/main/dashboard/service/mapreduce2.js
incubator/ambari/branches/branch-1.2.4/ambari-web/test/utils/date_test.js
incubator/ambari/branches/branch-1.2.4/ambari-web/test/utils/host_progress_popup_test.js
incubator/ambari/branches/branch-1.2.4/docs/src/site/apt/irc.apt
Modified:
incubator/ambari/branches/branch-1.2.4/ambari-agent/pom.xml
incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/monitor.pp
incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp
incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-ganglia/templates/gangliaClusters.conf.erb
incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/namenode.pp
incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/hadoop-metrics2.properties-GANGLIA.erb
incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/hadoop-metrics2.properties.erb
incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/hbase/service_check.pp
incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/init.pp
incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/params.pp
incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hbase/templates/hbase_grant_permissions.erb
incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hbase/templates/hbase_master_jaas.conf.erb
incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hbase/templates/hbase_regionserver_jaas.conf.erb
incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/jdbc-connector.pp
incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/service.pp
incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp
incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/python/ambari_agent/LiveStatus.py
incubator/ambari/branches/branch-1.2.4/ambari-server/pom.xml
incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/conf/ambari.properties
incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/java/org/apache/ambari/server/Role.java
incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaHostPropertyProvider.java
incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProvider.java
incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterControllerImpl.java
incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXPropertyProvider.java
incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/PredicateBuilder.java
incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/java/org/apache/ambari/server/metadata/RoleCommandOrder.java
incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentImpl.java
incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceImpl.java
incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java
incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java
incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/ganglia_properties.json
incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/mysql-ddl.sql
incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/oracle-DDL.sql
incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/1.2.0/services/ZOOKEEPER/metainfo.xml
incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/1.2.1/services/ZOOKEEPER/metainfo.xml
incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/1.3.0/services/ZOOKEEPER/metainfo.xml
incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/ZOOKEEPER/metainfo.xml
incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDPLocal/1.2.0/services/ZOOKEEPER/metainfo.xml
incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDPLocal/1.2.1/services/ZOOKEEPER/metainfo.xml
incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDPLocal/1.3.0/services/ZOOKEEPER/metainfo.xml
incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/upgrade/ddl/Ambari-DDL-Postgres-UPGRADE-1.3.0.sql
incubator/ambari/branches/branch-1.2.4/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
incubator/ambari/branches/branch-1.2.4/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaServiceTest.java
incubator/ambari/branches/branch-1.2.4/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java
incubator/ambari/branches/branch-1.2.4/ambari-server/src/test/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProviderTest.java
incubator/ambari/branches/branch-1.2.4/ambari-server/src/test/java/org/apache/ambari/server/metadata/RoleGraphTest.java
incubator/ambari/branches/branch-1.2.4/ambari-server/src/test/java/org/apache/ambari/server/orm/InMemoryDefaultTestModule.java
incubator/ambari/branches/branch-1.2.4/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AuthorizationTestModule.java
incubator/ambari/branches/branch-1.2.4/ambari-server/src/test/resources/stacks/HDP/0.2/services/ZOOKEEPER/metainfo.xml
incubator/ambari/branches/branch-1.2.4/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/ZOOKEEPER/metainfo.xml
incubator/ambari/branches/branch-1.2.4/ambari-web/app/app.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/test/tests.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/config.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/global/cluster_controller.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/main/admin/cluster.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/main/admin/misc_controller.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/main/admin/security/add/step3.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/main/admin/security/disable.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/main/service/info/configs.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/main/service/item.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/wizard.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/wizard/slave_component_groups_controller.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/wizard/step12_controller.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/wizard/step14_controller.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/wizard/step3_controller.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/wizard/step4_controller.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/wizard/step6_controller.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/wizard/step7_controller.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/wizard/step8_controller.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/data/config_properties.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/data/review_configs.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/data/secure_configs.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/data/secure_mapping.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/data/secure_properties.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/data/service_components.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/data/service_configs.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/data/services.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/initialize.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/mappers/service_mapper.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/messages.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/models/host_component.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/models/service.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/models/service_config.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/routes/add_service_routes.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/routes/installer.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/routes/main.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/routes/reassign_master_routes.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/styles/application.less
incubator/ambari/branches/branch-1.2.4/ambari-web/app/templates.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/templates/main/admin/misc.hbs
incubator/ambari/branches/branch-1.2.4/ambari-web/app/templates/main/host/summary.hbs
incubator/ambari/branches/branch-1.2.4/ambari-web/app/templates/main/service/info/summary.hbs
incubator/ambari/branches/branch-1.2.4/ambari-web/app/templates/main/service/reconfigure.hbs
incubator/ambari/branches/branch-1.2.4/ambari-web/app/templates/wizard/step13.hbs
incubator/ambari/branches/branch-1.2.4/ambari-web/app/templates/wizard/step9HostTasksLogPopup.hbs
incubator/ambari/branches/branch-1.2.4/ambari-web/app/utils/ajax.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/utils/config.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/utils/date.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/utils/db.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/utils/helper.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/utils/string_utils.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/views.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/views/common/configs/services_config.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/views/common/quick_view_link_view.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/views/main/admin/cluster.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/views/main/dashboard.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/views/main/dashboard/service/hbase.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/views/main/dashboard/service/hdfs.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/views/main/dashboard/service/mapreduce.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/views/main/dashboard/service/oozie.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/views/main/host/summary.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/views/main/menu.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/views/main/service/info/summary.js
incubator/ambari/branches/branch-1.2.4/ambari-web/app/views/main/service/reconfigure.js
incubator/ambari/branches/branch-1.2.4/ambari-web/test/installer/step2_test.js
incubator/ambari/branches/branch-1.2.4/ambari-web/test/installer/step5_test.js
incubator/ambari/branches/branch-1.2.4/ambari-web/test/installer/step6_test.js
incubator/ambari/branches/branch-1.2.4/ambari-web/test/utils/string_utils_test.js
incubator/ambari/branches/branch-1.2.4/docs/pom.xml
incubator/ambari/branches/branch-1.2.4/docs/src/site/apt/index.apt
incubator/ambari/branches/branch-1.2.4/docs/src/site/apt/whats-new.apt
incubator/ambari/branches/branch-1.2.4/docs/src/site/site.xml
incubator/ambari/branches/branch-1.2.4/version
Modified: incubator/ambari/branches/branch-1.2.4/ambari-agent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-agent/pom.xml?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-agent/pom.xml (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-agent/pom.xml Thu May 30 22:14:29 2013
@@ -61,33 +61,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
- <executions>
- <execution>
- <id>parse-version</id>
- <phase>validate</phase>
- <goals>
- <goal>parse-version</goal>
- </goals>
- </execution>
- <execution>
- <id>regex-property</id>
- <goals>
- <goal>regex-property</goal>
- </goals>
- <configuration>
- <name>ambariVersion</name>
- <value>${project.version}</value>
- <regex>-SNAPSHOT</regex>
- <replacement></replacement>
- <failIfNoMatch>false</failIfNoMatch>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
</plugin>
@@ -325,7 +298,6 @@
<sources>
<source>
<location>../version</location>
- <filter>true</filter>
</source>
</sources>
</mapping>
Modified: incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/monitor.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/monitor.pp?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/monitor.pp (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/monitor.pp Thu May 30 22:14:29 2013
@@ -45,7 +45,7 @@ class hdp-ganglia::monitor(
class { 'hdp-ganglia::config': ganglia_server_host => $ganglia_server_host}
}
- if (($hdp::params::service_exists['hdp-hadoop::datanode'] == true) or ($hdp::params::service_exists['hdp-hadoop::namenode'] == true) or ($hdp::params::service_exists['hdp-hadoop::jobtracker'] == true) or ($hdp::params::service_exists['hdp-hadoop::tasktracker'] == true) or ($hdp::params::service_exists['hdp-yarn::resourcemanager'] == true) or ($hdp::params::service_exists['hdp-yarn::nodemanager'] == true) or ($hdp::params::service_exists['hdp-yarn::historyserver'] == true) or ($hdp::params::service_exists['hdp-hadoop::client'] == true) or ($hdp::params::service_exists['hdp-hadoop::snamenode'] == true)) {
+ if (($hdp::params::service_exists['hdp-hadoop::datanode'] == true) or ($hdp::params::service_exists['hdp-hadoop::namenode'] == true) or ($hdp::params::service_exists['hdp-hadoop::jobtracker'] == true) or ($hdp::params::service_exists['hdp-hadoop::tasktracker'] == true) or ($hdp::params::service_exists['hdp-hadoop::client'] == true) or ($hdp::params::service_exists['hdp-hadoop::snamenode'] == true)) {
class { 'hdp-hadoop::enable-ganglia': }
}
@@ -101,12 +101,6 @@ class hdp-ganglia::monitor::config-gen()
if ($hdp::params::is_jtnode_master) {
hdp-ganglia::config::generate_monitor { 'HDPJobTracker':}
}
- if ($hdp::params::is_rmnode_master) {
- hdp-ganglia::config::generate_monitor { 'HDPResourceManager':}
- }
- if ($hdp::params::is_hsnode_master) {
- hdp-ganglia::config::generate_monitor { 'HDPHistoryServer':}
- }
if ($hdp::params::is_hbase_master) {
hdp-ganglia::config::generate_monitor { 'HDPHBaseMaster':}
}
@@ -167,4 +161,4 @@ class hdp-ganglia::server::delete_defaul
path => '/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin',
require => Class['hdp-ganglia::monitor::gmond']
}
-}
+}
\ No newline at end of file
Modified: incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp Thu May 30 22:14:29 2013
@@ -59,7 +59,7 @@ class hdp-ganglia::server(
}
}
- hdp-ganglia::config::generate_server { ['HDPJobTracker','HDPNameNode','HDPSlaves','HDPResourceManager','HDPHistoryServer']:
+ hdp-ganglia::config::generate_server { ['HDPJobTracker','HDPNameNode','HDPSlaves']:
ganglia_service => 'gmond',
role => 'server'
}
Modified: incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-ganglia/templates/gangliaClusters.conf.erb
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-ganglia/templates/gangliaClusters.conf.erb?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-ganglia/templates/gangliaClusters.conf.erb (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-ganglia/templates/gangliaClusters.conf.erb Thu May 30 22:14:29 2013
@@ -23,5 +23,3 @@
HDPNameNode <%=scope.function_hdp_host("ganglia_server_host")%> 8661
HDPJobTracker <%=scope.function_hdp_host("ganglia_server_host")%> 8662
HDPHBaseMaster <%=scope.function_hdp_host("ganglia_server_host")%> 8663
- HDPResourceManager <%=scope.function_hdp_host("ganglia_server_host")%> 8664
- HDPHistoryServer <%=scope.function_hdp_host("ganglia_server_host")%> 8666
Modified: incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/namenode.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/namenode.pp?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/namenode.pp (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/namenode.pp Thu May 30 22:14:29 2013
@@ -140,12 +140,6 @@ define hdp-hadoop::namenode::create_app_
owner => $hdp::params::hbase_user,
service_state => $service_state
}
- $hbase_staging_dir = $hdp::params::hbase_staging_dir
- hdp-hadoop::hdfs::directory { $hbase_staging_dir:
- owner => $hdp::params::hbase_user,
- service_state => $service_state,
- mode => '711',
- }
}
if ($hdp::params::hive_server_host != "") {
Modified: incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/hadoop-metrics2.properties-GANGLIA.erb
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/hadoop-metrics2.properties-GANGLIA.erb?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/hadoop-metrics2.properties-GANGLIA.erb (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/hadoop-metrics2.properties-GANGLIA.erb Thu May 30 22:14:29 2013
@@ -34,6 +34,4 @@ jobtracker.sink.ganglia.servers=<%=scope
tasktracker.sink.ganglia.servers=<%=scope.function_hdp_host("ganglia_server_host")%>:8660
maptask.sink.ganglia.servers=<%=scope.function_hdp_host("ganglia_server_host")%>:8660
reducetask.sink.ganglia.servers=<%=scope.function_hdp_host("ganglia_server_host")%>:8660
-resourcemanager.sink.ganglia.servers=<%=scope.function_hdp_host("ganglia_server_host")%>:8664
-nodemanager.sink.ganglia.servers=<%=scope.function_hdp_host("ganglia_server_host")%>:8660
-historyserver.sink.ganglia.servers=<%=scope.function_hdp_host("ganglia_server_host")%>:8666
+
Modified: incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/hadoop-metrics2.properties.erb
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/hadoop-metrics2.properties.erb?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/hadoop-metrics2.properties.erb (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/hadoop-metrics2.properties.erb Thu May 30 22:14:29 2013
@@ -34,6 +34,4 @@ jobtracker.sink.ganglia.servers=<%=scope
tasktracker.sink.ganglia.servers=<%=scope.function_hdp_host("ganglia_server_host")%>:8660
maptask.sink.ganglia.servers=<%=scope.function_hdp_host("ganglia_server_host")%>:8660
reducetask.sink.ganglia.servers=<%=scope.function_hdp_host("ganglia_server_host")%>:8660
-resourcemanager.sink.ganglia.servers=<%=scope.function_hdp_host("ganglia_server_host")%>:8664
-nodemanager.sink.ganglia.servers=<%=scope.function_hdp_host("ganglia_server_host")%>:8660
-historyserver.sink.ganglia.servers=<%=scope.function_hdp_host("ganglia_server_host")%>:8666
+
Modified: incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/hbase/service_check.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/hbase/service_check.pp?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/hbase/service_check.pp (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/hbase/service_check.pp Thu May 30 22:14:29 2013
@@ -18,53 +18,28 @@
# under the License.
#
#
-class hdp-hbase::hbase::service_check() inherits hdp-hbase::params
+class hdp-hbase::hbase::service_check()
{
$smoke_test_user = $hdp::params::smokeuser
- $security_enabled = $hdp::params::security_enabled
+
$output_file = "/apps/hbase/data/ambarismoketest"
$conf_dir = $hdp::params::hbase_conf_dir
- $smoke_user_keytab = "${hdp-hbase::params::keytab_path}/${smoke_test_user}.headless.keytab"
- $hbase_user = $hdp-hbase::params::hbase_user
- $hbase_keytab = "${hdp-hbase::params::keytab_path}/${hbase_user}.headless.keytab"
- $test_cmd = "fs -test -e ${output_file}"
- $serviceCheckData = hdp_unique_id_and_date()
- $kinit_cmd = "${hdp::params::kinit_path_local} -kt ${smoke_user_keytab} ${smoke_test_user};"
+ $test_cmd = "fs -test -e ${output_file}"
+
anchor { 'hdp-hbase::hbase::service_check::begin':}
- $hbase_servicecheck_file = '/tmp/hbase-smoke.sh'
-
- file { '/tmp/hbaseSmokeVerify.sh':
+ file { '/tmp/hbaseSmoke.sh':
ensure => present,
- source => "puppet:///modules/hdp-hbase/hbaseSmokeVerify.sh",
- mode => '0755',
- }
-
- file { $hbase_servicecheck_file:
+ source => "puppet:///modules/hdp-hbase/hbaseSmoke.sh",
mode => '0755',
- content => template('hdp-hbase/hbase-smoke.sh.erb'),
- }
- if ($security_enabled == true) {
- $servicecheckcmd = "su - ${smoke_test_user} -c '$kinit_cmd hbase --config $conf_dir shell $hbase_servicecheck_file'"
- $smokeverifycmd = "su - ${smoke_test_user} -c '$kinit_cmd /tmp/hbaseSmokeVerify.sh $conf_dir ${serviceCheckData}'"
- } else {
- $servicecheckcmd = "su - ${smoke_test_user} -c 'hbase --config $conf_dir shell $hbase_servicecheck_file'"
- $smokeverifycmd = "su - ${smoke_test_user} -c '/tmp/hbaseSmokeVerify.sh $conf_dir ${serviceCheckData}'"
}
- exec { $hbase_servicecheck_file:
- command => $servicecheckcmd,
- tries => 3,
- try_sleep => 5,
- path => '/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin',
- logoutput => "true"
- }
-
- exec { '/tmp/hbaseSmokeVerify.sh':
- command => $smokeverifycmd,
+ exec { '/tmp/hbaseSmoke.sh':
+ command => "su - ${smoke_test_user} -c 'hbase --config $conf_dir shell /tmp/hbaseSmoke.sh'",
tries => 3,
try_sleep => 5,
+ require => File['/tmp/hbaseSmoke.sh'],
path => '/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin',
notify => Hdp-hadoop::Exec-hadoop['hbase::service_check::test'],
logoutput => "true"
@@ -73,34 +48,9 @@ class hdp-hbase::hbase::service_check()
hdp-hadoop::exec-hadoop { 'hbase::service_check::test':
command => $test_cmd,
refreshonly => true,
- require => Exec['/tmp/hbaseSmokeVerify.sh'],
+ require => Exec['/tmp/hbaseSmoke.sh'],
before => Anchor['hdp-hbase::hbase::service_check::end'] #TODO: remove after testing
}
-
- if ($security_enabled == true) {
- $hbase_grant_premissions_file = '/tmp/hbase_grant_permissions.sh'
- $hbase_kinit_cmd = "${hdp::params::kinit_path_local} -kt ${hbase_keytab} ${hbase_user};"
- $grantprivelegecmd = "$hbase_kinit_cmd hbase shell ${hbase_grant_premissions_file}"
-
- file { $hbase_grant_premissions_file:
- owner => $hbase_user,
- group => $hdp::params::user_group,
- mode => '0644',
- content => template('hdp-hbase/hbase_grant_permissions.erb')
- }
- hdp::exec { '${smokeuser}_grant_privileges' :
- command => $grantprivelegecmd,
- require => File[$hbase_grant_premissions_file],
- user => $hbase_user
- }
- Anchor['hdp-hbase::hbase::service_check::begin'] -> File['/tmp/hbaseSmokeVerify.sh']
- File[$hbase_servicecheck_file] -> File[$hbase_grant_premissions_file] ->
- Hdp::Exec['${smokeuser}_grant_privileges'] -> Exec[$hbase_servicecheck_file] ->
- Exec['/tmp/hbaseSmokeVerify.sh'] -> Anchor['hdp-hbase::hbase::service_check::end']
- } else {
- Anchor['hdp-hbase::hbase::service_check::begin'] -> File['/tmp/hbaseSmokeVerify.sh']
- File[$hbase_servicecheck_file] -> Exec[$hbase_servicecheck_file] -> Exec['/tmp/hbaseSmokeVerify.sh']
- -> Anchor['hdp-hbase::hbase::service_check::end']
- }
+
anchor{ 'hdp-hbase::hbase::service_check::end':}
-}
\ No newline at end of file
+}
Modified: incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/init.pp?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/init.pp (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/init.pp Thu May 30 22:14:29 2013
@@ -29,7 +29,6 @@ class hdp-hbase(
$hdp::params::component_exists['hdp-hbase'] = true
$smokeuser = $hdp::params::smokeuser
- $security_enabled = $hdp::params::security_enabled
#Configs generation
@@ -94,18 +93,36 @@ class hdp-hbase(
override_owner => true
}
- hdp-hbase::configfile { ['hbase-env.sh','hadoop-metrics.properties']:
+ hdp-hbase::configfile { ['hbase-env.sh','log4j.properties','hadoop-metrics.properties']:
type => $type
}
hdp-hbase::configfile { 'regionservers':}
if ($security_enabled == true) {
- if ($type == 'master' and $service_state == 'running') {
+ if ($type == 'master') {
hdp-hbase::configfile { 'hbase_master_jaas.conf' : }
- } elsif ($type == 'regionserver' and $service_state == 'running') {
+
+ $hbase_grant_premissions_file = '/tmp/hbase_grant_permissions.sh'
+
+ file { $hbase_grant_premissions_file:
+ owner => $hbase_user,
+ group => $hdp::params::user_group,
+ mode => '0644',
+ content => template('hdp-hbase/hbase_grant_permissions.erb')
+ }
+
+ hdp::exec { '${smokeuser}_grant_privileges' :
+ command => "su - ${smoke_test_user} -c 'hbase --config $conf_dir shell ${hbase_grant_premissions_file}'",
+ require => File[$hbase_grant_premissions_file]
+ }
+
+ Hdp-hbase::Configfile<||> -> File[$hbase_grant_premissions_file] ->
+ Hdp::Exec['${smokeuser}_grant_privileges'] -> Anchor['hdp-hbase::end']
+
+ } elsif ($type == 'regionserver') {
hdp-hbase::configfile { 'hbase_regionserver_jaas.conf' : }
- } elsif ($type == 'client') {
+ } else {
hdp-hbase::configfile { 'hbase_client_jaas.conf' : }
}
}
Modified: incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/params.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/params.pp?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/params.pp (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/params.pp Thu May 30 22:14:29 2013
@@ -83,13 +83,13 @@ class hdp-hbase::params() inherits hdp::
$regionserver_memstore_upperlimit = hdp_default("hbase-site/regionserver.memstore.upperlimit","0.4")
- $keytab_path = hdp_default("keytab_path","/etc/security/keytabs")
$hbase_client_jaas_config_file = hdp_default("hbase_client_jaas_config_file", "${conf_dir}/hbase_client_jaas.conf")
$hbase_master_jaas_config_file = hdp_default("hbase_master_jaas_config_file", "${conf_dir}/hbase_master_jaas.conf")
$hbase_regionserver_jaas_config_file = hdp_default("hbase_regionserver_jaas_config_file", "${conf_dir}/hbase_regionserver_jaas.conf")
- $hbase_keytab_path = hdp_default("hbase-site/hbase.master.keytab.file", "${keytab_path}/hbase.service.keytab")
+ $hbase_master_keytab_path = hdp_default("hbase-site/hbase.master.keytab.file", "${keytab_path}/hbase.service.keytab")
$hbase_master_principal = hdp_default("hbase-site/hbase.master.kerberos.principal", "hbase/_HOST@${kerberos_domain}")
+ $hbase_regionserver_keytab_path = hdp_default("hbase-site/hbase.regionserver.keytab.file", "${keytab_path}/hbase.service.keytab")
$hbase_regionserver_principal = hdp_default("hbase-site/hbase.regionserver.kerberos.principal", "hbase/_HOST@${kerberos_domain}")
$hbase_primary_name = hdp_default("hbase_primary_name", "hbase")
Modified: incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hbase/templates/hbase_grant_permissions.erb
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hbase/templates/hbase_grant_permissions.erb?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hbase/templates/hbase_grant_permissions.erb (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hbase/templates/hbase_grant_permissions.erb Thu May 30 22:14:29 2013
@@ -17,5 +17,4 @@
# under the License.
#
#
-grant '<%=scope.function_hdp_template_var("::hdp::params::smokeuser")%>', '<%=scope.function_hdp_template_var("::hdp-hbase::params::smokeuser_permissions")%>'
-exit
\ No newline at end of file
+grant '<%=scope.function_hdp_template_var("::hdp::params::smokeuser")%>', '<%=scope.function_hdp_template_var("::hdp-hbase::params::smokeuser_permissions")%>'
\ No newline at end of file
Modified: incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hbase/templates/hbase_master_jaas.conf.erb
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hbase/templates/hbase_master_jaas.conf.erb?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hbase/templates/hbase_master_jaas.conf.erb (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hbase/templates/hbase_master_jaas.conf.erb Thu May 30 22:14:29 2013
@@ -3,6 +3,6 @@ com.sun.security.auth.module.Krb5LoginMo
useKeyTab=true
storeKey=true
useTicketCache=false
-keyTab="<%=scope.function_hdp_template_var("::hdp-hbase::params::hbase_keytab_path")%>"
+keyTab="<%=scope.function_hdp_template_var("::hdp-hbase::params::hbase_master_keytab_path")%>"
principal="<%=scope.function_hdp_template_var("::hdp-hbase::params::hbase_jaas_princ")%>";
};
Modified: incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hbase/templates/hbase_regionserver_jaas.conf.erb
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hbase/templates/hbase_regionserver_jaas.conf.erb?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hbase/templates/hbase_regionserver_jaas.conf.erb (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hbase/templates/hbase_regionserver_jaas.conf.erb Thu May 30 22:14:29 2013
@@ -3,6 +3,6 @@ com.sun.security.auth.module.Krb5LoginMo
useKeyTab=true
storeKey=true
useTicketCache=false
-keyTab="<%=scope.function_hdp_template_var("::hdp-hbase::params::hbase_keytab_path")%>"
+keyTab="<%=scope.function_hdp_template_var("::hdp-hbase::params::hbase_regionserver_keytab_path")%>"
principal="<%=scope.function_hdp_template_var("::hdp-hbase::params::hbase_jaas_princ")%>";
};
Modified: incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/jdbc-connector.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/jdbc-connector.pp?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/jdbc-connector.pp (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/jdbc-connector.pp Thu May 30 22:14:29 2013
@@ -24,13 +24,8 @@ class hdp-hive::jdbc-connector()
$jdbc_jar_name = $hdp-hive::params::jdbc_jar_name
-
- $java_share_dir = "/usr/share/java"
- $driver_curl_target = "${java_share_dir}/${jdbc_jar_name}"
$hive_lib = $hdp-hive::params::hive_lib
$target = "${hive_lib}/${jdbc_jar_name}"
- $jdk_location = $hdp::params::jdk_location
- $driver_curl_source = "${jdk_location}${jdbc_jar_name}"
anchor { 'hdp-hive::jdbc-connector::begin':}
@@ -46,18 +41,18 @@ class hdp-hive::jdbc-connector()
creates => $target,
path => ["/bin","/usr/bin/"],
require => Hdp::Package['mysql-connector-java'],
- before => Anchor['hdp-hive::jdbc-connector::end'],
+ notify => Anchor['hdp-hive::jdbc-connector::end'],
}
} elsif ($hive_jdbc_driver == "oracle.jdbc.driver.OracleDriver") {
- hdp::exec { 'hive mkdir -p ${artifact_dir} ; curl -f --retry 10 ${driver_curl_source} -o ${driver_curl_target} && cp ${driver_curl_target} ${target}':
- command => "mkdir -p ${artifact_dir} ; curl -f --retry 10 ${driver_curl_source} -o ${driver_curl_target} && cp ${driver_curl_target} ${target}",
+ hdp::exec { 'hive mkdir -p ${artifact_dir} ; cp /usr/share/java/${jdbc_jar_name} ${target}':
+ command => "mkdir -p ${artifact_dir} ; cp /usr/share/java/${jdbc_jar_name} ${target}",
unless => "test -f ${target}",
path => ["/bin","/usr/bin/"],
- before => Anchor['hdp-hive::jdbc-connector::end'],
+ notify => Anchor['hdp-hive::jdbc-connector::end'],
}
}
anchor { 'hdp-hive::jdbc-connector::end':}
-
+
}
Modified: incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/service.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/service.pp?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/service.pp (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/service.pp Thu May 30 22:14:29 2013
@@ -39,21 +39,13 @@ class hdp-oozie::service(
$oozie_keytab = $hdp-oozie::params::oozie_service_keytab
$oozie_principal = $configuration['oozie-site']['oozie.service.HadoopAccessorService.kerberos.principal']
- $oracle_driver_jar_name = "ojdbc6.jar"
- $java_share_dir = "/usr/share/java"
-
- $artifact_dir = $hdp::params::artifact_dir
- $driver_location = $hdp::params::jdk_location
- $driver_curl_target = "${java_share_dir}/${oracle_driver_jar_name}"
- $curl_cmd = "curl -f --retry 10 ${driver_location}${oracle_driver_jar_name} -o ${driver_curl_target}"
-
$jdbc_driver_name = $configuration['oozie-site']['oozie.service.JPAService.jdbc.driver']
if ($jdbc_driver_name == "com.mysql.jdbc.Driver"){
- $jdbc_driver_jar = "${java_share_dir}/mysql-connector-java.jar"
+ $jdbc_driver_jar = "/usr/share/java/mysql-connector-java.jar"
$jdbc_driver_jar_target = "${libext_dir}/mysql-connector-java.jar"
} elsif($jdbc_driver_name == "oracle.jdbc.driver.OracleDriver") {
- $jdbc_driver_jar = "${java_share_dir}/${oracle_driver_jar_name}"
- $jdbc_driver_jar_target = "${libext_dir}/${oracle_driver_jar_name}"
+ $jdbc_driver_jar = "/usr/share/java/ojdbc6.jar"
+ $jdbc_driver_jar_target = "${libext_dir}/ojdbc6.jar"
}
@@ -115,14 +107,13 @@ class hdp-oozie::service(
hdp-oozie::service::directory { $hdp-oozie::params::oozie_lib_dir : }
hdp-oozie::service::directory { $hdp-oozie::params::oozie_webapps_dir : }
hdp-oozie::service::directory { $hdp-oozie::params::libext_dir : }
- hdp-oozie::service::jdbc-connector-java { $hdp-oozie::params::libext_dir : }
anchor{'hdp-oozie::service::begin':} -> Hdp-oozie::Service::Directory<||> -> anchor{'hdp-oozie::service::end':}
if ($ensure == 'installed_and_configured') {
hdp-oozie::service::exec_sh{$sh_cmds:}
hdp-oozie::service::exec_user{$user_cmds:}
- Anchor['hdp-oozie::service::begin'] -> Hdp-oozie::Service::Jdbc-connector-java[$hdp-oozie::params::libext_dir] -> Hdp-oozie::Service::Directory<||> -> Hdp-oozie::Service::Exec_sh[$cmd1] -> Hdp-oozie::Service::Exec_sh[$cmd2] ->Hdp-oozie::Service::Exec_sh[$cmd3] -> Hdp-oozie::Service::Exec_user[$cmd4] ->Hdp-oozie::Service::Exec_user[$cmd5] -> Anchor['hdp-oozie::service::end']
+ Anchor['hdp-oozie::service::begin'] -> Hdp-oozie::Service::Directory<||> -> Hdp-oozie::Service::Exec_sh[$cmd1] -> Hdp-oozie::Service::Exec_sh[$cmd2] ->Hdp-oozie::Service::Exec_sh[$cmd3] -> Hdp-oozie::Service::Exec_user[$cmd4] ->Hdp-oozie::Service::Exec_user[$cmd5] -> Anchor['hdp-oozie::service::end']
} elsif ($ensure == 'running') {
hdp::exec { "exec $cmd6" :
command => $cmd6,
@@ -144,19 +135,6 @@ class hdp-oozie::service(
}
}
-define hdp-oozie::service::jdbc-connector-java()
-{
- if ($jdbc_driver_name == "com.mysql.jdbc.Driver"){
- hdp::package { 'mysql-connector-java' : }
- } elsif($jdbc_driver_name == "oracle.jdbc.driver.OracleDriver") {
- exec{ "${curl_cmd} ${name}":
- command => $curl_cmd,
- path => ["/bin","/usr/bin/"],
- unless => "test -e ${java_share_dir}/${oracle_driver_jar_name}",
- }
- }
-}
-
define hdp-oozie::service::directory()
{
hdp::directory_recursive_create { $name:
Modified: incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp Thu May 30 22:14:29 2013
@@ -202,7 +202,6 @@ class hdp::params()
$hive_apps_whs_dir = hdp_default("hive_apps_whs_dir", "/apps/hive/warehouse")
$webhcat_apps_dir = hdp_default("webhcat_apps_dir", "/apps/webhcat")
$hbase_hdfs_root_dir = hdp_default("hbase-site/hbase.hdfs.root.dir","/apps/hbase/data")
- $hbase_staging_dir = hdp_default("hbase-site/hbase.bulkload.staging.dir","/apps/hbase/staging")
$yarn_nm_app_log_dir = hdp_default("yarn-site/yarn.nodemanager.remote-app-log-dir","/app-logs")
@@ -698,7 +697,5 @@ class hdp::params()
$is_namenode_master = $hdp::params::hostname in $namenode_host
$is_jtnode_master = $hdp::params::hostname in $jtnode_host
- $is_rmnode_master = $hdp::params::hostname in $rm_host
- $is_hsnode_master = $hdp::params::hostname in $hs_host
$is_hbase_master = $hdp::params::hostname in $hbase_master_hosts
}
Modified: incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py Thu May 30 22:14:29 2013
@@ -88,7 +88,7 @@ rolesToClass = {
'YARN_CLIENT': 'hdp-yarn::yarn_client',
'HDFS_CLIENT': 'hdp-hadoop::client',
'MAPREDUCE_CLIENT': 'hdp-hadoop::client',
- 'MAPREDUCE2_CLIENT': 'hdp-yarn::mapreducev2_client',
+ 'MAPREDUCEv2_CLIENT': 'hdp-yarn::mapreducev2_client',
'ZOOKEEPER_SERVER': 'hdp-zookeeper',
'ZOOKEEPER_CLIENT': 'hdp-zookeeper::client',
'HBASE_MASTER': 'hdp-hbase::master',
@@ -186,10 +186,6 @@ pidPathesVars = [
'defaultValue' : '/var/run/mysqld'},
{'var' : 'webhcat_pid_dir',
'defaultValue' : '/var/run/webhcat'},
- {'var' : 'yarn_pid_dir',
- 'defaultValue' : '/var/run/hadoop-yarn'},
- {'var' : 'mapreduce2_pid_dir',
- 'defaultValue' : '/var/run/hadoop-mapreduce'},
]
class AmbariConfig:
Modified: incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/python/ambari_agent/LiveStatus.py
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/python/ambari_agent/LiveStatus.py?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/python/ambari_agent/LiveStatus.py (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-agent/src/main/python/ambari_agent/LiveStatus.py Thu May 30 22:14:29 2013
@@ -32,8 +32,7 @@ class LiveStatus:
SERVICES = [
"HDFS", "MAPREDUCE", "GANGLIA", "HBASE",
"NAGIOS", "ZOOKEEPER", "OOZIE", "HCATALOG",
- "KERBEROS", "TEMPLETON", "HIVE", "WEBHCAT",
- "YARN", "MAPREDUCE2"
+ "KERBEROS", "TEMPLETON", "HIVE", "WEBHCAT"
]
COMPONENTS = [
@@ -43,54 +42,50 @@ class LiveStatus:
"componentName" : "NAMENODE"},
{"serviceName" : "HDFS",
"componentName" : "SECONDARY_NAMENODE"},
-
+# {"serviceName" : "HDFS",
+# "componentName" : "HDFS_CLIENT"},
{"serviceName" : "MAPREDUCE",
"componentName" : "JOBTRACKER"},
{"serviceName" : "MAPREDUCE",
"componentName" : "TASKTRACKER"},
-
- {"serviceName" : "GANGLIA",
+# {"serviceName" : "MAPREDUCE",
+# "componentName" : "MAPREDUCE_CLIENT"},
+ {"serviceName" : "GANGLIA", #!
"componentName" : "GANGLIA_SERVER"},
- {"serviceName" : "GANGLIA",
+ {"serviceName" : "GANGLIA", #!
"componentName" : "GANGLIA_MONITOR"},
-
- {"serviceName" : "HBASE",
+ {"serviceName" : "HBASE", #!
"componentName" : "HBASE_MASTER"},
- {"serviceName" : "HBASE",
+ {"serviceName" : "HBASE", #!
"componentName" : "HBASE_REGIONSERVER"},
-
- {"serviceName" : "NAGIOS",
+# {"serviceName" : "HBASE",
+# "componentName" : "HBASE_CLIENT"},
+ {"serviceName" : "NAGIOS", #!
"componentName" : "NAGIOS_SERVER"},
-
{"serviceName" : "ZOOKEEPER",
"componentName" : "ZOOKEEPER_SERVER"},
-
+# {"serviceName" : "ZOOKEEPER",
+# "componentName" : "ZOOKEEPER_CLIENT"},
{"serviceName" : "OOZIE",
"componentName" : "OOZIE_SERVER"},
-
- {"serviceName" : "HCATALOG",
+# {"serviceName" : "OOZIE",
+# "componentName" : "OOZIE_CLIENT"},
+ {"serviceName" : "HCATALOG", #!
"componentName" : "HCATALOG_SERVER"},
-
{"serviceName" : "KERBEROS",
- "componentName" : "KERBEROS_SERVER"},
-
- {"serviceName" : "HIVE",
+ "componentName" : "KERBEROS_SERVER"}, #!
+# {"serviceName" : "TEMPLETON",
+# "componentName" : "TEMPLETON_SERVER"},
+# {"serviceName" : "TEMPLETON",
+# "componentName" : "TEMPLETON_CLIENT"},
+ {"serviceName" : "HIVE", #!
"componentName" : "HIVE_SERVER"},
- {"serviceName" : "HIVE",
+ {"serviceName" : "HIVE", #!
"componentName" : "HIVE_METASTORE"},
- {"serviceName" : "HIVE",
+ {"serviceName" : "HIVE", #!
"componentName" : "MYSQL_SERVER"},
-
{"serviceName" : "WEBHCAT",
"componentName" : "WEBHCAT_SERVER"},
-
- {"serviceName" : "YARN",
- "componentName" : "RESOURCEMANAGER"},
- {"serviceName" : "YARN",
- "componentName" : "NODEMANAGER"},
-
- {"serviceName" : "MAPREDUCE2",
- "componentName" : "HISTORYSERVER"},
]
LIVE_STATUS = "STARTED"
Modified: incubator/ambari/branches/branch-1.2.4/ambari-server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-server/pom.xml?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-server/pom.xml (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-server/pom.xml Thu May 30 22:14:29 2013
@@ -33,58 +33,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
- <executions>
- <execution>
- <id>parse-version</id>
- <phase>validate</phase>
- <goals>
- <goal>parse-version</goal>
- </goals>
- </execution>
- <execution>
- <id>regex-property</id>
- <goals>
- <goal>regex-property</goal>
- </goals>
- <configuration>
- <name>ambariVersion</name>
- <value>${project.version}</value>
- <regex>-SNAPSHOT</regex>
- <replacement></replacement>
- <failIfNoMatch>false</failIfNoMatch>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.6</version>
- <executions>
- <execution>
- <id>copy-resources</id>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/target/</outputDirectory>
- <resources>
- <resource>
- <directory>${basedir}/../</directory>
- <includes>
- <include>**/version</include>
- </includes>
- <filtering>true</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
</plugin>
@@ -308,7 +256,6 @@
<sources>
<source>
<location>src/main/resources/Ambari-DDL-Postgres-CREATE.sql</location>
- <filter>true</filter>
</source>
<source>
<location>src/main/resources/Ambari-DDL-Postgres-DROP.sql</location>
@@ -329,7 +276,6 @@
<sources>
<source>
<location>src/main/resources/upgrade/ddl/Ambari-DDL-Postgres-UPGRADE-1.3.0.sql</location>
- <filter>true</filter>
</source>
<source>
<location>src/main/resources/upgrade/ddl/Ambari-DDL-Postgres-UPGRADE-1.3.0.Fix.sql</location>
@@ -415,7 +361,6 @@
<sources>
<source>
<location>../version</location>
- <filter>true</filter>
</source>
</sources>
</mapping>
@@ -474,12 +419,6 @@
-->
</plugin>
</plugins>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
</build>
<profiles>
</profiles>
Modified: incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/conf/ambari.properties
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/conf/ambari.properties?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/conf/ambari.properties (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/conf/ambari.properties Thu May 30 22:14:29 2013
@@ -16,4 +16,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
metadata.path=src/main/resources/stacks
-server.version.file=target/version
+server.version.file=../version
\ No newline at end of file
Modified: incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/java/org/apache/ambari/server/Role.java
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/java/org/apache/ambari/server/Role.java?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/java/org/apache/ambari/server/Role.java (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/java/org/apache/ambari/server/Role.java Thu May 30 22:14:29 2013
@@ -35,7 +35,7 @@ public enum Role {
JOBTRACKER,
TASKTRACKER,
MAPREDUCE_CLIENT,
- MAPREDUCE2_CLIENT,
+ MAPREDUCEv2_CLIENT,
JAVA_JCE,
HADOOP_CLIENT,
JOBTRACKER_SERVICE_CHECK,
Modified: incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaHostPropertyProvider.java
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaHostPropertyProvider.java?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaHostPropertyProvider.java (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaHostPropertyProvider.java Thu May 30 22:14:29 2013
@@ -41,9 +41,7 @@ public class GangliaHostPropertyProvider
GANGLIA_CLUSTER_NAMES.add("HDPNameNode");
GANGLIA_CLUSTER_NAMES.add("HDPSlaves");
GANGLIA_CLUSTER_NAMES.add("HDPJobTracker");
- GANGLIA_CLUSTER_NAMES.add("HDPResourceManager");
GANGLIA_CLUSTER_NAMES.add("HDPHBaseMaster");
- GANGLIA_CLUSTER_NAMES.add("HDPHistoryServer");
}
// ----- Constructors ------------------------------------------------------
Modified: incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProvider.java
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProvider.java?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProvider.java (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProvider.java Thu May 30 22:14:29 2013
@@ -55,9 +55,6 @@ public abstract class GangliaPropertyPro
GANGLIA_CLUSTER_NAME_MAP.put("DATANODE", "HDPSlaves");
GANGLIA_CLUSTER_NAME_MAP.put("JOBTRACKER", "HDPJobTracker");
GANGLIA_CLUSTER_NAME_MAP.put("TASKTRACKER", "HDPSlaves");
- GANGLIA_CLUSTER_NAME_MAP.put("RESOURCEMANAGER", "HDPResourceManager");
- GANGLIA_CLUSTER_NAME_MAP.put("NODEMANAGER", "HDPSlaves");
- GANGLIA_CLUSTER_NAME_MAP.put("HISTORYSERVER", "HDPHistoryServer");
GANGLIA_CLUSTER_NAME_MAP.put("HBASE_MASTER", "HDPHBaseMaster");
GANGLIA_CLUSTER_NAME_MAP.put("HBASE_CLIENT", "HDPSlaves");
GANGLIA_CLUSTER_NAME_MAP.put("HBASE_REGIONSERVER", "HDPSlaves");
Modified: incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterControllerImpl.java
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterControllerImpl.java?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterControllerImpl.java (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterControllerImpl.java Thu May 30 22:14:29 2013
@@ -260,28 +260,28 @@ public class ClusterControllerImpl imple
Iterable<Resource> resources = getResources(type, readRequest, predicate);
PredicateBuilder pb = new PredicateBuilder();
- PredicateBuilder.PredicateBuilderPredicate pbPredicate = null;
+ PredicateBuilder.PredicateBuilderWithPredicate pbWithPredicate = null;
for (Resource resource : resources) {
- if (pbPredicate != null) {
- pb = pbPredicate.or();
+ if (pbWithPredicate != null) {
+ pb = pbWithPredicate.or();
}
- pb = pb.begin();
- pbPredicate = null;
+ pb = pb.begin();
+ pbWithPredicate = null;
for (String keyPropertyId : keyPropertyIds) {
- if (pbPredicate != null) {
- pb = pbPredicate.and();
+ if (pbWithPredicate != null) {
+ pb = pbWithPredicate.and();
}
- pbPredicate =
+ pbWithPredicate =
pb.property(keyPropertyId).equals((Comparable) resource.getPropertyValue(keyPropertyId));
}
- if (pbPredicate != null) {
- pbPredicate = pbPredicate.end();
+ if (pbWithPredicate != null) {
+ pbWithPredicate = pbWithPredicate.end();
}
}
- return pbPredicate == null ? null : pbPredicate.toPredicate();
+ return pbWithPredicate == null ? null : pbWithPredicate.toPredicate();
}
/**
Modified: incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXPropertyProvider.java
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXPropertyProvider.java?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXPropertyProvider.java (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXPropertyProvider.java Thu May 30 22:14:29 2013
@@ -93,9 +93,6 @@ public class JMXPropertyProvider extends
DEFAULT_JMX_PORTS.put("TASKTRACKER", "50060");
DEFAULT_JMX_PORTS.put("HBASE_MASTER", "60010");
DEFAULT_JMX_PORTS.put("HBASE_REGIONSERVER", "60030");
- DEFAULT_JMX_PORTS.put("RESOURCEMANAGER", "8088");
- DEFAULT_JMX_PORTS.put("HISTORYSERVER", "19888");
- DEFAULT_JMX_PORTS.put("NODEMANAGER", "8042");
ObjectMapper objectMapper = new ObjectMapper();
objectMapper.configure(DeserializationConfig.Feature.USE_ANNOTATIONS, false);
Modified: incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/PredicateBuilder.java
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/PredicateBuilder.java?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/PredicateBuilder.java (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/PredicateBuilder.java Thu May 30 22:14:29 2013
@@ -32,65 +32,6 @@ import java.util.List;
/**
* Builder for predicates.
- * <p/>
- * The builder enforces a domain specific language according to the following
- * grammar :
- * <p/>
- * <predicate> ::= <property_name> <relational_operator> <value>
- * <predicate> ::= NOT <predicate>
- * <predicate> ::= ( <predicate> )
- * <predicate> ::= <predicate> AND <predicate>
- * <predicate> ::= <predicate> OR <predicate>
- *
- * <relational_operator> ::= =|>|<|>=|<=
- * <p/>
- * The predicate builder uses the normal method chaining of the builder pattern
- * along with intermediate objects. The use of intermediate objects allows
- * for compiler checked constraints.
- * <p/>
- * For example, the predicate builder can be used to build a predicate where
- * property1=="foo" && property2=="bar".
- *
- * <pre>
- * {@code
- * PredicateBuilder builder = new PredicateBuilder();
- *
- * Predicate predicate = builder.property(property1).equals("foo").
- * and().property(property2).equals("bar").toPredicate();
- * }
- * </pre>
- *
- * In this example, we are starting with an instance of {@link PredicateBuilder}.
- * Calling the method {@link PredicateBuilder#property(String)} returns an
- * instance of {@link PredicateBuilderProperty} which exposes methods for attaching
- * a relational operator to the property to form a simple predicate.
- * <p/>
- * Notice that the method {@link PredicateBuilderProperty#equals(Comparable)}
- * returns an instance of {@link PredicateBuilderPredicate} which exposes methods
- * for using predicates with logical operators to create complex predicates.
- * <p/>
- * Calling the method {@link PredicateBuilderPredicate#and()} returns an instance
- * of {@link PredicateBuilder} which allows us to start over building the predicate
- * for property2.
- * <p/>
- * The reason for having these intermediate return objects is that they only
- * expose the methods that make sense for that point in the building process.
- * In other words, we can use the compiler to check the syntax of our DSL
- * grammar at compile time rather than having a single builder class with a
- * bunch of runtime checks.
- * <p/>
- * For example, if the user tries to make an inappropriate call to the and()
- * method ...
- *
- * <pre>
- * {@code
- *
- * Predicate predicate = builder.property(property1).and().
- * property(property2).equals("bar").toPredicate();
- * }
- * </pre>
- *
- * ... the compiler will flag it as an error and the code will simply not compile.
*/
public class PredicateBuilder {
@@ -101,122 +42,47 @@ public class PredicateBuilder {
private boolean done = false;
private boolean not = false;
-
- // ----- Constructors ------------------------------------------------------
-
- /**
- * Construct a predicate builder.
- */
public PredicateBuilder() {
this.outer = null;
}
- /**
- * Construct a predicate builder within another predicate builder.
- *
- * @param outer the outer predicate builder
- */
private PredicateBuilder(PredicateBuilder outer) {
this.outer = outer;
}
-
- // ----- enums ------------------------------------------------------
-
- /**
- * Logical operators
- */
private enum Operator {
And,
Or
}
-
- // ----- PredicateBuilder --------------------------------------------------
-
- /**
- * Create a property from the given property id. This supports method
- * chaining by returning an instance of {@link PredicateBuilderProperty}
- * which is an intermediate object that represents the property in the DSL.
- *
- * @param id the property id
- *
- * @return a property that can be used in the building of the predicate.
- *
- * @throws IllegalStateException if an attempt is made to reuse a predicate builder
- */
- public PredicateBuilderProperty property(String id) {
+ public PredicateBuilderWithProperty property(String id) {
checkDone();
propertyId = id;
- return new PredicateBuilderProperty();
+ return new PredicateBuilderWithProperty();
}
- /**
- * Set the builder to negate the predicate being built. This supports method
- * chaining by returning an instance of {@link PredicateBuilder} which can be
- * used to continue building the predicate.
- *
- * For example, the following shows a usage of the not() method to
- * produce a predicate where property "p1" does not equal "foo".
- *
- * <pre>
- * {@code
- * Predicate predicate = builder.not().property("p1").equals("foo").toPredicate();
- * }
- * </pre>
- *
- * @return a builder to be used to continue building the predicate
- */
public PredicateBuilder not() {
not = true;
return this;
}
- /**
- * Set the builder to begin a block around the predicate being built. Calling this
- * method is the equivalent of using a left parenthesis. This supports method
- * chaining by returning an instance of {@link PredicateBuilder} which can be
- * used to continue building the predicate.
- *
- * For example, the following shows a usage of the begin() method to
- * produce a predicate where p1==foo && (p2==bar || p3 == cat).
- *
- * <pre>
- * {@code
- * Predicate predicate = builder.property("p1").equals("foo").and().
- * begin().property("p2").equals("bar").or().property("p3").equals("cat").end().
- * toPredicate();
- * }
- * </pre>
- *
- * @return a builder to be used to continue building the predicate
- *
- * @throws IllegalStateException if an attempt is made to reuse a predicate builder
- */
public PredicateBuilder begin() {
checkDone();
return new PredicateBuilder(this);
}
- /**
- * Produce a {@link Predicate} object from the builder.
- *
- * @return the predicate object
- */
public Predicate toPredicate() {
return getPredicate();
}
- // ----- helper methods ----------------------------------------------------
-
private void checkDone() {
if (done) {
throw new IllegalStateException("Can't reuse a predicate builder.");
}
}
- private PredicateBuilderPredicate getPredicateBuilderWithPredicate() {
- return new PredicateBuilderPredicate();
+ private PredicateBuilderWithPredicate getPredicateBuilderWithPredicate() {
+ return new PredicateBuilderWithPredicate();
}
private void addPredicate(Predicate predicate) {
@@ -261,212 +127,60 @@ public class PredicateBuilder {
throw new IllegalStateException("Can't return a predicate.");
}
- // ----- inner classes -----------------------------------------------------
-
- // ----- PredicateBuilderProperty ------------------------------------------
+ public class PredicateBuilderWithProperty {
- /**
- * A builder object that represents the property portion of the predicate being built.
- * The PredicateBuilderProperty is itself a builder object that may be returned for
- * method chaining of the predicate builder methods.
- */
- public class PredicateBuilderProperty {
-
- /**
- * Create a {@link PredicateBuilderPredicate} representing an equals
- * predicate for the property represented by this builder for the given
- * value. This supports method chaining by returning an instance of
- * {@link PredicateBuilderPredicate} which can be used to continue building
- * the predicate.
- *
- * For example, the following shows a usage of the equals() method to
- * produce a predicate where p1==foo.
- *
- * <pre>
- * {@code
- * Predicate predicate = builder.property("p1").equals("foo").
- * toPredicate();
- * }
- * </pre>
- *
- * @param value the right operand (value) of the = operator
- * @param <T> the type of the property
- *
- * @return a new builder representing an equals predicate
- *
- * @throws IllegalStateException if no property name was specified on this builder
- */
- public <T>PredicateBuilderPredicate equals(Comparable<T> value) {
+ // ----- Equals -----
+ public <T>PredicateBuilderWithPredicate equals(Comparable<T> value) {
if (propertyId == null) {
throw new IllegalStateException("No property.");
}
addPredicate(new EqualsPredicate<T>(propertyId, value));
- return new PredicateBuilderPredicate();
+ return new PredicateBuilderWithPredicate();
}
- /**
- * Create a {@link PredicateBuilderPredicate} representing an greater than
- * predicate for the property represented by this builder for the given
- * value. This supports method chaining by returning an instance of
- * {@link PredicateBuilderPredicate} which can be used to continue building
- * the predicate.
- *
- * For example, the following shows a usage of the greaterThan() method to
- * produce a predicate where p1 > 5.
- *
- * <pre>
- * {@code
- * Predicate predicate = builder.property("p1").greaterThan(5).
- * toPredicate();
- * }
- * </pre>
- *
- * @param value the right operand (value) of the > operator
- * @param <T> the type of the property
- *
- * @return a new builder representing a greater than predicate
- *
- * @throws IllegalStateException if no property name was specified on this builder
- */
- public <T>PredicateBuilderPredicate greaterThan(Comparable<T> value) {
+ // ----- Greater than -----
+ public <T>PredicateBuilderWithPredicate greaterThan(Comparable<T> value) {
if (propertyId == null) {
throw new IllegalStateException("No property.");
}
addPredicate(new GreaterPredicate<T>(propertyId, value));
- return new PredicateBuilderPredicate();
+ return new PredicateBuilderWithPredicate();
}
- /**
- * Create a {@link PredicateBuilderPredicate} representing a
- * greater than or equals predicate for the property represented by this
- * builder for the given value. This supports method chaining by returning
- * an instance of {@link PredicateBuilderPredicate} which can be used to
- * continue building the predicate.
- *
- * For example, the following shows a usage of the greaterThanEqualTo()
- * method to produce a predicate where p1 >= 5.
- *
- * <pre>
- * {@code
- * Predicate predicate = builder.property("p1").greaterThanEqualTo(5).
- * toPredicate();
- * }
- * </pre>
- *
- * @param value the right operand (value) of the >= operator
- * @param <T> the type of the property
- *
- * @return a new builder representing a greater than or equals predicate
- *
- * @throws IllegalStateException if no property name was specified on this builder
- */
- public <T>PredicateBuilderPredicate greaterThanEqualTo(Comparable<T> value) {
+ // ----- Greater than equal to -----
+ public <T>PredicateBuilderWithPredicate greaterThanEqualTo(Comparable<T> value) {
if (propertyId == null) {
throw new IllegalStateException("No property.");
}
addPredicate(new GreaterEqualsPredicate<T>(propertyId, value));
- return new PredicateBuilderPredicate();
+ return new PredicateBuilderWithPredicate();
}
- /**
- * Create a {@link PredicateBuilderPredicate} representing a
- * less than predicate for the property represented by this builder
- * for the given value. This supports method chaining by returning
- * an instance of {@link PredicateBuilderPredicate} which can be used to
- * continue building the predicate.
- *
- * For example, the following shows a usage of the lessThan()
- * method to produce a predicate where p1 < 5.
- *
- * <pre>
- * {@code
- * Predicate predicate = builder.property("p1").lessThan(5).
- * toPredicate();
- * }
- * </pre>
- *
- * @param value the right operand (value) of the < operator
- * @param <T> the type of the property
- *
- * @return a new builder representing a less than predicate
- *
- * @throws IllegalStateException if no property name was specified on this builder
- */
- public <T>PredicateBuilderPredicate lessThan(Comparable<T> value) {
+ // ----- Less than -----
+ public <T>PredicateBuilderWithPredicate lessThan(Comparable<T> value) {
if (propertyId == null) {
throw new IllegalStateException("No property.");
}
addPredicate(new LessPredicate<T>(propertyId, value));
- return new PredicateBuilderPredicate();
+ return new PredicateBuilderWithPredicate();
}
- /**
- * Create a {@link PredicateBuilderPredicate} representing a
- * less than or equals predicate for the property represented by this
- * builder for the given value. This supports method chaining by returning
- * an instance of {@link PredicateBuilderPredicate} which can be used to
- * continue building the predicate.
- *
- * For example, the following shows a usage of the lessThanEqualTo()
- * method to produce a predicate where p1 <= 5.
- *
- * <pre>
- * {@code
- * Predicate predicate = builder.property("p1").lessThanEqualTo(5).
- * toPredicate();
- * }
- * </pre>
- *
- * @param value the right operand (value) of the <= operator
- * @param <T> the type of the property
- *
- * @return a new builder representing a less than or equals predicate
- *
- * @throws IllegalStateException if no property name was specified on this builder
- */
- public <T>PredicateBuilderPredicate lessThanEqualTo(Comparable<T> value) {
+ // ----- Less than equal to -----
+ public <T>PredicateBuilderWithPredicate lessThanEqualTo(Comparable<T> value) {
if (propertyId == null) {
throw new IllegalStateException("No property.");
}
addPredicate(new LessEqualsPredicate<T>(propertyId, value));
- return new PredicateBuilderPredicate();
+ return new PredicateBuilderWithPredicate();
}
}
- // ----- PredicateBuilderPredicate -----------------------------------------
-
- /**
- * A builder object that represents an inner predicate portion of the predicate being built.
- * Note that the predicate represented by an instance of PredicateBuilderPredicate may be
- * part of a larger complex predicate being built by the predicate builder. The
- * PredicateBuilderPredicate is itself a builder object that may be returned for method
- * chaining of the predicate builder methods.
- */
- public class PredicateBuilderPredicate {
-
- /**
- * Get a {@link PredicateBuilder} object that can be used to build a
- * predicate that will be ANDed with the predicate represented by this
- * PredicateBuilderPredicate.
- *
- * For example, the following shows a usage of the and() method to
- * produce a predicate where p1==foo && p2==bar.
- *
- * <pre>
- * {@code
- * Predicate predicate = builder.property(p1).equals("foo").
- * and().property(p2).equals("bar").toPredicate();
- * }
- * </pre>
- *
- * @return a new predicate builder that should be used to build the predicate
- * being ANDed with the predicate from this builder
- */
+ public class PredicateBuilderWithPredicate {
public PredicateBuilder and() {
if (operator != Operator.And) {
@@ -476,24 +190,6 @@ public class PredicateBuilder {
return PredicateBuilder.this;
}
- /**
- * Get a {@link PredicateBuilder} object that can be used to build a
- * predicate that will be ORed with the predicate represented by this
- * PredicateBuilderPredicate.
- *
- * For example, the following shows a usage of the and() method to
- * produce a predicate where p1==foo || p2==bar.
- *
- * <pre>
- * {@code
- * Predicate predicate = builder.property(p1).equals("foo").
- * or().property(p2).equals("bar").toPredicate();
- * }
- * </pre>
- *
- * @return a new predicate builder that should be used to build the predicate
- * being ORed with the predicate from this builder
- */
public PredicateBuilder or() {
if (operator != Operator.Or) {
@@ -503,13 +199,6 @@ public class PredicateBuilder {
return PredicateBuilder.this;
}
- /**
- * Produce a {@link Predicate} object from the builder.
- *
- * @return the predicate object
- *
- * @throws IllegalStateException if the block is unbalanced (missing end call)
- */
public Predicate toPredicate() {
if (outer != null) {
throw new IllegalStateException("Unbalanced block - missing end.");
@@ -518,28 +207,7 @@ public class PredicateBuilder {
return getPredicate();
}
- /**
- * Set the builder to end a block around the predicate being built. Calling this
- * method is the equivalent of using a right parenthesis. This supports method
- * chaining by returning an instance of {@link PredicateBuilderPredicate} which can
- * be used to continue building the predicate.
- *
- * For example, the following shows a usage of the end() method to
- * produce a predicate where p1==foo && (p2==bar || p3 == cat).
- *
- * <pre>
- * {@code
- * Predicate predicate = builder.property("p1").equals("foo").and().
- * begin().property("p2").equals("bar").or().property("p3").equals("cat").end().
- * toPredicate();
- * }
- * </pre>
- *
- * @return a builder to be used to continue building the predicate
- *
- * @throws IllegalStateException if the block is unbalanced (missing end call)
- */
- public PredicateBuilderPredicate end() {
+ public PredicateBuilderWithPredicate end() {
if (outer == null) {
throw new IllegalStateException("Unbalanced block - missing begin.");
}
Modified: incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/java/org/apache/ambari/server/metadata/RoleCommandOrder.java
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/java/org/apache/ambari/server/metadata/RoleCommandOrder.java?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/java/org/apache/ambari/server/metadata/RoleCommandOrder.java (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/java/org/apache/ambari/server/metadata/RoleCommandOrder.java Thu May 30 22:14:29 2013
@@ -155,8 +155,6 @@ public class RoleCommandOrder {
RoleCommand.START);
addDependency(Role.HDFS_SERVICE_CHECK, RoleCommand.EXECUTE, Role.DATANODE,
RoleCommand.START);
- addDependency(Role.HDFS_SERVICE_CHECK, RoleCommand.EXECUTE, Role.SECONDARY_NAMENODE,
- RoleCommand.START);
addDependency(Role.MAPREDUCE_SERVICE_CHECK, RoleCommand.EXECUTE,
Role.JOBTRACKER, RoleCommand.START);
addDependency(Role.MAPREDUCE_SERVICE_CHECK, RoleCommand.EXECUTE,
@@ -181,10 +179,6 @@ public class RoleCommandOrder {
Role.JOBTRACKER, RoleCommand.START);
addDependency(Role.PIG_SERVICE_CHECK, RoleCommand.EXECUTE,
Role.TASKTRACKER, RoleCommand.START);
- addDependency(Role.PIG_SERVICE_CHECK, RoleCommand.EXECUTE,
- Role.RESOURCEMANAGER, RoleCommand.START);
- addDependency(Role.PIG_SERVICE_CHECK, RoleCommand.EXECUTE,
- Role.NODEMANAGER, RoleCommand.START);
addDependency(Role.SQOOP_SERVICE_CHECK, RoleCommand.EXECUTE,
Role.JOBTRACKER, RoleCommand.START);
addDependency(Role.SQOOP_SERVICE_CHECK, RoleCommand.EXECUTE,