ambari git commit: AMBARI-11635 [WinTP2] Zookeeper service check fails

2015-06-11 Thread fbarca 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 53477a898 -> 1a718de87


AMBARI-11635 [WinTP2] Zookeeper service check fails

Repeat test in case of failure at installation time due to ZK startup slowness.


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

Branch: refs/heads/branch-2.1
Commit: 1a718de876be50ba1be08bd72b34434efc068ff1
Parents: 53477a89
Author: Florian Barca 
Authored: Thu Jun 11 22:35:16 2015 -0700
Committer: Florian Barca 
Committed: Thu Jun 11 22:35:16 2015 -0700

--
 .../ZOOKEEPER/3.4.5.2.0/package/scripts/service_check.py   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/1a718de8/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/service_check.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/service_check.py
 
b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/service_check.py
index 2d2b793..b601c58 100644
--- 
a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/service_check.py
+++ 
b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/service_check.py
@@ -63,7 +63,7 @@ class ZookeeperServiceCheckWindows(ZookeeperServiceCheck):
 
 smoke_cmd = os.path.join(params.hdp_root,"Run-SmokeTests.cmd")
 service = "Zookeeper"
-Execute(format("cmd /C {smoke_cmd} {service}"), user=params.zk_user, 
logoutput=True)
+Execute(format("cmd /C {smoke_cmd} {service}"), user=params.zk_user, 
logoutput=True, tries=3, try_sleep=20)
 
 if __name__ == "__main__":
   ZookeeperServiceCheck().execute()

ambari git commit: AMBARI-11635 [WinTP2] Zookeeper service check fails

2015-06-11 Thread fbarca 
Repository: ambari
Updated Branches:
  refs/heads/trunk 043e35a6b -> 4cb8180de


AMBARI-11635 [WinTP2] Zookeeper service check fails

Repeat test in case of failure at installation time due to ZK startup slowness.


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

Branch: refs/heads/trunk
Commit: 4cb8180de671b1deab1ec814f481a7ed1e7c5724
Parents: 043e35a
Author: Florian Barca 
Authored: Thu Jun 11 22:31:20 2015 -0700
Committer: Florian Barca 
Committed: Thu Jun 11 22:33:11 2015 -0700

--
 .../ZOOKEEPER/3.4.5.2.0/package/scripts/service_check.py   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4cb8180d/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/service_check.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/service_check.py
 
b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/service_check.py
index 2d2b793..b601c58 100644
--- 
a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/service_check.py
+++ 
b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/service_check.py
@@ -63,7 +63,7 @@ class ZookeeperServiceCheckWindows(ZookeeperServiceCheck):
 
 smoke_cmd = os.path.join(params.hdp_root,"Run-SmokeTests.cmd")
 service = "Zookeeper"
-Execute(format("cmd /C {smoke_cmd} {service}"), user=params.zk_user, 
logoutput=True)
+Execute(format("cmd /C {smoke_cmd} {service}"), user=params.zk_user, 
logoutput=True, tries=3, try_sleep=20)
 
 if __name__ == "__main__":
   ZookeeperServiceCheck().execute()

ambari git commit: AMBARI-11635 [WinTP2] Zookeeper service check fails

2015-06-02 Thread fbarca 
Repository: ambari
Updated Branches:
  refs/heads/trunk 216275d95 -> 1f3745397


AMBARI-11635 [WinTP2] Zookeeper service check fails

Fixed service check user context


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

Branch: refs/heads/trunk
Commit: 1f37453977488a855cbf5f0d7b2871930e0e4c92
Parents: 216275d
Author: Florian Barca 
Authored: Tue Jun 2 16:54:17 2015 -0700
Committer: Florian Barca 
Committed: Tue Jun 2 16:54:17 2015 -0700

--
 .../ZOOKEEPER/3.4.5.2.0/package/scripts/service_check.py   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/1f374539/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/service_check.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/service_check.py
 
b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/service_check.py
index 6ffe5f5..2d2b793 100644
--- 
a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/service_check.py
+++ 
b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/service_check.py
@@ -63,7 +63,7 @@ class ZookeeperServiceCheckWindows(ZookeeperServiceCheck):
 
 smoke_cmd = os.path.join(params.hdp_root,"Run-SmokeTests.cmd")
 service = "Zookeeper"
-Execute(format("cmd /C {smoke_cmd} {service}"), logoutput=True)
+Execute(format("cmd /C {smoke_cmd} {service}"), user=params.zk_user, 
logoutput=True)
 
 if __name__ == "__main__":
   ZookeeperServiceCheck().execute()