Skip to content

S
slapos.core
Commit cfd89054 authored by Łukasz Nowak's avatar Łukasz Nowak
Browse files
Options

Use searchAndActivate. 

Thanks to packet_size and activity_count it is possible to limit to one
small transaction per module.

Catalog can be used, as pervious step catalogs everything.
parent 186c8974
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 558 deletions
master/bt5/slapos_upgrader/SkinTemplateItem/portal_skins/slapos_upgrader/04_ERP5Site_deleteVifibAccounting.xml
View file @ cfd89054
......@@ -52,11 +52,11 @@
<key> <string>_body</string> </key>
<value> <string encoding="cdata"><![CDATA[
raise NotImplementedError(\'Use catalog\')\n
portal = context.getPortalObject()\n
tag = script.id\n
if portal.portal_activities.countMessageWithTag(tag) > 0:\n
raise TypeError(\'Already running\')\n
method_id = \'Base_deleteGrouped\'\n
for module in (\n
portal.accounting_module,\n
portal.internal_packing_list_module,\n
......@@ -67,20 +67,13 @@ for module in (\n
portal.sale_packing_list_module,\n
portal.sale_trade_condition_module,\n
):\n
method_id = \'Base_deleteGrouped_%s\' % module.getId()\n
module.recurseCallMethod(\n
method_id,\n
max_depth=1,\n
min_depth=1,\n
max_retry=0,\n
activity_count=20,\n
activate_kw={\n
\'tag\': tag,\n
\'group_method_id\': method_id,\n
\'group_method_cost\': 1./20, # fire up 20 jobs in same transaction\n
}\n
portal.portal_catalog.searchAndActivate(\n
parent_uid=module.getUid(),\n
method_id=method_id,\n
packet_size=20,\n
activity_count=1,\n
activate_kw={\'tag\': tag}\n
)\n
\n
return \'Done.\'\n
......
master/bt5/slapos_upgrader/SkinTemplateItem/portal_skins/slapos_upgrader/Base_deleteGrouped.xml
View file @ cfd89054
......@@ -62,17 +62,16 @@
\'sale_trade_condition_module/slapos_subscription_trade_condition\',\n
)\n
\n
for document in object_list:\n
document = document[0]\n
if document.getRelativeUrl() in BLACKLIST_RELATIVE_URL_LIST:\n
script.log(\'Not deleted blacklisted %s\' % document.getRelativeUrl())\n
continue\n
document.getParentValue().deleteContent(document.getId())\n
document = context\n
if document.getRelativeUrl() in BLACKLIST_RELATIVE_URL_LIST:\n
script.log(\'Not deleted blacklisted %s\' % document.getRelativeUrl())\n
return\n
document.getParentValue().deleteContent(document.getId())\n
</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>object_list</string> </value>
<value> <string></string> </value>
</item>
<item>
<key> <string>id</string> </key>
......
master/bt5/slapos_upgrader/SkinTemplateItem/portal_skins/slapos_upgrader/Base_deleteGrouped_accounting_module.xml deleted 100644 → 0
View file @ 186c8974
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<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>_body</string> </key>
<value> <string>context.Base_deleteGrouped(object_list)\n
</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>object_list</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Base_deleteGrouped_accounting_module</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_upgrader/SkinTemplateItem/portal_skins/slapos_upgrader/Base_deleteGrouped_internal_packing_list_module.xml deleted 100644 → 0
View file @ 186c8974
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<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>_body</string> </key>
<value> <string>context.Base_deleteGrouped(object_list)\n
</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>object_list</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Base_deleteGrouped_internal_packing_list_module</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_upgrader/SkinTemplateItem/portal_skins/slapos_upgrader/Base_deleteGrouped_open_sale_order_module.xml deleted 100644 → 0
View file @ 186c8974
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<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>_body</string> </key>
<value> <string>context.Base_deleteGrouped(object_list)\n
</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>object_list</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Base_deleteGrouped_open_sale_order_module</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_upgrader/SkinTemplateItem/portal_skins/slapos_upgrader/Base_deleteGrouped_portal_simulation.xml deleted 100644 → 0
View file @ 186c8974
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<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>_body</string> </key>
<value> <string>context.Base_deleteGrouped(object_list)\n
</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>object_list</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Base_deleteGrouped_portal_simulation</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_upgrader/SkinTemplateItem/portal_skins/slapos_upgrader/Base_deleteGrouped_purchase_packing_list_module.xml deleted 100644 → 0
View file @ 186c8974
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<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>_body</string> </key>
<value> <string>context.Base_deleteGrouped(object_list)\n
</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>object_list</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Base_deleteGrouped_purchase_packing_list_module</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_upgrader/SkinTemplateItem/portal_skins/slapos_upgrader/Base_deleteGrouped_sale_order_module.xml deleted 100644 → 0
View file @ 186c8974
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<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>_body</string> </key>
<value> <string>context.Base_deleteGrouped(object_list)\n
</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>object_list</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Base_deleteGrouped_sale_order_module</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_upgrader/SkinTemplateItem/portal_skins/slapos_upgrader/Base_deleteGrouped_sale_packing_list_module.xml deleted 100644 → 0
View file @ 186c8974
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<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>_body</string> </key>
<value> <string>context.Base_deleteGrouped(object_list)\n
</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>object_list</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Base_deleteGrouped_sale_packing_list_module</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_upgrader/SkinTemplateItem/portal_skins/slapos_upgrader/Base_deleteGrouped_sale_trade_condition_module.xml deleted 100644 → 0
View file @ 186c8974
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<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>_body</string> </key>
<value> <string>context.Base_deleteGrouped(object_list)\n
</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>object_list</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Base_deleteGrouped_sale_trade_condition_module</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_upgrader/bt/revision
View file @ cfd89054
38
\ No newline at end of file
39
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7