Make sure the Thread.run() method has terminated before closing the
socket. Currently, the socket is closed through Packetizer.close(),
which happens too early. Move the socket.close() into Transport.close()
and after the Thread.join() call.
While at it, modify the stop_thread() method and use it in
Transport.close() to avoid code duplication. Use join() with a timeout
to make it possible to terminate the main thread with KeyboardInterrupt.
Also, remove the now obsolete socket.close() from Transport.atfork().
This fixes a potential infinite loop if paramiko.SSHClient is connected
through a paramiko.Channel instead of a regular socket (tunneling).
Using a debug patch to dump the current stack of the thread every
couple of seconds while trying to close it, I've seen the following
over and over again:
Thread could not be stopped, still running.
Current traceback (most recent call last):
File "/usr/lib/python2.7/threading.py", line 524, in __bootstrap
File "/usr/lib/python2.7/threading.py", line 551, in __bootstrap_inner
File ".../paramiko/transport.py", line 1564, in run
File ".../paramiko/channel.py", line 1102, in _handle_close
File ".../paramiko/transport.py", line 1418, in _send_user_message
File ".../paramiko/transport.py", line 1398, in _send_message
File ".../paramiko/packet.py", line 319, in send_message
File ".../paramiko/packet.py", line 248, in write_all
n = self.__socket.send(out)
File ".../paramiko/channel.py", line 732, in send
The thread was running Packetizer.write_all() in an endless loop:
while len(out) > 0:
n = Channel.send(out) # n == 0 because channel got closed
out = out[n:] # essentially out = out
Signed-off-by: Frank Arnold <firstname.lastname@example.org>
Python's documentation has a bug, in that it doesn't correctly annotate
is_alive as being a function introduced in Python 2.6.
Signed-off-by: Steven Noonan <email@example.com>