Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
strudel2_backend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
hpc-team
strudel2_backend
Commits
a397f6ee
Commit
a397f6ee
authored
4 years ago
by
Chris Hines
Browse files
Options
Downloads
Patches
Plain Diff
more logz
parent
3402b6a0
No related branches found
No related tags found
3 merge requests
!77
Revert "disable agressive kill and restart"
,
!45
Test
,
!44
Dev
Pipeline
#11981
passed
4 years ago
Stage: build
Stage: deploy
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
tes/sshwrapper/__init__.py
+2
-2
2 additions, 2 deletions
tes/sshwrapper/__init__.py
with
2 additions
and
2 deletions
tes/sshwrapper/__init__.py
+
2
−
2
View file @
a397f6ee
...
@@ -353,7 +353,7 @@ class Ssh:
...
@@ -353,7 +353,7 @@ class Ssh:
ctrlsocket
=
Ssh
.
get_ctrl_master_socket
(
sess
,
host
,
user
,
sshport
)
ctrlsocket
=
Ssh
.
get_ctrl_master_socket
(
sess
,
host
,
user
,
sshport
)
else
:
else
:
ctrlsocket
=
Ssh
.
get_ctrl_master_socket
(
sess
,
bastion
,
user
,
bastionsshport
)
ctrlsocket
=
Ssh
.
get_ctrl_master_socket
(
sess
,
bastion
,
user
,
bastionsshport
)
logger
.
debug
(
'
in execute, got my ctrlsocket {}
'
.
format
(
sess
.
c
on
tr
o
l_processes
[
ctrlsocket
].
pid
))
logger
.
debug
(
'
in execute, got my ctrlsocket {}
'
.
format
(
sess
.
ctrl_processes
[
ctrlsocket
].
pid
))
if
bastion
==
None
:
if
bastion
==
None
:
# we are executing this command on the login node, so no more magic is needed
# we are executing this command on the login node, so no more magic is needed
sshcmd
=
Ssh
.
SSHCMDWITHOPTS
.
copy
()
sshcmd
=
Ssh
.
SSHCMDWITHOPTS
.
copy
()
...
@@ -443,7 +443,7 @@ class Ssh:
...
@@ -443,7 +443,7 @@ class Ssh:
Ssh
.
validate_username
(
user
)
Ssh
.
validate_username
(
user
)
Ssh
.
validate_hostname
(
host
)
Ssh
.
validate_hostname
(
host
)
ctrlsocket
=
Ssh
.
get_ctrl_master_socket
(
sess
,
host
,
user
,
sshport
)
ctrlsocket
=
Ssh
.
get_ctrl_master_socket
(
sess
,
host
,
user
,
sshport
)
logger
.
debug
(
'
in tunnel, got my ctrlsocket {}
'
.
format
(
sess
.
c
on
tr
o
l_processes
[
ctrlsocket
].
pid
))
logger
.
debug
(
'
in tunnel, got my ctrlsocket {}
'
.
format
(
sess
.
ctrl_processes
[
ctrlsocket
].
pid
))
localport
=
Ssh
.
get_free_port
()
localport
=
Ssh
.
get_free_port
()
if
port
==
22
or
(
not
internalfirewall
and
not
localbind
):
if
port
==
22
or
(
not
internalfirewall
and
not
localbind
):
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment