[Findit] Change the criteria of sending notification to code review.

appengine/findit/waterfall/send_notification_for_culprit_pipeline.py

Index: appengine/findit/waterfall/send_notification_for_culprit_pipeline.py
diff --git a/appengine/findit/waterfall/send_notification_for_culprit_pipeline.py b/appengine/findit/waterfall/send_notification_for_culprit_pipeline.py
index 5f40f4a3996ffae07e88c67d2ea99d88d7b3f3bc..cae02230700fc8cad698aeb51cc40faf8f46e7f9 100644
--- a/appengine/findit/waterfall/send_notification_for_culprit_pipeline.py
+++ b/appengine/findit/waterfall/send_notification_for_culprit_pipeline.py
@@ -14,15 +14,23 @@ from common.http_client_appengine import HttpClientAppengine as HttpClient
 from common.pipeline_wrapper import BasePipeline
 from common.rietveld import Rietveld
 from model import analysis_status as status
+from model.wf_analysis import WfAnalysis
 from model.wf_culprit import WfCulprit
 from waterfall import build_util
 from waterfall import waterfall_config
 
 
+def _PassAdditionalCriteria(additional_criteria):
+  passed = True
+  for criterion in additional_criteria.values():

[Sharu Jiang, 2016/09/02 20:42:51]

Sorry, just realize =_=
You just can do

for ...:
  if not criterion:
    return False

return True

[chanli, 2016/09/03 01:27:02]

Thought of a one liner to do this : )

+    passed = passed and criterion

[lijeffrey1, 2016/09/03 00:31:53]

so this is assuming every criterion must have a value of True? If this is the
intended design add a docstring to this function explaining that this is the
expected format of additional_criteria

[chanli, 2016/09/03 01:27:02]

Done.

+  return passed
+
+
 @ndb.transactional
 def _ShouldSendNotification(
     master_name, builder_name, build_number, repo_name, revision,
-    commit_position, build_num_threshold, time_limit_passed):
+    commit_position, additional_criteria):
   """Returns True if a notification for the culprit should be sent."""
   culprit = (WfCulprit.Get(repo_name, revision) or
              WfCulprit.Create(repo_name, revision, commit_position))
@@ -32,14 +40,11 @@ def _ShouldSendNotification(
   culprit.builds.append([master_name, builder_name, build_number])
   # Send notification only when:
   # 1. It was not processed yet.
-  # 2. The culprit is for multiple failures in different builds to avoid false
-  #    positive due to flakiness.
-  # 3. It is not too late after the culprit was committed.
+  # 2. It is not too late after the culprit was committed.
   #    * Try-job takes too long to complete and the failure got fixed.
   #    * The whole analysis was rerun a long time after the failure occurred.
   should_send = not (culprit.cr_notification_processed or
-                     len(culprit.builds) < build_num_threshold or
-                     time_limit_passed)
+                     not _PassAdditionalCriteria(additional_criteria))
   if should_send:
     culprit.cr_notification_status = status.RUNNING
   culprit.put()
@@ -86,10 +91,10 @@ def _GetCulpritInfo(repo_name, revision):
   return change_log.commit_position, change_log.code_review_url
 
 
-def _NotificationTimeLimitPassed(build_end_time, latency_limit_minutes):
+def _NotificationTimeLimitNotPassed(build_end_time, latency_limit_minutes):
   """Returns True if it is too late to send notification."""

[lijeffrey1, 2016/09/03 00:31:53]

is this docstring now out of date? I think i preferred the old naming/returning
true if the time limit has passed, or rename this _WithinNotificationTimeLimit()
or something

[chanli, 2016/09/03 01:27:02]

Done.

   latency_seconds = (time_util.GetUTCNow() - build_end_time).total_seconds()
-  return latency_seconds > latency_limit_minutes * 60
+  return latency_seconds <= latency_limit_minutes * 60
 
 
 class SendNotificationForCulpritPipeline(BasePipeline):
@@ -98,8 +103,6 @@ class SendNotificationForCulpritPipeline(BasePipeline):
   def run(self, master_name, builder_name, build_number, repo_name, revision):
     action_settings = waterfall_config.GetActionSettings()
     # Set some impossible default values to prevent notification by default.
-    build_threshold = action_settings.get(
-        'cr_notification_build_threshold', 100000)
     latency_limit_minutes = action_settings.get(
         'cr_notification_latency_limit_minutes', 1)
 
@@ -107,12 +110,20 @@ class SendNotificationForCulpritPipeline(BasePipeline):
         repo_name, revision)
     build_end_time = build_util.GetBuildEndTime(
         master_name, builder_name, build_number)
-    time_limit_passed = _NotificationTimeLimitPassed(
+    within_time_limit = _NotificationTimeLimitNotPassed(
         build_end_time, latency_limit_minutes)
 
+    #  Additional criteria that will help decide if a notification

[lijeffrey1, 2016/09/03 00:31:53]

nit: Too many spaces

[chanli, 2016/09/03 01:27:02]

Done.

+    #  should be sent.
+    # TODO (chanli): Add check for if confidence for the culprit is
+    # over threshold.
+    additional_criteria = {
+        'within_time_limit': within_time_limit
+    }
+
     if not _ShouldSendNotification(
       master_name, builder_name, build_number, repo_name,
-      revision, commit_position, build_threshold, time_limit_passed):
+      revision, commit_position, additional_criteria):
       return False
     return _SendNotificationForCulprit(
         repo_name, revision, commit_position, code_review_url)