Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Łukasz Nowak
slapos
Commits
64886cd8
Commit
64886cd8
authored
Oct 01, 2013
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resiliency: PBS: promise should NOT bang.
Never. Really.
parent
13c48f9e
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
36 deletions
+7
-36
slapos/recipe/pbs.py
slapos/recipe/pbs.py
+7
-36
No files found.
slapos/recipe/pbs.py
View file @
64886cd8
...
@@ -27,7 +27,6 @@
...
@@ -27,7 +27,6 @@
import
json
import
json
import
os
import
os
import
signal
import
subprocess
import
subprocess
import
sys
import
sys
import
textwrap
import
textwrap
...
@@ -37,31 +36,13 @@ from slapos.recipe.librecipe import GenericSlapRecipe
...
@@ -37,31 +36,13 @@ from slapos.recipe.librecipe import GenericSlapRecipe
from
slapos.recipe.dropbear
import
KnownHostsFile
from
slapos.recipe.dropbear
import
KnownHostsFile
from
slapos.recipe.notifier
import
Notify
from
slapos.recipe.notifier
import
Notify
from
slapos.recipe.notifier
import
Callback
from
slapos.recipe.notifier
import
Callback
from
slapos
import
slap
as
slapmodule
def
promise
(
args
):
def
promise
(
args
):
ssh
=
subprocess
.
Popen
(
def
failed_ssh
():
[
args
[
'ssh_client'
],
'%(user)s@%(host)s/%(port)s'
%
args
],
sys
.
stderr
.
write
(
"SSH Connection failed
\
n
"
)
stdin
=
subprocess
.
PIPE
,
stdout
=
None
,
stderr
=
None
partition
=
slap
.
registerComputerPartition
(
args
[
'computer_id'
],
)
args
[
'partition_id'
])
partition
.
bang
(
"SSH Connection failed. rdiff-backup is unusable."
)
def
sigterm_handler
(
signum
,
frame
):
failed_ssh
()
signal
.
signal
(
signal
.
SIGTERM
,
sigterm_handler
)
slap
=
slapmodule
.
slap
()
slap
.
initializeConnection
(
args
[
'server_url'
],
key_file
=
args
.
get
(
'key_file'
),
cert_file
=
args
.
get
(
'cert_file'
))
ssh
=
subprocess
.
Popen
([
args
[
'ssh_client'
],
'%(user)s@%(host)s/%(port)s'
%
args
],
stdin
=
subprocess
.
PIPE
,
stdout
=
open
(
os
.
devnull
,
'w'
),
stderr
=
open
(
os
.
devnull
,
'w'
))
# Rdiff Backup protocol quit command
# Rdiff Backup protocol quit command
quitcommand
=
'q'
+
chr
(
255
)
+
chr
(
0
)
*
7
quitcommand
=
'q'
+
chr
(
255
)
+
chr
(
0
)
*
7
...
@@ -74,7 +55,7 @@ def promise(args):
...
@@ -74,7 +55,7 @@ def promise(args):
if
ssh
.
poll
()
is
None
:
if
ssh
.
poll
()
is
None
:
return
1
return
1
if
ssh
.
returncode
!=
0
:
if
ssh
.
returncode
!=
0
:
failed_ssh
(
)
sys
.
stderr
.
write
(
"SSH Connection failed
\
n
"
)
return
ssh
.
returncode
return
ssh
.
returncode
...
@@ -98,8 +79,8 @@ class Recipe(GenericSlapRecipe, Notify, Callback):
...
@@ -98,8 +79,8 @@ class Recipe(GenericSlapRecipe, Notify, Callback):
print
'Processing PBS slave %s with type %s'
%
(
slave_id
,
slave_type
)
print
'Processing PBS slave %s with type %s'
%
(
slave_id
,
slave_type
)
promise_path
=
os
.
path
.
join
(
self
.
options
[
'promises-directory'
],
slave_id
)
promise_path
=
os
.
path
.
join
(
self
.
options
[
'promises-directory'
],
slave_id
)
promise_dict
=
self
.
promise_base_dict
.
copy
()
promise_dict
=
dict
(
ssh_client
=
self
.
options
[
'sshclient-binary'
],
promise_dict
.
update
(
user
=
parsed_url
.
username
,
user
=
parsed_url
.
username
,
host
=
parsed_url
.
hostname
,
host
=
parsed_url
.
hostname
,
port
=
parsed_url
.
port
)
port
=
parsed_url
.
port
)
promise
=
self
.
createPythonScript
(
promise_path
,
promise
=
self
.
createPythonScript
(
promise_path
,
...
@@ -221,16 +202,6 @@ class Recipe(GenericSlapRecipe, Notify, Callback):
...
@@ -221,16 +202,6 @@ class Recipe(GenericSlapRecipe, Notify, Callback):
if
self
.
optionIsTrue
(
'client'
,
True
):
if
self
.
optionIsTrue
(
'client'
,
True
):
self
.
logger
.
info
(
"Client mode"
)
self
.
logger
.
info
(
"Client mode"
)
slap_connection
=
self
.
buildout
[
'slap-connection'
]
self
.
promise_base_dict
=
{
'server_url'
:
slap_connection
[
'server-url'
],
'computer_id'
:
slap_connection
[
'computer-id'
],
'cert_file'
:
slap_connection
.
get
(
'cert-file'
),
'key_file'
:
slap_connection
.
get
(
'key-file'
),
'partition_id'
:
slap_connection
[
'partition-id'
],
'ssh_client'
:
self
.
options
[
'sshclient-binary'
],
}
slaves
=
json
.
loads
(
self
.
options
[
'slave-instance-list'
])
slaves
=
json
.
loads
(
self
.
options
[
'slave-instance-list'
])
known_hosts
=
KnownHostsFile
(
self
.
options
[
'known-hosts'
])
known_hosts
=
KnownHostsFile
(
self
.
options
[
'known-hosts'
])
with
known_hosts
:
with
known_hosts
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment