[05/12] ambari git commit: AMBARI-15061: PXF Service checks fails with timeout (bhuvnesh2703 via jaoki)
AMBARI-15061: PXF Service checks fails with timeout (bhuvnesh2703 via jaoki)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/49813c98
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/49813c98
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/49813c98
Branch: refs/heads/branch-dev-patch-upgrade
Commit: 49813c987a491d1527f6499927d22746a11f3631
Parents: ecd6a30
Author: Jun Aoki
Authored: Mon Feb 22 14:44:07 2016 -0800
Committer: Jun Aoki
Committed: Mon Feb 22 14:44:07 2016 -0800
--
.../PXF/3.0.0/package/scripts/params.py | 1 +
.../PXF/3.0.0/package/scripts/pxf_constants.py | 3 +
.../PXF/3.0.0/package/scripts/service_check.py | 167 ++-
3 files changed, 96 insertions(+), 75 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/49813c98/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/params.py
--
diff --git
a/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/params.py
b/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/params.py
index b3e85e4..1dbed45 100644
---
a/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/params.py
+++
b/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/params.py
@@ -42,6 +42,7 @@ tomcat_group = "tomcat"
# Directories
pxf_conf_dir = "/etc/pxf/conf"
pxf_instance_dir = "/var/pxf"
+exec_tmp_dir = Script.get_tmp_dir()
# Java home path
java_home = config["hostLevelParams"]["java_home"] if "java_home" in
config["hostLevelParams"] else None
http://git-wip-us.apache.org/repos/asf/ambari/blob/49813c98/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/pxf_constants.py
--
diff --git
a/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/pxf_constants.py
b/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/pxf_constants.py
index 9d93a38..1d88893 100644
---
a/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/pxf_constants.py
+++
b/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/pxf_constants.py
@@ -24,4 +24,7 @@ pxf_hdfs_test_dir = "/pxf_hdfs_smoke_test"
pxf_hdfs_read_test_file = pxf_hdfs_test_dir + "/pxf_smoke_test_read_data"
pxf_hdfs_write_test_file = pxf_hdfs_test_dir + "/pxf_smoke_test_write_data"
pxf_hbase_test_table = "pxf_hbase_smoke_test_table"
+hbase_populate_data_script = "hbase-populate-data.sh"
+hbase_cleanup_data_script = "hbase-cleanup-data.sh"
pxf_hive_test_table = "pxf_hive_smoke_test_table"
+hive_populate_data_script = "hive-populate-data.hql"
http://git-wip-us.apache.org/repos/asf/ambari/blob/49813c98/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/service_check.py
--
diff --git
a/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/service_check.py
b/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/service_check.py
index 21b7c5d..6f60661 100644
---
a/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/service_check.py
+++
b/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/service_check.py
@@ -16,18 +16,20 @@ See the License for the specific language governing
permissions and
limitations under the License.
"""
import json
+import os
from resource_management.libraries.script import Script
from resource_management.core.exceptions import Fail
from resource_management.core.logger import Logger
from resource_management.core.system import System
-from resource_management.core.resources.system import Execute
+from resource_management.core.resources.system import Execute, File
from resource_management.core.environment import Environment
from resource_management.libraries.functions.curl_krb_request import
curl_krb_request
+from resource_management.core.source import InlineTemplate
+from resource_management.libraries.functions.default import default
from pxf_utils import makeHTTPCall, runLocalCmd
import pxf_constants
-
class PXFServiceCheck(Script):
"""
Runs a set of simple PXF tests to verify if the service has been setup
correctly
@@ -46,13 +48,12 @@ class PXFServiceCheck(Script):
"X-GP-URL-HOST": pxf_constants.service_check_hostname
}
-
def service_check(self, env):
"""
Runs the service check for PXF
"""
import params
-Logger.info("Starting PXF service checks..")
+Logger.info("Starting PXF service checks")
try:
# Get delegation token if securit
ambari git commit: AMBARI-15061: PXF Service checks fails with timeout (bhuvnesh2703 via jaoki)
Repository: ambari
Updated Branches:
refs/heads/trunk ecd6a3057 -> 49813c987
AMBARI-15061: PXF Service checks fails with timeout (bhuvnesh2703 via jaoki)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/49813c98
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/49813c98
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/49813c98
Branch: refs/heads/trunk
Commit: 49813c987a491d1527f6499927d22746a11f3631
Parents: ecd6a30
Author: Jun Aoki
Authored: Mon Feb 22 14:44:07 2016 -0800
Committer: Jun Aoki
Committed: Mon Feb 22 14:44:07 2016 -0800
--
.../PXF/3.0.0/package/scripts/params.py | 1 +
.../PXF/3.0.0/package/scripts/pxf_constants.py | 3 +
.../PXF/3.0.0/package/scripts/service_check.py | 167 ++-
3 files changed, 96 insertions(+), 75 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/49813c98/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/params.py
--
diff --git
a/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/params.py
b/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/params.py
index b3e85e4..1dbed45 100644
---
a/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/params.py
+++
b/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/params.py
@@ -42,6 +42,7 @@ tomcat_group = "tomcat"
# Directories
pxf_conf_dir = "/etc/pxf/conf"
pxf_instance_dir = "/var/pxf"
+exec_tmp_dir = Script.get_tmp_dir()
# Java home path
java_home = config["hostLevelParams"]["java_home"] if "java_home" in
config["hostLevelParams"] else None
http://git-wip-us.apache.org/repos/asf/ambari/blob/49813c98/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/pxf_constants.py
--
diff --git
a/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/pxf_constants.py
b/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/pxf_constants.py
index 9d93a38..1d88893 100644
---
a/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/pxf_constants.py
+++
b/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/pxf_constants.py
@@ -24,4 +24,7 @@ pxf_hdfs_test_dir = "/pxf_hdfs_smoke_test"
pxf_hdfs_read_test_file = pxf_hdfs_test_dir + "/pxf_smoke_test_read_data"
pxf_hdfs_write_test_file = pxf_hdfs_test_dir + "/pxf_smoke_test_write_data"
pxf_hbase_test_table = "pxf_hbase_smoke_test_table"
+hbase_populate_data_script = "hbase-populate-data.sh"
+hbase_cleanup_data_script = "hbase-cleanup-data.sh"
pxf_hive_test_table = "pxf_hive_smoke_test_table"
+hive_populate_data_script = "hive-populate-data.hql"
http://git-wip-us.apache.org/repos/asf/ambari/blob/49813c98/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/service_check.py
--
diff --git
a/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/service_check.py
b/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/service_check.py
index 21b7c5d..6f60661 100644
---
a/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/service_check.py
+++
b/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/service_check.py
@@ -16,18 +16,20 @@ See the License for the specific language governing
permissions and
limitations under the License.
"""
import json
+import os
from resource_management.libraries.script import Script
from resource_management.core.exceptions import Fail
from resource_management.core.logger import Logger
from resource_management.core.system import System
-from resource_management.core.resources.system import Execute
+from resource_management.core.resources.system import Execute, File
from resource_management.core.environment import Environment
from resource_management.libraries.functions.curl_krb_request import
curl_krb_request
+from resource_management.core.source import InlineTemplate
+from resource_management.libraries.functions.default import default
from pxf_utils import makeHTTPCall, runLocalCmd
import pxf_constants
-
class PXFServiceCheck(Script):
"""
Runs a set of simple PXF tests to verify if the service has been setup
correctly
@@ -46,13 +48,12 @@ class PXFServiceCheck(Script):
"X-GP-URL-HOST": pxf_constants.service_check_hostname
}
-
def service_check(self, env):
"""
Runs the service check for PXF
"""
import params
-Logger.info("Starting PXF service checks..")
+Logger.info("Starting PXF servi
ambari git commit: AMBARI-15061: PXF Service checks fails with timeout (bhuvnesh2703 via jaoki)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 990f19b8a -> 8430fbd39
AMBARI-15061: PXF Service checks fails with timeout (bhuvnesh2703 via jaoki)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8430fbd3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8430fbd3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8430fbd3
Branch: refs/heads/branch-2.2
Commit: 8430fbd3929383a6d40dc17b7a58e63a4f780e3c
Parents: 990f19b
Author: Jun Aoki
Authored: Mon Feb 22 14:43:33 2016 -0800
Committer: Jun Aoki
Committed: Mon Feb 22 14:43:33 2016 -0800
--
.../PXF/3.0.0/package/scripts/params.py | 1 +
.../PXF/3.0.0/package/scripts/pxf_constants.py | 3 +
.../PXF/3.0.0/package/scripts/service_check.py | 167 ++-
3 files changed, 96 insertions(+), 75 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/8430fbd3/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/params.py
--
diff --git
a/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/params.py
b/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/params.py
index b3e85e4..1dbed45 100644
---
a/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/params.py
+++
b/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/params.py
@@ -42,6 +42,7 @@ tomcat_group = "tomcat"
# Directories
pxf_conf_dir = "/etc/pxf/conf"
pxf_instance_dir = "/var/pxf"
+exec_tmp_dir = Script.get_tmp_dir()
# Java home path
java_home = config["hostLevelParams"]["java_home"] if "java_home" in
config["hostLevelParams"] else None
http://git-wip-us.apache.org/repos/asf/ambari/blob/8430fbd3/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/pxf_constants.py
--
diff --git
a/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/pxf_constants.py
b/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/pxf_constants.py
index 9d93a38..1d88893 100644
---
a/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/pxf_constants.py
+++
b/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/pxf_constants.py
@@ -24,4 +24,7 @@ pxf_hdfs_test_dir = "/pxf_hdfs_smoke_test"
pxf_hdfs_read_test_file = pxf_hdfs_test_dir + "/pxf_smoke_test_read_data"
pxf_hdfs_write_test_file = pxf_hdfs_test_dir + "/pxf_smoke_test_write_data"
pxf_hbase_test_table = "pxf_hbase_smoke_test_table"
+hbase_populate_data_script = "hbase-populate-data.sh"
+hbase_cleanup_data_script = "hbase-cleanup-data.sh"
pxf_hive_test_table = "pxf_hive_smoke_test_table"
+hive_populate_data_script = "hive-populate-data.hql"
http://git-wip-us.apache.org/repos/asf/ambari/blob/8430fbd3/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/service_check.py
--
diff --git
a/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/service_check.py
b/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/service_check.py
index 21b7c5d..6f60661 100644
---
a/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/service_check.py
+++
b/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/service_check.py
@@ -16,18 +16,20 @@ See the License for the specific language governing
permissions and
limitations under the License.
"""
import json
+import os
from resource_management.libraries.script import Script
from resource_management.core.exceptions import Fail
from resource_management.core.logger import Logger
from resource_management.core.system import System
-from resource_management.core.resources.system import Execute
+from resource_management.core.resources.system import Execute, File
from resource_management.core.environment import Environment
from resource_management.libraries.functions.curl_krb_request import
curl_krb_request
+from resource_management.core.source import InlineTemplate
+from resource_management.libraries.functions.default import default
from pxf_utils import makeHTTPCall, runLocalCmd
import pxf_constants
-
class PXFServiceCheck(Script):
"""
Runs a set of simple PXF tests to verify if the service has been setup
correctly
@@ -46,13 +48,12 @@ class PXFServiceCheck(Script):
"X-GP-URL-HOST": pxf_constants.service_check_hostname
}
-
def service_check(self, env):
"""
Runs the service check for PXF
"""
import params
-Logger.info("Starting PXF service checks..")
+Logger.info("Starting
