Clean up temp dirs when breaking locks.

git_cache.py

 #!/usr/bin/env python
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """A git command for managing a local cache of git repositories."""
 
 from __future__ import print_function
 import errno
 import logging
@@ skipping 260 matching lines @@
     # Get the most recent version of the zipfile.
     _, ls_out, _ = gsutil.check_call('ls', gs_folder)
     ls_out_sorted = sorted(ls_out.splitlines())
     if not ls_out_sorted:
       # This repo is not on Google Storage.
       return False
     latest_checkout = ls_out_sorted[-1]
 
     # Download zip file to a temporary directory.
     try:
-      tempdir = tempfile.mkdtemp()
+      tempdir = tempfile.mkdtemp(prefix='_cache_tmp', dir=self.GetCachePath())
       self.print('Downloading %s' % latest_checkout)
       code = gsutil.call('cp', latest_checkout, tempdir)
       if code:
         return False
       filename = os.path.join(tempdir, latest_checkout.split('/')[-1])
 
       # Unpack the file with 7z on Windows, unzip on linux, or fallback.
       if not python_fallback:
         if sys.platform.startswith('win'):
           cmd = ['7z', 'x', '-o%s' % directory, '-tzip', filename]
@@ skipping 45 matching lines @@
       config_file = os.path.join(self.mirror_path, 'config')
       pack_dir = os.path.join(self.mirror_path, 'objects', 'pack')
       pack_files = []
       if os.path.isdir(pack_dir):
         pack_files = [f for f in os.listdir(pack_dir) if f.endswith('.pack')]
 
       should_bootstrap = (not os.path.exists(config_file) or
                           len(pack_files) > GC_AUTOPACKLIMIT)
       if should_bootstrap:
         tempdir = tempfile.mkdtemp(
-            suffix=self.basedir, dir=self.GetCachePath())
+            prefix='_cache_tmp', suffix=self.basedir, dir=self.GetCachePath())
         bootstrapped = not depth and bootstrap and self.bootstrap_repo(tempdir)
         if bootstrapped:
           # Bootstrap succeeded; delete previous cache, if any.
           gclient_utils.rmtree(self.mirror_path)
         elif not os.path.exists(config_file):
           # Bootstrap failed, no previous cache; start with a bare git dir.
           self.RunGit(['init', '--bare'], cwd=tempdir)
         else:
           # Bootstrap failed, previous cache exists; warn and continue.
           logging.warn(
@@ skipping 43 matching lines @@
     pack_files = [f for f in os.listdir(pack_dir) if
                   f.startswith('.tmp-') or f.startswith('tmp_pack_')]
     for f in pack_files:
       f = os.path.join(pack_dir, f)
       try:
         os.remove(f)
         logging.warn('Deleted stale temporary pack file %s' % f)
       except OSError:
         logging.warn('Unable to delete temporary pack file %s' % f)
 
-  @staticmethod
-  def BreakLocks(path):
+  @classmethod
+  def BreakLocks(cls, path):
     did_unlock = False
     lf = Lockfile(path)
     if lf.break_lock():
       did_unlock = True
     # Look for lock files that might have been left behind by an interrupted
     # git process.
     lf = os.path.join(path, 'config.lock')
     if os.path.exists(lf):
       os.remove(lf)
       did_unlock = True
+    cls.DeleteTmpPackFiles(path)

[Ryan Tseng, 2014/06/17 01:00:44]

Is this implemented somewhere....?

[szager1, 2014/06/17 15:04:12]

It's defined just before this method.

     return did_unlock
 
   def unlock(self):
     return self.BreakLocks(self.mirror_path)
 
   @classmethod
   def UnlockAll(cls):
     cachepath = cls.GetCachePath()
     dirlist = os.listdir(cachepath)
     repo_dirs = set([os.path.join(cachepath, path) for path in dirlist
                      if os.path.isdir(os.path.join(cachepath, path))])
     for dirent in dirlist:
+      if dirent.startswith('_cache_tmp'):
+        gclient_utils.rmtree(os.path.join(cachepath, dirent))
       if (dirent.endswith('.lock') and
           os.path.isfile(os.path.join(cachepath, dirent))):
         repo_dirs.add(os.path.join(cachepath, dirent[:-5]))
 
     unlocked_repos = []
     for repo_dir in repo_dirs:
+      if os.path.basename(repo_dir).startswith('tmp'):
+        gclient_utils.rmtree(repo_dir)
       if cls.BreakLocks(repo_dir):
         unlocked_repos.append(repo_dir)
 
     return unlocked_repos
 
 @subcommand.usage('[url of repo to check for caching]')
 def CMDexists(parser, args):
   """Check to see if there already is a cache of the given repo."""
   _, args = parser.parse_args(args)
   if not len(args) == 1:
@@ skipping 122 matching lines @@
     return options, args
 
 
 def main(argv):
   dispatcher = subcommand.CommandDispatcher(__name__)
   return dispatcher.execute(OptionParser(), argv)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))