Add cloudtail start/stop in recipe_modules/goma

scripts/slave/recipe_modules/goma/api.py

Index: scripts/slave/recipe_modules/goma/api.py
diff --git a/scripts/slave/recipe_modules/goma/api.py b/scripts/slave/recipe_modules/goma/api.py
index db1b0061f82875595c795a87a8aaae0adf1407aa..151fcad795c5827f7ef2007d0a5586de7060860d 100644
--- a/scripts/slave/recipe_modules/goma/api.py
+++ b/scripts/slave/recipe_modules/goma/api.py
@@ -13,6 +13,7 @@ class GomaApi(recipe_api.RecipeApi):
     self._goma_started = False
 
     self._goma_ctl_env = {}
+    self._cloudtail_pid = None
 
   @property
   def service_account_json_path(self):
@@ -20,6 +21,12 @@ class GomaApi(recipe_api.RecipeApi):
       return 'C:\\creds\\service_accounts\\service-account-goma-client.json'
     return '/creds/service_accounts/service-account-goma-client.json'
 
+  @property
+  def cloudtail_path(self):
+    if self.m.platform.is_win:
+      return 'C:\\infra-tools\\cloudtail'
+    return '/opt/infra-tools/cloudtail'

[Yoshisato Yanagisawa, 2016/08/15 07:19:30]

It it possible for you to download cloudtail from cipd?

[tikuta, 2016/08/16 02:16:56]

I added code to donwload cloudtail.
But that changes many *.json, so let me make another CL to enable downloading
cloudtail from cipd.

[Yoshisato Yanagisawa, 2016/08/16 02:50:10]

Sorry for going back and forward but if you actually do not download cipd, will
you remove the code and just leave TODO?
I believe it confusing to have the code that won't be used.

[tikuta, 2016/08/16 02:56:21]

Done.

+
   def ensure_goma(self, canary=False):
     with self.m.step.nest('ensure_goma'):
       with self.m.step.context({'infra_step': True}):
@@ -51,6 +58,28 @@ class GomaApi(recipe_api.RecipeApi):
   def build_data_dir(self):
     return self.m.properties.get('build_data_dir')
 
+  def start_cloudtail(self):
+    assert self._cloudtail_pid is None
+
+    step_result = self.m.python(
+      name='start cloudtail',
+      script=self.resource('cloudtail_utils.py'),
+      args=['--start-cloudtail',
+            '--cloudtail-path', self.cloudtail_path,
+            '--log-id', 'goma_compiler_proxy',
+          ],
+      env=self._goma_ctl_env,
+      stdout=self.m.raw_io.output())
+
+    self._cloudtail_pid = step_result.stdout
+
+  def stop_cloudtail(self):
+    self.m.python(
+        name='stop cloudtail',
+        script=self.resource('cloudtail_utils.py'),
+        args=['--killed-pid', self._cloudtail_pid])
+    self._cloudtail_pid = None
+
   def start(self, env=None, **kwargs):
     """Start goma compiler_proxy.
 
@@ -94,6 +123,8 @@ class GomaApi(recipe_api.RecipeApi):
       self.upload_logs(name=upload_logs_name)
       raise e
 
+    self.start_cloudtail()
+
   def stop(self, ninja_log_outdir=None, ninja_log_compiler=None,
            ninja_log_command=None, ninja_log_exit_status=None, **kwargs):
     """Stop goma compiler_proxy.
@@ -108,6 +139,7 @@ class GomaApi(recipe_api.RecipeApi):
         script=self.goma_ctl,
         args=['stop'], env=self._goma_ctl_env, **kwargs)
 
+    self.stop_cloudtail()
     self.upload_logs(ninja_log_outdir, ninja_log_compiler, ninja_log_command,
                      ninja_log_exit_status)