You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2015/12/23 14:31:54 UTC
[1/2] ambari git commit: AMBARI-14479. Namenode start fails when time
taken to get out of safemode is more than 20 minutes (dlysnichenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 940272628 -> 59d7a3464
refs/heads/trunk 37a0ff7ec -> c32cbbe2b
AMBARI-14479. Namenode start fails when time taken to get out of safemode is more than 20 minutes (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/59d7a346
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/59d7a346
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/59d7a346
Branch: refs/heads/branch-2.2
Commit: 59d7a3464317d03f1a9a1594e80f4d9edb7ad011
Parents: 9402726
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Wed Dec 23 15:06:10 2015 +0200
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Wed Dec 23 15:06:10 2015 +0200
----------------------------------------------------------------------
.../common-services/HDFS/2.1.0.2.0/metainfo.xml | 2 +-
.../2.1.0.2.0/package/scripts/hdfs_namenode.py | 2 +-
.../HDFS/2.1.0.2.0/package/scripts/namenode.py | 2 +-
.../python/stacks/2.0.6/HDFS/test_namenode.py | 18 +++++++++---------
4 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/59d7a346/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metainfo.xml b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metainfo.xml
index b678e51..e3e16e3 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metainfo.xml
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metainfo.xml
@@ -34,7 +34,7 @@
<commandScript>
<script>scripts/namenode.py</script>
<scriptType>PYTHON</scriptType>
- <timeout>1200</timeout>
+ <timeout>1800</timeout>
</commandScript>
<customCommands>
<customCommand>
http://git-wip-us.apache.org/repos/asf/ambari/blob/59d7a346/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py
index 004caff..1766c44 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py
@@ -168,7 +168,7 @@ def namenode(action=None, hdfs_binary=None, do_format=True, upgrade_type=None, e
try:
# Wait up to 30 mins
Execute(is_namenode_safe_mode_off,
- tries=180,
+ tries=65,
try_sleep=10,
user=params.hdfs_user,
logoutput=True
http://git-wip-us.apache.org/repos/asf/ambari/blob/59d7a346/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py
index 13d1912..67db735 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py
@@ -197,7 +197,7 @@ class NameNodeDefault(NameNode):
# Wait up to 30 mins
Execute(is_namenode_safe_mode_off,
- tries=180,
+ tries=65,
try_sleep=10,
user=params.hdfs_user,
logoutput=True
http://git-wip-us.apache.org/repos/asf/ambari/blob/59d7a346/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py
index 4be4fd4..399fd8d 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py
@@ -89,7 +89,7 @@ class TestNamenode(RMFTestCase):
not_if = "ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E test -f /var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid && ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E pgrep -F /var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid",
)
self.assertResourceCalled('Execute', "hdfs dfsadmin -fs hdfs://c6405.ambari.apache.org:8020 -safemode get | grep 'Safe mode is OFF'",
- tries=180,
+ tries=65,
try_sleep=10,
user="hdfs",
logoutput=True
@@ -199,7 +199,7 @@ class TestNamenode(RMFTestCase):
not_if = "ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E test -f /var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid && ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E pgrep -F /var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid",
)
self.assertResourceCalled('Execute', "hdfs dfsadmin -fs hdfs://c6401.ambari.apache.org:8020 -safemode get | grep 'Safe mode is OFF'",
- tries=180,
+ tries=65,
try_sleep=10,
user="hdfs",
logoutput=True
@@ -325,7 +325,7 @@ class TestNamenode(RMFTestCase):
user='hdfs',
)
self.assertResourceCalled('Execute', "hdfs dfsadmin -fs hdfs://c6401.ambari.apache.org:8020 -safemode get | grep 'Safe mode is OFF'",
- tries=180,
+ tries=65,
try_sleep=10,
user="hdfs",
logoutput=True
@@ -418,7 +418,7 @@ class TestNamenode(RMFTestCase):
not_if = "ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E test -f /var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid && ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E pgrep -F /var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid",
)
self.assertResourceCalled('Execute', "hdfs dfsadmin -fs hdfs://c6401.ambari.apache.org:8020 -safemode get | grep 'Safe mode is OFF'",
- tries=180,
+ tries=65,
try_sleep=10,
user="hdfs",
logoutput=True
@@ -512,7 +512,7 @@ class TestNamenode(RMFTestCase):
not_if = "ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E test -f /var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid && ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E pgrep -F /var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid",
)
self.assertResourceCalled('Execute', "hdfs dfsadmin -fs hdfs://c6401.ambari.apache.org:8020 -safemode get | grep 'Safe mode is OFF'",
- tries=180,
+ tries=65,
try_sleep=10,
user="hdfs",
logoutput=True
@@ -612,7 +612,7 @@ class TestNamenode(RMFTestCase):
user = 'hdfs',
)
self.assertResourceCalled('Execute', "hdfs dfsadmin -fs hdfs://c6401.ambari.apache.org:8020 -safemode get | grep 'Safe mode is OFF'",
- tries=180,
+ tries=65,
try_sleep=10,
user="hdfs",
logoutput=True
@@ -712,7 +712,7 @@ class TestNamenode(RMFTestCase):
not_if = "ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E test -f /var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid && ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E pgrep -F /var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid",
)
self.assertResourceCalled('Execute', "hdfs dfsadmin -fs hdfs://c6401.ambari.apache.org:8020 -safemode get | grep 'Safe mode is OFF'",
- tries=180,
+ tries=65,
try_sleep=10,
user="hdfs",
logoutput=True
@@ -811,7 +811,7 @@ class TestNamenode(RMFTestCase):
not_if = "ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E test -f /var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid && ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E pgrep -F /var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid",
)
self.assertResourceCalled('Execute', "hdfs dfsadmin -fs hdfs://c6402.ambari.apache.org:8020 -safemode get | grep 'Safe mode is OFF'",
- tries=180,
+ tries=65,
try_sleep=10,
user="hdfs",
logoutput=True
@@ -918,7 +918,7 @@ class TestNamenode(RMFTestCase):
not_if = "ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E test -f /var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid && ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E pgrep -F /var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid",
)
self.assertResourceCalled('Execute', "hdfs dfsadmin -fs hdfs://c6402.ambari.apache.org:8020 -safemode get | grep 'Safe mode is OFF'",
- tries=180,
+ tries=65,
try_sleep=10,
user="hdfs",
logoutput=True
[2/2] ambari git commit: AMBARI-14479. Namenode start fails when time
taken to get out of safemode is more than 20 minutes (dlysnichenko)
Posted by dm...@apache.org.
AMBARI-14479. Namenode start fails when time taken to get out of safemode is more than 20 minutes (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c32cbbe2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c32cbbe2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c32cbbe2
Branch: refs/heads/trunk
Commit: c32cbbe2bb9c6962ce252005060eeee61bdecadf
Parents: 37a0ff7
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Wed Dec 23 15:08:20 2015 +0200
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Wed Dec 23 15:08:20 2015 +0200
----------------------------------------------------------------------
.../common-services/HDFS/2.1.0.2.0/metainfo.xml | 2 +-
.../2.1.0.2.0/package/scripts/hdfs_namenode.py | 2 +-
.../HDFS/2.1.0.2.0/package/scripts/namenode.py | 2 +-
.../python/stacks/2.0.6/HDFS/test_namenode.py | 18 +++++++++---------
4 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/c32cbbe2/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metainfo.xml b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metainfo.xml
index b678e51..e3e16e3 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metainfo.xml
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metainfo.xml
@@ -34,7 +34,7 @@
<commandScript>
<script>scripts/namenode.py</script>
<scriptType>PYTHON</scriptType>
- <timeout>1200</timeout>
+ <timeout>1800</timeout>
</commandScript>
<customCommands>
<customCommand>
http://git-wip-us.apache.org/repos/asf/ambari/blob/c32cbbe2/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py
index b91fdb5..8fa0a35 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py
@@ -168,7 +168,7 @@ def namenode(action=None, hdfs_binary=None, do_format=True, upgrade_type=None, e
try:
# Wait up to 30 mins
Execute(is_namenode_safe_mode_off,
- tries=180,
+ tries=65,
try_sleep=10,
user=params.hdfs_user,
logoutput=True
http://git-wip-us.apache.org/repos/asf/ambari/blob/c32cbbe2/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py
index 598d9ce..9f5ea76 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py
@@ -197,7 +197,7 @@ class NameNodeDefault(NameNode):
# Wait up to 30 mins
Execute(is_namenode_safe_mode_off,
- tries=180,
+ tries=65,
try_sleep=10,
user=params.hdfs_user,
logoutput=True
http://git-wip-us.apache.org/repos/asf/ambari/blob/c32cbbe2/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py
index fa701cf..2beb8fc 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py
@@ -89,7 +89,7 @@ class TestNamenode(RMFTestCase):
not_if = "ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E test -f /var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid && ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E pgrep -F /var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid",
)
self.assertResourceCalled('Execute', "hdfs dfsadmin -fs hdfs://c6405.ambari.apache.org:8020 -safemode get | grep 'Safe mode is OFF'",
- tries=180,
+ tries=65,
try_sleep=10,
user="hdfs",
logoutput=True
@@ -202,7 +202,7 @@ class TestNamenode(RMFTestCase):
not_if = "ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E test -f /var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid && ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E pgrep -F /var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid",
)
self.assertResourceCalled('Execute', "hdfs dfsadmin -fs hdfs://c6401.ambari.apache.org:8020 -safemode get | grep 'Safe mode is OFF'",
- tries=180,
+ tries=65,
try_sleep=10,
user="hdfs",
logoutput=True
@@ -331,7 +331,7 @@ class TestNamenode(RMFTestCase):
user='hdfs',
)
self.assertResourceCalled('Execute', "hdfs dfsadmin -fs hdfs://c6401.ambari.apache.org:8020 -safemode get | grep 'Safe mode is OFF'",
- tries=180,
+ tries=65,
try_sleep=10,
user="hdfs",
logoutput=True
@@ -427,7 +427,7 @@ class TestNamenode(RMFTestCase):
not_if = "ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E test -f /var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid && ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E pgrep -F /var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid",
)
self.assertResourceCalled('Execute', "hdfs dfsadmin -fs hdfs://c6401.ambari.apache.org:8020 -safemode get | grep 'Safe mode is OFF'",
- tries=180,
+ tries=65,
try_sleep=10,
user="hdfs",
logoutput=True
@@ -524,7 +524,7 @@ class TestNamenode(RMFTestCase):
not_if = "ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E test -f /var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid && ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E pgrep -F /var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid",
)
self.assertResourceCalled('Execute', "hdfs dfsadmin -fs hdfs://c6401.ambari.apache.org:8020 -safemode get | grep 'Safe mode is OFF'",
- tries=180,
+ tries=65,
try_sleep=10,
user="hdfs",
logoutput=True
@@ -627,7 +627,7 @@ class TestNamenode(RMFTestCase):
user = 'hdfs',
)
self.assertResourceCalled('Execute', "hdfs dfsadmin -fs hdfs://c6401.ambari.apache.org:8020 -safemode get | grep 'Safe mode is OFF'",
- tries=180,
+ tries=65,
try_sleep=10,
user="hdfs",
logoutput=True
@@ -730,7 +730,7 @@ class TestNamenode(RMFTestCase):
not_if = "ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E test -f /var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid && ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E pgrep -F /var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid",
)
self.assertResourceCalled('Execute', "hdfs dfsadmin -fs hdfs://c6401.ambari.apache.org:8020 -safemode get | grep 'Safe mode is OFF'",
- tries=180,
+ tries=65,
try_sleep=10,
user="hdfs",
logoutput=True
@@ -832,7 +832,7 @@ class TestNamenode(RMFTestCase):
not_if = "ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E test -f /var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid && ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E pgrep -F /var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid",
)
self.assertResourceCalled('Execute', "hdfs dfsadmin -fs hdfs://c6402.ambari.apache.org:8020 -safemode get | grep 'Safe mode is OFF'",
- tries=180,
+ tries=65,
try_sleep=10,
user="hdfs",
logoutput=True
@@ -942,7 +942,7 @@ class TestNamenode(RMFTestCase):
not_if = "ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E test -f /var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid && ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E pgrep -F /var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid",
)
self.assertResourceCalled('Execute', "hdfs dfsadmin -fs hdfs://c6402.ambari.apache.org:8020 -safemode get | grep 'Safe mode is OFF'",
- tries=180,
+ tries=65,
try_sleep=10,
user="hdfs",
logoutput=True