xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2024-11-22 17:43:14 +00:00
Code Issues Projects Releases Wiki Activity

Improve behavior on python2 systems

Browse Source
This commit is contained in:
Jarrod Johnson 2021-04-02 11:47:14 -04:00
parent 7fb5f9756d
commit 4a0d419f85
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
confluent_server/confluent/consoleserver.py
View File

@ -66,7 +66,7 @@ def get_buffer_output(nodename):
instream = _bufferdaemon.stdout
if not isinstance(nodename, bytes):
nodename = nodename.encode('utf8')
outdata = b''
outdata = bytearray()
with _bufferlock:
out.write(struct.pack('I', len(nodename)))
out.write(nodename)
@ -75,10 +75,10 @@ def get_buffer_output(nodename):
while not outdata or outdata[-1]:
chunk = instream.read(128)
if chunk:
outdata += chunk
outdata.extend(chunk)
else:
select.select((instream,), (), (), 0)
return outdata[:-1]
return bytes(outdata[:-1])
def send_output(nodename, output):
@ -590,7 +590,7 @@ def start_console_sessions():
_bufferlock = semaphore.Semaphore()
_tracelog = log.Logger('trace')
_bufferdaemon = subprocess.Popen(
['/opt/confluent/bin/vtbufferd'], stdin=subprocess.PIPE,
['/opt/confluent/bin/vtbufferd'], bufsize=0, stdin=subprocess.PIPE,
stdout=subprocess.PIPE)
fl = fcntl.fcntl(_bufferdaemon.stdout.fileno(), fcntl.F_GETFL)
fcntl.fcntl(_bufferdaemon.stdout.fileno(),