AMBARI-19202. Devdeploy: Database check failed.(vbrodetskyi)

ambari-common/src/main/python/ambari_commons/os_linux.py

@@ -45,8 +45,13 @@ def os_run_os_command(cmd, env=None, shell=False, cwd=None):
                              env=env,
                              cwd=cwd,
                              shell=shell
-                             )
+  )
+  process_pid = process.pid
   (stdoutdata, stderrdata) = process.communicate()
+  if stdoutdata:
+    stdoutdata = stdoutdata + "\nprocess_pid=" + str(process_pid) + "\n"
+  else:
+    stdoutdata = "\nprocess_pid=" + str(process_pid) + "\n"
   return process.returncode, stdoutdata, stderrdata
 
 def os_change_owner(filePath, user, recursive):

ambari-server/src/main/python/ambari_server/checkDatabase.py

@@ -80,9 +80,8 @@ def check_database(options):
 
 
   if retcode > 0:
-    print str(stdout)
-    raise FatalException(1, 'Database check failed to complete. Please check ' + configDefaults.SERVER_LOG_FILE +
-                            ' and ' + configDefaults.DB_CHECK_LOG + ' for more information.')
+    raise FatalException(int(retcode), "Database check failed to complete: {0}. \nPlease check {1} and {2} for more "
+                                       "information.".format(stdout+stderr, configDefaults.SERVER_LOG_FILE, configDefaults.DB_CHECK_LOG))
   else:
     print str(stdout)
     if not stdout.startswith("No errors"):