ambari git commit: AMBARI-10464 - Ambari Agent holding socket open on 50070 prevents NN from starting (jonathanhurley)

2015-04-21 Thread jonathanhurley 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.0.maint d0f32d236 -> 138b8ec86


AMBARI-10464 - Ambari Agent holding socket open on 50070 prevents NN from 
starting (jonathanhurley)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/138b8ec8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/138b8ec8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/138b8ec8

Branch: refs/heads/branch-2.0.maint
Commit: 138b8ec86c74d841bd6a7381aea727d0a05ea7c4
Parents: d0f32d2
Author: Jonathan Hurley 
Authored: Tue Apr 14 11:00:59 2015 -0400
Committer: Jonathan Hurley 
Committed: Tue Apr 21 08:30:33 2015 -0400

--
 .../src/main/python/ambari_agent/alerts/metric_alert.py| 4 +++-
 .../HDFS/2.1.0.2.0/package/alerts/alert_checkpoint_time.py | 4 +++-
 .../HDFS/2.1.0.2.0/package/alerts/alert_ha_namenode_health.py  | 4 +++-
 .../HIVE/0.12.0.2.0/package/alerts/alert_webhcat_server.py | 5 +++--
 .../YARN/2.1.0.2.0/package/alerts/alert_nodemanager_health.py  | 4 +++-
 .../2.1.0.2.0/package/alerts/alert_nodemanagers_summary.py | 6 --
 .../0.8/services/HDFS/package/files/alert_checkpoint_time.py   | 4 +++-
 .../services/HDFS/package/files/alert_ha_namenode_health.py| 4 +++-
 .../0.8/services/WEBHCAT/package/files/alert_webhcat_server.py | 5 +++--
 .../services/YARN/package/files/alert_nodemanager_health.py| 4 +++-
 10 files changed, 31 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/138b8ec8/ambari-agent/src/main/python/ambari_agent/alerts/metric_alert.py
--
diff --git a/ambari-agent/src/main/python/ambari_agent/alerts/metric_alert.py 
b/ambari-agent/src/main/python/ambari_agent/alerts/metric_alert.py
index 8b5f15d..33f7508 100644
--- a/ambari-agent/src/main/python/ambari_agent/alerts/metric_alert.py
+++ b/ambari-agent/src/main/python/ambari_agent/alerts/metric_alert.py
@@ -31,6 +31,8 @@ from 
resource_management.libraries.functions.get_port_from_url import get_port_f
 
 logger = logging.getLogger()
 
+CONNECTION_TIMEOUT = 5.0
+
 class MetricAlert(BaseAlert):
   
   def __init__(self, alert_meta, alert_source_meta):
@@ -157,7 +159,7 @@ class MetricAlert(BaseAlert):
   response = None
   try:
 url_opener = urllib2.build_opener(RefreshHeaderProcessor())
-response = url_opener.open(url)
+response = url_opener.open(url, timeout=CONNECTION_TIMEOUT)
 content = response.read()
   finally:
 # explicitely close the connection as we've seen python hold onto these

http://git-wip-us.apache.org/repos/asf/ambari/blob/138b8ec8/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/alerts/alert_checkpoint_time.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/alerts/alert_checkpoint_time.py
 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/alerts/alert_checkpoint_time.py
index 032310d..2455d3b 100644
--- 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/alerts/alert_checkpoint_time.py
+++ 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/alerts/alert_checkpoint_time.py
@@ -36,6 +36,8 @@ PERCENT_CRITICAL = 200
 CHECKPOINT_TX_DEFAULT = 100
 CHECKPOINT_PERIOD_DEFAULT = 21600
 
+CONNECTION_TIMEOUT = 5.0
+
 def get_tokens():
   """
   Returns a tuple of tokens in the format {{site/property}} that will be used
@@ -133,7 +135,7 @@ def get_value_from_jmx(query, jmx_property):
   response = None
   
   try:
-response = urllib2.urlopen(query)
+response = urllib2.urlopen(query, timeout=CONNECTION_TIMEOUT)
 data = response.read()
 
 data_dict = json.loads(data)

http://git-wip-us.apache.org/repos/asf/ambari/blob/138b8ec8/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/alerts/alert_ha_namenode_health.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/alerts/alert_ha_namenode_health.py
 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/alerts/alert_ha_namenode_health.py
index 058b7b2..2066d46 100644
--- 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/alerts/alert_ha_namenode_health.py
+++ 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/alerts/alert_ha_namenode_health.py
@@ -35,6 +35,8 @@ NN_HTTP_ADDRESS_KEY = 
'{{hdfs-site/dfs.namenode.http-address}}'
 NN_HTTPS_ADDRESS_KEY = '{{hdfs-site/dfs.namenode.https-address}}'
 DFS_POLICY_KEY = '{{hdfs-site/dfs.http.policy}}'
 
+CONNECTION_TIMEOUT = 5.0
+
 def get_tokens():
   """

ambari git commit: AMBARI-10464 - Ambari Agent holding socket open on 50070 prevents NN from starting (jonathanhurley)

2015-04-14 Thread jonathanhurley 
Repository: ambari
Updated Branches:
  refs/heads/trunk 8669ec812 -> d2bc7bd37


AMBARI-10464 - Ambari Agent holding socket open on 50070 prevents NN from 
starting (jonathanhurley)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d2bc7bd3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d2bc7bd3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d2bc7bd3

Branch: refs/heads/trunk
Commit: d2bc7bd37549ef29fa610c4687151df96e7b454b
Parents: 8669ec8
Author: Jonathan Hurley 
Authored: Tue Apr 14 11:00:59 2015 -0400
Committer: Jonathan Hurley 
Committed: Tue Apr 14 15:57:51 2015 -0400

--
 .../src/main/python/ambari_agent/alerts/metric_alert.py| 4 +++-
 .../HDFS/2.1.0.2.0/package/alerts/alert_checkpoint_time.py | 4 +++-
 .../HDFS/2.1.0.2.0/package/alerts/alert_ha_namenode_health.py  | 4 +++-
 .../HIVE/0.12.0.2.0/package/alerts/alert_webhcat_server.py | 5 +++--
 .../YARN/2.1.0.2.0/package/alerts/alert_nodemanager_health.py  | 4 +++-
 .../2.1.0.2.0/package/alerts/alert_nodemanagers_summary.py | 6 --
 .../0.8/services/HDFS/package/files/alert_checkpoint_time.py   | 4 +++-
 .../services/HDFS/package/files/alert_ha_namenode_health.py| 4 +++-
 .../0.8/services/WEBHCAT/package/files/alert_webhcat_server.py | 5 +++--
 .../services/YARN/package/files/alert_nodemanager_health.py| 4 +++-
 10 files changed, 31 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d2bc7bd3/ambari-agent/src/main/python/ambari_agent/alerts/metric_alert.py
--
diff --git a/ambari-agent/src/main/python/ambari_agent/alerts/metric_alert.py 
b/ambari-agent/src/main/python/ambari_agent/alerts/metric_alert.py
index 8b5f15d..33f7508 100644
--- a/ambari-agent/src/main/python/ambari_agent/alerts/metric_alert.py
+++ b/ambari-agent/src/main/python/ambari_agent/alerts/metric_alert.py
@@ -31,6 +31,8 @@ from 
resource_management.libraries.functions.get_port_from_url import get_port_f
 
 logger = logging.getLogger()
 
+CONNECTION_TIMEOUT = 5.0
+
 class MetricAlert(BaseAlert):
   
   def __init__(self, alert_meta, alert_source_meta):
@@ -157,7 +159,7 @@ class MetricAlert(BaseAlert):
   response = None
   try:
 url_opener = urllib2.build_opener(RefreshHeaderProcessor())
-response = url_opener.open(url)
+response = url_opener.open(url, timeout=CONNECTION_TIMEOUT)
 content = response.read()
   finally:
 # explicitely close the connection as we've seen python hold onto these

http://git-wip-us.apache.org/repos/asf/ambari/blob/d2bc7bd3/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/alerts/alert_checkpoint_time.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/alerts/alert_checkpoint_time.py
 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/alerts/alert_checkpoint_time.py
index 032310d..2455d3b 100644
--- 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/alerts/alert_checkpoint_time.py
+++ 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/alerts/alert_checkpoint_time.py
@@ -36,6 +36,8 @@ PERCENT_CRITICAL = 200
 CHECKPOINT_TX_DEFAULT = 100
 CHECKPOINT_PERIOD_DEFAULT = 21600
 
+CONNECTION_TIMEOUT = 5.0
+
 def get_tokens():
   """
   Returns a tuple of tokens in the format {{site/property}} that will be used
@@ -133,7 +135,7 @@ def get_value_from_jmx(query, jmx_property):
   response = None
   
   try:
-response = urllib2.urlopen(query)
+response = urllib2.urlopen(query, timeout=CONNECTION_TIMEOUT)
 data = response.read()
 
 data_dict = json.loads(data)

http://git-wip-us.apache.org/repos/asf/ambari/blob/d2bc7bd3/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/alerts/alert_ha_namenode_health.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/alerts/alert_ha_namenode_health.py
 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/alerts/alert_ha_namenode_health.py
index 058b7b2..2066d46 100644
--- 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/alerts/alert_ha_namenode_health.py
+++ 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/alerts/alert_ha_namenode_health.py
@@ -35,6 +35,8 @@ NN_HTTP_ADDRESS_KEY = 
'{{hdfs-site/dfs.namenode.http-address}}'
 NN_HTTPS_ADDRESS_KEY = '{{hdfs-site/dfs.namenode.https-address}}'
 DFS_POLICY_KEY = '{{hdfs-site/dfs.http.policy}}'
 
+CONNECTION_TIMEOUT = 5.0
+
 def get_tokens():
   """
   Returns a tuple of t