Remount autodir after reboot.

server/autotest.py

 # Copyright 2007 Google Inc. Released under the GPL v2
 
 import re, os, sys, traceback, subprocess, time, pickle, glob, tempfile
 import logging, getpass
 from autotest_lib.server import installable_object, prebuild, utils
 from autotest_lib.client.common_lib import base_job, log, error, autotemp
 from autotest_lib.client.common_lib import global_config, packages
 from autotest_lib.client.common_lib import utils as client_utils
 
 AUTOTEST_SVN  = 'svn://test.kernel.org/autotest/trunk/client'
@@ skipping 58 matching lines @@
     @classmethod
     def get_installed_autodir(cls, host):
         """
         Find where the Autotest client is installed on the host.
         @returns an absolute path to an installed Autotest client root.
         @raises AutodirNotFoundError if no Autotest installation can be found.
         """
         autodir = host.get_autodir()
         if autodir:
             logging.debug('Using existing host autodir: %s', autodir)
+            # We have an autodir, make sure it's mounted.
+            result = host.run('mount | grep -q ' + autodir, ignore_status=True)
+            if result.exit_status != 0:
+                # Attempt to remount if it isn't.
+                client_autodir_real_path = utils.sh_escape(
+                    cls.get_client_autodir_real_path(host))
+                host.run('mount --bind %s %s' % (client_autodir_real_path,
+                                                 autodir))
+                host.run('mount -o remount,exec ' + autodir)

[ericli, 2010/12/17 04:24:18]

could you consolidate this logic with _find_installable_dir(). Petty much they
are duplicated.

[DaleCurtis, 2010/12/17 17:46:07]

I can do this, but I'll have to add a new @classmethod. I know you'd previously
had reservations about this.

Additionally since this method is called so frequently, I'll have to unify both
methods to preserve the existing mount rather than unmounting and remounting if
it exists.

On 2010/12/17 04:24:18, ericli wrote:

[ericli, 2010/12/17 18:02:48]

I see, I also recalled _find_installable_dir() worked on an list of candidate
paths. I dont like that either, but seems more close to upstream design.

On 2010/12/17 17:46:07, dalec wrote:

             return autodir
 
         for path in Autotest.get_client_autodir_paths(host):
             try:
                 autotest_binary = os.path.join(path, 'bin', 'autotest')
                 host.run('test -x %s' % utils.sh_escape(autotest_binary))
                 logging.debug('Found existing autodir at %s', path)
                 return path
             except error.AutoservRunError:
                 logging.debug('%s does not exist on %s', autotest_binary,
@@ skipping 1006 matching lines @@
 
         @returns: True if the test passes, False otherwise."""
         at = self._Autotest()
         control_file = ('result = job.run_test(%s)\n'
                         'job.set_state("test_result", result)\n')
         test_args = [repr(test_name)]
         test_args += ['%s=%r' % (k, v) for k, v in dargs.iteritems()]
         control_file %= ', '.join(test_args)
         at.run(control_file, host=self)
         return at.job.get_state('test_result', default=False)