ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aonis...@apache.org
Subject [1/2] git commit: AMBARI-7498. HiveServer2 still throwing Transport Errors (aonishuk)
Date Wed, 08 Oct 2014 17:58:24 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-1.7.0 1ee822f23 -> 6f5db3166
  refs/heads/trunk edef266e7 -> 0b7fcf6f3


AMBARI-7498. HiveServer2 still throwing Transport Errors (aonishuk)


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

Branch: refs/heads/trunk
Commit: 0b7fcf6f39a032dbfd41242bba5af6439c6ef9f0
Parents: edef266
Author: Andrew Onishuk <aonishuk@hortonworks.com>
Authored: Wed Oct 8 20:58:17 2014 +0300
Committer: Andrew Onishuk <aonishuk@hortonworks.com>
Committed: Wed Oct 8 20:58:17 2014 +0300

----------------------------------------------------------------------
 .../libraries/functions/__init__.py             |  1 +
 .../libraries/functions/hive_check.py           | 83 ++++++++++++++++++++
 .../HIVE/package/scripts/hive_service.py        | 27 +++----
 .../HIVE/package/scripts/service_check.py       | 11 +--
 .../package/files/check_hive_thrift_port.py     | 66 ++++++++++++++++
 .../package/scripts/nagios_server_config.py     |  1 +
 .../package/templates/hadoop-commands.cfg.j2    |  2 +-
 .../package/templates/hadoop-services.cfg.j2    |  2 +-
 .../HIVE/package/scripts/hive_service.py        | 25 ++----
 .../HIVE/package/scripts/service_check.py       | 11 +--
 .../package/files/check_hive_thrift_port.py     | 66 ++++++++++++++++
 .../package/scripts/nagios_server_config.py     |  1 +
 .../package/templates/hadoop-commands.cfg.j2    |  2 +-
 .../package/templates/hadoop-services.cfg.j2    |  2 +-
 .../stacks/1.3.2/HIVE/test_hive_server.py       |  4 +-
 .../stacks/1.3.2/NAGIOS/test_nagios_server.py   |  5 ++
 .../stacks/2.0.6/HIVE/test_hive_server.py       |  4 +-
 .../stacks/2.0.6/NAGIOS/test_nagios_server.py   |  5 ++
 18 files changed, 259 insertions(+), 59 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/0b7fcf6f/ambari-common/src/main/python/resource_management/libraries/functions/__init__.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/__init__.py
b/ambari-common/src/main/python/resource_management/libraries/functions/__init__.py
index ec2fdeb..3d92d64 100644
--- a/ambari-common/src/main/python/resource_management/libraries/functions/__init__.py
+++ b/ambari-common/src/main/python/resource_management/libraries/functions/__init__.py
@@ -28,3 +28,4 @@ from resource_management.libraries.functions.check_process_status import
*
 from resource_management.libraries.functions.is_empty import *
 from resource_management.libraries.functions.substitute_vars import *
 from resource_management.libraries.functions.get_port_from_url import *
+from resource_management.libraries.functions.hive_check import *

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b7fcf6f/ambari-common/src/main/python/resource_management/libraries/functions/hive_check.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/hive_check.py
b/ambari-common/src/main/python/resource_management/libraries/functions/hive_check.py
new file mode 100644
index 0000000..c5f557e
--- /dev/null
+++ b/ambari-common/src/main/python/resource_management/libraries/functions/hive_check.py
@@ -0,0 +1,83 @@
+#!/usr/bin/env python
+
+'''
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+'''
+import socket
+from resource_management.core.exceptions import Fail
+
+def check_thrift_port_sasl(address, port, timeout = 5):
+  """
+  Hive thrift SASL port check
+  """
+
+  #Authentification mechanism
+  mechanism = "PLAIN"
+  #Anonymous username
+  usr = "ANONYMOUS"
+  start_byte = 0x01 #START communication
+  ok_byte = 0x02 #OK
+  bad_byte = 0x03 #BAD
+  error_byte = 0x04 #ERROR
+  complete_byte = 0x05 #COMPLETE communication
+  
+  msg = bytearray()
+
+  msg.append(start_byte)
+  msg.append(0)
+  msg.append(0)
+  msg.append(0)
+  msg.append(len(mechanism))
+  for elem in mechanism:
+    msg.append(ord(elem))
+
+  msg.append(ok_byte)
+  msg.append(0)
+  msg.append(0)
+  msg.append(0)
+  msg.append(len(usr)*2+2)
+  
+  #Adding anonymous user name
+  msg.append(0)
+  for elem in usr:
+    msg.append(ord(elem))
+
+  #Adding anonymous user password
+  msg.append(0)
+  for elem in usr:
+    msg.append(ord(elem))
+
+  msg.append(complete_byte)
+  msg.append(0)
+  msg.append(0)
+  msg.append(0)
+  msg.append(0)
+
+  is_service_socket_valid = False
+  s = socket.socket()
+  s.settimeout(timeout)
+
+  try:
+    s.connect((address, port))
+    s.send(msg)
+    is_service_socket_valid = True
+  except socket.error, e:
+    #Expected if service unreachable
+    pass
+  finally:
+    s.close()
+    return is_service_socket_valid
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b7fcf6f/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/hive_service.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/hive_service.py
b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/hive_service.py
index c58dff5..fa11b28 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/hive_service.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/hive_service.py
@@ -19,7 +19,6 @@ limitations under the License.
 """
 
 from resource_management import *
-import socket
 import sys
 import time
 
@@ -66,25 +65,17 @@ def hive_service(
       
       start_time = time.time()
       end_time = start_time + SOCKET_WAIT_SECONDS
-      
-      s = socket.socket()
-      s.settimeout(5)
-            
+
       is_service_socket_valid = False
       print "Waiting for the Hive server to start..."
-      try:
-        while time.time() < end_time:
-          try:
-            s.connect((address, port))
-            s.send("A001 AUTHENTICATE ANONYMOUS")
-            is_service_socket_valid = True
-            break
-          except socket.error, e:          
-            time.sleep(5)
-      finally:
-        s.close()
-      
-      elapsed_time = time.time() - start_time    
+      while time.time() < end_time:
+        if check_thrift_port_sasl(address, port, 2):
+          is_service_socket_valid = True
+          break
+        else:
+          time.sleep(2)
+
+      elapsed_time = time.time() - start_time
       
       if is_service_socket_valid == False: 
         raise Fail("Connection to Hive server %s on port %s failed after %d seconds" % (address,
port, elapsed_time))

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b7fcf6f/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/service_check.py
b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/service_check.py
index 69bc33a..e6d5494 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/service_check.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/service_check.py
@@ -32,16 +32,11 @@ class HiveServiceCheck(Script):
 
     address=format("{hive_server_host}")
     port=int(format("{hive_server_port}"))
-    s = socket.socket()
     print "Test connectivity to hive server"
-    try:
-      s.connect((address, port))
-      s.send("A001 AUTHENTICATE ANONYMOUS")
+    if check_thrift_port_sasl(address, port):
       print "Successfully connected to %s on port %s" % (address, port)
-      s.close()
-    except socket.error, e:
-      print "Connection to %s on port %s failed: %s" % (address, port, e)
-      sys.exit(1)
+    else:
+      print "Connection to %s on port %s failed: %s" % (address, port)
 
     hcat_service_check()
     webhcat_service_check()

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b7fcf6f/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/files/check_hive_thrift_port.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/files/check_hive_thrift_port.py
b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/files/check_hive_thrift_port.py
new file mode 100644
index 0000000..cd39641
--- /dev/null
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/files/check_hive_thrift_port.py
@@ -0,0 +1,66 @@
+#!/usr/bin/env python
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+
+import os
+import optparse
+import json
+import traceback
+from resource_management import *
+from time import time
+
+
+OK_MESSAGE = "TCP OK - %.3f second response time on port %s"
+CRITICAL_MESSAGE = "Connection to %s on port %s failed"
+
+def main():
+
+  parser = optparse.OptionParser()
+
+  parser.add_option("-H", "--host", dest="address", help="Hive thrift host")
+  parser.add_option("-p", "--port", type="int", dest="port", help="Hive thrift port")
+
+  (options, args) = parser.parse_args()
+
+  if options.address is None:
+    print "Hive thrift host (--name or -n)"
+    exit(-1)
+
+  if options.port is None:
+    print "Hive thrift port (--file or -f)"
+    exit(-1)
+
+  address = options.address
+  port = options.port
+
+  starttime = time()
+  if check_thrift_port_sasl(address, port):
+    timetaken = time() - starttime
+    print OK_MESSAGE % (timetaken, port)
+    exit(0)
+  else:
+    print CRITICAL_MESSAGE % (address, port)
+    exit(2)
+
+
+if __name__ == "__main__":
+  main()
+

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b7fcf6f/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/nagios_server_config.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/nagios_server_config.py
b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/nagios_server_config.py
index ee7f149..4d452c6 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/nagios_server_config.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/nagios_server_config.py
@@ -67,6 +67,7 @@ def nagios_server_config():
   nagios_server_check( 'check_namenodes_ha.sh')
   nagios_server_check( 'check_wrapper.sh')
   nagios_server_check( 'hdp_nagios_init.php')
+  nagios_server_check( 'check_hive_thrift_port.py' )
 
 
 def nagios_server_configfile(

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b7fcf6f/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-commands.cfg.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-commands.cfg.j2
b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-commands.cfg.j2
index 3035f30..8f5a230 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-commands.cfg.j2
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-commands.cfg.j2
@@ -143,5 +143,5 @@ define command{
 
 define command{
         command_name check_tcp_wrapper_sasl
-        command_line  $USER1$/check_wrapper.sh $USER1$/check_tcp -H $HOSTADDRESS$ -p $ARG1$
$ARG2$ -s \"$ARG3$\"
+        command_line $USER1$/check_wrapper.sh /var/lib/ambari-agent/ambari-python-wrap $USER1$/check_hive_thrift_port.py
-H $HOSTADDRESS$ -p $ARG1$
        }

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b7fcf6f/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-services.cfg.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-services.cfg.j2
b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-services.cfg.j2
index 094ed56..5fd0777 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-services.cfg.j2
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-services.cfg.j2
@@ -539,7 +539,7 @@ define service {
         use                     hadoop-service
         service_description     HIVE-SERVER::HiveServer2 process
         servicegroups           HIVE
-        check_command           check_tcp_wrapper_sasl!{{ hive_server_port }}!-w 1 -c 1!A001
AUTHENTICATE ANONYMOUS
+        check_command           check_tcp_wrapper_sasl!{{ hive_server_port }}!-w 1 -c 1
         normal_check_interval   0.5
         retry_check_interval    0.5
         max_check_attempts      3

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b7fcf6f/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hive_service.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hive_service.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hive_service.py
index cfcdd9a..e40e9f8 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hive_service.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hive_service.py
@@ -19,7 +19,6 @@ limitations under the License.
 """
 
 from resource_management import *
-import socket
 import sys
 import time
 from resource_management.core.shell import call
@@ -72,24 +71,16 @@ def hive_service(
       
       start_time = time.time()
       end_time = start_time + SOCKET_WAIT_SECONDS
-      
-      s = socket.socket()
-      s.settimeout(5)
-            
+
       is_service_socket_valid = False
       print "Waiting for the Hive server to start..."
-      try:
-        while time.time() < end_time:
-          try:
-            s.connect((address, port))
-            s.send("A001 AUTHENTICATE ANONYMOUS")
-            is_service_socket_valid = True
-            break
-          except socket.error, e:          
-            time.sleep(5)
-      finally:
-        s.close()
-      
+      while time.time() < end_time:
+        if check_thrift_port_sasl(address, port, 2):
+          is_service_socket_valid = True
+          break
+        else:
+          time.sleep(2)
+
       elapsed_time = time.time() - start_time    
       
       if is_service_socket_valid == False: 

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b7fcf6f/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/service_check.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/service_check.py
index 69bc33a..e6d5494 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/service_check.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/service_check.py
@@ -32,16 +32,11 @@ class HiveServiceCheck(Script):
 
     address=format("{hive_server_host}")
     port=int(format("{hive_server_port}"))
-    s = socket.socket()
     print "Test connectivity to hive server"
-    try:
-      s.connect((address, port))
-      s.send("A001 AUTHENTICATE ANONYMOUS")
+    if check_thrift_port_sasl(address, port):
       print "Successfully connected to %s on port %s" % (address, port)
-      s.close()
-    except socket.error, e:
-      print "Connection to %s on port %s failed: %s" % (address, port, e)
-      sys.exit(1)
+    else:
+      print "Connection to %s on port %s failed: %s" % (address, port)
 
     hcat_service_check()
     webhcat_service_check()

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b7fcf6f/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/files/check_hive_thrift_port.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/files/check_hive_thrift_port.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/files/check_hive_thrift_port.py
new file mode 100644
index 0000000..cd39641
--- /dev/null
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/files/check_hive_thrift_port.py
@@ -0,0 +1,66 @@
+#!/usr/bin/env python
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+
+import os
+import optparse
+import json
+import traceback
+from resource_management import *
+from time import time
+
+
+OK_MESSAGE = "TCP OK - %.3f second response time on port %s"
+CRITICAL_MESSAGE = "Connection to %s on port %s failed"
+
+def main():
+
+  parser = optparse.OptionParser()
+
+  parser.add_option("-H", "--host", dest="address", help="Hive thrift host")
+  parser.add_option("-p", "--port", type="int", dest="port", help="Hive thrift port")
+
+  (options, args) = parser.parse_args()
+
+  if options.address is None:
+    print "Hive thrift host (--name or -n)"
+    exit(-1)
+
+  if options.port is None:
+    print "Hive thrift port (--file or -f)"
+    exit(-1)
+
+  address = options.address
+  port = options.port
+
+  starttime = time()
+  if check_thrift_port_sasl(address, port):
+    timetaken = time() - starttime
+    print OK_MESSAGE % (timetaken, port)
+    exit(0)
+  else:
+    print CRITICAL_MESSAGE % (address, port)
+    exit(2)
+
+
+if __name__ == "__main__":
+  main()
+

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b7fcf6f/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/nagios_server_config.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/nagios_server_config.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/nagios_server_config.py
index 86d5a8a..4efce9b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/nagios_server_config.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/nagios_server_config.py
@@ -72,6 +72,7 @@ def nagios_server_config():
   nagios_server_check( 'check_checkpoint_time.py' )
   nagios_server_check( 'sys_logger.py' )
   nagios_server_check( 'check_ambari_alerts.py' )
+  nagios_server_check( 'check_hive_thrift_port.py' )
 
 def nagios_server_configfile(
   name,

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b7fcf6f/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/hadoop-commands.cfg.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/hadoop-commands.cfg.j2
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/hadoop-commands.cfg.j2
index a8a616c..656ee7f 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/hadoop-commands.cfg.j2
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/hadoop-commands.cfg.j2
@@ -157,7 +157,7 @@ define command{
 
 define command{
         command_name check_tcp_wrapper_sasl
-        command_line  $USER1$/check_wrapper.sh $USER1$/check_tcp -H $HOSTADDRESS$ -p $ARG1$
$ARG2$ -s \"$ARG3$\"
+        command_line $USER1$/check_wrapper.sh /var/lib/ambari-agent/ambari-python-wrap $USER1$/check_hive_thrift_port.py
-H $HOSTADDRESS$ -p $ARG1$
        }
 
 define command{

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b7fcf6f/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/hadoop-services.cfg.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/hadoop-services.cfg.j2
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/hadoop-services.cfg.j2
index 8e92efc..fd15e6b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/hadoop-services.cfg.j2
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/hadoop-services.cfg.j2
@@ -700,7 +700,7 @@ define service {
         use                     hadoop-service
         service_description     HIVE-SERVER::HiveServer2 process
         servicegroups           HIVE
-        check_command           check_tcp_wrapper_sasl!{{ hive_server_port }}!-w 1 -c 1!A001
AUTHENTICATE ANONYMOUS
+        check_command           check_tcp_wrapper_sasl!{{ hive_server_port }}!-w 1 -c 1
         normal_check_interval   0.5
         retry_check_interval    0.5
         max_check_attempts      3

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b7fcf6f/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_server.py b/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_server.py
index 7425bd1..4dceec1 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_server.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_server.py
@@ -379,5 +379,5 @@ class TestHiveServer(RMFTestCase):
       self.fail("Script failure due to socket error was expected")
     except:
       self.assert_configure_default()
-      self.assertTrue(socket_mock.called)
-      self.assertTrue(s.close.called)    
+      self.assertFalse(socket_mock.called)
+      self.assertFalse(s.close.called)

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b7fcf6f/ambari-server/src/test/python/stacks/1.3.2/NAGIOS/test_nagios_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/NAGIOS/test_nagios_server.py b/ambari-server/src/test/python/stacks/1.3.2/NAGIOS/test_nagios_server.py
index e48a5ca..17f0dca 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/NAGIOS/test_nagios_server.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/NAGIOS/test_nagios_server.py
@@ -254,6 +254,11 @@ class TestNagiosServer(RMFTestCase):
                               content=StaticFile('hdp_nagios_init.php'),
                               mode=0755
     )
+    self.assertResourceCalled('File',
+                              '/usr/lib64/nagios/plugins/check_hive_thrift_port.py',
+                              content=StaticFile('check_hive_thrift_port.py'),
+                              mode=0755
+    )
     self.assertResourceCalled('Execute',
                               'htpasswd2 -c -b  /etc/nagios/htpasswd.users nagiosadmin \'!`"\'"\'"\'
1\'',
                               not_if="grep nagiosadmin /etc/nagios/htpasswd.users"

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b7fcf6f/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py
index 7d1f116..ed759ac 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py
@@ -492,5 +492,5 @@ class TestHiveServer(RMFTestCase):
       self.fail("Script failure due to socket error was expected")
     except:
       self.assert_configure_default()
-      self.assertTrue(socket_mock.called)
-      self.assertTrue(s.close.called)    
+      self.assertFalse(socket_mock.called)
+      self.assertFalse(s.close.called)

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b7fcf6f/ambari-server/src/test/python/stacks/2.0.6/NAGIOS/test_nagios_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/NAGIOS/test_nagios_server.py b/ambari-server/src/test/python/stacks/2.0.6/NAGIOS/test_nagios_server.py
index 6e980b5..58c04f3 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/NAGIOS/test_nagios_server.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/NAGIOS/test_nagios_server.py
@@ -283,6 +283,11 @@ class TestNagiosServer(RMFTestCase):
                               content=StaticFile('check_ambari_alerts.py'),
                               mode=0755
     )
+    self.assertResourceCalled('File',
+                              '/usr/lib64/nagios/plugins/check_hive_thrift_port.py',
+                              content=StaticFile('check_hive_thrift_port.py'),
+                              mode=0755
+    )
     self.assertResourceCalled('Execute',
                               'htpasswd2 -c -b  /etc/nagios/htpasswd.users nagiosadmin \'!`"\'"\'"\'
1\'',
                               not_if="grep nagiosadmin /etc/nagios/htpasswd.users"


Mime
View raw message