From: Sandon Van Ness <sandon@inktank.com>
Date: Fri, 28 Feb 2014 22:16:32 +0000 (-0800)
Subject: Allow setting kdb to fail.
X-Git-Tag: 1.1.0~1632^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=fd507ed35abedfd161db9e7ab146aefd7cb74ed8;p=teuthology.git

Allow setting kdb to fail.

Some kernels (primarily Debian distro kernels) do not support
setting kdb. Rather than having the entire test fail.

Signed-off-by: Sandon Van Ness <sandon@inktank.com>
---

diff --git a/teuthology/task/kernel.py b/teuthology/task/kernel.py
index 7bf14379a5..933b15c928 100644
--- a/teuthology/task/kernel.py
+++ b/teuthology/task/kernel.py
@@ -487,23 +487,29 @@ def enable_disable_kdb(ctx, config):
             serialdev = "ttyS1"
         if enable:
             log.info('Enabling kdb on {role}...'.format(role=role))
-            role_remote.run(
-                args=[
-                    'echo', serialdev,
-                    run.Raw('|'),
-                    'sudo', 'tee', '/sys/module/kgdboc/parameters/kgdboc'
-                    ])
+            try:
+                role_remote.run(
+                    args=[
+                        'echo', serialdev,
+                        run.Raw('|'),
+                        'sudo', 'tee', '/sys/module/kgdboc/parameters/kgdboc'
+                        ])
+            except run.CommandFailedError:
+                log.warn('Kernel does not support kdb')
         else:
             log.info('Disabling kdb on {role}...'.format(role=role))
             # Add true pipe so command doesn't fail on kernel without kdb support.
-            role_remote.run(
-                args=[
-                    'echo', '',
-                    run.Raw('|'),
-                    'sudo', 'tee', '/sys/module/kgdboc/parameters/kgdboc',
-                    run.Raw('|'),
-                    'true',
-                    ])
+            try:
+                role_remote.run(
+                    args=[
+                        'echo', '',
+                        run.Raw('|'),
+                        'sudo', 'tee', '/sys/module/kgdboc/parameters/kgdboc',
+                        run.Raw('|'),
+                        'true',
+                        ])
+            except run.CommandFailedError:
+                log.warn('Kernel does not support kdb')
 
 def wait_for_reboot(ctx, need_install, timeout, distro=False):
     """