slapos_cloud: reduce the number of alarm calls

master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Base_reindexAndSenseAlarm.py

+from zExceptions import Unauthorized
+if REQUEST is not None:
+  raise Unauthorized
+
 portal = context.getPortalObject()
 alarm_tool = portal.portal_alarms
 
 # Higher than simulable movement priority
-PRIORITY = 4
+# priority=3, to be executed after all reindex, but also execute simulation _expand
+PRIORITY = 3
 
 if alarm_tool.isSubscribed() and len(alarm_id_list):
   # No alarm tool is not subscribed, respect this choice and do not activate any alarm
@@ -14,6 +19,8 @@ if alarm_tool.isSubscribed() and len(alarm_id_list):
 
   for alarm_id in alarm_id_list:
     alarm = alarm_tool.restrictedTraverse(alarm_id)
+    deduplication_tag = 'Base_reindexAndSenseAlarm_%s' % alarm_id
+
     if alarm.isEnabled():
       # do nothing if the alarm is not enabled
 
@@ -21,24 +28,28 @@ if alarm_tool.isSubscribed() and len(alarm_id_list):
         activate_kw = {}
         activate_kw['activity'] = 'SQLQueue'
         activate_kw['after_tag'] = tag
-        # Wait for the previous alarm run to be finished
-        context.activate(**activate_kw).Base_reindexAndSenseAlarm([alarm_id],
-                                                                  must_reindex_context=False)
-      elif alarm.isActive():
-        activate_kw = {}
-        activate_kw['priority'] = PRIORITY
-        activate_kw['after_path_and_method_id'] = (alarm.getPath(), 'getId')
-        # Wait for the previous alarm run to be finished
-        # call on alarm tool to gather and drop with sqldict
+        activate_kw['tag'] = deduplication_tag
+        activate_kw['priority'] = max(1, PRIORITY-1)
+        # Wait for the context indexation to be finished
         alarm_tool.activate(**activate_kw).Base_reindexAndSenseAlarm([alarm_id],
                                                                      must_reindex_context=False)
-      else:
-        # Do not call directly call activeSense, because in case of concurrency,
-        # it will trigger the alarm multiple time in parallel
-        # Wait for the previous alarm run to be finished
-        # wait for the context to be reindexed before activating the alarm
-        # ROMAIN: getId is used, because most alarm script ends with an getId activity
-        # priority=3, to be executed after all reindex, but also execute simulation _expand
-        alarm.activate(priority=PRIORITY).activeSense()
-        # Prevent 2 nodes to call activateSense concurrently
-        alarm.serialize()
+
+      elif portal.portal_activities.countMessageWithTag(deduplication_tag) <= 1:
+        if alarm.isActive():
+          # If the alarm is active, wait for it
+          # and try to reduce the number of activities
+          # to reduce the number of alarm execution
+          activate_kw = {}
+          activate_kw['activity'] = 'SQLQueue'
+          activate_kw['priority'] = PRIORITY
+          activate_kw['tag'] = deduplication_tag
+          activate_kw['after_path'] = alarm.getPath()
+          # Wait for the previous alarm run to be finished
+          # call on alarm tool to gather and drop with sqldict
+          alarm_tool.activate(**activate_kw).Base_reindexAndSenseAlarm([alarm_id],
+                                                                       must_reindex_context=False)
+        else:
+          # activeSense create an activity in SQLDict
+          alarm.activeSense()
+          # Prevent 2 nodes to call activateSense concurrently
+          alarm.serialize()

master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Base_reindexAndSenseAlarm.xml

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

master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.testSlapOSCloudSkins.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Test Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>testSlapOSCloudSkins</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>test.erp5.testSlapOSCloudSkins</string> </value>
+        </item>
+        <item>
+            <key> <string>language</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Test Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_error_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_warning_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
+              <list>
+                <dictionary>
+                  <item>
+                      <key> <string>action</string> </key>
+                      <value> <string>validate</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>validation_state</string> </key>
+                      <value> <string>validated</string> </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

master/bt5/slapos_cloud/bt/template_test_id_list

-test.erp5.testSlapOSCloudAlarm
+test.erp5.SlapOSTestCaseDefaultScenarioMixin
+test.erp5.SlapOSTestCaseMixin
 test.erp5.testSlapOSAllocationSupply
+test.erp5.testSlapOSCloud
+test.erp5.testSlapOSCloudAlarm
 test.erp5.testSlapOSCloudAllocationAlarm
+test.erp5.testSlapOSCloudComputeNodeSlapInterfaceWorkflow
 test.erp5.testSlapOSCloudComputePartitionSlapInterfaceWorkflow
+test.erp5.testSlapOSCloudConstraint
+test.erp5.testSlapOSCloudInstanceSlapInterfaceWorkflow
 test.erp5.testSlapOSCloudInteractionWorkflow
-test.erp5.testSlapOSCloudPersonSlapInterfaceWorkflow
 test.erp5.testSlapOSCloudNetworkSlapInterfaceWorkflow
-test.erp5.testSlapOSCloudComputeNodeSlapInterfaceWorkflow
-test.erp5.testSlapOSCloudInstanceSlapInterfaceWorkflow
+test.erp5.testSlapOSCloudPersonSlapInterfaceWorkflow
 test.erp5.testSlapOSCloudProjectSlapInterfaceWorkflow
 test.erp5.testSlapOSCloudSecurityGroup
-test.erp5.testSlapOSCloudConstraint
-test.erp5.testSlapOSCloudUpgrader
 test.erp5.testSlapOSCloudShadow
-test.erp5.SlapOSTestCaseMixin
-test.erp5.SlapOSTestCaseDefaultScenarioMixin
-test.erp5.testSlapOSCloud
+test.erp5.testSlapOSCloudSkins
+test.erp5.testSlapOSCloudUpgrader
\ No newline at end of file
\ No newline at end of file