Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
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
Eric Zheng
slapos.core
Commits
b489d4e8
Commit
b489d4e8
authored
Oct 02, 2013
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Watchdog: check if previously already banged before proceeding.
parent
36f2841b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
83 additions
and
6 deletions
+83
-6
slapos/grid/slapgrid.py
slapos/grid/slapgrid.py
+2
-0
slapos/grid/watchdog.py
slapos/grid/watchdog.py
+81
-6
No files found.
slapos/grid/slapgrid.py
View file @
b489d4e8
...
...
@@ -70,6 +70,7 @@ SLAPGRID_PROMISE_FAIL = 2
WATCHDOG_PATH
=
'/opt/slapos/bin/slapos-watchdog'
COMPUTER_PARTITION_TIMESTAMP_FILENAME
=
'.timestamp'
COMPUTER_PARTITION_LATEST_BANG_TIMESTAMP_FILENAME
=
'.slapos_latest_bang_timestamp'
class
_formatXMLError
(
Exception
):
...
...
@@ -334,6 +335,7 @@ class Slapgrid(object):
invocation_list
.
append
(
"--certificate-repository-path '%s'"
%
self
.
certificate_repository_path
)
invocation_list
.
append
(
"--computer-id '%s'"
%
self
.
computer_id
)
invocation_list
.
append
(
"--instance-root '%s'"
%
self
.
instance_root
)
return
' '
.
join
(
invocation_list
)
def
checkEnvironmentAndCreateStructure
(
self
):
...
...
slapos/grid/watchdog.py
View file @
b489d4e8
...
...
@@ -32,6 +32,7 @@ import os.path
import
sys
import
slapos.slap.slap
import
slapos.grid.slapgrid
def
getWatchdogID
():
...
...
@@ -49,11 +50,13 @@ def parseArgumentTuple():
parser
.
add_argument
(
"--certificate-repository-path"
,
help
=
"Path to partition certificates."
,
default
=
None
)
parser
.
add_argument
(
"--instance-root-path"
,
help
=
"Path to instance root directory."
,
default
=
None
)
option
=
parser
.
parse_args
()
# Build option_dict
option_dict
=
{}
for
argument_key
,
argument_value
in
vars
(
option
).
iteritems
():
option_dict
.
update
({
argument_key
:
argument_value
})
...
...
@@ -64,9 +67,13 @@ class Watchdog(object):
process_state_events
=
[
'PROCESS_STATE_EXITED'
,
'PROCESS_STATE_FATAL'
]
def
__init__
(
self
,
option_dict
):
for
option
,
value
in
option_dict
.
items
():
setattr
(
self
,
option
,
value
)
def
__init__
(
self
,
master_url
,
computer_id
,
certificate_repository_path
=
None
,
instance_root_path
=
None
):
self
.
master_url
=
master_url
self
.
computer_id
=
computer_id
self
.
certificate_repository_path
=
certificate_repository_path
self
.
instance_root_path
=
instance_root_path
self
.
stdin
=
sys
.
stdin
self
.
stdout
=
sys
.
stdout
self
.
stderr
=
sys
.
stderr
...
...
@@ -103,9 +110,76 @@ class Watchdog(object):
def
handle_event
(
self
,
headers
,
payload
):
if
headers
[
'eventname'
]
in
self
.
process_state_events
:
payload_dict
=
dict
([
x
.
split
(
':'
)
for
x
in
payload
.
split
()])
if
getWatchdogID
()
in
payload_dict
[
'processname'
]:
if
getWatchdogID
()
in
payload_dict
[
'processname'
]
and
\
not
self
.
has_bang_already_been_called
(
payload_dict
[
'groupname'
]):
self
.
handle_process_state_change_event
(
headers
,
payload_dict
)
def
has_bang_already_been_called
(
self
,
partition_name
):
"""
Checks if bang has already been called since last successful deployment
"""
if
not
self
.
instance_root_path
:
# Backward compatibility
return
False
partition_home_path
=
os
.
path
.
join
(
self
.
instance_root_path
,
partition_name
)
partition_timestamp_file_path
=
os
.
path
.
join
(
partition_home_path
,
slapos
.
grid
.
slapgrid
.
COMPUTER_PARTITION_TIMESTAMP_FILENAME
)
slapos_last_bang_timestamp_file_path
=
os
.
path
.
join
(
partition_home_path
,
slapos
.
grid
.
slapgrid
.
COMPUTER_PARTITION_LATEST_BANG_TIMESTAMP_FILENAME
)
if
not
os
.
path
.
exists
(
slapos_last_bang_timestamp_file_path
):
# Never heard of any previous bang
return
False
if
not
os
.
path
.
exists
(
partition_timestamp_file_path
):
# Partition never managed to deploy successfully, ignore bang
return
True
last_bang_timestamp
=
int
(
open
(
slapos_last_bang_timestamp_file_path
,
'r'
).
read
())
deployment_timestamp
=
int
(
open
(
partition_timestamp_file_path
,
'r'
).
read
())
if
deployment_timestamp
>
last_bang_timestamp
:
# It previously banged BEFORE latest successful deployment
# i.e it haven't banged since last successful deployment
return
False
# It previously banged AFTER latest successful deployment: ignore
return
True
def
create_partition_bang_timestamp_file
(
self
,
partition_name
):
"""
Copy the timestamp file of the partition to a bang timestamp file.
If timestamp file does not exist, create a dummy bang timestamp file.
"""
if
not
self
.
instance_root_path
:
# Backward compatibility
return
partition_home_path
=
os
.
path
.
join
(
self
.
instance_root_path
,
partition_name
)
partition_timestamp_file_path
=
os
.
path
.
join
(
partition_home_path
,
slapos
.
grid
.
slapgrid
.
COMPUTER_PARTITION_TIMESTAMP_FILENAME
)
slapos_last_bang_timestamp_file_path
=
os
.
path
.
join
(
partition_home_path
,
slapos
.
grid
.
slapgrid
.
COMPUTER_PARTITION_LATEST_BANG_TIMESTAMP_FILENAME
)
if
os
.
path
.
exists
(
partition_timestamp_file_path
):
timestamp
=
open
(
partition_timestamp_file_path
,
'r'
).
read
()
else
:
timestamp
=
'0'
open
(
slapos_last_bang_timestamp_file_path
,
'w'
).
write
(
timestamp
)
def
handle_process_state_change_event
(
self
,
headers
,
payload_dict
):
partition_id
=
payload_dict
[
'groupname'
]
self
.
initialize_connection
(
partition_id
)
...
...
@@ -115,10 +189,11 @@ class Watchdog(object):
partition_id
=
partition_id
)
partition
.
bang
(
"%s process in partition %s encountered a problem"
%
(
payload_dict
[
'processname'
],
partition_id
))
self
.
create_partition_bang_timestamp_file
(
payload_dict
[
'groupname'
])
def
main
():
watchdog
=
Watchdog
(
parseArgumentTuple
())
watchdog
=
Watchdog
(
**
parseArgumentTuple
())
watchdog
.
run
()
if
__name__
==
'__main__'
:
...
...
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