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
5b7f4c31
Commit
5b7f4c31
authored
2 years ago
by
Chris Hines
Browse files
Options
Downloads
Patches
Plain Diff
more try except to make sure locks are released
parent
12da8603
No related branches found
Branches containing commit
No related tags found
2 merge requests
!97
Test
,
!96
Dev
Pipeline
#70106
passed
2 years ago
Stage: build
Stage: deploy
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
tes/sshwrapper/__init__.py
+23
-19
23 additions, 19 deletions
tes/sshwrapper/__init__.py
tes/tunnelstat/__init__.py
+12
-4
12 additions, 4 deletions
tes/tunnelstat/__init__.py
with
35 additions
and
23 deletions
tes/sshwrapper/__init__.py
+
23
−
19
View file @
5b7f4c31
...
...
@@ -113,8 +113,8 @@ class Ssh:
import
logging
logger
=
logging
.
getLogger
()
logger
.
debug
(
"
enter get_ctrl_master_socket
"
)
sess
.
lock
.
acquire
()
ctrlsocket
=
"
/tmp/cm-{}-{}-{}
"
.
format
(
user
,
host
,
sess
.
sshsessid
)
sess
.
lock
.
acquire
()
if
Ssh
.
check_ctrlsocket
(
sess
,
ctrlsocket
):
sess
.
lock
.
release
()
return
ctrlsocket
...
...
@@ -126,25 +126,29 @@ class Ssh:
except
FileNotFoundError
as
e
:
pass
sshcmd
=
Ssh
.
SSHCMDWITHOPTS
.
copy
()
sshcmd
.
extend
([
"
-S
"
,
ctrlsocket
,
"
-M
"
,
'
-o
'
,
'
ControlPersist=60s
'
,
'
-p
'
,
sshport
,
'
-N
'
,
'
-l
'
,
user
,
host
])
env
=
os
.
environ
.
copy
()
if
sess
.
socket
is
None
:
try
:
sshcmd
=
Ssh
.
SSHCMDWITHOPTS
.
copy
()
sshcmd
.
extend
([
"
-S
"
,
ctrlsocket
,
"
-M
"
,
'
-o
'
,
'
ControlPersist=60s
'
,
'
-p
'
,
sshport
,
'
-N
'
,
'
-l
'
,
user
,
host
])
env
=
os
.
environ
.
copy
()
if
sess
.
socket
is
None
:
sess
.
lock
.
release
()
logger
.
debug
(
"
Exception get_ctrl_master_socket
"
)
raise
SshAgentException
(
"
No ssh-agent yet
"
)
env
[
'
SSH_AUTH_SOCK
'
]
=
sess
.
socket
logger
.
debug
(
"
creating master socket
"
)
logger
.
debug
(
"
ssh_auth_sock {}
"
.
format
(
sess
.
socket
))
logger
.
debug
(
"
"
.
join
(
sshcmd
))
ctrl_p
=
subprocess
.
Popen
(
sshcmd
,
stdout
=
subprocess
.
PIPE
,
stderr
=
subprocess
.
PIPE
,
stdin
=
None
,
env
=
env
)
(
stderr
,
stdout
)
=
ctrl_p
.
communicate
()
# The process should exit, while the mux persists
except
Exception
as
e
:
sess
.
lock
.
release
()
logger
.
debug
(
"
Exception get_ctrl_master_socket
"
)
raise
SshAgentException
(
"
No ssh-agent yet
"
)
env
[
'
SSH_AUTH_SOCK
'
]
=
sess
.
socket
logger
.
debug
(
"
creating master socket
"
)
logger
.
debug
(
"
ssh_auth_sock {}
"
.
format
(
sess
.
socket
))
logger
.
debug
(
"
"
.
join
(
sshcmd
))
ctrl_p
=
subprocess
.
Popen
(
sshcmd
,
stdout
=
subprocess
.
PIPE
,
stderr
=
subprocess
.
PIPE
,
stdin
=
None
,
env
=
env
)
(
stderr
,
stdout
)
=
ctrl_p
.
communicate
()
# The process should exit, while the mux persists
raise
e
if
ctrl_p
.
returncode
==
0
:
sess
.
lock
.
release
()
return
ctrlsocket
...
...
This diff is collapsed.
Click to expand it.
tes/tunnelstat/__init__.py
+
12
−
4
View file @
5b7f4c31
...
...
@@ -64,8 +64,12 @@ class SSHSession:
import
logging
logger
=
logging
.
getLogger
()
self
.
lock
.
acquire
()
if
self
.
socket
is
None
:
self
.
start_agent
()
try
:
if
self
.
socket
is
None
:
self
.
start_agent
()
except
Exception
as
e
:
self
.
lock
.
release
()
raise
e
self
.
lock
.
release
()
keyf
=
tempfile
.
NamedTemporaryFile
(
mode
=
'
w
'
,
delete
=
False
)
keyname
=
keyf
.
name
...
...
@@ -206,8 +210,12 @@ class SSHSession:
logger
=
logging
.
getLogger
()
env
=
os
.
environ
.
copy
()
sess
.
lock
.
acquire
()
if
sess
.
socket
is
None
:
sess
.
start_agent
()
try
:
if
sess
.
socket
is
None
:
sess
.
start_agent
()
except
Exception
as
e
:
sess
.
lock
.
release
()
raise
e
sess
.
lock
.
release
()
env
[
'
SSH_AUTH_SOCK
'
]
=
sess
.
socket
cmd
=
[
sess
.
sshadd
,
'
-l
'
]
...
...
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