Ver Fonte

AMBARI-6129. ambari-server setup with jdbc options runs setup.(vbrodetskyi)

Vitaly Brodetskyi há 11 anos atrás
pai
commit
a7232a7229

+ 1 - 3
ambari-server/src/main/python/ambari-server.py

@@ -2221,9 +2221,7 @@ def setup(args):
   # proceed jdbc properties if they were set
   if args.jdbc_driver is not None and args.jdbc_db is not None:
     proceedJDBCProperties(args)
-    status, pid = is_server_runing()
-    if status:
-      return
+    return
 
   print 'Checking SELinux...'
   retcode = check_selinux()

+ 1 - 0
ambari-server/src/test/python/TestAmbariServer.py

@@ -2393,6 +2393,7 @@ MIIFHjCCAwYCCQDpHKOBI+Lt0zANBgkqhkiG9w0BAQUFADBRMQswCQYDVQQGEwJV
     except NonFatalException as fe:
       self.assertTrue("Remote database setup aborted." in fe.reason)
 
+    # test not run setup if ambari-server setup executed with jdbc properties
     reset_mocks()
     is_server_runing_mock.return_value = (True, 0)
     args.jdbc_driver= "path/to/driver"