Increase flexibility of network port mapping in clustermq #329
Conversation
…mq ports - clustermq.port.range - clustermq.ssh.hpc_fwd_port.range
R/qsys_ssh.r
Outdated
| args$ssh.hpc_fwd_port | ||
| hpc_fwd_port = getOption( | ||
| "clustermq.ssh.hpc_fwd_port", | ||
| sample((50000:55000),1) | ||
| ) | ||
| args$ssh.hpc_fwd_port=ifelse(length(hpc_fwd_port)==1, | ||
| hpc_fwd_port, | ||
| sample(hpc_fwd_port,1) | ||
| ) |
There was a problem hiding this comment.
Why not just:
args$ssh.hpc_fwd_port = sample(getOption("clustermq.ssh.hpc_fwd_port", 50000:55000), 1)There was a problem hiding this comment.
That would be great but if we really want to allow both single ports and port ranges, then your approach would lead to
#default
> sample(getOption("clustermq.ssh.hpc_fwd_port", 50000:55000), 1)
[1] 53710
#single custom port
> options(clustermq.ssh.hpc_fwd_port=1024)
> sample(getOption("clustermq.ssh.hpc_fwd_port", 50000:55000), 1)
[1] 437
#custom port range
> options(clustermq.ssh.hpc_fwd_port=1024:2048)
> sample(getOption("clustermq.ssh.hpc_fwd_port", 50000:55000), 1)
[1] 1731
the problem is that the single port would then be used as single argument to the sample command and then the actual port would be a sample of 1:clustermq.ssh.hpc_fwd_port
There was a problem hiding this comment.
Oh, you're right. I forgot that sample with a single integer samples any integer up to and including this point. In that case I'd prefer:
args$ssh.hpc_fwd_port = getOption("clustermq.ssh.hpc_fwd_port", 50000:55000)
if (length(args$ssh.hpc_fwd_port) > 1)
args$ssh.hpc_fwd_port = sample(args$ssh.hpc_fwd_port, 1)There was a problem hiding this comment.
That's much cleaner than my algorithm - thanks for this ! I have added this as a commit now in 7995621.
R/qsys_ssh.r
Outdated
| args$ssh.hpc_fwd_port=getOption("clustermq.ssh.hpc_fwd_port", 50000:55000) | ||
| if (length(args$ssh.hpc_fwd_port) > 1) | ||
| args$ssh.hpc_fwd_port = sample(args$ssh.hpc_fwd_port, 1) | ||
| utils::modifyList(private$defaults, args) |
There was a problem hiding this comment.
please still fix tab indentation on L61 -> should be spaces
|
Thank you! 🎉 |
At the moment, the ports used by
clustermqare hard coded. By default, ports between 6000 and 9999 are used byclustermqand ports between 50000 and 55000 are used by thesshconnector for forwarding ssh sessions.This PR will introduce two new options to
clustermq, i.e.clustermq.port.rangeclustermq.ssh.hpc_fwd_port.rangeboth of which will make working with
clustermqin environments with networking firewalls much easier.