New commit detected on cfme/5.3.z: https://code.engineering.redhat.com/gerrit/gitweb?p=cfme.git;a=commitdiff;h=209ce68716ed6ee4beb2a0e0e280c2dfd1e06ea7 commit 209ce68716ed6ee4beb2a0e0e280c2dfd1e06ea7 Merge: d5dfa33 2c830c6 Author: Greg McCullough <gmccullo> AuthorDate: Thu Sep 24 09:57:17 2015 -0400 Commit: Greg McCullough <gmccullo> CommitDate: Thu Sep 24 09:57:17 2015 -0400 Merge branch 'bugzilla_1258648_53z' into '5.3.z' Automate Method dispatch changes for 5.3 https://bugzilla.redhat.com/show_bug.cgi?id=1265787 Addressed the following issues (1) Flush stderr and stdout in separate threads, prior to this it would cause deadlock if the stderr was not drained. (2) Ensure block makes sure that the Automate method is terminated if it doesn't respond by the :msg_timeout specified in the queue. This used to leave orphaned processes. (3) Terminate the stdout and stderr reading threads in the ensure block. Added a spec with automate method that writes to stdout/stderr and sleeps waiting to be terminated. Original PR https://github.com/ManageIQ/manageiq/pull/4302 This MR was created from the 5.4.z MR for the same issue. Not a clean cherry pick, had to do manual editing See merge request !264 .../miq_automation_engine/engine/miq_ae_method.rb | 119 +++++++++++---------- .../miq_ae_method_dispatch_spec.rb | 110 +++++++++++++++++++ vmdb/spec/support/automation_spec_helper.rb | 46 ++++++++ 3 files changed, 218 insertions(+), 57 deletions(-)
This bug was accidentally moved from POST to MODIFIED via an error in automation, please see mmccune with any questions