--archive_dir will now serve existing update.gz

autoupdate.py

 # Copyright (c) 2009-2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 from buildutil import BuildObject
 from xml.dom import minidom
 
 import cherrypy
 import os
 import shutil
 import subprocess
 import time
 
 
 def _LogMessage(message):
   cherrypy.log(message, 'UPDATE')
 
 UPDATE_FILE='update.gz'
 STATEFUL_FILE='stateful.tgz'
 
 class Autoupdate(BuildObject):
   """Class that contains functionality that handles Chrome OS update pings.
 
   Members:
-    serve_only: Serve images from a pre-built image.zip file.  static_dir
-      must be set to the location of the image.zip.
+    serve_only: Serve updates from a pre-built image.zip file. If an update.gz

[sosa, 2010/11/23 19:50:36]

is newer*

+      newer than the extracted image exists in the static_dir, it will be

[sosa, 2010/11/23 19:50:36]

This is a little confusing.  Can you make another pass at this docstring.

+      served instead. static_dir must be set to the location of the image.zip.
     factory_config: Path to the factory config file if handling factory
       requests.
     use_test_image: Use chromiumos_test_image.bin rather than the standard.
     static_url_base: base URL, other than devserver, for update images.
     client_prefix: The prefix for the update engine client.
     forced_image: Path to an image to use for all updates.
   """
 
   def __init__(self, serve_only=None, test_image=False, urlbase=None,
                factory_config_path=None, client_prefix=None,
@@ skipping 501 matching lines @@
                                 STATEFUL_FILE),
                    os.path.join(static_image_dir,
                                 STATEFUL_FILE))
 
       return UPDATE_FILE
     elif self.forced_image:
       return self.GenerateUpdateImageWithCache(
           self.forced_image,
           static_image_dir=static_image_dir)
     elif self.serve_only:
+      image_path = os.path.join(static_image_dir, self._GetImageName())
+      update_path = os.path.join(static_image_dir, UPDATE_FILE)
+
+      # If a valid update already exists, no need to generate.
+      if (os.path.exists(image_path) and os.path.exists(update_path) and
+          os.path.getmtime(image_path) < os.path.getmtime(update_path)):

[sosa, 2010/11/23 19:50:36]

Can you fold this into GenerateImageFromZip and remove Don's TODO?  That seems
like the better place.  Also, why not use MD5 hash's versus timestamps?

[DaleCurtis, 2010/11/23 20:11:20]

I can if you really want to. I think it's confusing to put it into
GenerateImageFromZip though unless we want to change the method.

Alternatively, does anyone actually use the ZIP generation? If not lets just
remove it and change serve_only to actually mean serve_only. Meaning, update.gz
and stateful.tgz must always be in the static_dir. No more 0-byte
chromiumos_test_image.bin's or hard to explain time stamp/md5 checks.

Going this route would also remove any of the caching concerns noted in Don's
TODO.

On 2010/11/23 19:50:36, sosa wrote:

[sosa, 2010/11/23 20:45:57]

I'm ok with removing the logic but you many want to email chromium-os-dev in
case.  I don't know of anyone who uses it as it was specifically added to
support test automation.

On 2010/11/23 20:11:20, dalec wrote:

[DaleCurtis, 2010/11/23 21:02:37]

Sent, I'll give it until next week before making any changes. We've already got
a patch in place to keep our Dev Server running.

On 2010/11/23 20:45:57, sosa wrote:

+        _LogMessage('Existing update found to serve.')
+        return UPDATE_FILE
+
       return self.GenerateImageFromZip(static_image_dir)
     else:
       if board_id:
         return self.GenerateLatestUpdateImage(board_id,
                                               client_version,
                                               static_image_dir)
 
       _LogMessage('You must set --board for pre-generating latest update.')
       return None
 
@@ skipping 79 matching lines @@
         is_delta_format = self._IsDeltaFormatFile(filename)
         if label:
           url = '%s/%s/%s' % (static_urlbase, label, payload_path)
         else:
           url = '%s/%s' % (static_urlbase, payload_path)
 
         _LogMessage('Responding to client to use url %s to get image.' % url)
         return self.GetUpdatePayload(hash, sha256, size, url, is_delta_format)
       else:
         return self.GetNoUpdatePayload()