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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
slapos.core
Commits
0b479327
Commit
0b479327
authored
Mar 29, 2018
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
grid.promise: return previous execution result if promise is skipped because of periodicity
parent
fbe6c179
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
173 additions
and
21 deletions
+173
-21
slapos/grid/promise/__init__.py
slapos/grid/promise/__init__.py
+39
-13
slapos/grid/promise/generic.py
slapos/grid/promise/generic.py
+28
-8
slapos/tests/promise.py
slapos/tests/promise.py
+106
-0
No files found.
slapos/grid/promise/__init__.py
View file @
0b479327
...
@@ -44,8 +44,7 @@ from slapos.grid.utils import dropPrivileges
...
@@ -44,8 +44,7 @@ from slapos.grid.utils import dropPrivileges
from
slapos.grid.promise
import
interface
from
slapos.grid.promise
import
interface
from
slapos.grid.promise.generic
import
(
GenericPromise
,
PromiseQueueResult
,
from
slapos.grid.promise.generic
import
(
GenericPromise
,
PromiseQueueResult
,
AnomalyResult
,
TestResult
,
AnomalyResult
,
TestResult
,
PROMISE_RESULT_FOLDER_NAME
,
PROMISE_RESULT_FOLDER_NAME
)
PROMISE_STATE_FOLDER_NAME
)
from
slapos.grid.promise.wrapper
import
WrapPromise
from
slapos.grid.promise.wrapper
import
WrapPromise
...
@@ -183,6 +182,13 @@ class PromiseLauncher(object):
...
@@ -183,6 +182,13 @@ class PromiseLauncher(object):
self
.
queue_result
=
MQueue
()
self
.
queue_result
=
MQueue
()
self
.
bang_called
=
False
self
.
bang_called
=
False
self
.
promise_output_dir
=
os
.
path
.
join
(
self
.
partition_folder
,
PROMISE_RESULT_FOLDER_NAME
)
if
not
os
.
path
.
exists
(
self
.
promise_output_dir
):
mkdir_p
(
self
.
promise_output_dir
)
def
_loadPromiseModule
(
self
,
promise_name
):
def
_loadPromiseModule
(
self
,
promise_name
):
"""Load a promise from promises directory."""
"""Load a promise from promises directory."""
...
@@ -222,34 +228,55 @@ class PromiseLauncher(object):
...
@@ -222,34 +228,55 @@ class PromiseLauncher(object):
self
.
logger
.
error
(
'Bad result: %s is not type of PromiseQueueResult...'
%
result
)
self
.
logger
.
error
(
'Bad result: %s is not type of PromiseQueueResult...'
%
result
)
return
return
promise_output_dir
=
os
.
path
.
join
(
self
.
partition_folder
,
PROMISE_RESULT_FOLDER_NAME
)
promise_output_file
=
os
.
path
.
join
(
promise_output_file
=
os
.
path
.
join
(
promise_output_dir
,
self
.
promise_output_dir
,
"%s.status.json"
%
result
.
title
"%s.status.json"
%
result
.
title
)
)
promise_tmp_file
=
'%s.tmp'
%
promise_output_file
promise_tmp_file
=
'%s.tmp'
%
promise_output_file
if
not
os
.
path
.
exists
(
promise_output_dir
):
mkdir_p
(
promise_output_dir
)
with
open
(
promise_tmp_file
,
"w"
)
as
outputfile
:
with
open
(
promise_tmp_file
,
"w"
)
as
outputfile
:
json
.
dump
(
result
.
serialize
(),
outputfile
)
json
.
dump
(
result
.
serialize
(),
outputfile
)
os
.
rename
(
promise_tmp_file
,
promise_output_file
)
os
.
rename
(
promise_tmp_file
,
promise_output_file
)
def
_loadPromiseResult
(
self
,
promise_title
):
promise_output_file
=
os
.
path
.
join
(
self
.
promise_output_dir
,
"%s.status.json"
%
promise_title
)
result
=
None
if
os
.
path
.
exists
(
promise_output_file
):
with
open
(
promise_output_file
)
as
f
:
try
:
result
=
PromiseQueueResult
()
result
.
load
(
json
.
loads
(
f
.
read
()))
except
ValueError
,
e
:
result
=
None
self
.
logger
.
warn
(
'Bad promise JSON result at %r: %s'
%
(
promise_output_file
,
e
))
return
result
def
_launchPromise
(
self
,
promise_name
,
argument_dict
,
promise_module
=
None
):
def
_launchPromise
(
self
,
promise_name
,
argument_dict
,
promise_module
=
None
):
"""
"""
Launch the promise and save the result if `self.save_method` is not None
Launch the promise and save the result. If promise_module is None,
If no save method is set, raise PromiseError in case of failure
the promise will be run with the promise process wap module.
If the promise periodicity doesn't match, the previous promise result is
checked.
"""
"""
self
.
logger
.
info
(
"Checking promise %s..."
%
promise_name
)
try
:
try
:
if
promise_module
is
None
:
if
promise_module
is
None
:
promise_instance
=
WrapPromise
(
argument_dict
)
promise_instance
=
WrapPromise
(
argument_dict
)
else
:
else
:
promise_instance
=
promise_module
.
RunPromise
(
argument_dict
)
promise_instance
=
promise_module
.
RunPromise
(
argument_dict
)
if
not
self
.
force
and
not
promise_instance
.
isPeriodicityMatch
():
if
not
self
.
force
and
not
promise_instance
.
isPeriodicityMatch
():
result
=
self
.
_loadPromiseResult
(
promise_instance
.
getTitle
())
if
result
is
not
None
:
if
result
.
item
.
hasFailed
():
self
.
logger
.
error
(
result
.
item
.
message
)
return
True
return
False
return
False
promise_instance
.
setPromiseRunTimestamp
()
promise_instance
.
setPromiseRunTimestamp
()
except
Exception
:
except
Exception
:
...
@@ -268,7 +295,6 @@ class PromiseLauncher(object):
...
@@ -268,7 +295,6 @@ class PromiseLauncher(object):
logger
=
self
.
logger
logger
=
self
.
logger
)
)
self
.
logger
.
info
(
"Checking promise %s..."
%
promise_name
)
# set deamon to True, so promise process will be terminated if parent exit
# set deamon to True, so promise process will be terminated if parent exit
promise_process
.
daemon
=
True
promise_process
.
daemon
=
True
promise_process
.
start
()
promise_process
.
start
()
...
...
slapos/grid/promise/generic.py
View file @
0b479327
...
@@ -54,8 +54,8 @@ class BaseResult(object):
...
@@ -54,8 +54,8 @@ class BaseResult(object):
def
hasFailed
(
self
):
def
hasFailed
(
self
):
return
self
.
__problem
return
self
.
__problem
@
property
@
staticmethod
def
type
(
self
):
def
type
():
return
"Base Result"
return
"Base Result"
@
property
@
property
...
@@ -68,19 +68,20 @@ class BaseResult(object):
...
@@ -68,19 +68,20 @@ class BaseResult(object):
class
TestResult
(
BaseResult
):
class
TestResult
(
BaseResult
):
@
property
@
staticmethod
def
type
(
self
):
def
type
():
return
"Test Result"
return
"Test Result"
class
AnomalyResult
(
BaseResult
):
class
AnomalyResult
(
BaseResult
):
@
property
@
staticmethod
def
type
(
self
):
def
type
():
return
"Anomaly Result"
return
"Anomaly Result"
class
PromiseQueueResult
(
object
):
class
PromiseQueueResult
(
object
):
def
__init__
(
self
,
path
,
name
,
title
,
item
,
execution_time
=
0
):
def
__init__
(
self
,
path
=
None
,
name
=
None
,
title
=
None
,
item
=
None
,
execution_time
=
0
):
self
.
path
=
path
self
.
path
=
path
self
.
name
=
name
self
.
name
=
name
self
.
item
=
item
self
.
item
=
item
...
@@ -94,13 +95,32 @@ class PromiseQueueResult(object):
...
@@ -94,13 +95,32 @@ class PromiseQueueResult(object):
'path'
:
self
.
path
,
'path'
:
self
.
path
,
'execution-time'
:
self
.
execution_time
,
'execution-time'
:
self
.
execution_time
,
'result'
:
{
'result'
:
{
'type'
:
self
.
item
.
type
,
'type'
:
self
.
item
.
type
()
,
'failed'
:
self
.
item
.
hasFailed
(),
'failed'
:
self
.
item
.
hasFailed
(),
'date'
:
self
.
item
.
date
.
strftime
(
'%Y-%m-%dT%H:%M:%S'
),
'date'
:
self
.
item
.
date
.
strftime
(
'%Y-%m-%dT%H:%M:%S'
),
'message'
:
self
.
item
.
message
'message'
:
self
.
item
.
message
}
}
}
}
def
load
(
self
,
data
):
if
data
[
'result'
][
'type'
]
==
AnomalyResult
.
type
():
self
.
item
=
AnomalyResult
(
problem
=
data
[
'result'
][
'failed'
],
message
=
data
[
'result'
][
'message'
],
date
=
datetime
.
strptime
(
data
[
'result'
][
'date'
],
'%Y-%m-%dT%H:%M:%S'
))
elif
data
[
'result'
][
'type'
]
==
TestResult
.
type
():
self
.
item
=
TestResult
(
problem
=
data
[
'result'
][
'failed'
],
message
=
data
[
'result'
][
'message'
],
date
=
datetime
.
strptime
(
data
[
'result'
][
'date'
],
'%Y-%m-%dT%H:%M:%S'
))
else
:
raise
ValueError
(
'Unknown result type: %r'
%
data
[
'result'
][
'type'
])
self
.
title
=
data
[
'title'
]
self
.
name
=
data
[
'name'
]
self
.
path
=
data
[
'path'
]
self
.
execution_time
=
data
[
'execution-time'
]
class
GenericPromise
(
object
):
class
GenericPromise
(
object
):
# Abstract class
# Abstract class
...
...
slapos/tests/promise.py
View file @
0b479327
...
@@ -533,6 +533,112 @@ class RunPromise(GenericPromise):
...
@@ -533,6 +533,112 @@ class RunPromise(GenericPromise):
self
.
launcher
.
run
()
self
.
launcher
.
run
()
self
.
assertEquals
(
self
.
counter
,
2
)
self
.
assertEquals
(
self
.
counter
,
2
)
def
test_runpromise_with_periodicity_result_failed
(
self
):
first_promise
=
'my_first_promise.py'
second_promise
=
'my_second_promise.py'
first_state_file
=
os
.
path
.
join
(
self
.
partition_dir
,
PROMISE_RESULT_FOLDER_NAME
,
'my_first_promise.status.json'
)
second_state_file
=
os
.
path
.
join
(
self
.
partition_dir
,
PROMISE_RESULT_FOLDER_NAME
,
'my_second_promise.status.json'
)
self
.
configureLauncher
()
# ~2 seconds
self
.
generatePromiseScript
(
first_promise
,
success
=
True
,
periodicity
=
0.03
)
# ~3 seconds
self
.
generatePromiseScript
(
second_promise
,
success
=
False
,
periodicity
=
0.05
)
with
self
.
assertRaises
(
PromiseError
)
as
exc
:
self
.
launcher
.
run
()
self
.
assertEquals
(
exc
.
exception
.
message
,
'Promise %r failed.'
%
second_promise
)
self
.
assertTrue
(
os
.
path
.
exists
(
first_state_file
))
self
.
assertTrue
(
os
.
path
.
exists
(
second_state_file
))
first_result
=
json
.
load
(
open
(
first_state_file
))
second_result
=
json
.
load
(
open
(
second_state_file
))
self
.
assertEquals
(
first_result
[
'name'
],
first_promise
)
self
.
assertEquals
(
second_result
[
'name'
],
second_promise
)
first_date
=
first_result
[
'result'
][
'date'
]
second_date
=
second_result
[
'result'
][
'date'
]
self
.
configureLauncher
()
time
.
sleep
(
2
)
with
self
.
assertRaises
(
PromiseError
)
as
exc
:
self
.
launcher
.
run
()
# only my_first_promise will run but second_promise still failing
self
.
assertEquals
(
exc
.
exception
.
message
,
'Promise %r failed.'
%
second_promise
)
first_result
=
json
.
load
(
open
(
first_state_file
))
second_result
=
json
.
load
(
open
(
second_state_file
))
self
.
assertNotEquals
(
first_result
[
'result'
][
'date'
],
first_date
)
self
.
assertEquals
(
second_result
[
'result'
][
'date'
],
second_date
)
first_date
=
first_result
[
'result'
][
'date'
]
time
.
sleep
(
3
)
self
.
configureLauncher
()
with
self
.
assertRaises
(
PromiseError
)
as
exc
:
self
.
launcher
.
run
()
self
.
assertEquals
(
exc
.
exception
.
message
,
'Promise %r failed.'
%
second_promise
)
first_result
=
json
.
load
(
open
(
first_state_file
))
second_result
=
json
.
load
(
open
(
second_state_file
))
self
.
assertNotEquals
(
first_result
[
'result'
][
'date'
],
first_date
)
self
.
assertNotEquals
(
second_result
[
'result'
][
'date'
],
second_date
)
def
test_runpromise_with_periodicity_result_failed_and_ok
(
self
):
first_promise
=
'my_first_promise.py'
second_promise
=
'my_second_promise.py'
first_state_file
=
os
.
path
.
join
(
self
.
partition_dir
,
PROMISE_RESULT_FOLDER_NAME
,
'my_first_promise.status.json'
)
second_state_file
=
os
.
path
.
join
(
self
.
partition_dir
,
PROMISE_RESULT_FOLDER_NAME
,
'my_second_promise.status.json'
)
self
.
configureLauncher
()
# ~2 seconds
self
.
generatePromiseScript
(
first_promise
,
success
=
True
,
periodicity
=
0.03
)
# ~3 seconds
self
.
generatePromiseScript
(
second_promise
,
success
=
False
,
periodicity
=
0.05
)
with
self
.
assertRaises
(
PromiseError
)
as
exc
:
self
.
launcher
.
run
()
self
.
assertEquals
(
exc
.
exception
.
message
,
'Promise %r failed.'
%
second_promise
)
self
.
assertTrue
(
os
.
path
.
exists
(
first_state_file
))
self
.
assertTrue
(
os
.
path
.
exists
(
second_state_file
))
first_result
=
json
.
load
(
open
(
first_state_file
))
second_result
=
json
.
load
(
open
(
second_state_file
))
self
.
assertEquals
(
first_result
[
'name'
],
first_promise
)
self
.
assertEquals
(
second_result
[
'name'
],
second_promise
)
first_date
=
first_result
[
'result'
][
'date'
]
second_date
=
second_result
[
'result'
][
'date'
]
self
.
configureLauncher
()
time
.
sleep
(
2
)
with
self
.
assertRaises
(
PromiseError
)
as
exc
:
self
.
launcher
.
run
()
# only my_first_promise will run but second_promise still failing
self
.
assertEquals
(
exc
.
exception
.
message
,
'Promise %r failed.'
%
second_promise
)
first_result
=
json
.
load
(
open
(
first_state_file
))
second_result
=
json
.
load
(
open
(
second_state_file
))
self
.
assertNotEquals
(
first_result
[
'result'
][
'date'
],
first_date
)
self
.
assertEquals
(
second_result
[
'result'
][
'date'
],
second_date
)
first_date
=
first_result
[
'result'
][
'date'
]
second_date
=
second_result
[
'result'
][
'date'
]
time
.
sleep
(
4
)
if
"my_second_promise"
in
sys
.
modules
:
# force to reload the module without rerun python
os
.
system
(
'rm %s/*.pyc'
%
self
.
plugin_dir
)
del
sys
.
modules
[
"my_second_promise"
]
# second_promise is now success
self
.
generatePromiseScript
(
second_promise
,
success
=
True
,
periodicity
=
0.05
)
self
.
configureLauncher
()
self
.
launcher
.
run
()
# now all succeed
first_result
=
json
.
load
(
open
(
first_state_file
))
second_result
=
json
.
load
(
open
(
second_state_file
))
self
.
assertNotEquals
(
first_result
[
'result'
][
'date'
],
first_date
)
self
.
assertNotEquals
(
second_result
[
'result'
][
'date'
],
second_date
)
def
test_runpromise_force
(
self
):
def
test_runpromise_force
(
self
):
first_promise
=
'my_first_promise.py'
first_promise
=
'my_first_promise.py'
second_promise
=
'my_second_promise.py'
second_promise
=
'my_second_promise.py'
...
...
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