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
Paul Graydon
slapos.core
Commits
0f7c8d44
Commit
0f7c8d44
authored
Jun 13, 2024
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_cloud: speed up Instance's deletion
parent
6b35e83b
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
163 additions
and
5 deletions
+163
-5
master/bt5/slapos_cloud/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
...rtalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
+1
-1
master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.testSlapOSCloudAlarm.py
...eItem/portal_components/test.erp5.testSlapOSCloudAlarm.py
+8
-4
master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/slapos_cloud_interaction_workflow/interaction_InstanceTree_archive.xml
...interaction_workflow/interaction_InstanceTree_archive.xml
+74
-0
master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/slapos_cloud_interaction_workflow/script_Instance_triggerGarbageCollectDestroyedRootTreeAlarm.py
...t_Instance_triggerGarbageCollectDestroyedRootTreeAlarm.py
+1
-0
master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/slapos_cloud_interaction_workflow/script_Instance_triggerGarbageCollectDestroyedRootTreeAlarm.xml
..._Instance_triggerGarbageCollectDestroyedRootTreeAlarm.xml
+78
-0
master/bt5/slapos_cloud/bt/template_portal_type_workflow_chain_list
.../slapos_cloud/bt/template_portal_type_workflow_chain_list
+1
-0
No files found.
master/bt5/slapos_cloud/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
View file @
0f7c8d44
...
@@ -33,7 +33,7 @@
...
@@ -33,7 +33,7 @@
</chain>
</chain>
<chain>
<chain>
<type>
Instance Tree
</type>
<type>
Instance Tree
</type>
<workflow>
edit_workflow, instance_slap_interface_workflow, instance_tree_workflow
</workflow>
<workflow>
edit_workflow, instance_slap_interface_workflow, instance_tree_workflow
, slapos_cloud_interaction_workflow
</workflow>
</chain>
</chain>
<chain>
<chain>
<type>
One Time Virtual Master Access Token
</type>
<type>
One Time Virtual Master Access Token
</type>
...
...
master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.testSlapOSCloudAlarm.py
View file @
0f7c8d44
...
@@ -394,7 +394,8 @@ class TestSlapOSGarbageCollectDestroyedRootTreeAlarm(SlapOSTestCaseMixin):
...
@@ -394,7 +394,8 @@ class TestSlapOSGarbageCollectDestroyedRootTreeAlarm(SlapOSTestCaseMixin):
self
.
assertEqual
(
'validated'
,
self
.
assertEqual
(
'validated'
,
software_instance
.
getValidationState
())
software_instance
.
getValidationState
())
self
.
tic
()
with
TemporaryAlarmScript
(
self
.
portal
,
'SoftwareInstance_tryToGarbageCollect'
,
"'subscribed'"
):
self
.
tic
()
software_instance
.
SoftwareInstance_tryToGarbageCollect
()
software_instance
.
SoftwareInstance_tryToGarbageCollect
()
self
.
assertEqual
(
'destroy_requested'
,
self
.
assertEqual
(
'destroy_requested'
,
...
@@ -408,7 +409,8 @@ class TestSlapOSGarbageCollectDestroyedRootTreeAlarm(SlapOSTestCaseMixin):
...
@@ -408,7 +409,8 @@ class TestSlapOSGarbageCollectDestroyedRootTreeAlarm(SlapOSTestCaseMixin):
instance_tree
.
archive
()
instance_tree
.
archive
()
self
.
tic
()
with
TemporaryAlarmScript
(
self
.
portal
,
'SoftwareInstance_tryToGarbageCollect'
,
"'subscribed'"
):
self
.
tic
()
software_instance
.
SoftwareInstance_tryToGarbageCollect
()
software_instance
.
SoftwareInstance_tryToGarbageCollect
()
self
.
assertEqual
(
'start_requested'
,
self
.
assertEqual
(
'start_requested'
,
...
@@ -422,7 +424,8 @@ class TestSlapOSGarbageCollectDestroyedRootTreeAlarm(SlapOSTestCaseMixin):
...
@@ -422,7 +424,8 @@ class TestSlapOSGarbageCollectDestroyedRootTreeAlarm(SlapOSTestCaseMixin):
self
.
portal
.
portal_workflow
.
_jumpToStateFor
(
instance_tree
,
self
.
portal
.
portal_workflow
.
_jumpToStateFor
(
instance_tree
,
'destroy_requested'
)
'destroy_requested'
)
self
.
tic
()
with
TemporaryAlarmScript
(
self
.
portal
,
'SoftwareInstance_tryToGarbageCollect'
,
"'subscribed'"
):
self
.
tic
()
software_instance
.
SoftwareInstance_tryToGarbageCollect
()
software_instance
.
SoftwareInstance_tryToGarbageCollect
()
self
.
assertEqual
(
'start_requested'
,
self
.
assertEqual
(
'start_requested'
,
software_instance
.
getSlapState
())
software_instance
.
getSlapState
())
...
@@ -438,7 +441,8 @@ class TestSlapOSGarbageCollectDestroyedRootTreeAlarm(SlapOSTestCaseMixin):
...
@@ -438,7 +441,8 @@ class TestSlapOSGarbageCollectDestroyedRootTreeAlarm(SlapOSTestCaseMixin):
self
.
portal
.
portal_workflow
.
_jumpToStateFor
(
instance_tree
,
self
.
portal
.
portal_workflow
.
_jumpToStateFor
(
instance_tree
,
'destroy_requested'
)
'destroy_requested'
)
self
.
tic
()
with
TemporaryAlarmScript
(
self
.
portal
,
'SoftwareInstance_tryToGarbageCollect'
,
"'subscribed'"
):
self
.
tic
()
software_instance
.
SoftwareInstance_tryToGarbageCollect
()
software_instance
.
SoftwareInstance_tryToGarbageCollect
()
self
.
assertEqual
(
'destroy_requested'
,
self
.
assertEqual
(
'destroy_requested'
,
...
...
master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/slapos_cloud_interaction_workflow/interaction_InstanceTree_archive.xml
0 → 100644
View file @
0f7c8d44
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"Interaction Workflow Interaction"
module=
"erp5.portal_type"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
categories
</string>
</key>
<value>
<tuple>
<string>
after_script/portal_workflow/slapos_cloud_interaction_workflow/script_Instance_triggerGarbageCollectDestroyedRootTreeAlarm
</string>
</tuple>
</value>
</item>
<item>
<key>
<string>
description
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
interaction_InstanceTree_archive
</string>
</value>
</item>
<item>
<key>
<string>
portal_type
</string>
</key>
<value>
<string>
Interaction Workflow Interaction
</string>
</value>
</item>
<item>
<key>
<string>
portal_type_filter
</string>
</key>
<value>
<tuple>
<string>
Instance Tree
</string>
</tuple>
</value>
</item>
<item>
<key>
<string>
portal_type_group_filter
</string>
</key>
<value>
<tuple/>
</value>
</item>
<item>
<key>
<string>
temporary_document_disallowed
</string>
</key>
<value>
<int>
1
</int>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<key>
<string>
trigger_method_id
</string>
</key>
<value>
<tuple>
<string>
archive
</string>
</tuple>
</value>
</item>
<item>
<key>
<string>
trigger_once_per_transaction
</string>
</key>
<value>
<int>
0
</int>
</value>
</item>
<item>
<key>
<string>
trigger_type
</string>
</key>
<value>
<int>
2
</int>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/slapos_cloud_interaction_workflow/script_Instance_triggerGarbageCollectDestroyedRootTreeAlarm.py
0 → 100644
View file @
0f7c8d44
return
state_change
[
'object'
].
Base_reindexAndSenseAlarm
([
'slapos_garbage_collect_destroyed_root_tree'
])
master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/slapos_cloud_interaction_workflow/script_Instance_triggerGarbageCollectDestroyedRootTreeAlarm.xml
0 → 100644
View file @
0f7c8d44
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"Workflow Script"
module=
"erp5.portal_type"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_bind_names
</string>
</key>
<value>
<object>
<klass>
<global
name=
"_reconstructor"
module=
"copy_reg"
/>
</klass>
<tuple>
<global
name=
"NameAssignments"
module=
"Shared.DC.Scripts.Bindings"
/>
<global
name=
"object"
module=
"__builtin__"
/>
<none/>
</tuple>
<state>
<dictionary>
<item>
<key>
<string>
_asgns
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
name_container
</string>
</key>
<value>
<string>
container
</string>
</value>
</item>
<item>
<key>
<string>
name_context
</string>
</key>
<value>
<string>
context
</string>
</value>
</item>
<item>
<key>
<string>
name_m_self
</string>
</key>
<value>
<string>
script
</string>
</value>
</item>
<item>
<key>
<string>
name_subpath
</string>
</key>
<value>
<string>
traverse_subpath
</string>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key>
<string>
_params
</string>
</key>
<value>
<string>
state_change
</string>
</value>
</item>
<item>
<key>
<string>
description
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
script_Instance_triggerGarbageCollectDestroyedRootTreeAlarm
</string>
</value>
</item>
<item>
<key>
<string>
portal_type
</string>
</key>
<value>
<string>
Workflow Script
</string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<none/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_cloud/bt/template_portal_type_workflow_chain_list
View file @
0f7c8d44
...
@@ -19,6 +19,7 @@ Instance Node | validation_workflow
...
@@ -19,6 +19,7 @@ Instance Node | validation_workflow
Instance Tree | edit_workflow
Instance Tree | edit_workflow
Instance Tree | instance_slap_interface_workflow
Instance Tree | instance_slap_interface_workflow
Instance Tree | instance_tree_workflow
Instance Tree | instance_tree_workflow
Instance Tree | slapos_cloud_interaction_workflow
One Time Virtual Master Access Token | edit_workflow
One Time Virtual Master Access Token | edit_workflow
One Time Virtual Master Access Token | validation_workflow
One Time Virtual Master Access Token | validation_workflow
Person | person_slap_interface_workflow
Person | person_slap_interface_workflow
...
...
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