Bladeren bron

AMBARI-10220 [WinTP2] Automatic db structure populating is broken

Fixed sqlcmd arguments to allow it to return non-zero codes.
Florian Barca 10 jaren geleden
bovenliggende
commit
e426e71513
1 gewijzigde bestanden met toevoegingen van 2 en 2 verwijderingen
  1. 2 2
      ambari-server/src/main/python/ambari_server/dbConfiguration_windows.py

+ 2 - 2
ambari-server/src/main/python/ambari_server/dbConfiguration_windows.py

@@ -294,8 +294,8 @@ class SQLServerConfig(DBMSConfig):
     pass
 
   @staticmethod
-  def _execute_db_script(databaseHost, databaseScript):
-    dbCmd = 'sqlcmd -S {0} -i {1}'.format(databaseHost, databaseScript)
+  def _execute_db_script(databaseHost, databaseScript, minReportedSeverityLevel=10):
+    dbCmd = 'sqlcmd -S {0} -b -V {1} -i {2}'.format(databaseHost, minReportedSeverityLevel, databaseScript)
     retCode, outData, errData = run_os_command(['cmd', '/C', dbCmd])
     if not retCode == 0:
       err = 'Running database create script failed. Error output: {0} Output: {1} Exiting.'.format(errData, outData)