You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2015/03/04 17:02:33 UTC
[2/2] ambari git commit: AMBARI-9922. Spark service check fails due
to missing import (aonishuk)
AMBARI-9922. Spark service check fails due to missing import (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e3f6d302
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e3f6d302
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e3f6d302
Branch: refs/heads/branch-2.0.0
Commit: e3f6d3021f8a180411e7f205d7d978b0dea6cb25
Parents: 918355f
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Wed Mar 4 18:02:21 2015 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Wed Mar 4 18:02:21 2015 +0200
----------------------------------------------------------------------
.../src/main/python/resource_management/core/exceptions.py | 2 ++
.../SPARK/1.2.0.2.2/package/scripts/service_check.py | 1 +
2 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e3f6d302/ambari-common/src/main/python/resource_management/core/exceptions.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/core/exceptions.py b/ambari-common/src/main/python/resource_management/core/exceptions.py
index 3c001cc..a8b2a63 100644
--- a/ambari-common/src/main/python/resource_management/core/exceptions.py
+++ b/ambari-common/src/main/python/resource_management/core/exceptions.py
@@ -20,6 +20,8 @@ Ambari Agent
"""
+__all__ = ["Fail", "ExecuteTimeoutException", "InvalidArgument", "ClientComponentHasNoStatus", "ComponentIsNotRunning"]
+
class Fail(Exception):
pass
http://git-wip-us.apache.org/repos/asf/ambari/blob/e3f6d302/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/service_check.py b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/service_check.py
index b548b4d..7b8ba38 100644
--- a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/service_check.py
+++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/service_check.py
@@ -18,6 +18,7 @@ limitations under the License.
import subprocess
import time
+from resource_management import *
from resource_management.libraries.script.script import Script
from resource_management.libraries.functions.format import format
from resource_management.core.resources.system import Execute