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 2012/11/07 09:13:24 UTC
svn commit: r1406489 [1/19] - in /incubator/ambari/branches/AMBARI-666: ./
ambari-agent/ ambari-agent/conf/ ambari-agent/conf/unix/
ambari-agent/src/main/puppet/manifestloader/
ambari-agent/src/main/puppet/modules/configgenerator/manifests/
ambari-agen...
Author: mahadev
Date: Wed Nov 7 08:13:12 2012
New Revision: 1406489
URL: http://svn.apache.org/viewvc?rev=1406489&view=rev
Log:
AMBARI-967. Enhance predicate comparison. (Tom Beerbower via mahadev)
Added:
incubator/ambari/branches/AMBARI-666/ambari-agent/conf/
incubator/ambari/branches/AMBARI-666/ambari-agent/conf/unix/
incubator/ambari/branches/AMBARI-666/ambari-agent/conf/unix/ambari-agent
incubator/ambari/branches/AMBARI-666/ambari-agent/conf/unix/ambari.ini
incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/NetUtil.py
incubator/ambari/branches/AMBARI-666/ambari-agent/src/test/python/TestConnectionRetries.py
incubator/ambari/branches/AMBARI-666/ambari-agent/src/test/python/TestStatusCheck.py
incubator/ambari/branches/AMBARI-666/ambari-server/conf/unix/
incubator/ambari/branches/AMBARI-666/ambari-server/conf/unix/ambari-server
incubator/ambari/branches/AMBARI-666/ambari-server/conf/unix/ambari.properties
incubator/ambari/branches/AMBARI-666/ambari-server/conf/unix/log4j.properties
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/StackNotFoundException.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ActionResourceDefinition.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/api/resources/RequestResourceDefinition.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/api/resources/TaskResourceDefinition.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/api/services/ActionService.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaService.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/api/services/PersistKeyValueImpl.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/api/services/PersistKeyValueService.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestService.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/api/services/TaskService.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/ActionRequest.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/ActionResponse.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/RequestStatusRequest.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/RequestStatusResponse.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/RequestsByStatusesRequest.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/ShortTaskStatus.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/TaskStatusRequest.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/TaskStatusResponse.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaHostProvider.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestStatusImpl.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXHostProvider.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/RequestStatus.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/metadata/ActionMetadata.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ClearEntityManagerInterceptor.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/User.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/Users.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/ComponentInfo.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/StackId.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/action/
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/action/Action.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/action/ActionCompletedEvent.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/action/ActionEvent.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/action/ActionEventType.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/action/ActionFailedEvent.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/action/ActionId.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/action/ActionImpl.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/action/ActionInitEvent.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/action/ActionProgressUpdateEvent.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/action/ActionState.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/action/ActionType.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/python/rrd.py
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/Ambari-DDL-Postgres-DROP.sql
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/stacks/HDP/0.1/services/GANGLIA/
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/stacks/HDP/0.1/services/GANGLIA/metainfo.xml
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/stacks/HDP/0.1/services/HBASE/
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/stacks/HDP/0.1/services/HBASE/configuration/
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/stacks/HDP/0.1/services/HBASE/configuration/hbase-site.xml
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/stacks/HDP/0.1/services/HBASE/metainfo.xml
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/stacks/HDP/0.1/services/HCATALOG/
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/stacks/HDP/0.1/services/HCATALOG/metainfo.xml
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/stacks/HDP/0.1/services/HDFS/configuration/core-site.xml
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/stacks/HDP/0.1/services/HIVE/
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/stacks/HDP/0.1/services/HIVE/metainfo.xml
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/stacks/HDP/0.1/services/MAPREDUCE/
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/stacks/HDP/0.1/services/MAPREDUCE/configuration/
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/stacks/HDP/0.1/services/MAPREDUCE/configuration/core-site.xml
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/stacks/HDP/0.1/services/MAPREDUCE/configuration/mapred-site.xml
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/stacks/HDP/0.1/services/MAPREDUCE/metainfo.xml
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/stacks/HDP/0.1/services/NAGIOS/
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/stacks/HDP/0.1/services/NAGIOS/metainfo.xml
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/stacks/HDP/0.1/services/OOZIE/
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/stacks/HDP/0.1/services/OOZIE/configuration/
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/stacks/HDP/0.1/services/OOZIE/configuration/oozie-site.xml
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/stacks/HDP/0.1/services/OOZIE/metainfo.xml
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/stacks/HDP/0.1/services/PIG/
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/stacks/HDP/0.1/services/PIG/configuration/
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/stacks/HDP/0.1/services/PIG/configuration/pig.properties
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/stacks/HDP/0.1/services/PIG/metainfo.xml
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/stacks/HDP/0.1/services/SQOOP/
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/stacks/HDP/0.1/services/SQOOP/metainfo.xml
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/stacks/HDP/0.1/services/TEMPLETON/
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/stacks/HDP/0.1/services/TEMPLETON/configuration/
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/stacks/HDP/0.1/services/TEMPLETON/configuration/templeton-site.xml
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/stacks/HDP/0.1/services/TEMPLETON/metainfo.xml
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/stacks/HDP/0.1/services/ZOOKEEPER/
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/stacks/HDP/0.1/services/ZOOKEEPER/metainfo.xml
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/api/services/ActionServiceTest.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaServiceTest.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/api/services/ConfigurationServiceTest.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/api/services/PersistServiceTest.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/TestUsers.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/state/action/
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/state/action/JobTest.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/resources/stacks/
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/resources/stacks/HDP/
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/resources/stacks/HDP/0.1/
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/resources/stacks/HDP/0.1/repos/
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/resources/stacks/HDP/0.1/repos/repoinfo.xml
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/resources/stacks/HDP/0.1/services/
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/resources/stacks/HDP/0.1/services/HDFS/
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/resources/stacks/HDP/0.1/services/HDFS/configuration/
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/resources/stacks/HDP/0.1/services/HDFS/configuration/hbase-site.xml
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/resources/stacks/HDP/0.1/services/HDFS/configuration/hdfs-site.xml
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/resources/stacks/HDP/0.1/services/HDFS/metainfo.xml
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/resources/stacks/HDP/0.1/services/MAPREDUCE/
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/resources/stacks/HDP/0.1/services/MAPREDUCE/configuration/
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/resources/stacks/HDP/0.1/services/MAPREDUCE/configuration/hbase-site.xml
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/resources/stacks/HDP/0.1/services/MAPREDUCE/configuration/hdfs-site.xml
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/resources/stacks/HDP/0.1/services/MAPREDUCE/configuration/mapred-site.xml
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/resources/stacks/HDP/0.1/services/MAPREDUCE/metainfo.xml
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/resources/stacks/HDP/0.2/
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/resources/stacks/HDP/0.2/repos/
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/resources/stacks/HDP/0.2/repos/repoinfo.xml
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/resources/stacks/HDP/0.2/services/
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/resources/stacks/HDP/0.2/services/HBASE/
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/resources/stacks/HDP/0.2/services/HBASE/configuration/
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/resources/stacks/HDP/0.2/services/HBASE/configuration/hbase-site.xml
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/resources/stacks/HDP/0.2/services/HBASE/metainfo.xml
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/resources/stacks/HDP/0.2/services/HDFS/
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/resources/stacks/HDP/0.2/services/HDFS/configuration/
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/resources/stacks/HDP/0.2/services/HDFS/configuration/hbase-site.xml
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/resources/stacks/HDP/0.2/services/HDFS/configuration/hdfs-site.xml
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/resources/stacks/HDP/0.2/services/HDFS/metainfo.xml
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/resources/stacks/HDP/0.2/services/HIVE/
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/resources/stacks/HDP/0.2/services/HIVE/metainfo.xml
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/resources/stacks/HDP/0.2/services/MAPREDUCE/
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/resources/stacks/HDP/0.2/services/MAPREDUCE/configuration/
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/resources/stacks/HDP/0.2/services/MAPREDUCE/configuration/hbase-site.xml
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/resources/stacks/HDP/0.2/services/MAPREDUCE/configuration/hdfs-site.xml
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/resources/stacks/HDP/0.2/services/MAPREDUCE/configuration/mapred-site.xml
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/resources/stacks/HDP/0.2/services/MAPREDUCE/metainfo.xml
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/resources/stacks/HDP/0.2/services/ZOOKEEPER/
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/resources/stacks/HDP/0.2/services/ZOOKEEPER/metainfo.xml
Modified:
incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt
incubator/ambari/branches/AMBARI-666/ambari-agent/pom.xml
incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/manifestloader/site.pp
incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/configgenerator/manifests/init.pp
incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/client.pp
incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp
incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/params.pp
incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/init.pp
incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/init.pp
incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/init.pp
incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/init.pp
incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp/lib/puppet/parser/functions/hdp_calc_xmn_from_xms.rb
incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp
incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/Controller.py
incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/Heartbeat.py
incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/StatusCheck.py
incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/main.py
incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/manifestGenerator.py
incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/puppetExecutor.py
incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/rolesToClass.dict
incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/security.py
incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/serviceStates.dict
incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/test.json
incubator/ambari/branches/AMBARI-666/ambari-agent/src/test/python/TestCertGeneration.py
incubator/ambari/branches/AMBARI-666/ambari-agent/src/test/python/TestHeartbeat.py
incubator/ambari/branches/AMBARI-666/ambari-server/pom.xml
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/assemblies/server.xml
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/HostNotFoundException.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessor.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessorImpl.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBInMemoryImpl.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionManager.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/HostAction.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/HostRoleCommand.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Stage.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/StageFactory.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/agent/CommandReport.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/agent/HostInfo.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/agent/rest/AgentResource.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/BaseManagementHandler.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/RequestHandlerFactory.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/api/query/QueryImpl.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ClusterResourceDefinition.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ConfigurationResourceDefinition.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/api/resources/HostResourceDefinition.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/api/rest/HealthCheck.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterService.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/api/services/ComponentService.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/api/services/ConfigurationService.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/api/services/CreatePersistenceManager.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/api/services/DeletePersistenceManager.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostComponentService.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostService.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/api/services/PersistenceManager.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/api/services/Request.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestImpl.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/api/services/ResponseFactory.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/api/services/Result.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/api/services/ResultImpl.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceService.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpdatePersistenceManager.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/api/services/parsers/JsonPropertyParser.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/BootStrapImpl.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/SshHostInfo.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementController.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/ClusterResponse.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/HostRequest.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProvider.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterControllerImpl.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/DefaultProviderModule.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PropertyIdImpl.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestImpl.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ResourceProviderImpl.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/SchemaImpl.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/jdbc/JDBCProviderModule.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/jdbc/JDBCResourceProvider.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXPropertyProvider.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/Comparables.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/ComparisonPredicate.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/EqualsPredicate.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/GreaterEqualsPredicate.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/GreaterPredicate.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/LessEqualsPredicate.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/LessPredicate.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/PropertyPredicate.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/ClusterController.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/Request.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/Resource.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/ResourceProvider.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/ClusterControllerHelper.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/DBHelper.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/PropertyHelper.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/metadata/RoleCommandOrder.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ClusterDAO.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ClusterServiceDAO.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ClusterStateDAO.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ExecutionCommandDAO.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostComponentDesiredStateDAO.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostComponentMappingDAO.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostComponentStateDAO.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostDAO.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostRoleCommandDAO.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostStateDAO.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RoleDAO.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RoleSuccessCriteriaDAO.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ServiceComponentConfigDAO.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ServiceComponentDesiredStateDAO.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ServiceComponentHostConfigDAO.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ServiceConfigDAO.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ServiceDesiredStateDAO.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/StageDAO.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/UserDAO.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ExecutionCommandEntity.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostComponentConfigMappingEntityPK.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostRoleCommandEntity.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UserEntity.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/security/CertificateManager.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariLdapAuthoritiesPopulator.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariLocalUserDetailsService.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/AgentVersion.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/Cluster.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigImpl.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/Host.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/RepositoryInfo.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/Service.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponent.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentHost.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentImpl.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceImpl.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceInfo.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/StackInfo.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClustersImpl.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/utils/ShellCommandUtil.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/utils/StageUtils.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/python/ambari-server.py
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/python/bootstrap.py
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/META-INF/persistence.xml
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/ganglia_properties.json
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/jmx_properties.json
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/key_properties.json
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/properties.json
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/stacks/HDP/0.1/repos/repoinfo.xml
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/stacks/HDP/0.1/services/HDFS/metainfo.xml
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/webapp/WEB-INF/spring-security.xml
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionDBAccessorImpl.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionManager.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/api/TestSuite.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/api/handlers/CreateHandlerTest.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/api/handlers/DelegatingRequestHandlerTest.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/api/handlers/DeleteHandlerTest.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/api/handlers/UpdateHandlerTest.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/api/query/QueryImplTest.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/api/services/ClusterServiceTest.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/api/services/ComponentServiceTest.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/api/services/CreatePersistenceManagerTest.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/api/services/DeletePersistenceManagerTest.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/api/services/HostComponentServiceTest.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/api/services/HostServiceTest.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/api/services/RequestImplTest.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/api/services/ServiceServiceTest.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/api/services/UpdatePersistenceManagerTest.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/api/services/serializers/JsonSerializerTest.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/controller/ClusterRequestTest.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/controller/ClusterResponseTest.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProviderTest.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterControllerImplTest.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ResourceProviderImplTest.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/SchemaImplTest.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/TestProviderModule.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/controller/jmx/JMXPropertyProviderTest.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/controller/predicate/AndPredicateTest.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/controller/predicate/EqualsPredicateTest.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/controller/predicate/GreaterEqualsPredicateTest.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/controller/predicate/GreaterPredicateTest.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/controller/predicate/LessEqualsPredicateTest.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/controller/predicate/LessPredicateTest.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/controller/predicate/NotPredicateTest.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/controller/predicate/OrPredicateTest.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/controller/predicate/PredicateVisitorTest.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/orm/InMemoryDefaultTestModule.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/orm/TestOrmImpl.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/stageplanner/TestStagePlanner.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceComponentTest.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceTest.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostTest.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/utils/TestStageUtils.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/test/resources/data.db
incubator/ambari/branches/AMBARI-666/pom.xml
Modified: incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt?rev=1406489&r1=1406488&r2=1406489&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt (original)
+++ incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt Wed Nov 7 08:13:12 2012
@@ -12,6 +12,8 @@ AMBARI-666 branch (unreleased changes)
NEW FEATURES
+ AMBARI-967. Enhance predicate comparison. (Tom Beerbower via mahadev)
+
AMBARI-954. Support installation of Ganglia master and slaves via
Ambari Web. (yusaku)
Added: incubator/ambari/branches/AMBARI-666/ambari-agent/conf/unix/ambari-agent
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-agent/conf/unix/ambari-agent?rev=1406489&view=auto
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-agent/conf/unix/ambari-agent (added)
+++ incubator/ambari/branches/AMBARI-666/ambari-agent/conf/unix/ambari-agent Wed Nov 7 08:13:12 2012
@@ -0,0 +1,26 @@
+# description: ambari-agent daemon
+# processname: ambari-agent
+
+# /etc/init.d/ambari-agent
+
+case "$1" in
+ start)
+ echo -e "Starting ambari-agent"
+ export AMBARI_PASSPHRASE=pass_phrase
+ python /usr/lib/python2.6/site-packages/ambari_agent/main.py
+ ;;
+ stop)
+ echo -e "Stopping ambari-agent"
+ python /usr/lib/python2.6/site-packages/ambari_agent/main.py stop
+ ;;
+ restart)
+ echo -e "Restarting ambari-agent"
+ $0 stop
+ $0 start
+ ;;
+ *)
+ echo "Usage: /usr/sbin/ambari-agent {start|stop|restart}"
+ exit 1
+esac
+
+exit 0
Added: incubator/ambari/branches/AMBARI-666/ambari-agent/conf/unix/ambari.ini
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-agent/conf/unix/ambari.ini?rev=1406489&view=auto
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-agent/conf/unix/ambari.ini (added)
+++ incubator/ambari/branches/AMBARI-666/ambari-agent/conf/unix/ambari.ini Wed Nov 7 08:13:12 2012
@@ -0,0 +1,28 @@
+[server]
+hostname=ambari-rpm.cybervisiontech.com.ua
+url_port=4080
+secured_url_port=8443
+
+[agent]
+prefix=/tmp/ambari-agent
+
+[stack]
+installprefix=/var/ambari/
+
+[puppet]
+puppetmodules=/etc/ambari-agent/puppet
+puppet_home=/usr/bin/puppet
+facter_home=/usr/bin/facter
+
+[command]
+maxretries=2
+sleepBetweenRetries=1
+
+[security]
+keysdir=/etc/ambari-agent/keys
+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/
Modified: incubator/ambari/branches/AMBARI-666/ambari-agent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-agent/pom.xml?rev=1406489&r1=1406488&r2=1406489&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-agent/pom.xml (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-agent/pom.xml Wed Nov 7 08:13:12 2012
@@ -96,6 +96,75 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rpm-maven-plugin</artifactId>
+ <version>2.0.1</version>
+ <executions>
+ <execution>
+ <phase>none</phase>
+ <goals>
+ <goal>rpm</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <copyright>2012, Apache Software Foundation</copyright>
+ <group>Development</group>
+ <description>Maven Recipe: RPM Package.</description>
+ <mappings>
+
+ <mapping>
+ <directory>/usr/lib/python2.6/site-packages/ambari_agent</directory>
+ <sources>
+ <source>
+ <location>${project.build.directory}/${project.artifactId}-${project.version}/ambari_agent</location>
+ </source>
+ </sources>
+ </mapping>
+
+ <mapping>
+ <directory>/etc/${project.artifactId}/puppet</directory>
+ <sources>
+ <source>
+ <location>src/main/puppet</location>
+ </source>
+ </sources>
+ </mapping>
+
+ <mapping>
+ <directory>/etc/ambari</directory>
+ <sources>
+ <source>
+ <location>conf/unix/ambari.ini</location>
+ </source>
+ </sources>
+ </mapping>
+
+ <mapping>
+ <directory>/usr/sbin</directory>
+ <filemode>744</filemode>
+ <sources>
+ <source>
+ <location>conf/unix/ambari-agent</location>
+ </source>
+ </sources>
+ </mapping>
+
+ <mapping>
+ <directory>/var/run/ambari</directory>
+ </mapping>
+
+ <mapping>
+ <directory>/etc/ambari-agent/keys</directory>
+ </mapping>
+
+ <!-- -->
+ </mappings>
+ </configuration>
+ </plugin>
+
</plugins>
<extensions>
<extension>
Modified: incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/manifestloader/site.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/manifestloader/site.pp?rev=1406489&r1=1406488&r2=1406489&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/manifestloader/site.pp (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/manifestloader/site.pp Wed Nov 7 08:13:12 2012
@@ -1,48 +1,48 @@
-#
-#
-# 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.
-#
-#
-
-class manifestloader () {
- file { '/etc/puppet/agent/modules.tgz':
- ensure => present,
- source => "puppet:///modules/catalog/modules.tgz",
- mode => '0755',
- }
-
- exec { 'untar_modules':
- command => "rm -rf /etc/puppet/agent/modules ; tar zxf /etc/puppet/agent/modules.tgz -C /etc/puppet/agent/ --strip-components 3",
- path => '/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'
- }
-
- exec { 'puppet_apply':
- command => "sh /etc/puppet/agent/modules/puppetApply.sh",
- timeout => 1800,
- path => '/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin',
- logoutput => "true"
- }
-
- File['/etc/puppet/agent/modules.tgz'] -> Exec['untar_modules'] -> Exec['puppet_apply']
-}
-
-node default {
- stage{1 :}
- class {'manifestloader': stage => 1}
-}
-
+#
+#
+# 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.
+#
+#
+
+class manifestloader () {
+ file { '/etc/puppet/agent/modules.tgz':
+ ensure => present,
+ source => "puppet:///modules/catalog/modules.tgz",
+ mode => '0755',
+ }
+
+ exec { 'untar_modules':
+ command => "rm -rf /etc/puppet/agent/modules ; tar zxf /etc/puppet/agent/modules.tgz -C /etc/puppet/agent/ --strip-components 3",
+ path => '/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'
+ }
+
+ exec { 'puppet_apply':
+ command => "sh /etc/puppet/agent/modules/puppetApply.sh",
+ timeout => 1800,
+ path => '/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin',
+ logoutput => "true"
+ }
+
+ File['/etc/puppet/agent/modules.tgz'] -> Exec['untar_modules'] -> Exec['puppet_apply']
+}
+
+node default {
+ stage{1 :}
+ class {'manifestloader': stage => 1}
+}
+
Modified: incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/configgenerator/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/configgenerator/manifests/init.pp?rev=1406489&r1=1406488&r2=1406489&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/configgenerator/manifests/init.pp (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/configgenerator/manifests/init.pp Wed Nov 7 08:13:12 2012
@@ -1,23 +1,23 @@
-#
-#
-# 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.
-#
-#
-
-class configgenerator() {
-}
+#
+#
+# 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.
+#
+#
+
+class configgenerator() {
+}
Modified: incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/client.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/client.pp?rev=1406489&r1=1406488&r2=1406489&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/client.pp (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/client.pp Wed Nov 7 08:13:12 2012
@@ -20,7 +20,7 @@
#
class hdp-hadoop::client(
$service_state = $hdp::params::cluster_client_state
-) inherits hdp::params
+) inherits hdp-hadoop::params
{
$hdp::params::service_exists['hdp-hadoop::client'] = true
Modified: incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp?rev=1406489&r1=1406488&r2=1406489&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp Wed Nov 7 08:13:12 2012
@@ -43,57 +43,57 @@ class hdp-hadoop::initialize()
debug('##Configs generation for hdp-hadoop')
- if has_key($configuration, 'mapred_queue_acls') {
- configgenerator::configfile{'mapred_queue_acls':
+ if has_key($configuration, 'mapred-queue-acls') {
+ configgenerator::configfile{'mapred-queue-acls':
modulespath => $hdp-hadoop::params::conf_dir,
filename => 'mapred-queue-acls.xml',
module => 'hdp-hadoop',
- configuration => $configuration['mapred_queue_acls']
+ configuration => $configuration['mapred-queue-acls']
}
}
- if has_key($configuration, 'hadoop_policy') {
- configgenerator::configfile{'hadoop_policy':
+ if has_key($configuration, 'hadoop-policy') {
+ configgenerator::configfile{'hadoop-policy':
modulespath => $hdp-hadoop::params::conf_dir,
filename => 'hadoop-policy.xml',
module => 'hdp-hadoop',
- configuration => $configuration['hadoop_policy']
+ configuration => $configuration['hadoop-policy']
}
}
- if has_key($configuration, 'core_site') {
- configgenerator::configfile{'core_site':
+ if has_key($configuration, 'core-site') {
+ configgenerator::configfile{'core-site':
modulespath => $hdp-hadoop::params::conf_dir,
filename => 'core-site.xml',
module => 'hdp-hadoop',
- configuration => $configuration['core_site']
+ configuration => $configuration['core-site']
}
}
- if has_key($configuration, 'mapred_site') {
- configgenerator::configfile{'mapred_site':
+ if has_key($configuration, 'mapred-site') {
+ configgenerator::configfile{'mapred-site':
modulespath => $hdp-hadoop::params::conf_dir,
filename => 'mapred-site.xml',
module => 'hdp-hadoop',
- configuration => $configuration['mapred_site']
+ configuration => $configuration['mapred-site']
}
}
- if has_key($configuration, 'capacity_scheduler') {
- configgenerator::configfile{'capacity_scheduler':
+ if has_key($configuration, 'capacity-scheduler') {
+ configgenerator::configfile{'capacity-scheduler':
modulespath => $hdp-hadoop::params::conf_dir,
filename => 'capacity-scheduler.xml',
module => 'hdp-hadoop',
- configuration => $configuration['capacity_scheduler']
+ configuration => $configuration['capacity-scheduler']
}
}
- if has_key($configuration, 'hdfs_site') {
- configgenerator::configfile{'hdfs_site':
+ if has_key($configuration, 'hdfs-site') {
+ configgenerator::configfile{'hdfs-site':
modulespath => $hdp-hadoop::params::conf_dir,
filename => 'hdfs-site.xml',
module => 'hdp-hadoop',
- configuration => $configuration['hdfs_site']
+ configuration => $configuration['hdfs-site']
}
}
}
Modified: incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/params.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/params.pp?rev=1406489&r1=1406488&r2=1406489&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/params.pp (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/params.pp Wed Nov 7 08:13:12 2012
@@ -95,7 +95,7 @@ class hdp-hadoop::params(
}
### core-site
- $fs_checkpoint_dir = hdp_default("hadoop/core-site/fs_checkpoint_dir","/tmp/dfs/namesecondary")
+ $fs_checkpoint_dir = hdp_default("hadoop/core-site/fs_checkpoint_dir","/tmp/hadoop-hdfs/dfs/namesecondary")
$proxyuser_group = hdp_default("hadoop/core-site/proxyuser_group","users")
Modified: incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/init.pp?rev=1406489&r1=1406488&r2=1406489&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/init.pp (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/init.pp Wed Nov 7 08:13:12 2012
@@ -1,110 +1,113 @@
-#
-#
-# 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.
-#
-#
-class hdp-hbase(
- $type,
- $service_state)
-{
- include hdp-hbase::params
-
- $hbase_user = $hdp-hbase::params::hbase_user
- $config_dir = $hdp-hbase::params::conf_dir
-
- $hdp::params::component_exists['hdp-hbase'] = true
+#
+#
+# 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.
+#
+#
+class hdp-hbase(
+ $type,
+ $service_state)
+{
+ include hdp-hbase::params
+
+ $hbase_user = $hdp-hbase::params::hbase_user
+ $config_dir = $hdp-hbase::params::conf_dir
+
+ $hdp::params::component_exists['hdp-hbase'] = true
+
-
#Configs generation
- if has_key($configuration, 'hbase_site') {
- configgenerator::configfile{'hbase_site':
- modulespath => $hdp-hbase::params::conf_dir,
- filename => 'hbase-site.xml',
- module => 'hdp-hbase',
- configuration => $configuration['hbase_site']
- }
- }
-
- if has_key($configuration, 'hbase_policy') {
- configgenerator::configfile{'hbase_policy':
- modulespath => $hdp-hbase::params::conf_dir,
- filename => 'hbase-policy.xml',
- module => 'hdp-hbase',
- configuration => $configuration['hbase_policy']
- }
- }
-
- anchor{'hdp-hbase::begin':}
- anchor{'hdp-hbase::end':}
-
- if ($service_state == 'uninstalled') {
- hdp::package { 'hbase':
- ensure => 'uninstalled'
- }
- hdp::directory { $config_dir:
- service_state => $service_state,
- force => true
- }
-
- Anchor['hdp-hbase::begin'] -> Hdp::Package['hbase'] -> Hdp::Directory[$config_dir] -> Anchor['hdp-hbase::end']
-
- } else {
- hdp::package { 'hbase': }
-
- hdp::user{ $hbase_user:}
-
- hdp::directory { $config_dir:
- service_state => $service_state,
- force => true
- }
-
- hdp-hbase::configfile { ['hbase-env.sh','log4j.properties','hadoop-metrics.properties']:
- type => $type
- }
- hdp-hbase::configfile { 'regionservers':}
- Anchor['hdp-hbase::begin'] -> Hdp::Package['hbase'] -> Hdp::User[$hbase_user] -> Hdp::Directory[$config_dir] ->
- Hdp-hbase::Configfile<||> -> Anchor['hdp-hbase::end']
- }
-}
-
-### config files
-define hdp-hbase::configfile(
- $mode = undef,
- $hbase_master_host = undef,
- $template_tag = undef,
- $type = undef,
-)
-{
- if ($name == 'hadoop-metrics.properties') {
- if ($type == 'master') {
- $tag = GANGLIA-MASTER
- } else {
- $tag = GANGLIA-RS
- }
- } else {
- $tag = $template_tag
-}
- hdp::configfile { "${hdp-hbase::params::conf_dir}/${name}":
- component => 'hbase',
- owner => $hdp-hbase::params::hbase_user,
- mode => $mode,
- hbase_master_host => $hbase_master_host,
- template_tag => $tag
- }
-}
+ if has_key($configuration, 'hbase-site') {
+ configgenerator::configfile{'hbase-site':
+ modulespath => $hdp-hbase::params::conf_dir,
+ filename => 'hbase-site.xml',
+ module => 'hdp-hbase',
+ configuration => $configuration['hbase-site']
+ }
+ }
+ hdp-hbase::configfile { 'regionservers':}
+ Anchor['hdp-hbase::begin'] -> Hdp::Package['hbase'] -> Hdp::User[$hbase_user] -> Hdp::Directory[$config_dir] ->
+ Hdp-hbase::Configfile<||> -> Anchor['hdp-hbase::end']
+
+ if has_key($configuration, 'hbase-policy') {
+ configgenerator::configfile{'hbase-policy':
+ modulespath => $hdp-hbase::params::conf_dir,
+ filename => 'hbase-policy.xml',
+ module => 'hdp-hbase',
+ configuration => $configuration['hbase-policy']
+ }
+ }
+
+ anchor{'hdp-hbase::begin':}
+ anchor{'hdp-hbase::end':}
+
+ if ($service_state == 'uninstalled') {
+ hdp::package { 'hbase':
+ ensure => 'uninstalled'
+ }
+ hdp::directory { $config_dir:
+ service_state => $service_state,
+ force => true
+ }
+
+ Anchor['hdp-hbase::begin'] -> Hdp::Package['hbase'] -> Hdp::Directory[$config_dir] -> Anchor['hdp-hbase::end']
+
+ } else {
+ hdp::package { 'hbase': }
+
+ hdp::user{ $hbase_user:}
+
+ hdp::directory { $config_dir:
+ service_state => $service_state,
+ force => true
+ }
+
+ hdp-hbase::configfile { ['hbase-env.sh','log4j.properties','hadoop-metrics.properties']:
+ type => $type
+ }
+ hdp-hbase::configfile { 'regionservers':}
+ Anchor['hdp-hbase::begin'] -> Hdp::Package['hbase'] -> Hdp::User[$hbase_user] -> Hdp::Directory[$config_dir] ->
+ Hdp-hbase::Configfile<||> -> Anchor['hdp-hbase::end']
+ }
+}
+
+### config files
+define hdp-hbase::configfile(
+ $mode = undef,
+ $hbase_master_host = undef,
+ $template_tag = undef,
+ $type = undef,
+)
+{
+ if ($name == 'hadoop-metrics.properties') {
+ if ($type == 'master') {
+ $tag = GANGLIA-MASTER
+ } else {
+ $tag = GANGLIA-RS
+ }
+ } else {
+ $tag = $template_tag
+}
+ hdp::configfile { "${hdp-hbase::params::conf_dir}/${name}":
+ component => 'hbase',
+ owner => $hdp-hbase::params::hbase_user,
+ mode => $mode,
+ hbase_master_host => $hbase_master_host,
+ template_tag => $tag
+ }
+}
Modified: incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/init.pp?rev=1406489&r1=1406488&r2=1406489&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/init.pp (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/init.pp Wed Nov 7 08:13:12 2012
@@ -30,12 +30,12 @@ class hdp-hive(
# Configs generation
- if has_key($configuration, 'hive_site') {
- configgenerator::configfile{'hive_site':
+ if has_key($configuration, 'hive-site') {
+ configgenerator::configfile{'hive-site':
modulespath => $hdp-hive::params::hive_conf_dir,
filename => 'hive-site.xml',
module => 'hdp-hive',
- configuration => $configuration['hive_site']
+ configuration => $configuration['hive-site']
}
}
Modified: incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/init.pp?rev=1406489&r1=1406488&r2=1406489&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/init.pp (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/init.pp Wed Nov 7 08:13:12 2012
@@ -28,12 +28,12 @@ class hdp-oozie(
# Configs generation
- if has_key($configuration, 'oozie_site') {
- configgenerator::configfile{'oozie_site':
+ if has_key($configuration, 'oozie-site') {
+ configgenerator::configfile{'oozie-site':
modulespath => $hdp-oozie::params::conf_dir,
filename => 'oozie-site.xml',
module => 'hdp-oozie',
- configuration => $configuration['oozie_site']
+ configuration => $configuration['oozie-site']
}
}
Modified: incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/init.pp?rev=1406489&r1=1406488&r2=1406489&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/init.pp (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/init.pp Wed Nov 7 08:13:12 2012
@@ -25,12 +25,12 @@ class hdp-templeton(
{
# Configs generation
- if has_key($configuration, 'templeton_site') {
- configgenerator::configfile{'templeton_site':
+ if has_key($configuration, 'templeton-site') {
+ configgenerator::configfile{'templeton-site':
modulespath => $hdp-templeton::params::conf_dir,
filename => 'templeton-site.xml',
module => 'hdp-templeton',
- configuration => $configuration['templeton_site']
+ configuration => $configuration['templeton-site']
}
}
Modified: incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp/lib/puppet/parser/functions/hdp_calc_xmn_from_xms.rb
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp/lib/puppet/parser/functions/hdp_calc_xmn_from_xms.rb?rev=1406489&r1=1406488&r2=1406489&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp/lib/puppet/parser/functions/hdp_calc_xmn_from_xms.rb (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp/lib/puppet/parser/functions/hdp_calc_xmn_from_xms.rb Wed Nov 7 08:13:12 2012
@@ -1,37 +1,37 @@
-#
-#
-# 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.
-#
-#
-module Puppet::Parser::Functions
- newfunction(:hdp_calc_xmn_from_xms, :type => :rvalue) do |args|
- heapsize_orig_str = args[0].to_s
- xmn_percent = args[1].to_f
- xmn_max = args[2].to_i
- heapsize_str = heapsize_orig_str.gsub(/\D/,"")
- heapsize = heapsize_str.to_i
- heapsize_unit = heapsize_orig_str.gsub(/\d/,"")
- xmn_val = heapsize*xmn_percent
- xmn_val = xmn_val.floor.to_i
- xmn_val = xmn_val/8
- xmn_val = xmn_val*8
- xmn_val = xmn_val > xmn_max ? xmn_max : xmn_val
- xmn_val_str = "" + xmn_val.to_s + heapsize_unit
- xmn_val_str
- end
-end
+#
+#
+# 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.
+#
+#
+module Puppet::Parser::Functions
+ newfunction(:hdp_calc_xmn_from_xms, :type => :rvalue) do |args|
+ heapsize_orig_str = args[0].to_s
+ xmn_percent = args[1].to_f
+ xmn_max = args[2].to_i
+ heapsize_str = heapsize_orig_str.gsub(/\D/,"")
+ heapsize = heapsize_str.to_i
+ heapsize_unit = heapsize_orig_str.gsub(/\d/,"")
+ xmn_val = heapsize*xmn_percent
+ xmn_val = xmn_val.floor.to_i
+ xmn_val = xmn_val/8
+ xmn_val = xmn_val*8
+ xmn_val = xmn_val > xmn_max ? xmn_max : xmn_val
+ xmn_val_str = "" + xmn_val.to_s + heapsize_unit
+ xmn_val_str
+ end
+end
Modified: incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp?rev=1406489&r1=1406488&r2=1406489&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp Wed Nov 7 08:13:12 2012
@@ -136,15 +136,15 @@ class hdp::params()
$host_address = undef
##### java
- $java32_home = hdp_default("java32_home","/usr/jdk32/jdk1.6.0_26")
- $java64_home = hdp_default("java64_home","/usr/jdk64/jdk1.6.0_26")
+ $java32_home = hdp_default("java32_home","/usr/jdk32/jdk1.6.0_31")
+ $java64_home = hdp_default("java64_home","/usr/jdk64/jdk1.6.0_31")
$wipeoff_data = hdp_default("wipeoff_data",false)
- $jdk_location = hdp_default("jdk_location","http://download.oracle.com/otn-pub/java/jdk/6u26-b03")
+ $jdk_location = hdp_default("jdk_location","http://download.oracle.com/otn-pub/java/jdk/6u31-b03")
$jdk_bins = hdp_default("jdk_bins",{
- 32 => "jdk-6u26-linux-i586.bin",
- 64 => "jdk-6u26-linux-x64.bin"
+ 32 => "jdk-6u31-linux-i586.bin",
+ 64 => "jdk-6u31-linux-x64.bin"
})
$jce_policy_zip = "jce_policy-6.zip"
Modified: incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/ActionQueue.py?rev=1406489&r1=1406488&r2=1406489&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/ActionQueue.py (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/ActionQueue.py Wed Nov 7 08:13:12 2012
@@ -126,6 +126,7 @@ class ActionQueue(threading.Thread):
# assume some puppet pluing to run these commands
roleResult = {'role' : command['role'],
'actionId' : commandId,
+ 'taskId' : command['taskId'],
'stdout' : commandresult['stdout'],
'clusterName' : clusterName,
'stderr' : commandresult['stderr'],
Modified: incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py?rev=1406489&r1=1406488&r2=1406489&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py Wed Nov 7 08:13:12 2012
@@ -27,12 +27,17 @@ config = ConfigParser.RawConfigParser()
content = """
[server]
-url=https://localhost:4080
-secured_url=https://localhost:8443
+hostname=localhost
+url_port=4080
+secured_url_port=8443
[agent]
prefix=/tmp/ambari-agent
+[services]
+serviceToPidMapFile=servicesToPidNames.dict
+pidLookupPath=/var/run/
+
[stack]
installprefix=/var/ambari/
Modified: incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/Controller.py
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/Controller.py?rev=1406489&r1=1406488&r2=1406489&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/Controller.py (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/Controller.py Wed Nov 7 08:13:12 2012
@@ -38,6 +38,7 @@ from ActionQueue import ActionQueue
from optparse import OptionParser
from wsgiref.simple_server import ServerHandler
import security
+from NetUtil import NetUtil
logger = logging.getLogger()
@@ -52,10 +53,10 @@ class Controller(threading.Thread):
self.credential = None
self.config = config
self.hostname = socket.gethostname()
- self.registerUrl = config.get('server', 'secured_url') + \
- '/agent/register/' + self.hostname
- self.heartbeatUrl = config.get('server', 'secured_url') + \
- '/agent/heartbeat/' + self.hostname
+ server_secured_url = 'https://' + config.get('server', 'hostname') + ':' + config.get('server', 'secured_url_port')
+ self.registerUrl = server_secured_url + '/agent/register/' + self.hostname
+ self.heartbeatUrl = server_secured_url + '/agent/heartbeat/' + self.hostname
+ self.netutil = NetUtil()
def start(self):
self.actionQueue = ActionQueue(self.config)
@@ -88,9 +89,10 @@ class Controller(threading.Thread):
registered = True
pass
except Exception, err:
+ delay = self.netutil.CONNECT_SERVER_RETRY_INTERVAL_SEC
logger.info("Unable to connect to: " + self.registerUrl, exc_info = True)
- """ sleep for 30 seconds and then retry again """
- time.sleep(30)
+ """ Sleeping for {0} seconds and then retrying again """.format(delay)
+ time.sleep(delay)
pass
pass
return ret
@@ -111,18 +113,30 @@ class Controller(threading.Thread):
pass
pass
pass
-
+
+ # For testing purposes
+ DEBUG_HEARTBEAT_RETRIES = 0
+ DEBUG_SUCCESSFULL_HEARTBEATS = 0
+ DEBUG_STOP_HEARTBITTING = False
+
def heartbeatWithServer(self):
+ self.DEBUG_HEARTBEAT_RETRIES = 0
+ self.DEBUG_SUCCESSFULL_HEARTBEATS = 0
retry = False
#TODO make sure the response id is monotonically increasing
id = 0
while True:
try:
- if retry==False:
+ if self.DEBUG_STOP_HEARTBITTING:
+ return
+
+ if not retry:
data = json.dumps(self.heartbeat.build(id))
pass
- logger.info("Sending HeartBeat " + pprint.pformat(data))
- req = urllib2.Request(self.heartbeatUrl, data, {'Content-Type':
+ else:
+ self.DEBUG_HEARTBEAT_RETRIES += 1
+
+ req = urllib2.Request(self.heartbeatUrl, data, {'Content-Type':
'application/json'})
f = security.secured_url_open(req)
response = f.read()
@@ -137,6 +151,8 @@ class Controller(threading.Thread):
logger.info("No commands sent from the Server.")
pass
retry=False
+ self.DEBUG_SUCCESSFULL_HEARTBEATS += 1
+ self.DEBUG_HEARTBEAT_RETRIES = 0
except Exception, err:
retry=True
if "code" in err:
@@ -145,9 +161,9 @@ class Controller(threading.Thread):
logger.error("Unable to connect to: "+
self.heartbeatUrl,exc_info=True)
if self.actionQueue.isIdle():
- time.sleep(3)
+ time.sleep(self.netutil.HEARTBEAT_IDDLE_INTERVAL_SEC)
else:
- time.sleep(1)
+ time.sleep(self.netutil.HEARTBEAT_NOT_IDDLE_INTERVAL_SEC)
pass
def run(self):
Modified: incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/Heartbeat.py
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/Heartbeat.py?rev=1406489&r1=1406488&r2=1406489&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/Heartbeat.py (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/Heartbeat.py Wed Nov 7 08:13:12 2012
@@ -19,11 +19,30 @@ limitations under the License.
'''
import json
+import logging
from Hardware import Hardware
from ActionQueue import ActionQueue
from ServerStatus import ServerStatus
+from StatusCheck import StatusCheck
+import AmbariConfig
import socket
import time
+import traceback
+from pprint import pprint, pformat
+
+logger = logging.getLogger()
+
+COMPONENTS = [
+ {"serviceName" : "HDFS",
+ "componentName" : "DATANODE"},
+ {"serviceName" : "HDFS",
+ "componentName" : "NAMENODE"},
+ {"serviceName" : "HDFS",
+ "componentName" : "SECONDARYNAMENODE"}
+]
+
+LIVE_STATUS = "LIVE"
+DEAD_STATUS = "DEAD"
firstContact = True
class Heartbeat:
@@ -31,7 +50,6 @@ class Heartbeat:
def __init__(self, actionQueue):
self.actionQueue = actionQueue
self.reports = []
- self.componentStatus = []
def build(self, id='-1'):
global clusterId, clusterDefinitionRevision, firstContact
@@ -39,6 +57,22 @@ class Heartbeat:
timestamp = int(time.time()*1000)
queueResult = self.actionQueue.result()
installedRoleStates = serverStatus.build()
+ pidLookupPath = AmbariConfig.config.get('services','pidLookupPath')
+ serviceToPidMapFile = AmbariConfig.config.get('services','serviceToPidMapFile')
+ statusCheck = StatusCheck(pidLookupPath, serviceToPidMapFile)
+ servicesStatusesDict = {}
+ componentStatus = []
+ for component in COMPONENTS:
+ serviceStatus = statusCheck.getStatus(component["componentName"])
+ if serviceStatus == None:
+ logger.warn("There is no service to pid mapping for " + component["componentName"])
+ status = LIVE_STATUS if serviceStatus else DEAD_STATUS
+ componentStatus.append({"componentName" : component["componentName"],
+ "msg" : "",
+ "status" : status,
+ "serviceName" : component["serviceName"],
+ "clusterName" : ""})
+
nodeStatus = { "status" : "HEALTHY",
"cause" : "NONE"}
@@ -46,13 +80,13 @@ class Heartbeat:
heartbeat = { 'responseId' : int(id),
'timestamp' : timestamp,
'hostname' : socket.gethostname(),
- # 'componentStatus' : self.componentStatus,
+ 'componentStatus' : componentStatus,
'nodeStatus' : nodeStatus
}
if len(queueResult) != 0:
heartbeat['reports'] = queueResult
pass
-
+ logger.info("Status for node heartbeat: " + pformat(nodeStatus))
return heartbeat
def main(argv=None):
Added: incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/NetUtil.py
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/NetUtil.py?rev=1406489&view=auto
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/NetUtil.py (added)
+++ incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/NetUtil.py Wed Nov 7 08:13:12 2012
@@ -0,0 +1,50 @@
+from httplib import HTTP
+from urlparse import urlparse
+import time
+
+class NetUtil:
+
+ CONNECT_SERVER_RETRY_INTERVAL_SEC = 10
+ HEARTBEAT_IDDLE_INTERVAL_SEC = 3
+ HEARTBEAT_NOT_IDDLE_INTERVAL_SEC = 1
+
+ # Url within server to request during status check. This url
+ # should return HTTP code 200
+ SERVER_STATUS_REQUEST = "{0}/api/check"
+
+ # For testing purposes
+ DEBUG_STOP_RETRIES_FLAG = False
+
+ def checkURL(self, url):
+ """Try to connect to a given url. Result is True if url returns HTTP code 200, in any other case
+ (like unreachable server or wrong HTTP code) result will be False
+ """
+ try:
+ p = urlparse(url)
+ h = HTTP(p[1])
+ h.putrequest('HEAD', p[2])
+ h.endheaders()
+ if h.getreply()[0] == 200: return True
+ else: return False
+ except Exception, e:
+ return False
+
+ def try_to_connect(self, server_url, max_retries, logger = None):
+ """Try to connect to a given url, sleeping for CONNECT_SERVER_RETRY_INTERVAL_SEC seconds
+ between retries. No more than max_retries is performed. If max_retries is -1, connection
+ attempts will be repeated forever until server is not reachable
+ Returns count of retries
+ """
+ retries = 0
+ while (max_retries == -1 or retries < max_retries) and not self.DEBUG_STOP_RETRIES_FLAG:
+ server_is_up = self.checkURL(self.SERVER_STATUS_REQUEST.format(server_url))
+ if server_is_up:
+ break
+ else:
+ if logger is not None:
+ logger.info('Server at {0} is not reachable, sleeping for {1} seconds...'.format(server_url,
+ self.CONNECT_SERVER_RETRY_INTERVAL_SEC))
+ retries += 1
+ time.sleep(self.CONNECT_SERVER_RETRY_INTERVAL_SEC)
+ return retries
+
Modified: incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/StatusCheck.py
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/StatusCheck.py?rev=1406489&r1=1406488&r2=1406489&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/StatusCheck.py (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/StatusCheck.py Wed Nov 7 08:13:12 2012
@@ -28,15 +28,17 @@ logger = logging.getLogger()
-def get_pair(line):
- key, sep, value = line.strip().partition("=")
- return key, value
+
class StatusCheck:
+ def get_pair(self, line):
+ key, sep, value = line.strip().partition("=")
+ return key, value
+
def listFiles(self, dir):
basedir = dir
- logger.info("Files in ", os.path.abspath(dir), ": ")
+ logger.debug("Files in " + os.path.abspath(dir) + ": ")
subdirlist = []
try:
if os.path.isdir(dir):
@@ -53,28 +55,33 @@ class StatusCheck:
except OSError as e:
logger.info(e.strerror + ' to ' + e.filename)
- def __init__(self, path):
+ def __init__(self, path, mappingFilePath):
+ if not os.path.isdir(path):
+ raise ValueError("Path argument must be valid directory")
+
+ if not os.path.exists(mappingFilePath):
+ raise IOError("File with services to pid mapping doesn't exists")
self.path = path
+ self.mappingFilePath = mappingFilePath
self.sh = shellRunner()
self.pidFilesDict = {}
self.listFiles(self.path)
- with open("servicesToPidNames.dict") as fd:
- self.serToPidDict = dict(get_pair(line) for line in fd)
+ with open(self.mappingFilePath) as fd:
+ self.serToPidDict = dict(self.get_pair(line) for line in fd)
def getIsLive(self, pidPath):
isLive = False
pidFile = open(pidPath, 'r')
pid = int(pidFile.readline())
res = self.sh.run(['ps -p', str(pid), '-f'])
- lines = res['output'].split('\n')
+ lines = res['output'].strip().split(os.linesep)
try:
procInfo = lines[1]
isLive = not procInfo == None
except IndexError:
logger.info('Process is dead')
-
return isLive
def getStatus(self, serviceCode):
@@ -93,12 +100,6 @@ class StatusCheck:
logger.info('Pid file was not found')
return False
-#Temporary, for testing from console
-def main(argv=None):
- statusCheck = StatusCheck('/var/')
- isLive = statusCheck.getStatus(argv[1])
- print isLive
-
-if __name__ == '__main__':
- main(sys.argv)
+ def getSerToPidDict(self):
+ return self.serToPidDict