Merge lp:~nuclearbob/utah/dont-wait-for-booted into lp:utah

[Max Brustkern]

This branch temporarily catches exceptions raised when waiting for a system to boot until the associated bugs with this process are fixed.

[Andy Doan (doanac)]

looks fine. can you update test_rsyslog.py with a test specific to this?

[lp:~nuclearbob/utah/dont-wait-for-booted]

856. By Max Brustkern on 2013-04-10

Added test for workaround

[Max Brustkern (nuclearbob)]

Added a test. Verified that it works with this code but not with the current dev branch.

review: Needs Resubmitting

[Andy Doan (doanac)]

review: Approve

[lp:~nuclearbob/utah/dont-wait-for-booted]

857. By Max Brustkern on 2013-04-10

Removed blank line that I think is added in a different merge

858. By Max Brustkern on 2013-04-10

Adding dummy line that won't match

859. By Max Brustkern on 2013-04-10

Added changelog

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-04 14:58:12 +0000
+++ debian/changelog	2013-04-10 15:19:26 +0000
@@ -1,5 +1,6 @@
 utah (0.10ubuntu1) UNRELEASED; urgency=low
 
+  [ Javier Collado ]
   * Return error code on unhandled error (LP: #1160857)
   * Remove temporary files downloaded based on URL (LP: #1101186)
   * Stop server on installation failure (LP: #1161855)
@@ -9,7 +10,11 @@
   * Use sys.exit when SIGTERM is received (LP: #1160247)
   * Write syslog pattern matched and timeouts timestamps (LP: #1162862)
 
- -- Javier Collado <[e-mail]>  Wed, 27 Mar 2013 13:00:47 +0100
+  [ Max Brustkern ]
+  * Temporarily removing exception from wait_for_booted until some
+    installer bugs are fixed
+
+ -- Max Brustkern <[e-mail]>  Wed, 10 Apr 2013 11:17:22 -0400
 
 utah (0.9.2ubuntu1) quantal; urgency=low
 
 
=== modified file 'tests/test_rsyslog.py'
--- tests/test_rsyslog.py	2013-03-29 16:22:16 +0000
+++ tests/test_rsyslog.py	2013-04-10 15:19:26 +0000
@@ -202,6 +202,20 @@
         threading.Thread(target=self.producer, args=(r.port, messages)).start()
         r.wait_for_booted(steps)
 
+    def test_booted_workaround(self):
+        """Test that wait_for_booted doesn't raise an exception on timeout."""
+        steps = [
+            {
+                "message": "test booted",
+                "pattern": "Wait forever for a line that never comes",
+                "timeout": 5,
+            },
+        ]
+
+        r = RSyslog("utah-test", '/tmp')
+
+        r.wait_for_booted(steps)
+
     def usefile(self, truncate):
         """
         minimal test to make sure wait_for_booted works when tailing a file
 
=== modified file 'utah/provisioning/baremetal/cobbler.py'
--- utah/provisioning/baremetal/cobbler.py	2013-03-29 15:55:46 +0000
+++ utah/provisioning/baremetal/cobbler.py	2013-04-10 15:19:26 +0000
@@ -200,7 +200,9 @@
         # TODO: wait_for_booted isn't working on d-i installs and
         # autopilot jobs like:
         # http://10.97.0.1:8080/view/autopilot/job/ps-unity-autopilot-release-testing/140/label=autopilot-nvidia/
-        # self.rsyslog.wait_for_booted(config.boot_steps)
+        # For now, it seems to be a problem on all installs, so we're going to
+        # handle it in rsyslog.py
+        self.rsyslog.wait_for_booted(config.boot_steps)
 
         retry(self.sshcheck, logmethod=self.logger.info,
               retry_timeout=config.checktimeout)
 
=== modified file 'utah/provisioning/rsyslog.py'
--- utah/provisioning/rsyslog.py	2013-04-03 09:38:49 +0000
+++ utah/provisioning/rsyslog.py	2013-04-10 15:19:26 +0000
@@ -127,7 +127,12 @@
         """
         logfile = '{}/{}-boot.log'.format(self._logpath, self._host)
         callbacks = {}
-        self._wait_for_steps(steps, logfile, callbacks)
+        # TODO: Resolve the issues around this and get it back to normal
+        # i.e. LP#1100386
+        try:
+            self._wait_for_steps(steps, logfile, callbacks)
+        except UTAHException as err:
+            self.logger.warning('Timed out waiting for boot, but continuing')
 
     def _wait_for_steps(self, steps, logfile, callbacks):
         with open(logfile, 'w') as f: