Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5-Boxiang
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
Hamza
erp5-Boxiang
Commits
65520be5
Commit
65520be5
authored
Aug 27, 2013
by
Benjamin Blanc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
testnode: deleting instances: remove only non-destroyed instances + comments
parent
27265c83
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
9 deletions
+15
-9
erp5/util/testnode/ScalabilityTestRunner.py
erp5/util/testnode/ScalabilityTestRunner.py
+15
-9
No files found.
erp5/util/testnode/ScalabilityTestRunner.py
View file @
65520be5
...
...
@@ -431,14 +431,19 @@ late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),))
def
_cleanUpOldInstance
(
self
):
self
.
log
(
"_cleanUpOldInstance"
)
# Get
link list of instances to delete
# Get
title and link list of all instances
instance_dict
=
self
.
slapos_communicator
.
getHostingSubscriptionDict
()
instance_to_delete_list
=
[]
outdated_date
=
datetime
.
fromtimestamp
(
time
.
time
())
-
timedelta
(
days
=
2
)
# Select instances to delete
for
title
,
link
in
instance_dict
.
items
():
# Instances created by testnode contains "Scalability-" and
# "timestamp=" in the title.
if
"Scalability-"
in
title
and
"timestamp="
in
title
:
# Get timestamp of the instance creation date
foo
,
timestamp
=
title
.
split
(
"timestamp="
)
creation_date
=
datetime
.
fromtimestamp
(
timestamp
)
# Test if instance is older than the limit
if
creation_date
<
outdated_date
:
instance_to_delete_list
.
append
((
title
,
link
))
...
...
@@ -447,14 +452,15 @@ late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),))
instance_information_dict
=
self
.
slapos_communicator
.
getHostingSubscriptionInformation
(
link
)
# Delete instance
if
instance_information_dict
:
self
.
slapos_controler
.
request
(
instance_information_dict
[
'title'
],
instance_information_dict
[
'software_url'
],
software_type
=
instance_information_dict
[
'software_type'
],
computer_guid
=
instance_information_dict
[
'computer_guid'
],
state
=
'destroyed'
)
self
.
log
(
"Instance '%s' deleted."
%
instance_information_dict
[
'title'
])
if
instance_information_dict
[
'status'
]
!=
'destroyed'
:
self
.
slapos_controler
.
request
(
instance_information_dict
[
'title'
],
instance_information_dict
[
'software_url'
],
software_type
=
instance_information_dict
[
'software_type'
],
computer_guid
=
instance_information_dict
[
'computer_guid'
],
state
=
'destroyed'
)
self
.
log
(
"Instance '%s' deleted."
%
instance_information_dict
[
'title'
])
def
_cleanUpNodesInformation
(
self
):
self
.
involved_nodes_computer_guid
=
[]
...
...
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