From df4cba54e2284935494d9eb65c0a3af22c11b166 Mon Sep 17 00:00:00 2001 From: Roopa Prabhu Date: Tue, 8 Jul 2014 08:52:05 -0700 Subject: [PATCH] Bump kernel ethtool get/set wait to 20 + ifupdown2 convert ethtool errors to warns Ticket: CM-3159 Reviewed By: briefly ran this by jtoppins and andy (sfeldma is on vacation this week). Testing Done: tested ifupdown2 with ethtool config during boot (sam will also be adding the testcase mentioned in the bug to ifupdown2 smoke) The kernel timeout increase helps right now. we should revisit this again in 2.3 to close all corner cases. ifupdown2 will now warn on ethtool errors and will also return non-zero exit status --- pkg/scheduler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/scheduler.py b/pkg/scheduler.py index e0c1079..a98ee7e 100644 --- a/pkg/scheduler.py +++ b/pkg/scheduler.py @@ -84,7 +84,7 @@ class ifaceScheduler(): err = 0 # error can be ignored by log_error, in which case # reset err flag finally: - if err: + if err or ifaceobj.status == ifaceStatus.ERROR: ifaceobj.set_state_n_status(ifaceState.from_str(op), ifaceStatus.ERROR) if 'up' in op or 'down' in op: