Skip to content

Commit

Permalink
fix: don't treat ethtool errors as fatal
Browse files Browse the repository at this point in the history
Looks like on some platforms (RPi4 at least) call fails until the link
is brought up via the flags.

Signed-off-by: Andrey Smirnov <smirnov.andrey@gmail.com>
  • Loading branch information
smira authored and andrewrynhard committed Jun 16, 2021
1 parent f2ae9cd commit d739445
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions internal/app/machined/pkg/controllers/network/link_status.go
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ func (ctrl *LinkStatusController) reconcile(ctx context.Context, r controller.Ru
Index: int(link.Index),
})
if err != nil && !errors.Is(err, os.ErrNotExist) {
return fmt.Errorf("error querying ethtool link state for %q: %w", link.Attributes.Name, err)
logger.Warn("error querying ethtool link state", zap.String("link", link.Attributes.Name), zap.Error(err))
}

// skip if previous call failed (e.g. not supported)
Expand All @@ -151,7 +151,7 @@ func (ctrl *LinkStatusController) reconcile(ctx context.Context, r controller.Ru
Index: int(link.Index),
})
if err != nil && !errors.Is(err, os.ErrNotExist) {
return fmt.Errorf("error querying ethtool link info for %q: %w", link.Attributes.Name, err)
logger.Warn("error querying ethtool link info", zap.String("link", link.Attributes.Name), zap.Error(err))
}
}

Expand All @@ -161,7 +161,7 @@ func (ctrl *LinkStatusController) reconcile(ctx context.Context, r controller.Ru
Index: int(link.Index),
})
if err != nil && !errors.Is(err, os.ErrNotExist) {
return fmt.Errorf("error querying ethtool link mode for %q: %w", link.Attributes.Name, err)
logger.Warn("error querying ethtool link mode", zap.String("link", link.Attributes.Name), zap.Error(err))
}
}

Expand Down

0 comments on commit d739445

Please sign in to comment.