You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ma...@apache.org on 2013/02/04 03:24:02 UTC
svn commit: r1442010 [1/29] - in /incubator/ambari/branches/branch-1.2: ./
ambari-agent/ ambari-agent/conf/unix/ ambari-agent/src/examples/
ambari-agent/src/main/puppet/modules/hdp-ganglia/files/
ambari-agent/src/main/puppet/modules/hdp-ganglia/manifes...
Author: mahadev
Date: Mon Feb 4 02:23:55 2013
New Revision: 1442010
URL: http://svn.apache.org/viewvc?rev=1442010&view=rev
Log:
Backporting patches for 1.2.1 release
Added:
incubator/ambari/branches/branch-1.2/ambari-agent/src/examples/
incubator/ambari/branches/branch-1.2/ambari-agent/src/examples/query_with3jobs.txt
incubator/ambari/branches/branch-1.2/ambari-agent/src/examples/query_with6jobs.txt
incubator/ambari/branches/branch-1.2/ambari-agent/src/examples/tpcds_ss_tables.sql
incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/files/capacity-scheduler.xml
incubator/ambari/branches/branch-1.2/ambari-agent/src/main/python/ambari_agent/HostInfo.py
incubator/ambari/branches/branch-1.2/ambari-agent/src/main/python/ambari_agent/hostname.py
incubator/ambari/branches/branch-1.2/ambari-agent/src/test/python/TestHostname.py
incubator/ambari/branches/branch-1.2/ambari-agent/src/test/python/TestManifestGenerator.py
incubator/ambari/branches/branch-1.2/ambari-agent/src/test/python/TestProcessHelper.py
incubator/ambari/branches/branch-1.2/ambari-agent/src/test/python/TestRepoInstaller.py
incubator/ambari/branches/branch-1.2/ambari-common/
incubator/ambari/branches/branch-1.2/ambari-common/src/
incubator/ambari/branches/branch-1.2/ambari-common/src/test/
incubator/ambari/branches/branch-1.2/ambari-common/src/test/python/
incubator/ambari/branches/branch-1.2/ambari-common/src/test/python/mock/
incubator/ambari/branches/branch-1.2/ambari-common/src/test/python/mock/LICENSE.txt
incubator/ambari/branches/branch-1.2/ambari-common/src/test/python/mock/MANIFEST.in
incubator/ambari/branches/branch-1.2/ambari-common/src/test/python/mock/README.txt
incubator/ambari/branches/branch-1.2/ambari-common/src/test/python/mock/__init__.py
incubator/ambari/branches/branch-1.2/ambari-common/src/test/python/mock/docs/
incubator/ambari/branches/branch-1.2/ambari-common/src/test/python/mock/docs/changelog.txt
incubator/ambari/branches/branch-1.2/ambari-common/src/test/python/mock/docs/compare.txt
incubator/ambari/branches/branch-1.2/ambari-common/src/test/python/mock/docs/conf.py
incubator/ambari/branches/branch-1.2/ambari-common/src/test/python/mock/docs/examples.txt
incubator/ambari/branches/branch-1.2/ambari-common/src/test/python/mock/docs/getting-started.txt
incubator/ambari/branches/branch-1.2/ambari-common/src/test/python/mock/docs/helpers.txt
incubator/ambari/branches/branch-1.2/ambari-common/src/test/python/mock/docs/index.txt
incubator/ambari/branches/branch-1.2/ambari-common/src/test/python/mock/docs/magicmock.txt
incubator/ambari/branches/branch-1.2/ambari-common/src/test/python/mock/docs/mock.txt
incubator/ambari/branches/branch-1.2/ambari-common/src/test/python/mock/docs/patch.txt
incubator/ambari/branches/branch-1.2/ambari-common/src/test/python/mock/docs/sentinel.txt
incubator/ambari/branches/branch-1.2/ambari-common/src/test/python/mock/extendmock.py
incubator/ambari/branches/branch-1.2/ambari-common/src/test/python/mock/mock.py
incubator/ambari/branches/branch-1.2/ambari-common/src/test/python/mock/mock.wpr
incubator/ambari/branches/branch-1.2/ambari-common/src/test/python/mock/setup.cfg
incubator/ambari/branches/branch-1.2/ambari-common/src/test/python/mock/setup.py
incubator/ambari/branches/branch-1.2/ambari-common/src/test/python/mock/tests/
incubator/ambari/branches/branch-1.2/ambari-common/src/test/python/mock/tests/__init__.py
incubator/ambari/branches/branch-1.2/ambari-common/src/test/python/mock/tests/_testwith.py
incubator/ambari/branches/branch-1.2/ambari-common/src/test/python/mock/tests/support.py
incubator/ambari/branches/branch-1.2/ambari-common/src/test/python/mock/tests/support_with.py
incubator/ambari/branches/branch-1.2/ambari-common/src/test/python/mock/tests/testcallable.py
incubator/ambari/branches/branch-1.2/ambari-common/src/test/python/mock/tests/testhelpers.py
incubator/ambari/branches/branch-1.2/ambari-common/src/test/python/mock/tests/testmagicmethods.py
incubator/ambari/branches/branch-1.2/ambari-common/src/test/python/mock/tests/testmock.py
incubator/ambari/branches/branch-1.2/ambari-common/src/test/python/mock/tests/testpatch.py
incubator/ambari/branches/branch-1.2/ambari-common/src/test/python/mock/tests/testsentinel.py
incubator/ambari/branches/branch-1.2/ambari-common/src/test/python/mock/tests/testwith.py
incubator/ambari/branches/branch-1.2/ambari-common/src/test/python/mock/tox.ini
incubator/ambari/branches/branch-1.2/ambari-common/src/test/python/mock/unittest.cfg
incubator/ambari/branches/branch-1.2/ambari-server/pass.txt
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/agent/AgentEnv.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/HostsMap.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/gsinstaller/
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/gsinstaller/ClusterDefinition.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerClusterProvider.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerComponentProvider.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerHostComponentProvider.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerHostProvider.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerNoOpProvider.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerProviderModule.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerResourceProvider.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerServiceProvider.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerStateProvider.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HttpProxyPropertyProvider.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/resources/upgrade/
incubator/ambari/branches/branch-1.2/ambari-server/src/main/resources/upgrade/ddl/
incubator/ambari/branches/branch-1.2/ambari-server/src/main/resources/upgrade/ddl/Ambari-DDL-Postgres-UPGRADE-1.2.1.sql
incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/
incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerClusterProviderTest.java
incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerComponentProviderTest.java
incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerHostComponentProviderTest.java
incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerHostProviderTest.java
incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerServiceProviderTest.java
incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/TestGSInstallerStateProvider.java
incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HttpPropertyProviderTest.java
incubator/ambari/branches/branch-1.2/ambari-server/src/test/python/
incubator/ambari/branches/branch-1.2/ambari-server/src/test/python/TestAmbaryServer.py
incubator/ambari/branches/branch-1.2/ambari-server/src/test/python/unitTests.py
incubator/ambari/branches/branch-1.2/ambari-server/src/test/resources/TestAmbaryServer.samples/
incubator/ambari/branches/branch-1.2/ambari-server/src/test/resources/TestAmbaryServer.samples/configure_pg_hba_ambaridb_users1
incubator/ambari/branches/branch-1.2/ambari-server/src/test/resources/TestAmbaryServer.samples/configure_pg_hba_ambaridb_users2
incubator/ambari/branches/branch-1.2/ambari-server/src/test/resources/TestAmbaryServer.samples/configure_postgresql_conf1
incubator/ambari/branches/branch-1.2/ambari-server/src/test/resources/gsInstaller-hosts.txt
incubator/ambari/branches/branch-1.2/ambari-server/src/test/resources/hbase_hbasemaster_jmx.json
incubator/ambari/branches/branch-1.2/ambari-server/src/test/resources/temporal_ganglia_data.txt
incubator/ambari/branches/branch-1.2/ambari-web/app/assets/data/apps/jobs/mr_201301280808_0001.json
incubator/ambari/branches/branch-1.2/ambari-web/app/assets/data/apps/jobs/mr_201301280808_0003.json
incubator/ambari/branches/branch-1.2/ambari-web/app/assets/data/apps/jobs/mr_201301280808_0004.json
incubator/ambari/branches/branch-1.2/ambari-web/app/assets/data/apps/jobs/pig_f9957a11-a902-4f01-ac53-9679ce3a4b13.json
incubator/ambari/branches/branch-1.2/ambari-web/app/assets/data/wizard/bootstrap/two_hosts_information.json
incubator/ambari/branches/branch-1.2/ambari-web/app/classes/
incubator/ambari/branches/branch-1.2/ambari-web/app/classes/job_class.js
incubator/ambari/branches/branch-1.2/ambari-web/app/classes/run_class.js
incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/apps/user_filter.hbs
incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/host/component_filter.hbs
incubator/ambari/branches/branch-1.2/ambari-web/app/templates/wizard/step3_host_warnings_popup.hbs
incubator/ambari/branches/branch-1.2/ambari-web/app/templates/wizard/step8_log_popup.hbs
incubator/ambari/branches/branch-1.2/ambari-web/app/utils/component.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/common/filter_view.js
incubator/ambari/branches/branch-1.2/contrib/ambari-log4j/src/test/java/org/apache/ambari/TestMapReduceJobHistoryUpdater.java
Removed:
incubator/ambari/branches/branch-1.2/ambari-web/app/assets/data/apps/jobs2.json
incubator/ambari/branches/branch-1.2/ambari-web/app/assets/data/apps/runs2.json
incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/main/admin/item.js
incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/main/alert.js
incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/main/charts/horizon_chart.js
incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/main/rack.js
incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/main/service/info/metrics.js
incubator/ambari/branches/branch-1.2/ambari-web/app/models/component.js
incubator/ambari/branches/branch-1.2/ambari-web/app/models/service_metrics.js
incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/admin/security.hbs
incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/apps/custom_rundate_popup.hbs
incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/charts/horizon.hbs
incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/charts/horizon/chart.hbs
incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/host/audit.hbs
incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/service/info/metrics.hbs
incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/test.hbs
incubator/ambari/branches/branch-1.2/ambari-web/app/utils/jquery.unique.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/common/combobox.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/common/empty_view.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/admin/security.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/apps/runs_view.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/charts/horizon.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/charts/horizon/chart.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/host/audit.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/hosts.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/audit.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/test.js
incubator/ambari/branches/branch-1.2/ambari-web/vendor/styles/bootstrap-responsive.css
Modified:
incubator/ambari/branches/branch-1.2/LICENSE.txt
incubator/ambari/branches/branch-1.2/NOTICE.txt
incubator/ambari/branches/branch-1.2/ambari-agent/conf/unix/ambari-agent.ini
incubator/ambari/branches/branch-1.2/ambari-agent/pom.xml
incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/rrd.py
incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp
incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/datanode.pp
incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp
incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/namenode.pp
incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hcat/files/hcatSmoke.sh
incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hcat/manifests/hcat/service_check.pp
incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-mysql/manifests/server.pp
incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-nagios/files/check_name_dir_status.php
incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-nagios/manifests/server.pp
incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-nagios/manifests/server/packages.pp
incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/service.pp
incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/service.pp
incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp/manifests/init.pp
incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp
incubator/ambari/branches/branch-1.2/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
incubator/ambari/branches/branch-1.2/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
incubator/ambari/branches/branch-1.2/ambari-agent/src/main/python/ambari_agent/Controller.py
incubator/ambari/branches/branch-1.2/ambari-agent/src/main/python/ambari_agent/Heartbeat.py
incubator/ambari/branches/branch-1.2/ambari-agent/src/main/python/ambari_agent/LiveStatus.py
incubator/ambari/branches/branch-1.2/ambari-agent/src/main/python/ambari_agent/NetUtil.py
incubator/ambari/branches/branch-1.2/ambari-agent/src/main/python/ambari_agent/ProcessHelper.py
incubator/ambari/branches/branch-1.2/ambari-agent/src/main/python/ambari_agent/Register.py
incubator/ambari/branches/branch-1.2/ambari-agent/src/main/python/ambari_agent/RepoInstaller.py
incubator/ambari/branches/branch-1.2/ambari-agent/src/main/python/ambari_agent/StatusCheck.py
incubator/ambari/branches/branch-1.2/ambari-agent/src/main/python/ambari_agent/main.py
incubator/ambari/branches/branch-1.2/ambari-agent/src/main/python/ambari_agent/manifestGenerator.py
incubator/ambari/branches/branch-1.2/ambari-agent/src/main/python/ambari_agent/puppetExecutor.py
incubator/ambari/branches/branch-1.2/ambari-agent/src/main/python/ambari_agent/security.py
incubator/ambari/branches/branch-1.2/ambari-agent/src/test/python/TestActionQueue.py
incubator/ambari/branches/branch-1.2/ambari-agent/src/test/python/TestController.py
incubator/ambari/branches/branch-1.2/ambari-agent/src/test/python/TestGrep.py
incubator/ambari/branches/branch-1.2/ambari-agent/src/test/python/TestHeartbeat.py
incubator/ambari/branches/branch-1.2/ambari-agent/src/test/python/TestLiveStatus.py
incubator/ambari/branches/branch-1.2/ambari-agent/src/test/python/TestNetUtil.py
incubator/ambari/branches/branch-1.2/ambari-agent/src/test/python/TestPuppetExecutor.py
incubator/ambari/branches/branch-1.2/ambari-agent/src/test/python/TestRegistration.py
incubator/ambari/branches/branch-1.2/ambari-agent/src/test/python/TestStatusCheck.py
incubator/ambari/branches/branch-1.2/ambari-agent/src/test/python/dummy_puppet_output_error.txt
incubator/ambari/branches/branch-1.2/ambari-agent/src/test/python/dummy_puppet_output_good.txt
incubator/ambari/branches/branch-1.2/ambari-agent/src/test/python/examples/debug_testcase_example.py
incubator/ambari/branches/branch-1.2/ambari-project/pom.xml
incubator/ambari/branches/branch-1.2/ambari-server/pom.xml
incubator/ambari/branches/branch-1.2/ambari-server/sbin/ambari-server
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/eventdb/db/PostgresConnector.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/eventdb/model/DataTable.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionManager.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeat.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/agent/Register.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/agent/StatusCommand.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/api/query/QueryImpl.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceImpl.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/HostResponse.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaComponentPropertyProvider.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaHostComponentPropertyProvider.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaHostPropertyProvider.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaMetric.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProvider.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/DefaultProviderModule.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ResourceImpl.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/URLStreamProvider.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/jdbc/JDBCProviderModule.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXHostProvider.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXMetricHolder.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXPropertyProvider.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/ProviderModule.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ClusterDAO.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ServiceConfigMappingDAO.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterEntity.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterServiceEntity.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostComponentStateEntity.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostRoleCommandEntity.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceDesiredStateEntity.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/StageEntity.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/state/Cluster.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigImpl.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/state/Host.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/state/Service.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponent.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentHost.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentImpl.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceImpl.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/state/State.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClustersImpl.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostHealthyHeartbeatEvent.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostRegistrationRequestEvent.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/utils/StageUtils.java
incubator/ambari/branches/branch-1.2/ambari-server/src/main/python/ambari-server.py
incubator/ambari/branches/branch-1.2/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
incubator/ambari/branches/branch-1.2/ambari-server/src/main/resources/ganglia_properties.json
incubator/ambari/branches/branch-1.2/ambari-server/src/main/resources/jmx_properties.json
incubator/ambari/branches/branch-1.2/ambari-server/src/main/resources/properties.json
incubator/ambari/branches/branch-1.2/ambari-server/src/main/resources/stacks/HDP/1.2.0/services/MAPREDUCE/configuration/mapred-site.xml
incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionDBAccessorImpl.java
incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionManager.java
incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionScheduler.java
incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestStage.java
incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java
incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java
incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProviderTest.java
incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/ganglia/TestStreamProvider.java
incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ResourceImplTest.java
incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/TestProviderModule.java
incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/jmx/JMXPropertyProviderTest.java
incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/jmx/TestStreamProvider.java
incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/stageplanner/TestStagePlanner.java
incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceComponentTest.java
incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceTest.java
incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java
incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClustersTest.java
incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/state/host/HostTest.java
incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostTest.java
incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/utils/TestStageUtils.java
incubator/ambari/branches/branch-1.2/ambari-server/src/test/resources/hdfs_datanode_jmx.json
incubator/ambari/branches/branch-1.2/ambari-server/src/test/resources/hdfs_namenode_jmx.json
incubator/ambari/branches/branch-1.2/ambari-server/src/test/resources/mapreduce_jobtracker_jmx.json
incubator/ambari/branches/branch-1.2/ambari-server/src/test/resources/mapreduce_tasktracker_jmx.json
incubator/ambari/branches/branch-1.2/ambari-web/app/app.js
incubator/ambari/branches/branch-1.2/ambari-web/app/assets/data/alerts/alerts.json
incubator/ambari/branches/branch-1.2/ambari-web/app/assets/data/apps/jobs.json
incubator/ambari/branches/branch-1.2/ambari-web/app/assets/data/apps/jobs/taskview.json
incubator/ambari/branches/branch-1.2/ambari-web/app/assets/data/apps/runs.json
incubator/ambari/branches/branch-1.2/ambari-web/app/assets/data/dashboard/services.json
incubator/ambari/branches/branch-1.2/ambari-web/app/assets/data/hosts/hosts.json
incubator/ambari/branches/branch-1.2/ambari-web/app/controllers.js
incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/global/background_operations_controller.js
incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/global/cluster_controller.js
incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/login_controller.js
incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/main/admin/user.js
incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/main/apps/item_controller.js
incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/main/apps_controller.js
incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/main/charts/heatmap.js
incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/main/host.js
incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/main/host/add_controller.js
incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/main/host/details.js
incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/main/service.js
incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/main/service/add_controller.js
incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/main/service/info/configs.js
incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/main/service/item.js
incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/wizard.js
incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/wizard/step10_controller.js
incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/wizard/step1_controller.js
incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/wizard/step2_controller.js
incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/wizard/step3_controller.js
incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/wizard/step5_controller.js
incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/wizard/step7_controller.js
incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/wizard/step8_controller.js
incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/wizard/step9_controller.js
incubator/ambari/branches/branch-1.2/ambari-web/app/data/config_properties.js
incubator/ambari/branches/branch-1.2/ambari-web/app/data/statusCodes.js
incubator/ambari/branches/branch-1.2/ambari-web/app/mappers/alerts_mapper.js
incubator/ambari/branches/branch-1.2/ambari-web/app/mappers/hosts_mapper.js
incubator/ambari/branches/branch-1.2/ambari-web/app/mappers/jobs_mapper.js
incubator/ambari/branches/branch-1.2/ambari-web/app/mappers/runs_mapper.js
incubator/ambari/branches/branch-1.2/ambari-web/app/mappers/server_data_mapper.js
incubator/ambari/branches/branch-1.2/ambari-web/app/mappers/service_mapper.js
incubator/ambari/branches/branch-1.2/ambari-web/app/mappers/status_mapper.js
incubator/ambari/branches/branch-1.2/ambari-web/app/messages.js
incubator/ambari/branches/branch-1.2/ambari-web/app/models.js
incubator/ambari/branches/branch-1.2/ambari-web/app/models/alert.js
incubator/ambari/branches/branch-1.2/ambari-web/app/models/authentication.js
incubator/ambari/branches/branch-1.2/ambari-web/app/models/cluster_states.js
incubator/ambari/branches/branch-1.2/ambari-web/app/models/form.js
incubator/ambari/branches/branch-1.2/ambari-web/app/models/host.js
incubator/ambari/branches/branch-1.2/ambari-web/app/models/host_component.js
incubator/ambari/branches/branch-1.2/ambari-web/app/models/service.js
incubator/ambari/branches/branch-1.2/ambari-web/app/models/service_config.js
incubator/ambari/branches/branch-1.2/ambari-web/app/models/user.js
incubator/ambari/branches/branch-1.2/ambari-web/app/router.js
incubator/ambari/branches/branch-1.2/ambari-web/app/routes/add_host_routes.js
incubator/ambari/branches/branch-1.2/ambari-web/app/routes/add_service_routes.js
incubator/ambari/branches/branch-1.2/ambari-web/app/routes/installer.js
incubator/ambari/branches/branch-1.2/ambari-web/app/routes/main.js
incubator/ambari/branches/branch-1.2/ambari-web/app/styles/application.less
incubator/ambari/branches/branch-1.2/ambari-web/app/styles/apps.less
incubator/ambari/branches/branch-1.2/ambari-web/app/templates/application.hbs
incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main.hbs
incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/admin/user/create.hbs
incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/admin/user/edit.hbs
incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/apps.hbs
incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/apps/item/bar.hbs
incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/apps/item/dag.hbs
incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/apps/list_row.hbs
incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/charts/heatmap.hbs
incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/charts/heatmap/heatmap_host_detail.hbs
incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/dashboard/service/hbase.hbs
incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/dashboard/service/hdfs.hbs
incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/dashboard/service/hive.hbs
incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/dashboard/service/mapreduce.hbs
incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/dashboard/service/oozie.hbs
incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/dashboard/service/zookeeper.hbs
incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/host.hbs
incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/host/details.hbs
incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/host/summary.hbs
incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/service.hbs
incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/service/info/configs.hbs
incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/service/info/summary.hbs
incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/service/info/summary/ganglia.hbs
incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/service/info/summary/oozie.hbs
incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/service/item.hbs
incubator/ambari/branches/branch-1.2/ambari-web/app/templates/wizard/step2.hbs
incubator/ambari/branches/branch-1.2/ambari-web/app/templates/wizard/step3.hbs
incubator/ambari/branches/branch-1.2/ambari-web/app/templates/wizard/step9HostTasksLogPopup.hbs
incubator/ambari/branches/branch-1.2/ambari-web/app/utils/data_table.js
incubator/ambari/branches/branch-1.2/ambari-web/app/utils/graph.js
incubator/ambari/branches/branch-1.2/ambari-web/app/utils/http_client.js
incubator/ambari/branches/branch-1.2/ambari-web/app/utils/string_utils.js
incubator/ambari/branches/branch-1.2/ambari-web/app/utils/validator.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/common/chart/linear_time.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/common/chart/pie.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/common/modal_popup.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/common/quick_view_link_view.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/admin/user/create.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/admin/user/edit.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/apps/item/bar_view.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/apps/item/dag_view.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/apps/item_view.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/apps_view.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/charts/heatmap/heatmap_host.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/charts/heatmap/heatmap_host_detail.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/dashboard/cluster_metrics/cpu.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/dashboard/cluster_metrics/load.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/dashboard/cluster_metrics/memory.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/dashboard/cluster_metrics/network.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/dashboard/service.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/dashboard/service/hbase.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/dashboard/service/hdfs.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/dashboard/service/hive.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/dashboard/service/mapreduce.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/dashboard/service/oozie.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/dashboard/service/zookeeper.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/host.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/host/details.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/host/metrics/cpu.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/host/metrics/disk.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/host/metrics/load.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/host/metrics/memory.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/host/metrics/network.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/host/metrics/processes.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/host/summary.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/hbase/cluster_requests.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/hbase/hlog_split_size.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/hbase/hlog_split_time.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/hbase/regionserver_queuesize.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/hbase/regionserver_regions.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/hbase/regionserver_rw_requests.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/hdfs/block_status.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/hdfs/file_operations.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/hdfs/gc.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/hdfs/io.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/hdfs/jvm_heap.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/hdfs/jvm_threads.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/hdfs/rpc.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/hdfs/space_utilization.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/mapreduce/gc.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/mapreduce/jobs_status.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/mapreduce/jvm_heap.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/mapreduce/jvm_threads.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/mapreduce/map_slots.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/mapreduce/reduce_slots.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/mapreduce/rpc.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/mapreduce/tasks_running_waiting.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/summary.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/wizard/controls_view.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/wizard/step2_view.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/wizard/step8_view.js
incubator/ambari/branches/branch-1.2/ambari-web/app/views/wizard/step9_view.js
incubator/ambari/branches/branch-1.2/ambari-web/config.coffee
incubator/ambari/branches/branch-1.2/ambari-web/package.json
incubator/ambari/branches/branch-1.2/ambari-web/pom.xml
incubator/ambari/branches/branch-1.2/ambari-web/vendor/scripts/workflow_visualization.js
incubator/ambari/branches/branch-1.2/ambari-web/vendor/styles/cubism.css
incubator/ambari/branches/branch-1.2/contrib/addons/package/rpm/create_ganglia_addon_rpm.sh
incubator/ambari/branches/branch-1.2/contrib/addons/package/rpm/create_nagios_addon_rpm.sh
incubator/ambari/branches/branch-1.2/contrib/addons/package/rpm/hdp_mon_ganglia_addons.spec
incubator/ambari/branches/branch-1.2/contrib/addons/package/rpm/hdp_mon_nagios_addons.spec
incubator/ambari/branches/branch-1.2/contrib/ambari-log4j/pom.xml
incubator/ambari/branches/branch-1.2/contrib/ambari-log4j/src/main/java/org/apache/ambari/log4j/hadoop/mapreduce/jobhistory/MapReduceJobHistoryUpdater.java
incubator/ambari/branches/branch-1.2/contrib/ambari-log4j/src/test/java/org/apache/ambari/TestJobHistoryParsing.java
incubator/ambari/branches/branch-1.2/pom.xml
Modified: incubator/ambari/branches/branch-1.2/LICENSE.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/LICENSE.txt?rev=1442010&r1=1442009&r2=1442010&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/LICENSE.txt (original)
+++ incubator/ambari/branches/branch-1.2/LICENSE.txt Mon Feb 4 02:23:55 2013
@@ -231,3 +231,32 @@ You may obtain a copy of the License at
See the License for the specific language governing permissions and
limitations under the License.
+For ambari-common/src/test/python:
+
+Copyright (c) 2003-2012, Michael Foord
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
Modified: incubator/ambari/branches/branch-1.2/NOTICE.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/NOTICE.txt?rev=1442010&r1=1442009&r2=1442010&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/NOTICE.txt (original)
+++ incubator/ambari/branches/branch-1.2/NOTICE.txt Mon Feb 4 02:23:55 2013
@@ -9,3 +9,7 @@ Copyright (C) 2011 Puppet Labs Inc
and some parts:
Copyright (C) 2011 Krzysztof Wilczynski
+Component ambari-common/src/test/python are under the following copyright:
+
+Copyright (c) 2003-2012, Michael Foord
+All rights reserved.
Modified: incubator/ambari/branches/branch-1.2/ambari-agent/conf/unix/ambari-agent.ini
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-agent/conf/unix/ambari-agent.ini?rev=1442010&r1=1442009&r2=1442010&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/ambari-agent/conf/unix/ambari-agent.ini (original)
+++ incubator/ambari/branches/branch-1.2/ambari-agent/conf/unix/ambari-agent.ini Mon Feb 4 02:23:55 2013
@@ -28,9 +28,6 @@ puppetmodules=/var/lib/ambari-agent/pupp
ruby_home=/usr/lib/ambari-agent/lib/ruby-1.8.7-p370
puppet_home=/usr/lib/ambari-agent/lib/puppet-2.7.9
facter_home=/usr/lib/ambari-agent/lib/facter-1.6.10
-imports_file=/usr/lib/python2.6/site-packages/ambari_agent/imports.txt
-roles_to_class=/usr/lib/python2.6/site-packages/ambari_agent/rolesToClass.dict
-service_states=/usr/lib/python2.6/site-packages/ambari_agent/serviceStates.dict
[command]
maxretries=2
@@ -42,5 +39,14 @@ server_crt=ca.crt
passphrase_env_var_name=AMBARI_PASSPHRASE
[services]
-serviceToPidMapFile=/usr/lib/python2.6/site-packages/ambari_agent/servicesToPidNames.dict
pidLookupPath=/var/run/
+
+[heartbeat]
+state_interval=6
+dirs=/etc/hadoop,/etc/hadoop/conf,/etc/hbase,/etc/hcatalog,/etc/hive,/etc/oozie,
+ /etc/sqoop,/etc/ganglia,/etc/nagios,
+ /var/run/hadoop,/var/run/zookeeper,/var/run/hbase,/var/run/templeton,/var/run/oozie,
+ /var/log/hadoop,/var/log/zookeeper,/var/log/hbase,/var/run/templeton,/var/log/hive,
+ /var/log/nagios
+rpms=nagios,ganglia,
+ hadoop,hbase,oozie,sqoop,pig,zookeeper,hive,libconfuse,ambari-log4j
Modified: incubator/ambari/branches/branch-1.2/ambari-agent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-agent/pom.xml?rev=1442010&r1=1442009&r2=1442010&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/ambari-agent/pom.xml (original)
+++ incubator/ambari/branches/branch-1.2/ambari-agent/pom.xml Mon Feb 4 02:23:55 2013
@@ -19,14 +19,14 @@
<parent>
<groupId>org.apache.ambari</groupId>
<artifactId>ambari-project</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.1-SNAPSHOT</version>
<relativePath>../ambari-project</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ambari</groupId>
<artifactId>ambari-agent</artifactId>
<packaging>pom</packaging>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.1-SNAPSHOT</version>
<name>Ambari Agent</name>
<description>Ambari Agent</description>
<properties>
@@ -38,22 +38,22 @@
<package.pid.dir>/var/run/ambari-agent</package.pid.dir>
<skipTests>false</skipTests>
<facter.tar>http://downloads.puppetlabs.com/facter/facter-1.6.10.tar.gz</facter.tar>
- <puppet.tar>http://www.puppetlabs.com/downloads/puppet/puppet-2.7.9.tar.gz</puppet.tar>
+ <puppet.tar>http://downloads.puppetlabs.com/puppet/puppet-2.7.9.tar.gz</puppet.tar>
<install.dir>/usr/lib/python2.6/site-packages/ambari_agent</install.dir>
- <ruby.tar>http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.15/repos/centos6/ruby-1.8.7-p370.tar.gz</ruby.tar>
+ <ruby.tar>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.15/repos/centos6/ruby-1.8.7-p370.tar.gz</ruby.tar>
<lib.dir>/usr/lib/ambari-agent/lib</lib.dir>
</properties>
<profiles>
<profile>
<id>suse11</id>
<properties>
- <ruby.tar>http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.15/repos/suse11/ruby-1.8.7-p370.tar.gz</ruby.tar>
+ <ruby.tar>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.15/repos/suse11/ruby-1.8.7-p370.tar.gz</ruby.tar>
</properties>
</profile>
<profile>
<id>centos5</id>
<properties>
- <ruby.tar>http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.15/repos/centos5/ruby-1.8.7-p370.tar.gz</ruby.tar>
+ <ruby.tar>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.15/repos/centos5/ruby-1.8.7-p370.tar.gz</ruby.tar>
</properties>
</profile>
</profiles>
@@ -90,7 +90,7 @@
<argument>unitTests.py</argument>
</arguments>
<environmentVariables>
- <PYTHONPATH>src/main/python/ambari_agent:$PYTHONPATH</PYTHONPATH>
+ <PYTHONPATH>${project.basedir}/../ambari-common/src/test/python:${project.basedir}/src/main/python/ambari_agent:$PYTHONPATH</PYTHONPATH>
</environmentVariables>
<skip>${skipTests}</skip>
</configuration>
@@ -150,6 +150,10 @@
<scriptFile>src/main/package/rpm/preinstall.sh</scriptFile>
<fileEncoding>utf-8</fileEncoding>
</preinstallScriptlet>
+ <preremoveScriptlet>
+ <script>mv /etc/ambari-agent/conf /etc/ambari-agent/conf.save</script>
+ </preremoveScriptlet>
+
<needarch>x86_64</needarch>
<autoRequires>false</autoRequires>
<mappings>
@@ -169,6 +173,17 @@
</source>
</sources>
</mapping>
+ <mapping>
+ <directory>${lib.dir}/examples</directory>
+ <filemode>755</filemode>
+ <username>root</username>
+ <groupname>root</groupname>
+ <sources>
+ <source>
+ <location>src/examples</location>
+ </source>
+ </sources>
+ </mapping>
<mapping>
<directory>/var/lib/${project.artifactId}/puppet</directory>
<filemode>755</filemode>
@@ -182,6 +197,7 @@
</mapping>
<mapping>
<directory>${package.conf.dir}</directory>
+ <configuration>true</configuration>
<filemode>755</filemode>
<username>root</username>
<groupname>root</groupname>
@@ -285,10 +301,10 @@
<artifactId>apache-rat-plugin</artifactId>
<configuration>
<excludes>
+ <exclude>src/examples/*</exclude>
<exclude>src/test/python/dummy*.txt</exclude>
<exclude>src/main/puppet/modules/stdlib/**</exclude>
<exclude>**/*.erb</exclude>
- <exclude>src/main/python/ambari_agent/imports.txt</exclude>
<exclude>**/*.json</exclude>
</excludes>
</configuration>
Added: incubator/ambari/branches/branch-1.2/ambari-agent/src/examples/query_with3jobs.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-agent/src/examples/query_with3jobs.txt?rev=1442010&view=auto
==============================================================================
--- incubator/ambari/branches/branch-1.2/ambari-agent/src/examples/query_with3jobs.txt (added)
+++ incubator/ambari/branches/branch-1.2/ambari-agent/src/examples/query_with3jobs.txt Mon Feb 4 02:23:55 2013
@@ -0,0 +1,36 @@
+SELECT
+ i_item_id,
+ s_state,
+ avg(ss_quantity) agg1,
+ avg(ss_list_price) agg2,
+ avg(ss_coupon_amt) agg3,
+ avg(ss_sales_price) agg4
+FROM
+ (SELECT /*+ MAPJOIN(item) */ i_item_id, s_state, ss_quantity, ss_list_price, ss_coupon_amt, ss_sales_price
+ FROM item
+ JOIN
+ (SELECT /*+ MAPJOIN(customer_demographics) */ s_state, ss_quantity, ss_list_price, ss_coupon_amt, ss_sales_price, ss_item_sk
+ FROM customer_demographics
+ JOIN
+ (SELECT /*+ MAPJOIN(store) */ s_state, ss_quantity, ss_list_price, ss_coupon_amt, ss_sales_price, ss_item_sk, ss_cdemo_sk
+ FROM store
+ JOIN
+ (SELECT /*+ MAPJOIN(date_dim) */ ss_quantity, ss_list_price, ss_coupon_amt, ss_sales_price, ss_item_sk, ss_cdemo_sk, ss_store_sk
+ FROM date_dim
+ JOIN store_sales
+ ON (store_sales.ss_sold_date_sk = date_dim.d_date_sk) WHERE d_year = 2002) a
+ ON (a.ss_store_sk = store.s_store_sk)
+ WHERE s_state in ('TN', 'SD')) b
+ ON (b.ss_cdemo_sk = customer_demographics.cd_demo_sk)
+ WHERE
+ cd_gender = 'M' and
+ cd_marital_status = 'S' and
+ cd_education_status = 'College') c
+ ON (c.ss_item_sk = item.i_item_sk)) d
+GROUP BY
+ i_item_id,
+ s_state
+ORDER BY
+ i_item_id,
+ s_state
+LIMIT 100;
\ No newline at end of file
Added: incubator/ambari/branches/branch-1.2/ambari-agent/src/examples/query_with6jobs.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-agent/src/examples/query_with6jobs.txt?rev=1442010&view=auto
==============================================================================
--- incubator/ambari/branches/branch-1.2/ambari-agent/src/examples/query_with6jobs.txt (added)
+++ incubator/ambari/branches/branch-1.2/ambari-agent/src/examples/query_with6jobs.txt Mon Feb 4 02:23:55 2013
@@ -0,0 +1,35 @@
+SELECT
+ i_item_id,
+ s_state,
+ avg(ss_quantity) agg1,
+ avg(ss_list_price) agg2,
+ avg(ss_coupon_amt) agg3,
+ avg(ss_sales_price) agg4
+FROM
+ (SELECT i_item_id, s_state, ss_quantity, ss_list_price, ss_coupon_amt, ss_sales_price
+ FROM item
+ JOIN
+ (SELECT s_state, ss_quantity, ss_list_price, ss_coupon_amt, ss_sales_price, ss_item_sk
+ FROM customer_demographics
+ JOIN
+ (SELECT s_state, ss_quantity, ss_list_price, ss_coupon_amt, ss_sales_price, ss_item_sk, ss_cdemo_sk
+ FROM store
+ JOIN
+ (SELECT ss_quantity, ss_list_price, ss_coupon_amt, ss_sales_price, ss_item_sk, ss_cdemo_sk, ss_store_sk
+ FROM date_dim
+ JOIN store_sales ON (store_sales.ss_sold_date_sk = date_dim.d_date_sk) WHERE d_year = 2002) a
+ ON (a.ss_store_sk = store.s_store_sk)
+ WHERE s_state in ('TN', 'SD')) b
+ ON (b.ss_cdemo_sk = customer_demographics.cd_demo_sk)
+ WHERE
+ cd_gender = 'M' and
+ cd_marital_status = 'S' and
+ cd_education_status = 'College') c
+ ON (c.ss_item_sk = item.i_item_sk)) d
+GROUP BY
+ i_item_id,
+ s_state
+ORDER BY
+ i_item_id,
+ s_state
+LIMIT 100;
\ No newline at end of file
Added: incubator/ambari/branches/branch-1.2/ambari-agent/src/examples/tpcds_ss_tables.sql
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-agent/src/examples/tpcds_ss_tables.sql?rev=1442010&view=auto
==============================================================================
--- incubator/ambari/branches/branch-1.2/ambari-agent/src/examples/tpcds_ss_tables.sql (added)
+++ incubator/ambari/branches/branch-1.2/ambari-agent/src/examples/tpcds_ss_tables.sql Mon Feb 4 02:23:55 2013
@@ -0,0 +1,226 @@
+create table store_sales
+(
+ ss_sold_date_sk int,
+ ss_sold_time_sk int,
+ ss_item_sk int,
+ ss_customer_sk int,
+ ss_cdemo_sk int,
+ ss_hdemo_sk int,
+ ss_addr_sk int,
+ ss_store_sk int,
+ ss_promo_sk int,
+ ss_ticket_number int,
+ ss_quantity int,
+ ss_wholesale_cost float,
+ ss_list_price float,
+ ss_sales_price float,
+ ss_ext_discount_amt float,
+ ss_ext_sales_price float,
+ ss_ext_wholesale_cost float,
+ ss_ext_list_price float,
+ ss_ext_tax float,
+ ss_coupon_amt float,
+ ss_net_paid float,
+ ss_net_paid_inc_tax float,
+ ss_net_profit float
+)
+row format delimited fields terminated by '|' ;
+
+create table customer_demographics
+(
+ cd_demo_sk int,
+ cd_gender string,
+ cd_marital_status string,
+ cd_education_status string,
+ cd_purchase_estimate int,
+ cd_credit_rating string,
+ cd_dep_count int,
+ cd_dep_employed_count int,
+ cd_dep_college_count int
+)
+row format delimited fields terminated by '|' ;
+
+create table date_dim
+(
+ d_date_sk int,
+ d_date_id string,
+ d_date timestamp,
+ d_month_seq int,
+ d_week_seq int,
+ d_quarter_seq int,
+ d_year int,
+ d_dow int,
+ d_moy int,
+ d_dom int,
+ d_qoy int,
+ d_fy_year int,
+ d_fy_quarter_seq int,
+ d_fy_week_seq int,
+ d_day_name string,
+ d_quarter_name string,
+ d_holiday string,
+ d_weekend string,
+ d_following_holiday string,
+ d_first_dom int,
+ d_last_dom int,
+ d_same_day_ly int,
+ d_same_day_lq int,
+ d_current_day string,
+ d_current_week string,
+ d_current_month string,
+ d_current_quarter string,
+ d_current_year string
+)
+row format delimited fields terminated by '|' ;
+
+create table time_dim
+(
+ t_time_sk int,
+ t_time_id string,
+ t_time int,
+ t_hour int,
+ t_minute int,
+ t_second int,
+ t_am_pm string,
+ t_shift string,
+ t_sub_shift string,
+ t_meal_time string
+)
+row format delimited fields terminated by '|' ;
+
+create table item
+(
+ i_item_sk int,
+ i_item_id string,
+ i_rec_start_date timestamp,
+ i_rec_end_date timestamp,
+ i_item_desc string,
+ i_current_price float,
+ i_wholesale_cost float,
+ i_brand_id int,
+ i_brand string,
+ i_class_id int,
+ i_class string,
+ i_category_id int,
+ i_category string,
+ i_manufact_id int,
+ i_manufact string,
+ i_size string,
+ i_formulation string,
+ i_color string,
+ i_units string,
+ i_container string,
+ i_manager_id int,
+ i_product_name string
+)
+row format delimited fields terminated by '|' ;
+
+create table store
+(
+ s_store_sk int,
+ s_store_id string,
+ s_rec_start_date timestamp,
+ s_rec_end_date timestamp,
+ s_closed_date_sk int,
+ s_store_name string,
+ s_number_employees int,
+ s_floor_space int,
+ s_hours string,
+ s_manager string,
+ s_market_id int,
+ s_geography_class string,
+ s_market_desc string,
+ s_market_manager string,
+ s_division_id int,
+ s_division_name string,
+ s_company_id int,
+ s_company_name string,
+ s_street_number string,
+ s_street_name string,
+ s_street_type string,
+ s_suite_number string,
+ s_city string,
+ s_county string,
+ s_state string,
+ s_zip string,
+ s_country string,
+ s_gmt_offset float,
+ s_tax_precentage float
+)
+row format delimited fields terminated by '|' ;
+
+create table customer
+(
+ c_customer_sk int,
+ c_customer_id string,
+ c_current_cdemo_sk int,
+ c_current_hdemo_sk int,
+ c_current_addr_sk int,
+ c_first_shipto_date_sk int,
+ c_first_sales_date_sk int,
+ c_salutation string,
+ c_first_name string,
+ c_last_name string,
+ c_preferred_cust_flag string,
+ c_birth_day int,
+ c_birth_month int,
+ c_birth_year int,
+ c_birth_country string,
+ c_login string,
+ c_email_address string,
+ c_last_review_date string
+)
+row format delimited fields terminated by '|' ;
+
+create table promotion
+(
+ p_promo_sk int,
+ p_promo_id string,
+ p_start_date_sk int,
+ p_end_date_sk int,
+ p_item_sk int,
+ p_cost float,
+ p_response_target int,
+ p_promo_name string,
+ p_channel_dmail string,
+ p_channel_email string,
+ p_channel_catalog string,
+ p_channel_tv string,
+ p_channel_radio string,
+ p_channel_press string,
+ p_channel_event string,
+ p_channel_demo string,
+ p_channel_details string,
+ p_purpose string,
+ p_discount_active string
+)
+row format delimited fields terminated by '|' ;
+
+create table household_demographics
+(
+ hd_demo_sk int,
+ hd_income_band_sk int,
+ hd_buy_potential string,
+ hd_dep_count int,
+ hd_vehicle_count int
+)
+row format delimited fields terminated by '|' ;
+
+create table customer_address
+(
+ ca_address_sk int,
+ ca_address_id string,
+ ca_street_number string,
+ ca_street_name string,
+ ca_street_type string,
+ ca_suite_number string,
+ ca_city string,
+ ca_county string,
+ ca_state string,
+ ca_zip string,
+ ca_country string,
+ ca_gmt_offset float,
+ ca_location_type string
+)
+row format delimited fields terminated by '|' ;
+
Modified: incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/rrd.py
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/rrd.py?rev=1442010&r1=1442009&r2=1442010&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/rrd.py (original)
+++ incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/rrd.py Mon Feb 4 02:23:55 2013
@@ -19,67 +19,81 @@ limitations under the License.
'''
import cgi
-#import cgitb
import os
import rrdtool
import sys
+import time
# place this script in /var/www/cgi-bin of the Ganglia collector
# requires 'yum install rrdtool-python' on the Ganglia collector
-#cgitb.enable()
-def printMetric(clusterName, hostName, metricName, file, cf, start, end, resolution):
+def printMetric(clusterName, hostName, metricName, file, cf, start, end, resolution, pointInTime):
if clusterName.endswith("rrds"):
clusterName = ""
args = [file, cf]
if start is not None:
- args.extend(["-s", start])
+ args.extend(["-s", start])
if end is not None:
- args.extend(["-e", end])
+ args.extend(["-e", end])
if resolution is not None:
- args.extend(["-r", resolution])
+ args.extend(["-r", resolution])
rrdMetric = rrdtool.fetch(args)
+ # ds_name
+ sys.stdout.write(rrdMetric[1][0])
+ sys.stdout.write("\n")
+
+ sys.stdout.write(clusterName)
+ sys.stdout.write("\n")
+ sys.stdout.write(hostName)
+ sys.stdout.write("\n")
+ sys.stdout.write(metricName)
+ sys.stdout.write("\n")
+
+ # write time
+ sys.stdout.write(str(rrdMetric[0][0]))
+ sys.stdout.write("\n")
+ # write step
+ sys.stdout.write(str(rrdMetric[0][2]))
+ sys.stdout.write("\n")
+
+ if not pointInTime:
+ for tuple in rrdMetric[2]:
+ if tuple[0] is not None:
+ sys.stdout.write(str(tuple[0]))
+ sys.stdout.write("\n")
+ else:
+ value = None
+ idx = -1
+ tuple = rrdMetric[2]
+ tupleLastIdx = len(tuple) * -1
+
+ while value is None and idx >= tupleLastIdx:
+ value = tuple[idx][0]
+ idx-=1
+
+ if value is not None:
+ sys.stdout.write(str(value))
+ sys.stdout.write("\n")
- time = rrdMetric[0][0]
- step = rrdMetric[0][2]
-
- sys.stdout.write(" {\n \"ds_name\":\"" + rrdMetric[1][0] +\
- "\",\n \"cluster_name\":\"" + clusterName +\
- "\",\n \"host_name\":\"" + hostName +\
- "\",\n \"metric_name\":\"" + metricName + "\",\n")
-
- firstDP = True
- sys.stdout.write(" \"datapoints\":[\n")
- for tuple in rrdMetric[2]:
- if tuple[0] is not None:
- if not firstDP:
- sys.stdout.write(",\n")
- firstDP = False
- sys.stdout.write(" [")
- sys.stdout.write(str(tuple[0]))
- sys.stdout.write(",")
- sys.stdout.write(str(time))
- sys.stdout.write("]")
- time = time + step
- sys.stdout.write("\n ]\n }")
+ sys.stdout.write("[AMBARI_DP_END]\n")
return
def stripList(l):
return([x.strip() for x in l])
-sys.stdout.write("Content-type: application/json\n\n")
-
-queryString = dict(cgi.parse_qsl(os.environ['QUERY_STRING']));
+sys.stdout.write("Content-type: text/plain\n\n")
-sys.stdout.write("[\n")
+# write start time
+sys.stdout.write(str(time.mktime(time.gmtime())))
+sys.stdout.write("\n")
-firstMetric = True
+queryString = dict(cgi.parse_qsl(os.environ['QUERY_STRING']));
if "m" in queryString:
metricParts = queryString["m"].split(",")
@@ -120,6 +134,11 @@ if "cf" in queryString:
else:
cf = "AVERAGE"
+if "pt" in queryString:
+ pointInTime = True
+else:
+ pointInTime = False
+
for cluster in clusterParts:
for path, dirs, files in os.walk(rrdPath + cluster):
pathParts = path.split("/")
@@ -127,12 +146,13 @@ for cluster in clusterParts:
for file in files:
for metric in metricParts:
if file.endswith(metric + ".rrd"):
- if not firstMetric:
- sys.stdout.write(",\n")
- printMetric(pathParts[-2], pathParts[-1], file[:-4], os.path.join(path, file), cf, start, end, resolution)
+ printMetric(pathParts[-2], pathParts[-1], file[:-4],
+ os.path.join(path, file), cf, start, end, resolution, pointInTime)
- firstMetric = False
+sys.stdout.write("[AMBARI_END]\n")
+# write end time
+sys.stdout.write(str(time.mktime(time.gmtime())))
+sys.stdout.write("\n")
-sys.stdout.write("\n]\n")
sys.stdout.flush
Modified: incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp?rev=1442010&r1=1442009&r2=1442010&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp (original)
+++ incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp Mon Feb 4 02:23:55 2013
@@ -130,7 +130,8 @@ class hdp-ganglia::server::files(
$rrd_py_path = $hdp::params::rrd_py_path [$hdp::params::hdp_os_type]
hdp::directory_recursive_create{$rrd_py_path:
- ensure => "directory"
+ ensure => "directory",
+ override_owner => false
}
$rrd_py_file_path = "${rrd_py_path}/rrd.py"
Added: incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/files/capacity-scheduler.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/files/capacity-scheduler.xml?rev=1442010&view=auto
==============================================================================
--- incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/files/capacity-scheduler.xml (added)
+++ incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/files/capacity-scheduler.xml Mon Feb 4 02:23:55 2013
@@ -0,0 +1,195 @@
+<?xml version="1.0"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- This is the configuration file for the resource manager in Hadoop. -->
+<!-- You can configure various scheduling parameters related to queues. -->
+<!-- The properties for a queue follow a naming convention,such as, -->
+<!-- mapred.capacity-scheduler.queue.<queue-name>.property-name. -->
+
+<configuration>
+
+ <property>
+ <name>mapred.capacity-scheduler.maximum-system-jobs</name>
+ <value>3000</value>
+ <description>Maximum number of jobs in the system which can be initialized,
+ concurrently, by the CapacityScheduler.
+ </description>
+ </property>
+
+ <property>
+ <name>mapred.capacity-scheduler.queue.default.capacity</name>
+ <value>100</value>
+ <description>Percentage of the number of slots in the cluster that are
+ to be available for jobs in this queue.
+ </description>
+ </property>
+
+ <property>
+ <name>mapred.capacity-scheduler.queue.default.maximum-capacity</name>
+ <value>-1</value>
+ <description>
+ maximum-capacity defines a limit beyond which a queue cannot use the capacity of the cluster.
+ This provides a means to limit how much excess capacity a queue can use. By default, there is no limit.
+ The maximum-capacity of a queue can only be greater than or equal to its minimum capacity.
+ Default value of -1 implies a queue can use complete capacity of the cluster.
+
+ This property could be to curtail certain jobs which are long running in nature from occupying more than a
+ certain percentage of the cluster, which in the absence of pre-emption, could lead to capacity guarantees of
+ other queues being affected.
+
+ One important thing to note is that maximum-capacity is a percentage , so based on the cluster's capacity
+ the max capacity would change. So if large no of nodes or racks get added to the cluster , max Capacity in
+ absolute terms would increase accordingly.
+ </description>
+ </property>
+
+ <property>
+ <name>mapred.capacity-scheduler.queue.default.supports-priority</name>
+ <value>false</value>
+ <description>If true, priorities of jobs will be taken into
+ account in scheduling decisions.
+ </description>
+ </property>
+
+ <property>
+ <name>mapred.capacity-scheduler.queue.default.minimum-user-limit-percent</name>
+ <value>100</value>
+ <description> Each queue enforces a limit on the percentage of resources
+ allocated to a user at any given time, if there is competition for them.
+ This user limit can vary between a minimum and maximum value. The former
+ depends on the number of users who have submitted jobs, and the latter is
+ set to this property value. For example, suppose the value of this
+ property is 25. If two users have submitted jobs to a queue, no single
+ user can use more than 50% of the queue resources. If a third user submits
+ a job, no single user can use more than 33% of the queue resources. With 4
+ or more users, no user can use more than 25% of the queue's resources. A
+ value of 100 implies no user limits are imposed.
+ </description>
+ </property>
+
+ <property>
+ <name>mapred.capacity-scheduler.queue.default.user-limit-factor</name>
+ <value>1</value>
+ <description>The multiple of the queue capacity which can be configured to
+ allow a single user to acquire more slots.
+ </description>
+ </property>
+
+ <property>
+ <name>mapred.capacity-scheduler.queue.default.maximum-initialized-active-tasks</name>
+ <value>200000</value>
+ <description>The maximum number of tasks, across all jobs in the queue,
+ which can be initialized concurrently. Once the queue's jobs exceed this
+ limit they will be queued on disk.
+ </description>
+ </property>
+
+ <property>
+ <name>mapred.capacity-scheduler.queue.default.maximum-initialized-active-tasks-per-user</name>
+ <value>100000</value>
+ <description>The maximum number of tasks per-user, across all the of the
+ user's jobs in the queue, which can be initialized concurrently. Once the
+ user's jobs exceed this limit they will be queued on disk.
+ </description>
+ </property>
+
+ <property>
+ <name>mapred.capacity-scheduler.queue.default.init-accept-jobs-factor</name>
+ <value>10</value>
+ <description>The multipe of (maximum-system-jobs * queue-capacity) used to
+ determine the number of jobs which are accepted by the scheduler.
+ </description>
+ </property>
+
+ <!-- The default configuration settings for the capacity task scheduler -->
+ <!-- The default values would be applied to all the queues which don't have -->
+ <!-- the appropriate property for the particular queue -->
+ <property>
+ <name>mapred.capacity-scheduler.default-supports-priority</name>
+ <value>false</value>
+ <description>If true, priorities of jobs will be taken into
+ account in scheduling decisions by default in a job queue.
+ </description>
+ </property>
+
+ <property>
+ <name>mapred.capacity-scheduler.default-minimum-user-limit-percent</name>
+ <value>100</value>
+ <description>The percentage of the resources limited to a particular user
+ for the job queue at any given point of time by default.
+ </description>
+ </property>
+
+
+ <property>
+ <name>mapred.capacity-scheduler.default-user-limit-factor</name>
+ <value>1</value>
+ <description>The default multiple of queue-capacity which is used to
+ determine the amount of slots a single user can consume concurrently.
+ </description>
+ </property>
+
+ <property>
+ <name>mapred.capacity-scheduler.default-maximum-active-tasks-per-queue</name>
+ <value>200000</value>
+ <description>The default maximum number of tasks, across all jobs in the
+ queue, which can be initialized concurrently. Once the queue's jobs exceed
+ this limit they will be queued on disk.
+ </description>
+ </property>
+
+ <property>
+ <name>mapred.capacity-scheduler.default-maximum-active-tasks-per-user</name>
+ <value>100000</value>
+ <description>The default maximum number of tasks per-user, across all the of
+ the user's jobs in the queue, which can be initialized concurrently. Once
+ the user's jobs exceed this limit they will be queued on disk.
+ </description>
+ </property>
+
+ <property>
+ <name>mapred.capacity-scheduler.default-init-accept-jobs-factor</name>
+ <value>10</value>
+ <description>The default multipe of (maximum-system-jobs * queue-capacity)
+ used to determine the number of jobs which are accepted by the scheduler.
+ </description>
+ </property>
+
+ <!-- Capacity scheduler Job Initialization configuration parameters -->
+ <property>
+ <name>mapred.capacity-scheduler.init-poll-interval</name>
+ <value>5000</value>
+ <description>The amount of time in miliseconds which is used to poll
+ the job queues for jobs to initialize.
+ </description>
+ </property>
+ <property>
+ <name>mapred.capacity-scheduler.init-worker-threads</name>
+ <value>5</value>
+ <description>Number of worker threads which would be used by
+ Initialization poller to initialize jobs in a set of queue.
+ If number mentioned in property is equal to number of job queues
+ then a single thread would initialize jobs in a queue. If lesser
+ then a thread would get a set of queues assigned. If the number
+ is greater then number of threads would be equal to number of
+ job queues.
+ </description>
+ </property>
+
+</configuration>
Modified: incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/datanode.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/datanode.pp?rev=1442010&r1=1442009&r2=1442010&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/datanode.pp (original)
+++ incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/datanode.pp Mon Feb 4 02:23:55 2013
@@ -91,7 +91,7 @@ class hdp-hadoop::datanode(
define hdp-hadoop::datanode::create_data_dirs($service_state)
{
$dirs = hdp_array_from_comma_list($name)
- hdp::directory_recursive_create { $dirs :
+ hdp::directory_recursive_create_ignore_failure { $dirs :
owner => $hdp-hadoop::params::hdfs_user,
mode => '0750',
service_state => $service_state,
Modified: incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp?rev=1442010&r1=1442009&r2=1442010&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp (original)
+++ incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp Mon Feb 4 02:23:55 2013
@@ -91,18 +91,31 @@ debug('##Configs generation for hdp-hado
group => $hdp::params::user_group
}
}
-
+
+
if has_key($configuration, 'capacity-scheduler') {
- configgenerator::configfile{'capacity-scheduler':
+ configgenerator::configfile{'capacity-scheduler':
modulespath => $hdp-hadoop::params::conf_dir,
filename => 'capacity-scheduler.xml',
module => 'hdp-hadoop',
configuration => $configuration['capacity-scheduler'],
owner => $hdp-hadoop::params::hdfs_user,
- group => $hdp::params::user_group
+ group => $hdp::params::user_group,
+ replace => true,
+ }
+ } else { # This file will just be a static file for now. - BUG-3195
+ file {"capacity-scheduler.xml":
+ ensure => present,
+ source => "puppet:///modules/hdp-hadoop/capacity-scheduler.xml",
+ mode => '0744',
+ path => "${hdp-hadoop::params::conf_dir}/capacity-scheduler.xml",
+ owner => $hdp-hadoop::params::mapred_user,
+ group => $hdp::params::user_group,
+ replace => true,
}
}
+
if has_key($configuration, 'hdfs-site') {
configgenerator::configfile{'hdfs-site':
modulespath => $hdp-hadoop::params::conf_dir,
@@ -163,7 +176,9 @@ class hdp-hadoop(
}
hdp::user{ $hdfs_user:}
- hdp::user { $mapred_user:}
+ if ($hdfs_user != $mapred_user) {
+ hdp::user { $mapred_user:}
+ }
$logdirprefix = $hdp-hadoop::params::hdfs_log_dir_prefix
hdp::directory_recursive_create { $logdirprefix:
Modified: incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/namenode.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/namenode.pp?rev=1442010&r1=1442009&r2=1442010&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/namenode.pp (original)
+++ incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/namenode.pp Mon Feb 4 02:23:55 2013
@@ -113,7 +113,8 @@ define hdp-hadoop::namenode::create_app_
{
if ($service_state == 'running') {
$smoke_test_user = $hdp::params::smokeuser
- hdp-hadoop::hdfs::directory{ "/user/${smoke_test_user}":
+ $smoke_hdfs_user_dir = $hdp::params::smoke_hdfs_user_dir
+ hdp-hadoop::hdfs::directory{ $smoke_hdfs_user_dir:
service_state => $service_state,
owner => $smoke_test_user,
mode => '770',
@@ -153,7 +154,7 @@ define hdp-hadoop::namenode::create_app_
mode => '777',
recursive_chmod => true
}
- hdp-hadoop::hdfs::directory{ "/user/${hive_user}":
+ hdp-hadoop::hdfs::directory{ $hive_hdfs_user_dir:
service_state => $service_state,
owner => $hive_user
}
@@ -161,7 +162,8 @@ define hdp-hadoop::namenode::create_app_
if ($hdp::params::oozie_server != "") {
$oozie_user = $hdp::params::oozie_user
- hdp-hadoop::hdfs::directory{ "/user/${oozie_user}":
+ $oozie_hdfs_user_dir = $hdp::params::oozie_hdfs_user_dir
+ hdp-hadoop::hdfs::directory{ $oozie_hdfs_user_dir:
service_state => $service_state,
owner => $oozie_user,
mode => '775',
@@ -171,7 +173,8 @@ define hdp-hadoop::namenode::create_app_
if ($hdp::params::webhcat_server_host != "") {
$templeton_user = $hdp::params::templeton_user
- hdp-hadoop::hdfs::directory{ '/user/hcat':
+ $hcat_hdfs_user_dir = $hdp::params::hcat_hdfs_user_dir
+ hdp-hadoop::hdfs::directory{ $hcat_hdfs_user_dir:
service_state => $service_state,
owner => $templeton_user,
mode => '755',
Modified: incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hcat/files/hcatSmoke.sh
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hcat/files/hcatSmoke.sh?rev=1442010&r1=1442009&r2=1442010&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hcat/files/hcatSmoke.sh (original)
+++ incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hcat/files/hcatSmoke.sh Mon Feb 4 02:23:55 2013
@@ -19,6 +19,17 @@
#
#
export tablename=$1
-hcat -e "show tables"
-hcat -e "drop table IF EXISTS ${tablename}"
-hcat -e "create table ${tablename} ( id INT, name string ) stored as rcfile ;"
+
+case "$2" in
+
+prepare)
+ hcat -e "show tables"
+ hcat -e "drop table IF EXISTS ${tablename}"
+ hcat -e "create table ${tablename} ( id INT, name string ) stored as rcfile ;"
+;;
+
+cleanup)
+ hcat -e "drop table IF EXISTS ${tablename}"
+;;
+
+esac
\ No newline at end of file
Modified: incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hcat/manifests/hcat/service_check.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hcat/manifests/hcat/service_check.pp?rev=1442010&r1=1442009&r2=1442010&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hcat/manifests/hcat/service_check.pp (original)
+++ incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hcat/manifests/hcat/service_check.pp Mon Feb 4 02:23:55 2013
@@ -43,8 +43,8 @@ class hdp-hcat::hcat::service_check()
mode => '0755',
}
- exec { '/tmp/hcatSmoke.sh':
- command => "su - ${smoke_test_user} -c '${smoke_user_kinitcmd}sh /tmp/hcatSmoke.sh hcatsmoke${unique}'",
+ exec { 'hcatSmoke.sh prepare':
+ command => "su - ${smoke_test_user} -c '${smoke_user_kinitcmd}sh /tmp/hcatSmoke.sh hcatsmoke${unique} prepare'",
tries => 3,
try_sleep => 5,
require => File['/tmp/hcatSmoke.sh'],
@@ -56,8 +56,17 @@ class hdp-hcat::hcat::service_check()
hdp-hadoop::exec-hadoop { 'hcat::service_check::test':
command => $test_cmd,
refreshonly => true,
- require => Exec['/tmp/hcatSmoke.sh'],
- before => Anchor['hdp-hcat::hcat::service_check::end']
+ require => Exec['hcatSmoke.sh prepare'],
+ }
+
+ exec { 'hcatSmoke.sh cleanup':
+ command => "su - ${smoke_test_user} -c '${smoke_user_kinitcmd}sh /tmp/hcatSmoke.sh hcatsmoke${unique} cleanup'",
+ tries => 3,
+ try_sleep => 5,
+ path => '/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin',
+ require => Hdp-hadoop::Exec-hadoop['hcat::service_check::test'],
+ before => Anchor['hdp-hcat::hcat::service_check::end'],
+ logoutput => "true"
}
anchor{ 'hdp-hcat::hcat::service_check::end':}
Modified: incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-mysql/manifests/server.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-mysql/manifests/server.pp?rev=1442010&r1=1442009&r2=1442010&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-mysql/manifests/server.pp (original)
+++ incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-mysql/manifests/server.pp Mon Feb 4 02:23:55 2013
@@ -41,10 +41,15 @@ class hdp-mysql::server(
if ($hdp::params::hdp_os_type == "suse") {
# On Suse, creating symlink from default mysqld pid file to expected /var/run location
- file { '/var/run/mysqld.pid':
- ensure => 'link',
- target => '/var/lib/mysql/mysqld.pid',
- require => Hdp::Package['mysql'],
+
+ hdp::directory_recursive_create {'/var/run/mysqld/':
+ require => Hdp::Package['mysql']
+ }
+
+ file { '/var/run/mysqld/mysqld.pid':
+ ensure => 'link',
+ target => '/var/lib/mysql/mysqld.pid',
+ require => Hdp::Directory_recursive_create['/var/run/mysqld/'],
}
}
@@ -77,7 +82,7 @@ class hdp-mysql::server(
if ($hdp::params::hdp_os_type == "suse") {
service {$service_name:
ensure => $mysqld_state,
- require => File['/var/run/mysqld.pid'],
+ require => File['/var/run/mysqld/mysqld.pid'],
notify => File['/tmp/addMysqlUser.sh']
}
} else {