Differential D587

Fix 100% cpu utilization when running commands via ssh
ClosedPublic
Actions

Authored by mkrizek on Sep 15 2015, 9:35 PM.

Details

Reviewers
lbrabec
kparal
tflink
jskladan
Maniphest Tasks
T593: libtaskotron hangs (indefinitely?) if ssh communication with minion goes down
Commits
rLTRNda77b269cf91: Fix 100% cpu utilization when running commands via ssh
Test Plan

Tried running kparal's use cases from the ticket. Worked.

Diff Detail

Repository
rLTRN libtaskotron
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
mkrizek retitled this revision from to Fix 100% cpu utilization when running commands via ssh.Sep 15 2015, 9:35 PM
mkrizek updated this object.
mkrizek edited the test plan for this revision. (Show Details)
mkrizek added reviewers: tflink, kparal, jskladan, lbrabec.
tflink accepted this revision.Sep 15 2015, 9:43 PM
This revision is now accepted and ready to land.Sep 15 2015, 9:43 PM
kparal accepted this revision.Sep 16 2015, 10:04 AM

There seems to be no better way if we want to capture stdout and stderr separately. Ack.

Closed by commit rLTRNda77b269cf91: Fix 100% cpu utilization when running commands via ssh (authored by mkrizek). · Explain WhySep 16 2015, 11:46 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathPackages
Mlibtaskotron/remote_exec.py (2 lines)

Diff 1526

View Options

libtaskotron/remote_exec.py

1# -*- coding: utf-8 -*- 1​# -*- coding: utf-8 -*-
2# Copyright 2009-2015, Red Hat, Inc. 2​# Copyright 2009-2015, Red Hat, Inc.
3# License: GPL-2.0+ <http://spdx.org/licenses/GPL-2.0+> 3​# License: GPL-2.0+ <http://spdx.org/licenses/GPL-2.0+>
4# See the LICENSE file for more details on Licensing 4​# See the LICENSE file for more details on Licensing
5 5​
6'''Tools for remote execution primary for disposable clients''' 6​'''Tools for remote execution primary for disposable clients'''
7 7​
8from __future__ import absolute_import 8​from __future__ import absolute_import
9import os 9​import os
10import os.path 10​import os.path
11import sys 11​import sys
12import socket 12​import socket
13from stat import S_ISDIR 13​from stat import S_ISDIR
14​from time import sleep
14 15​
15import paramiko 16​import paramiko
16 17​
17from .logger import log 18​from .logger import log
18from . import exceptions as exc 19​from . import exceptions as exc
19 20​
20from libtaskotron.directives import exitcode_directive 21​from libtaskotron.directives import exitcode_directive
21 22​
▲ Show 20 Lines • Show All 113 Lines • ▼ Show 20 Line(s)122 def cmd(self, cmd):
135 channel = stdout.channel 136​ channel = stdout.channel
136 while not channel.exit_status_ready(): 137​ while not channel.exit_status_ready():
137 if channel.recv_ready(): 138​ if channel.recv_ready():
138 data = channel.recv(1024) 139​ data = channel.recv(1024)
139 self.outstream.write(data) 140​ self.outstream.write(data)
140 if channel.recv_stderr_ready(): 141​ if channel.recv_stderr_ready():
141 data = channel.recv_stderr(1024) 142​ data = channel.recv_stderr(1024)
142 self.outstream.write(data) 143​ self.outstream.write(data)
144​ sleep(0.1)
143 145​
144 retcode = channel.recv_exit_status() 146​ retcode = channel.recv_exit_status()
145 147​
146 if retcode != 0 and retcode != exitcode_directive.FAILURE: 148​ if retcode != 0 and retcode != exitcode_directive.FAILURE:
147 raise exc.TaskotronRemoteError('Command "%s" on %s@%s exited with code %s' % 149​ raise exc.TaskotronRemoteError('Command "%s" on %s@%s exited with code %s' %
148 (cmd, self.username, self.hostname, retcode)) 150​ (cmd, self.username, self.hostname, retcode))
149 return retcode 151​ return retcode
150 152​
▲ Show 20 Lines • Show All 159 Lines • Show Last 20 Lines