Adjust priority and defaults of disaster recovery

See merge request nexedi/slapos.core!541

master/bt5/slapos_erp5/SkinTemplateItem/portal_skins/slapos_administration/ERP5Site_adjustProductionClone.py

-"""
-  General setup actions to adjust the clone after copy and restore data from 
-  clone.
-"""
-
-## Install erp5_ui_test_core and setup DummyMailHost to prevent to send emails
-# Make sure repository is ok.
-context.Alarm_installPromiseTemplateTool()
-
-bt5_list = ['erp5_ui_test_core', ]
-
-template_tool = context.getPortalObject().portal_templates
-template_tool.upgradeSite(bt5_list, delete_orphaned=False, dry_run=False)
-
-context.getPortalObject().ERP5Site_setupDummyMailHost()
-
-# Finished to setup DummyMailHost

master/bt5/slapos_erp5/SkinTemplateItem/portal_skins/slapos_administration/ERP5Site_adjustProductionClone.xml

-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-    </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></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>ERP5Site_adjustProductionClone</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>

master/bt5/slapos_erp5/SkinTemplateItem/portal_skins/slapos_disaster_recovery/ERP5Site_checkDeletedDocumentList.py

@@ -9,7 +9,7 @@ result_count = len(document_list)
 
 if result_count:
   if result_count == limit:
-    portal.portal_activities.activate(activity='SQLQueue').ERP5Site_checkDeletedDocumentList(document_list[-1].uid, limit, packet_size)
+    portal.portal_activities.activate(activity='SQLQueue', priority=3).ERP5Site_checkDeletedDocumentList(document_list[-1].uid, limit, packet_size)
 
   column_list = [(x.path, x.uid) for x in document_list]
   for i in xrange(0, result_count, packet_size):

master/bt5/slapos_erp5/SkinTemplateItem/portal_skins/slapos_disaster_recovery/ERP5Site_checkLatestModifiedDocumentList.py

@@ -12,7 +12,7 @@ result_count = len(document_list)
 
 if result_count:
   if result_count == limit:
-    portal.portal_activities.activate(activity='SQLQueue').ERP5Site_checkLatestModifiedDocumentList(document_list[-1].uid, limit, packet_size, before, now)
+    portal.portal_activities.activate(activity='SQLQueue', priority=3).ERP5Site_checkLatestModifiedDocumentList(document_list[-1].uid, limit, packet_size, before, now)
 
   column_list = [(x.path, x.uid) for x in document_list]
   for i in xrange(0, result_count, packet_size):

master/bt5/slapos_erp5/SkinTemplateItem/portal_skins/slapos_disaster_recovery/ERP5Site_recoverFromRestoration.py

 portal = context.getPortalObject()
 
 now = DateTime()
-before = now - int(7)
+before = now - int(days_before)
 
 strfstring = '%Y-%m-%d %H:%M:%S'
 

master/bt5/slapos_erp5/SkinTemplateItem/portal_skins/slapos_disaster_recovery/ERP5Site_recoverFromRestoration.xml

@@ -50,7 +50,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>optimistic=True</string> </value>
+            <value> <string>optimistic=True, days_before=1</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>

master/bt5/slapos_erp5/TestTemplateItem/portal_components/test.erp5.testSlapOSCodingStyle.py

@@ -267,7 +267,6 @@ def makeTestSlapOSCodingStyleTestCase(tested_business_template):
         'slapos_administration/ActivityTool_zGetDateForSQLDictMessage',
         'slapos_administration/ActivityTool_zGetDateForSQLQueueMessage',
         'slapos_administration/Base_checkStoredBrokenState',
-        'slapos_administration/ERP5Site_adjustProductionClone',
         'slapos_administration/ERP5Site_cleanUnusedSecurityUid',
         'slapos_administration/ERP5Site_getSecurityUidStat',
         'slapos_administration/ERP5Site_updateAllLocalRolesOnSecurityGroupsForSlapOS',