Adds extra logging to telemetry in hope it helps diagnose issue 351143

It seems there is a problem running gsutil on cros dtus, so adding few
extra log statements around that code.

BUG=351143

Review URL: https://codereview.chromium.org/298863016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272838 0039d316-1c4b-4281-b951-d872f2087c98

tools/telemetry/telemetry/page/cloud_storage.py

@@ -173,10 +173,12 @@ def GetIfChanged(file_path, bucket=None):
   """
   hash_path = file_path + '.sha1'
   if not os.path.exists(hash_path):
+    logging.warning('Hash file not found: %s' % hash_path)
     return False
 
   expected_hash = ReadHash(hash_path)
   if os.path.exists(file_path) and CalculateHash(file_path) == expected_hash:
+    logging.info('File up to date: %s' % file_path)
     return False
 
   if bucket:
@@ -188,6 +190,7 @@ def GetIfChanged(file_path, bucket=None):
   for bucket in buckets:
     try:
       url = 'gs://%s/%s' % (bucket, expected_hash)
+      logging.info('Running gsutil command: cp %s %s' % (url, file_path))
       _RunCommand(['cp', url, file_path])
       logging.info('Downloaded %s to %s' % (url, file_path))
       found = True

tools/telemetry/telemetry/page/page_set_archive_info.py

@@ -8,6 +8,7 @@ import os
 import re
 import shutil
 
+from telemetry.core.backends.chrome import cros_interface
 from telemetry.page import cloud_storage
 
 
@@ -22,16 +23,28 @@ class PageSetArchiveInfo(object):
 
     # Download all .wpr files.
     if not ignore_archive:
+      # TODO(tbarzic): Remove this once http://crbug.com/351143 is diagnosed.
+      log_cloud_storage_exception = cros_interface.IsRunningOnCrosDevice()
       for archive_path in data['archives']:
         archive_path = self._WprFileNameToPath(archive_path)
         try:
           cloud_storage.GetIfChanged(archive_path)
-        except (cloud_storage.CredentialsError, cloud_storage.PermissionError):
+        except (cloud_storage.CredentialsError,
+                cloud_storage.PermissionError) as e:
           if os.path.exists(archive_path):
             # If the archive exists, assume the user recorded their own and
             # simply warn.
             logging.warning('Need credentials to update WPR archive: %s',
                             archive_path)
+          elif log_cloud_storage_exception:
+            # Log access errors only once, as they should stay the same in other
+            # iterations.
+            log_cloud_storage_exception = False
+            logging.warning('Error getting WPR archive %s: %s ' %
+                                (archive_path, str(e)))
+            logging.info(
+                'HOME: "%s"; USER: "%s"' %
+                (os.environ.get('HOME', ''), os.environ.get('USER', '')))
 
     # Map from the relative path (as it appears in the metadata file) of the
     # .wpr file to a list of page names it supports.
@@ -53,6 +66,9 @@ class PageSetArchiveInfo(object):
       with open(file_path, 'r') as f:
         data = json.load(f)
         return cls(file_path, data, ignore_archive=ignore_archive)
+    # TODO(tbarzic): Remove this once http://crbug.com/351143 is diagnosed.
+    if cros_interface.IsRunningOnCrosDevice():
+      logging.warning('Page set archives not found: %s' % file_path)
     return cls(file_path, {'archives': {}}, ignore_archive=ignore_archive)
 
   def WprFilePathForPage(self, page):