swarming: change meaning of inputs_ref

appengine/swarming/swarming_bot/bot_code/task_runner.py

 # Copyright 2013 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 Swarming task.
 
 Downloads all the necessary files to run the task, executes the command and
 streams results back to the Swarming server.
 
 The process exit code is 0 when the task was executed, even if the task itself
@@ skipping 62 matching lines @@
   """Returns the path to itself to run run_isolated.
 
   Mocked in test to point to the real run_isolated.py script.
   """
   return [sys.executable, THIS_FILE, 'run_isolated']
 
 
 def get_isolated_cmd(
     work_dir, task_details, isolated_result, min_free_space):
   """Returns the command to call run_isolated. Mocked in tests."""
+  assert (bool(task_details.command) !=
+          bool(task_details.isolated and task_details.isolated.get('input')))
   bot_dir = os.path.dirname(work_dir)
   if os.path.isfile(isolated_result):
     os.remove(isolated_result)
   cmd = get_run_isolated()
+
+  if task_details.isolated:  # Almost certainly True.

[M-A Ruel, 2016/05/11 14:41:41]

I don't think the command is useful.

[nodir, 2016/05/11 16:04:29]

Done.

+    cmd.extend(
+        [
+          '-I', task_details.isolated['server'].encode('utf-8'),
+          '--namespace', task_details.isolated['namespace'].encode('utf-8'),
+        ])
+    isolated_input = task_details.isolated.get('input')
+    if isolated_input:
+      cmd.extend(
+          [
+            '--isolated', isolated_input,
+          ])
+
   cmd.extend(
       [
-        '--isolated', task_details.inputs_ref['isolated'].encode('utf-8'),
-        '--namespace', task_details.inputs_ref['namespace'].encode('utf-8'),
-        '-I', task_details.inputs_ref['isolatedserver'].encode('utf-8'),
         '--json', isolated_result,
         '--log-file', os.path.join(bot_dir, 'logs', 'run_isolated.log'),
         '--cache', os.path.join(bot_dir, 'cache'),
         '--root-dir', os.path.join(work_dir, 'isolated'),
       ])
   if min_free_space:
     cmd.extend(('--min-free-space', str(min_free_space)))
 
   if task_details.hard_timeout:
     cmd.extend(('--hard-timeout', str(task_details.hard_timeout)))
   if task_details.grace_period:
     cmd.extend(('--grace-period', str(task_details.grace_period)))
   if task_details.extra_args:
     cmd.append('--')
     cmd.extend(task_details.extra_args)
   return cmd
 
 
 class TaskDetails(object):
   def __init__(self, data):
-    """Loads the raw data.
-
-    It is expected to have at least:
-     - bot_id
-     - command as a list of str
-     - data as a list of urls
-     - env as a dict
-     - hard_timeout
-     - io_timeout
-     - task_id
-    """
+    """Loads the raw data from a manifest file specified by --in-file."""
     logging.info('TaskDetails(%s)', data)
     if not isinstance(data, dict):
       raise ValueError('Expected dict, got %r' % data)
 
     # Get all the data first so it fails early if the task details is invalid.
     self.bot_id = data['bot_id']
 
-    # Raw command. Only self.command or self.inputs_ref can be set.
+    # Raw command. Only self.command or self.isolated.input can be set.
     self.command = data['command'] or []
 
     # Isolated command. Is a serialized version of task_request.FilesRef.
-    self.inputs_ref = data['inputs_ref']
+    self.isolated = data['isolated']
     self.extra_args = data['extra_args']
 
     self.env = {
       k.encode('utf-8'): v.encode('utf-8') for k, v in data['env'].iteritems()
     }
     self.grace_period = data['grace_period']
     self.hard_timeout = data['hard_timeout']
     self.io_timeout = data['io_timeout']
     self.task_id = data['task_id']
 
@@ skipping 174 matching lines @@
     if task_details.env:
       env = os.environ.copy()
       for key, value in task_details.env.iteritems():
         if not value:
           env.pop(key, None)
         else:
           env[key] = value
     logging.info('cmd=%s', cmd)
     logging.info('env=%s', env)
     try:
+      assert cmd and all(isinstance(a, basestring) for a in cmd)
       proc = subprocess42.Popen(
           cmd,
           env=env,
           cwd=work_dir,
           detached=True,
           stdout=subprocess42.PIPE,
           stderr=subprocess42.STDOUT,
           stdin=subprocess42.PIPE)
     except OSError as e:
       stdout = 'Command "%s" failed to start.\nError: %s' % (' '.join(cmd), e)
@@ skipping 187 matching lines @@
   if options.start > now:
     options.start = now
 
   try:
     load_and_run(
         options.in_file, options.swarming_server, options.cost_usd_hour,
         options.start, options.out_file, options.min_free_space)
     return 0
   finally:
     logging.info('quitting')