openstack/ironic
Code Issues Proposed changes

Merge "Remove 'fork' option from socat command"

Browse Source
This commit is contained in:
Jenkins 2016-12-30 18:29:28 +00:00 committed by Gerrit Code Review
commit 2c2fbab480
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ironic/drivers/modules/console_utils.py
View File

@ -282,13 +282,17 @@ def start_socat_console(node_uuid, port, console_cmd):
# put together the command and arguments for invoking the console # put together the command and arguments for invoking the console
args = ['socat'] args = ['socat']
# set timeout check for user's connection. After 10min of inactivity
# on client side, connection will be closed.
# TODO(ashestakov) Make timeout value configurable
args.append('-T600')
args.append('-L%s' % pid_file) args.append('-L%s' % pid_file)
console_host = CONF.my_ip console_host = CONF.my_ip
if netutils.is_valid_ipv6(console_host): if netutils.is_valid_ipv6(console_host):
arg = 'TCP6-LISTEN:%(port)s,bind=[%(host)s],reuseaddr,fork' arg = 'TCP6-LISTEN:%(port)s,bind=[%(host)s],reuseaddr'
else: else:
arg = 'TCP4-LISTEN:%(port)s,bind=%(host)s,reuseaddr,fork' arg = 'TCP4-LISTEN:%(port)s,bind=%(host)s,reuseaddr'
args.append(arg % {'host': console_host, args.append(arg % {'host': console_host,
'port': port}) 'port': port})

8
ironic/releasenotes/notes/fix-socat-command-afc840284446870a.yaml Normal file
View File

@ -0,0 +1,8 @@
---
fixes:
- Fixes issue with socat console support where an unlimited
number of connections could be created, resulting in the prior
session being destroyed. Connections are now limited
to a single connection per server. Socat now closes the
console connection upon disconnect or timeout 10min. To reconnect,
users should re-activate the console.