incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yus...@apache.org
Subject svn commit: r1488035 [1/5] - in /incubator/ambari/trunk: ./ ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/ ambari-agent/src/main/puppet/modules/hdp-yarn/files/ ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/ ambari-agent/src/main/py...
Date Thu, 30 May 2013 22:03:59 GMT
Author: yusaku
Date: Thu May 30 22:03:58 2013
New Revision: 1488035

URL: http://svn.apache.org/r1488035
Log:

AMBARI-2234. Host Details Page: Update host component actions and icons depending on state.
(yusaku)
AMBARI-2230. Nagios user is presented in Admin > Misc page when Nagios service was not
installed. (yusaku)
AMBARI-2231. Service web UI links map to hostnames not resolvable by the client. (yusaku)

Added:
    incubator/ambari/trunk/ambari-server/docs/api/v1/job-resources.md
    incubator/ambari/trunk/ambari-server/docs/api/v1/jobs-job.md
    incubator/ambari/trunk/ambari-server/docs/api/v1/jobs.md
    incubator/ambari/trunk/ambari-server/docs/api/v1/taskattempt-resources.md
    incubator/ambari/trunk/ambari-server/docs/api/v1/taskattempts-taskattempt.md
    incubator/ambari/trunk/ambari-server/docs/api/v1/taskattempts.md
    incubator/ambari/trunk/ambari-server/docs/api/v1/workflow-resources.md
    incubator/ambari/trunk/ambari-server/docs/api/v1/workflows-workflow.md
    incubator/ambari/trunk/ambari-server/docs/api/v1/workflows.md
Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/init.pp
    incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/files/validateYarnComponentStatus.py
    incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/nodemanager.pp
    incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/params.pp
    incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/smoketest.pp
    incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/Heartbeat.py
    incubator/ambari/trunk/ambari-server/docs/api/v1/clusters.md
    incubator/ambari/trunk/ambari-server/docs/api/v1/create-cluster.md
    incubator/ambari/trunk/ambari-server/docs/api/v1/create-component.md
    incubator/ambari/trunk/ambari-server/docs/api/v1/create-host.md
    incubator/ambari/trunk/ambari-server/docs/api/v1/create-hostcomponent.md
    incubator/ambari/trunk/ambari-server/docs/api/v1/create-service.md
    incubator/ambari/trunk/ambari-server/docs/api/v1/delete-cluster.md
    incubator/ambari/trunk/ambari-server/docs/api/v1/host-component-resources.md
    incubator/ambari/trunk/ambari-server/docs/api/v1/host-components.md
    incubator/ambari/trunk/ambari-server/docs/api/v1/index.md
    incubator/ambari/trunk/ambari-server/docs/api/v1/services.md
    incubator/ambari/trunk/ambari-server/docs/api/v1/update-hostcomponent.md
    incubator/ambari/trunk/ambari-server/docs/api/v1/update-service.md
    incubator/ambari/trunk/ambari-server/docs/api/v1/update-services.md
    incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentImpl.java
    incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceImpl.java
    incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java
    incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java
    incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.3.0/repos/repoinfo.xml
    incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDPLocal/1.3.0/repos/repoinfo.xml
    incubator/ambari/trunk/ambari-server/src/test/resources/deploy_HDP2.sh
    incubator/ambari/trunk/ambari-web/app/config.js
    incubator/ambari/trunk/ambari-web/app/controllers/global/cluster_controller.js
    incubator/ambari/trunk/ambari-web/app/controllers/main/admin/misc_controller.js
    incubator/ambari/trunk/ambari-web/app/controllers/main/host.js
    incubator/ambari/trunk/ambari-web/app/controllers/main/host/details.js
    incubator/ambari/trunk/ambari-web/app/controllers/wizard/step7_controller.js
    incubator/ambari/trunk/ambari-web/app/data/HDP2/config_mapping.js
    incubator/ambari/trunk/ambari-web/app/data/HDP2/config_properties.js
    incubator/ambari/trunk/ambari-web/app/data/config_properties.js
    incubator/ambari/trunk/ambari-web/app/messages.js
    incubator/ambari/trunk/ambari-web/app/models/host_component.js
    incubator/ambari/trunk/ambari-web/app/models/service.js
    incubator/ambari/trunk/ambari-web/app/models/service_config.js
    incubator/ambari/trunk/ambari-web/app/styles/application.less
    incubator/ambari/trunk/ambari-web/app/templates/main/admin/misc.hbs
    incubator/ambari/trunk/ambari-web/app/templates/main/host/summary.hbs
    incubator/ambari/trunk/ambari-web/app/templates/wizard/step9HostTasksLogPopup.hbs
    incubator/ambari/trunk/ambari-web/app/utils/config.js
    incubator/ambari/trunk/ambari-web/app/utils/db.js
    incubator/ambari/trunk/ambari-web/app/views/common/configs/services_config.js
    incubator/ambari/trunk/ambari-web/app/views/common/filter_view.js
    incubator/ambari/trunk/ambari-web/app/views/common/quick_view_link_view.js
    incubator/ambari/trunk/ambari-web/app/views/common/sort_view.js
    incubator/ambari/trunk/ambari-web/app/views/common/table_view.js
    incubator/ambari/trunk/ambari-web/app/views/main/dashboard/service/hbase.js
    incubator/ambari/trunk/ambari-web/app/views/main/dashboard/service/hdfs.js
    incubator/ambari/trunk/ambari-web/app/views/main/dashboard/service/mapreduce.js
    incubator/ambari/trunk/ambari-web/app/views/main/dashboard/service/oozie.js
    incubator/ambari/trunk/ambari-web/app/views/main/host.js
    incubator/ambari/trunk/ambari-web/app/views/main/host/summary.js
    incubator/ambari/trunk/ambari-web/app/views/main/mirroring/datasets_view.js
    incubator/ambari/trunk/ambari-web/app/views/main/mirroring/jobs_view.js
    incubator/ambari/trunk/ambari-web/app/views/main/service/info/summary.js
    incubator/ambari/trunk/pom.xml

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1488035&r1=1488034&r2=1488035&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Thu May 30 22:03:58 2013
@@ -312,6 +312,9 @@ Trunk (unreleased changes):
 
  IMPROVEMENTS
 
+ AMBARI-2234. Host Details Page: Update host component actions and icons
+ depending on state. (yusaku)
+
  AMBARI-2199. Add a legend to Job Timeline. (billie via yusaku)
 
  AMBARI-2212. Change config loading mechanism to allow for different
@@ -906,6 +909,12 @@ Trunk (unreleased changes):
  Farrellee via mahadev)
 
  BUG FIXES
+ 
+ AMBARI-2230. Nagios user is presented in Admin > Misc page when Nagios
+ service was not installed. (yusaku)
+
+ AMBARI-2231. Service web UI links map to hostnames not resolvable by the
+ client. (yusaku)
 
  AMBARI-2239. secure cluster: Namenode and SNamenode should use same
  keytab. (jaimin)

Modified: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/init.pp?rev=1488035&r1=1488034&r2=1488035&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/init.pp
(original)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/init.pp
Thu May 30 22:03:58 2013
@@ -39,13 +39,13 @@ class hdp-oozie(
       configuration => $configuration['oozie-site'],
       owner => $oozie_user,
       group => $hdp::params::user_group,
-      mode => '0660'
+      mode => '0664'
     }
   } else {
     file { "${oozie_config_dir}/oozie-site.xml":
       owner => $oozie_user,
       group => $hdp::params::user_group,
-      mode => '0660'
+      mode => '0664'
     }
   }
 

Modified: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/files/validateYarnComponentStatus.py
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/files/validateYarnComponentStatus.py?rev=1488035&r1=1488034&r2=1488035&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/files/validateYarnComponentStatus.py
(original)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/files/validateYarnComponentStatus.py
Thu May 30 22:03:58 2013
@@ -27,10 +27,10 @@ HISTORYSERVER ='hs'
 
 STARTED_STATE = 'STARTED'
 
-def validate(component, path, port):
+def validate(component, path, address):
 
   try:
-    url = 'http://localhost:' + str(port) + path
+    url = 'http://' + address + path
     opener = urllib2.build_opener()
     urllib2.install_opener(opener)
     request = urllib2.Request(url)
@@ -71,14 +71,14 @@ def validateResponse(component, response
 #
 def main():
   parser = optparse.OptionParser(usage="usage: %prog [options] component ")
-  parser.add_option("-p", "--port", dest="port", help="Port for rest api of desired component")
+  parser.add_option("-p", "--port", dest="address", help="Host:Port for REST API of a desired
component")
 
 
   (options, args) = parser.parse_args()
 
   component = args[0]
   
-  port = options.port
+  address = options.address
   
   if component == RESOURCEMANAGER:
     path = '/ws/v1/cluster/info'
@@ -87,7 +87,7 @@ def main():
   else:
     parser.error("Invalid component")
 
-  validate(component, path, port)
+  validate(component, path, address)
 
 if __name__ == "__main__":
   main()

Modified: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/nodemanager.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/nodemanager.pp?rev=1488035&r1=1488034&r2=1488035&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/nodemanager.pp
(original)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/nodemanager.pp
Thu May 30 22:03:58 2013
@@ -24,6 +24,7 @@ class hdp-yarn::nodemanager(
 ) inherits hdp-yarn::params
 {
   $yarn_user = $hdp-yarn::params::yarn_user
+  $nm_local_dirs = $hdp-yarn::params::nm_local_dirs
   
   if ($service_state == 'no_op') {
   } elsif ($service_state in 'installed_and_configured') {
@@ -36,12 +37,21 @@ class hdp-yarn::nodemanager(
   } elsif ($service_state in ['running','stopped']) {
 
     include hdp-yarn::initialize
- 
+
+    hdp::directory_recursive_create { $nm_local_dirs: 
+      owner       => $yarn_user,
+      context_tag => 'yarn_service',
+      service_state => $service_state,
+      force => true
+    }
+
     hdp-yarn::service{ 'nodemanager':
       ensure       => $service_state,
       user         => $yarn_user
     }
 
+    Hdp::Directory_recursive_create[$nm_local_dirs] -> Hdp-yarn::Service['nodemanager']
+
   } else {
     hdp_fail("TODO not implemented yet: service_state = ${service_state}")
   }

Modified: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/params.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/params.pp?rev=1488035&r1=1488034&r2=1488035&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/params.pp
(original)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/params.pp
Thu May 30 22:03:58 2013
@@ -36,8 +36,9 @@ class hdp-yarn::params(
   $yarn_pid_dir_prefix = hdp_default("hadoop/yarn-env/yarn_pid_dir_prefix","/var/run/hadoop-yarn")
   
   ## yarn-site
-  $rm_webui_port = hdp_default("yarn-site/yarn.resourcemanager.webapp.address", "8088")
-  $nm_webui_port = hdp_default("yarn-site/yarn.nodemanager.webapp.address", "8042")
-  $hs_webui_port = hdp_default("yarn-site/mapreduce.jobhistory.address", "19888")
-
+  $rm_webui_address = hdp_default("yarn-site/yarn.resourcemanager.webapp.address", "localhost:8088")
+  $nm_webui_address = hdp_default("yarn-site/yarn.nodemanager.webapp.address", "localhost:8042")
+  $hs_webui_address = hdp_default("mapred-site/mapreduce.jobhistory.webapp.address", "localhost:19888")
+  
+  $nm_local_dirs = hdp_default("yarn-site/yarn.nodemanager.local-dirs", "/yarn/loc/dir")

 }

Modified: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/smoketest.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/smoketest.pp?rev=1488035&r1=1488034&r2=1488035&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/smoketest.pp
(original)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/smoketest.pp
Thu May 30 22:03:58 2013
@@ -22,16 +22,16 @@ class hdp-yarn::smoketest(
   $component_name = undef
 )
 {
-  $rm_webui_port = $hdp-yarn::params::rm_webui_port
-  $nm_webui_port = $hdp-yarn::params::nm_webui_port
-  $hs_webui_port = $hdp-yarn::params::hs_webui_port
+  $rm_webui_address = $hdp-yarn::params::rm_webui_address
+  $nm_webui_address = $hdp-yarn::params::nm_webui_address
+  $hs_webui_address = $hdp-yarn::params::hs_webui_address
 
   if ($component_name == 'resourcemanager') {
     $component_type = 'rm'
-    $component_port = $rm_webui_port
+    $component_address = $rm_webui_address
   } elsif ($component_name == 'historyserver') {
     $component_type = 'hs' 
-    $component_port = $hs_webui_port
+    $component_address = $hs_webui_address
   } else {
     hdp_fail("Unsupported component name: $component_name")
   }
@@ -41,7 +41,7 @@ class hdp-yarn::smoketest(
   $validateStatusFileName = "validateYarnComponentStatus.py"
   $validateStatusFilePath = "/tmp/$validateStatusFileName"
 
-  $validateStatusCmd = "su - ${smoke_test_user} -c 'python $validateStatusFilePath $component_type
-p $component_port'"
+  $validateStatusCmd = "su - ${smoke_test_user} -c 'python $validateStatusFilePath $component_type
-p $component_address'"
 
   file { $validateStatusFilePath:
     ensure => present,

Modified: incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/Heartbeat.py
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/Heartbeat.py?rev=1488035&r1=1488034&r2=1488035&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/Heartbeat.py (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/Heartbeat.py Thu May
30 22:03:58 2013
@@ -57,6 +57,8 @@ class Heartbeat:
       heartbeat['reports'] = queueResult['reports']
       heartbeat['componentStatus'] = queueResult['componentStatus']
       pass
+    logger.info("Sending heartbeat with response id: " + str(id) + " and "
+                "timestamp: " + str(timestamp))
     logger.debug("Heartbeat : " + pformat(heartbeat))
 
     if (int(id) >= 0) and state_interval > 0 and (int(id) % state_interval) == 0:

Modified: incubator/ambari/trunk/ambari-server/docs/api/v1/clusters.md
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/docs/api/v1/clusters.md?rev=1488035&r1=1488034&r2=1488035&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/docs/api/v1/clusters.md (original)
+++ incubator/ambari/trunk/ambari-server/docs/api/v1/clusters.md Thu May 30 22:03:58 2013
@@ -1,3 +1,4 @@
+
 <!---
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements. See the NOTICE file distributed with

Modified: incubator/ambari/trunk/ambari-server/docs/api/v1/create-cluster.md
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/docs/api/v1/create-cluster.md?rev=1488035&r1=1488034&r2=1488035&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/docs/api/v1/create-cluster.md (original)
+++ incubator/ambari/trunk/ambari-server/docs/api/v1/create-cluster.md Thu May 30 22:03:58
2013
@@ -1,3 +1,4 @@
+
 <!---
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements. See the NOTICE file distributed with

Modified: incubator/ambari/trunk/ambari-server/docs/api/v1/create-component.md
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/docs/api/v1/create-component.md?rev=1488035&r1=1488034&r2=1488035&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/docs/api/v1/create-component.md (original)
+++ incubator/ambari/trunk/ambari-server/docs/api/v1/create-component.md Thu May 30 22:03:58
2013
@@ -1,3 +1,4 @@
+
 <!---
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements. See the NOTICE file distributed with

Modified: incubator/ambari/trunk/ambari-server/docs/api/v1/create-host.md
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/docs/api/v1/create-host.md?rev=1488035&r1=1488034&r2=1488035&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/docs/api/v1/create-host.md (original)
+++ incubator/ambari/trunk/ambari-server/docs/api/v1/create-host.md Thu May 30 22:03:58 2013
@@ -1,3 +1,4 @@
+
 <!---
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements. See the NOTICE file distributed with

Modified: incubator/ambari/trunk/ambari-server/docs/api/v1/create-hostcomponent.md
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/docs/api/v1/create-hostcomponent.md?rev=1488035&r1=1488034&r2=1488035&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/docs/api/v1/create-hostcomponent.md (original)
+++ incubator/ambari/trunk/ambari-server/docs/api/v1/create-hostcomponent.md Thu May 30 22:03:58
2013
@@ -1,3 +1,4 @@
+
 <!---
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements. See the NOTICE file distributed with

Modified: incubator/ambari/trunk/ambari-server/docs/api/v1/create-service.md
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/docs/api/v1/create-service.md?rev=1488035&r1=1488034&r2=1488035&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/docs/api/v1/create-service.md (original)
+++ incubator/ambari/trunk/ambari-server/docs/api/v1/create-service.md Thu May 30 22:03:58
2013
@@ -1,3 +1,4 @@
+
 <!---
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements. See the NOTICE file distributed with

Modified: incubator/ambari/trunk/ambari-server/docs/api/v1/delete-cluster.md
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/docs/api/v1/delete-cluster.md?rev=1488035&r1=1488034&r2=1488035&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/docs/api/v1/delete-cluster.md (original)
+++ incubator/ambari/trunk/ambari-server/docs/api/v1/delete-cluster.md Thu May 30 22:03:58
2013
@@ -1,3 +1,4 @@
+
 <!---
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements. See the NOTICE file distributed with

Modified: incubator/ambari/trunk/ambari-server/docs/api/v1/host-component-resources.md
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/docs/api/v1/host-component-resources.md?rev=1488035&r1=1488034&r2=1488035&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/docs/api/v1/host-component-resources.md (original)
+++ incubator/ambari/trunk/ambari-server/docs/api/v1/host-component-resources.md Thu May 30
22:03:58 2013
@@ -158,3 +158,4 @@ A component can be stopped through the A
 The user can update the desired state of a host component through the API to be MAINTENANCE
(see [update host component](update-hostcomponent.md)).  When a host component is into maintenance
state it is basically taken off line. This state can be used, for example, to move a component
like NameNode.  The NameNode component can be put in MAINTENANCE mode and then a new NameNode
can be created for the service. 
 
 
+

Modified: incubator/ambari/trunk/ambari-server/docs/api/v1/host-components.md
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/docs/api/v1/host-components.md?rev=1488035&r1=1488034&r2=1488035&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/docs/api/v1/host-components.md (original)
+++ incubator/ambari/trunk/ambari-server/docs/api/v1/host-components.md Thu May 30 22:03:58
2013
@@ -94,4 +94,4 @@ Returns a collection of components runni
     		},
     		...
 		]
-	}
+	}
\ No newline at end of file



Mime
View raw message