swarming: fix invalid events on task retry

appengine/swarming/server/task_scheduler.py

 # Copyright 2014 The LUCI Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0
 # that can be found in the LICENSE file.
 
 """High level tasks execution scheduling API.
 
 This is the interface closest to the HTTP handlers.
 """
 
 import datetime
@@ skipping 772 matching lines @@
     smry, run_result, error = datastore_utils.transaction(run)
   except datastore_utils.CommitError as e:
     logging.info('Got commit error: %s', e)
     # It is important that the caller correctly surface this error.
     return None
   assert bool(error) != bool(run_result), (error, run_result)
   if error:
     logging.error('Task %s %s', packed, error)
     return None
   # Caller must retry if PubSub enqueue fails.
-  task_completed = run_result.state != task_result.State.RUNNING
   if not _maybe_pubsub_notify_now(smry, request):
     return None
-  if task_completed:
+  if smry.state not in task_result.State.STATES_RUNNING:
     event_mon_metrics.send_task_event(smry)
     ts_mon_metrics.update_jobs_completed_metrics(smry)
   return run_result.state
 
 
 def bot_kill_task(run_result_key, bot_id):
   """Terminates a task that is currently running as an internal failure.
 
   Returns:
     str if an error message.
@@ skipping 168 matching lines @@
 ## Task queue tasks.
 
 
 def task_handle_pubsub_task(payload):
   """Handles task enqueued by _maybe_pubsub_notify_via_tq."""
   # Do not catch errors to trigger task queue task retry. Errors should not
   # happen in normal case.
   _pubsub_notify(
       payload['task_id'], payload['topic'],
       payload['auth_token'], payload['userdata'])