Bug 957883 - git clone was getting stuck asking for a password in rem…

…ote repository and no amount of redirecting or closing stdin prevented a deadlock.

node/lib/openshift-origin-node/model/v1_cart_model.rb

@@ -268,20 +268,21 @@ def handle_cartridge_action(cartridge, action, hook_dir, args)
 
     def complete_process_gracefully(pid, stdin, stdout)
       stdin.close
-      ignored, status = Process::waitpid2 pid
-      exitcode = status.exitstatus
-      # Do this to avoid cartridges that might hold open stdout
       output = ""
       begin
-        Timeout::timeout(5) do
+        Timeout::timeout(120) do
           while (line = stdout.gets)
             output << line
           end
         end
       rescue Timeout::Error
-        logger.info("WARNING: stdout read timed out")
+        logger.info("WARNING: stdout read timed out, killing #{pid} and its child processes")
+        OpenShift::Utils::ShellExec.kill_process_tree(pid)
       end
 
+      ignored, status = Process::waitpid2 pid
+      exitcode = status.exitstatus
+
       if exitcode == 0
         logger.info("(#{exitcode})\n------\n#{cleanpwd(output)}\n------)")
       else