task_runner: always use run_isolated

client/run_isolated.py

 #!/usr/bin/env python
 # Copyright 2012 The LUCI Authors. All rights reserved.
 # Use of this source code is governed by the Apache v2.0 license that can be
 # found in the LICENSE file.
 
 """Runs a command with optional isolated input/output.
 
 Despite name "run_isolated", can run a generic non-isolated command specified as
 args.
 
@@ skipping 126 matching lines @@
   else:
     raise ValueError(
         'change_tree_read_only(%s, %s): Unknown flag %s' %
         (rootdir, read_only, read_only))
 
 
 def process_command(command, out_dir):
   """Replaces isolated specific variables in a command line."""
   def fix(arg):
     if ISOLATED_OUTDIR_PARAMETER in arg:
+      assert out_dir
       arg = arg.replace(ISOLATED_OUTDIR_PARAMETER, out_dir)
       # Replace slashes only if ISOLATED_OUTDIR_PARAMETER is present
       # because of arguments like '${ISOLATED_OUTDIR}/foo/bar'
       arg = arg.replace('/', os.sep)
     return arg
 
   return [fix(arg) for arg in command]
 
 
 def run_command(command, cwd, tmp_dir, hard_timeout, grace_period):
@@ skipping 185 matching lines @@
     'outputs_ref': None,
     'version': 3,
   }
   if root_dir:
     file_path.ensure_tree(root_dir, 0700)
     prefix = u''
   else:
     root_dir = os.path.dirname(cache.cache_dir) if cache.cache_dir else None
     prefix = u'isolated_'
   run_dir = make_temp_dir(prefix + u'run', root_dir)
-  out_dir = make_temp_dir(prefix + u'out', root_dir)
+  out_dir = make_temp_dir(prefix + u'out', root_dir) if storage else None
   tmp_dir = make_temp_dir(prefix + u'tmp', root_dir)
   cwd = run_dir
 
   try:
     if isolated_hash:
       bundle, result['stats']['download'] = fetch_and_measure(
           isolated_hash=isolated_hash,
           storage=storage,
           cache=cache,
           outdir=run_dir)
@@ skipping 60 matching lines @@
           if not success:
             print >> sys.stderr, (
                 'Failed to delete the temporary directory, forcibly failing\n'
                 'the task because of it. No zombie process can outlive a\n'
                 'successful task run and still be marked as successful.\n'
                 'Fix your stuff.')
             if result['exit_code'] == 0:
               result['exit_code'] = 1
 
       # This deletes out_dir if leak_temp_dir is not set.
-      result['outputs_ref'], success, result['stats']['upload'] = (
-          delete_and_upload(storage, out_dir, leak_temp_dir))
+      if out_dir:
+        result['outputs_ref'], success, result['stats']['upload'] = (
+            delete_and_upload(storage, out_dir, leak_temp_dir))
       if not success and result['exit_code'] == 0:
         result['exit_code'] = 1
     except Exception as e:
       # Swallow any exception in the main finally clause.
-      logging.exception('Leaking out_dir %s: %s', out_dir, e)
+      if out_dir:
+        logging.exception('Leaking out_dir %s: %s', out_dir, e)
       result['internal_failure'] = str(e)
   return result
 
 
 def run_tha_test(
     command, isolated_hash, storage, cache, leak_temp_dir, result_json,
     root_dir, hard_timeout, grace_period, extra_args):
   """Runs an executable and records execution metadata.
 
   Either command or isolated_hash must be specified.
@@ skipping 165 matching lines @@
     return run_tha_test(
         command, options.isolated, None, cache, options.leak_temp_dir,
         options.json, options.root_dir, options.hard_timeout,
         options.grace_period, args)
 
 
 if __name__ == '__main__':
   # Ensure that we are always running with the correct encoding.
   fix_encoding.fix_encoding()
   sys.exit(main(sys.argv[1:]))