[Predator] Pass config as argument to findit.

appengine/findit/util_scripts/crash_queries/delta_test/run-predator.py

 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import argparse
 import json
 import logging
 import os
 import sys
 import threading
@@ skipping 15 matching lines @@
 from crash.type_enums import CrashClient
 from crash_queries.delta_test import delta_util
 from git_checkout.local_git_repository import LocalGitRepository
 from model.crash.crash_config import CrashConfig
 import remote_api
 
 _FRACAS_FEEDBACK_URL_TEMPLATE = (
     'https://%s.appspot.com/crash/fracas-result-feedback?key=%s')
 
 
-def StoreResults(crash, client_id, app_id, id_to_culprits, lock, verbose=False):
+def StoreResults(crash, client_id, app_id, id_to_culprits, lock, config,
+                 verbose=False):
   """Stores findit result of crash into id_to_culprits dict."""
   crash_url = _FRACAS_FEEDBACK_URL_TEMPLATE % (app_id, crash['id'])
   try:
-    findit = FinditForClientID(client_id, LocalGitRepository)
+    findit = FinditForClientID(client_id, LocalGitRepository, config)
     stacktrace = findit._stacktrace_parser.Parse(
         crash['stack_trace'],
         ChromeDependencyFetcher(LocalGitRepository.Factory()).GetDependency(
             crash['crashed_version'],
             crash['platform']))
     if stacktrace:
       culprit = findit._predator.FindCulprit(CrashReport(
           crashed_version=crash['crashed_version'],
           signature=crash['signature'],
           platform=crash['platform'],
@@ skipping 11 matching lines @@
     with lock:
       id_to_culprits[crash['id']] = None
       print '\n\nCrash:', crash_url
       print traceback.format_exc()
 
 
 def GetCulprits(crashes, client_id, app_id, verbose=False):
   """Run predator analysis on crashes locally."""
   # Enable remote access to app engine services.
   remote_api.EnableRemoteApi(app_id)
-  origin_get = CrashConfig.Get
-  try:
-    # This hack is to solve flaky BadStatusLine excepion(crbug.com/666150) in
-    # remote api when key.get() gets called in threads.
-    # TODO(katesonia): Remove this hack after crbug.com/659354 is done.
-    CrashConfig.Get = script_util.GetLockedMethod(CrashConfig, 'Get',
-                                                  threading.Lock())
-    id_to_culprits = {}
-    tasks = []
-    lock = threading.Lock()
-    for crash in crashes:
-      crash['regression_range'] = DetectRegressionRange(
-          crash['historical_metadata'])
-      tasks.append({
-          'function': StoreResults,
-          'args': [crash, client_id, app_id, id_to_culprits, lock],
-          'kwargs': {'verbose': verbose}
-      })
-    script_util.RunTasks(tasks)
+  id_to_culprits = {}
+  tasks = []
+  lock = threading.Lock()
+  config = CrashConfig.Get()
+  for crash in crashes:
+    crash['regression_range'] = DetectRegressionRange(
+        crash['historical_metadata'])
+    tasks.append({
+        'function': StoreResults,
+        'args': [crash, client_id, app_id, id_to_culprits, lock, config],
+        'kwargs': {'verbose': verbose}
+    })
+  script_util.RunTasks(tasks)
 
-    return id_to_culprits
-  finally:
-    CrashConfig.Get = origin_get
+  return id_to_culprits
 
 
 def RunPredator():
   """Runs delta testing between 2 different Findit versions."""
   argparser = argparse.ArgumentParser(
       description='Run Predator on a batch of crashes.')
   argparser.add_argument('result_path', help='Path to store results')
   argparser.add_argument('client', help=('Possible values are: fracas, cracas, '
                                          'clusterfuzz. Right now, only fracas '
                                          'is supported.'))
@@ skipping 12 matching lines @@
     return
 
   culprits = GetCulprits(crashes, args.client, args.app, args.verbose)
   delta_util.FlushResult(culprits, args.result_path)
 
 
 if __name__ == '__main__':
   # Disable the trivial loggings inside predator.
   logging.basicConfig(level=logging.ERROR)
   RunPredator()