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
Ivan Tyagov
slapos.core
Commits
7609fc7a
Commit
7609fc7a
authored
Sep 19, 2012
by
Cédric Le Ninivin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add periodicity in proceeding instance
parent
36760a77
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
31 additions
and
4 deletions
+31
-4
slapos/grid/slapgrid.py
slapos/grid/slapgrid.py
+31
-4
No files found.
slapos/grid/slapgrid.py
View file @
7609fc7a
...
@@ -107,6 +107,8 @@ def parseArgumentTupleAndReturnSlapgridObject(*argument_tuple):
...
@@ -107,6 +107,8 @@ def parseArgumentTupleAndReturnSlapgridObject(*argument_tuple):
help
=
"Enables console output and live output from subcommands."
)
help
=
"Enables console output and live output from subcommands."
)
parser
.
add_argument
(
"-v"
,
"--verbose"
,
action
=
"store_true"
,
default
=
False
,
parser
.
add_argument
(
"-v"
,
"--verbose"
,
action
=
"store_true"
,
default
=
False
,
help
=
"Be verbose."
)
help
=
"Be verbose."
)
parser
.
add_argument
(
"--maximum-periodicity"
,
type
=
int
,
default
=
None
,
help
=
"Periodicity at which buildout should be run in instance."
)
parser
.
add_argument
(
"--promise-timeout"
,
type
=
int
,
default
=
3
,
parser
.
add_argument
(
"--promise-timeout"
,
type
=
int
,
default
=
3
,
help
=
"Promise timeout in seconds."
)
help
=
"Promise timeout in seconds."
)
parser
.
add_argument
(
"configuration_file"
,
nargs
=
1
,
type
=
argparse
.
FileType
(),
parser
.
add_argument
(
"configuration_file"
,
nargs
=
1
,
type
=
argparse
.
FileType
(),
...
@@ -170,6 +172,9 @@ def parseArgumentTupleAndReturnSlapgridObject(*argument_tuple):
...
@@ -170,6 +172,9 @@ def parseArgumentTupleAndReturnSlapgridObject(*argument_tuple):
if
option_dict
.
get
(
'all'
)
is
True
:
if
option_dict
.
get
(
'all'
)
is
True
:
option_dict
[
'develop'
]
=
True
option_dict
[
'develop'
]
=
True
if
option_dict
.
get
(
'maximum_periodicity'
)
is
not
None
:
option_dict
[
'force_periodicity'
]
=
True
repository_required
=
False
repository_required
=
False
if
'key_file'
in
option_dict
:
if
'key_file'
in
option_dict
:
repository_required
=
True
repository_required
=
True
...
@@ -232,6 +237,7 @@ def parseArgumentTupleAndReturnSlapgridObject(*argument_tuple):
...
@@ -232,6 +237,7 @@ def parseArgumentTupleAndReturnSlapgridObject(*argument_tuple):
else
:
else
:
signature_certificate_list
=
None
signature_certificate_list
=
None
# Parse cache / binary options
# Parse cache / binary options
option_dict
[
"binary-cache-url-blacklist"
]
=
[
option_dict
[
"binary-cache-url-blacklist"
]
=
[
url
.
strip
()
for
url
in
option_dict
.
get
(
"binary-cache-url-blacklist"
,
""
url
.
strip
()
for
url
in
option_dict
.
get
(
"binary-cache-url-blacklist"
,
""
...
@@ -285,6 +291,8 @@ def parseArgumentTupleAndReturnSlapgridObject(*argument_tuple):
...
@@ -285,6 +291,8 @@ def parseArgumentTupleAndReturnSlapgridObject(*argument_tuple):
develop
=
option_dict
.
get
(
'develop'
,
False
),
develop
=
option_dict
.
get
(
'develop'
,
False
),
software_release_filter_list
=
option_dict
.
get
(
'only_sr'
,
None
),
software_release_filter_list
=
option_dict
.
get
(
'only_sr'
,
None
),
computer_partition_filter_list
=
option_dict
.
get
(
'only_cp'
,
None
),
computer_partition_filter_list
=
option_dict
.
get
(
'only_cp'
,
None
),
force_periodicity
=
option_dict
.
get
(
'force_periodicity'
,
False
),
maximum_periodicity
=
option_dict
.
get
(
'maximum_periodicity'
,
86400
),
),
),
option_dict
])
option_dict
])
...
@@ -353,6 +361,8 @@ class Slapgrid(object):
...
@@ -353,6 +361,8 @@ class Slapgrid(object):
supervisord_socket
,
supervisord_socket
,
supervisord_configuration_path
,
supervisord_configuration_path
,
buildout
,
buildout
,
force_periodicity
=
False
,
maximum_periodicity
=
86400
,
key_file
=
None
,
key_file
=
None
,
cert_file
=
None
,
cert_file
=
None
,
signature_private_key_file
=
None
,
signature_private_key_file
=
None
,
...
@@ -374,7 +384,8 @@ class Slapgrid(object):
...
@@ -374,7 +384,8 @@ class Slapgrid(object):
shadir_key_file
=
None
,
shadir_key_file
=
None
,
develop
=
False
,
develop
=
False
,
software_release_filter_list
=
None
,
software_release_filter_list
=
None
,
computer_partition_filter_list
=
None
):
computer_partition_filter_list
=
None
,
):
"""Makes easy initialisation of class parameters"""
"""Makes easy initialisation of class parameters"""
# Parses arguments
# Parses arguments
self
.
software_root
=
os
.
path
.
abspath
(
software_root
)
self
.
software_root
=
os
.
path
.
abspath
(
software_root
)
...
@@ -424,6 +435,8 @@ class Slapgrid(object):
...
@@ -424,6 +435,8 @@ class Slapgrid(object):
if
computer_partition_filter_list
is
not
None
:
if
computer_partition_filter_list
is
not
None
:
self
.
computer_partition_filter_list
=
\
self
.
computer_partition_filter_list
=
\
computer_partition_filter_list
.
split
(
","
)
computer_partition_filter_list
.
split
(
","
)
self
.
maximum_periodicity
=
maximum_periodicity
self
.
force_periodicity
=
force_periodicity
def
checkEnvironmentAndCreateStructure
(
self
):
def
checkEnvironmentAndCreateStructure
(
self
):
"""Checks for software_root and instance_root existence, then creates
"""Checks for software_root and instance_root existence, then creates
...
@@ -634,22 +647,36 @@ class Slapgrid(object):
...
@@ -634,22 +647,36 @@ class Slapgrid(object):
else
:
else
:
timestamp
=
None
timestamp
=
None
software_path
=
os
.
path
.
join
(
self
.
software_root
,
getSoftwareUrlHash
(
software_url
))
# Get periodicity from periodicity file if not forced
if
not
self
.
force_periodicity
:
periodicity_path
=
os
.
path
.
join
(
software_path
,
'periodicity'
)
if
os
.
path
.
exists
(
periodicity_path
):
try
:
self
.
maximum_periodicity
=
int
(
open
(
periodicity_path
).
read
())
except
ValueError
:
os
.
remove
(
periodicity_path
)
exception
=
traceback
.
format_exc
()
logger
.
error
(
exception
)
# Check if timestamp from server is more recent than local one.
# Check if timestamp from server is more recent than local one.
# If not: it's not worth processing this partition (nothing has changed).
# If not: it's not worth processing this partition (nothing has changed).
if
computer_partition_id
not
in
self
.
computer_partition_filter_list
and
\
if
computer_partition_id
not
in
self
.
computer_partition_filter_list
and
\
(
not
self
.
develop
)
and
os
.
path
.
exists
(
timestamp_path
):
(
not
self
.
develop
)
and
os
.
path
.
exists
(
timestamp_path
):
old_timestamp
=
open
(
timestamp_path
).
read
()
old_timestamp
=
open
(
timestamp_path
).
read
()
last_runtime
=
int
(
os
.
path
.
getmtime
(
timestamp_path
))
if
timestamp
:
if
timestamp
:
try
:
try
:
if
int
(
timestamp
)
<=
int
(
old_timestamp
):
if
int
(
timestamp
)
<=
int
(
old_timestamp
):
if
int
(
time
.
time
())
<=
(
last_runtime
+
self
.
maximum_periodicity
)
:
continue
continue
except
ValueError
:
except
ValueError
:
os
.
remove
(
timestamp_path
)
os
.
remove
(
timestamp_path
)
exception
=
traceback
.
format_exc
()
exception
=
traceback
.
format_exc
()
logger
.
error
(
exception
)
logger
.
error
(
exception
)
software_path
=
os
.
path
.
join
(
self
.
software_root
,
getSoftwareUrlHash
(
software_url
))
local_partition
=
Partition
(
local_partition
=
Partition
(
software_path
=
software_path
,
software_path
=
software_path
,
instance_path
=
instance_path
,
instance_path
=
instance_path
,
...
...
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