The OpenShift::Runtime::Upgrader class needs to accept an hourglass in the constructor to correctly handle timeouts the way the other actions available in the mcollective agent do.
https://github.com/openshift/origin-server/pull/3481
https://github.com/openshift/origin-server/pull/3482
(In reply to Dan Mace from comment #2) > https://github.com/openshift/origin-server/pull/3482 Replaced by https://github.com/openshift/origin-server/pull/3484
Commit pushed to master at https://github.com/openshift/origin-server https://github.com/openshift/origin-server/commit/27cac39a11957eea659377fc5866b2b9d36e2f2d Bug 1000193: Use an Hourglass in the gear upgrader Improve Upgrader class to accept and use an Hourglass instance for timeout handling. Pass through the hourglass to all ApplicationContainer and cartridge model instances, and use the hourglass to configure Net::HTTP timeout values. Ensure that no Upgrader operations will ever be timed out by a higher level Timeout block such as MCollective.
Tested on devenv-stage_457, after the hourglass merged, the oo-admin-upgrade works fine. And no regression. Move bug to verified.