slapos_upgrader: reduce concurrency on instance tree creation

master/bt5/slapos_upgrader/SkinTemplateItem/portal_skins/slapos_upgrader/Base_triggerFullSiteMigrationToVirtualMasterStep3.py

@@ -34,6 +34,7 @@ portal.portal_catalog.searchAndActivate(
 ############################################
 portal.portal_catalog.searchAndActivate(
   method_id='InstanceTree_fixupSiteMigrationToVirtualMaster',
+  method_kw={'tag': tag},
   activate_kw={'tag': tag, 'priority': 1},
 
   portal_type="Instance Tree",

master/bt5/slapos_upgrader/SkinTemplateItem/portal_skins/slapos_upgrader/InstanceTree_fixupSiteMigrationToVirtualMaster.py

@@ -25,4 +25,8 @@ for sql_result in portal.portal_catalog(specialise__uid=instance_tree.getUid()):
 
 if not is_consistent:
   for instance_virtual_master_relative_url in remote_virtual_master_dict:
-    instance_tree_virtual_master.Project_checkSiteMigrationCreateRemoteNode(instance_virtual_master_relative_url, remote_virtual_master_dict[instance_virtual_master_relative_url])
+    instance_tree_virtual_master.Project_checkSiteMigrationCreateRemoteNode(
+      instance_virtual_master_relative_url,
+      remote_virtual_master_dict[instance_virtual_master_relative_url],
+      activate_kw={'tag': tag, 'serialization_tag': tag, 'limit': 1}
+    )

master/bt5/slapos_upgrader/SkinTemplateItem/portal_skins/slapos_upgrader/InstanceTree_fixupSiteMigrationToVirtualMaster.xml

@@ -50,7 +50,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>REQUEST=None</string> </value>
+            <value> <string>tag=None, REQUEST=None</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>

master/bt5/slapos_upgrader/SkinTemplateItem/portal_skins/slapos_upgrader/Project_checkSiteMigrationCreateRemoteNode.py

@@ -58,4 +58,4 @@ if remote_node is None:
 # XXX Then, migrate other documents linked to the virtual master
 for relative_url_to_migrate in relative_url_to_migrate_list:
   object_to_migrate = portal.restrictedTraverse(relative_url_to_migrate)
-  object_to_migrate.activate().Instance_activateMigrationToRemoteProject(remote_node.getRelativeUrl())
+  object_to_migrate.activate(**activate_kw).Instance_activateMigrationToRemoteProject(remote_node.getRelativeUrl())

master/bt5/slapos_upgrader/SkinTemplateItem/portal_skins/slapos_upgrader/Project_checkSiteMigrationCreateRemoteNode.xml

@@ -50,7 +50,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>remote_project_relative_url, relative_url_to_migrate_list, REQUEST=None, tag=None, *args, **kw</string> </value>
+            <value> <string>remote_project_relative_url, relative_url_to_migrate_list, REQUEST=None, tag=None, activate_kw=None, *args, **kw</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>