Skip to content

fetch-offline: immediately return ErrNeedNet on OpenStack #1094

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jlebon merged 1 commit into from
Sep 16, 2020
Merged

fetch-offline: immediately return ErrNeedNet on OpenStack #1094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions internal/providers/cloudstack/cloudstack.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,21 +47,23 @@ const (
)

func FetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) {
// The fetch-offline approach doesn't work well here because of the "split
// personality" of this provider. See:
// https://github.com/coreos/ignition/issues/1081
if f.Offline {
return types.Config{}, report.Report{}, resource.ErrNeedNet
}

var data []byte
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)

sawErrNeedNet := false

dispatch := func(name string, fn func() ([]byte, error)) {
raw, err := fn()
if err != nil {
switch err {
case context.Canceled:
case context.DeadlineExceeded:
f.Logger.Err("timed out while fetching config from %s", name)
case resource.ErrNeedNet:
sawErrNeedNet = true
fallthrough
default:
f.Logger.Err("failed to fetch config from %s: %v", name, err)
}
Expand All @@ -86,11 +88,6 @@ func FetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) {

<-ctx.Done()
if ctx.Err() == context.DeadlineExceeded {
// Did we hit neednet? If so, propagate that up instead. The OS should
// retry fetching again once networking is up.
if sawErrNeedNet {
return types.Config{}, report.Report{}, resource.ErrNeedNet
}
f.Logger.Info("neither config drive nor metadata service were available in time. Continuing without a config...")
}

Expand Down
17 changes: 7 additions & 10 deletions internal/providers/openstack/openstack.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,21 +52,23 @@ var (
)

func FetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) {
// The fetch-offline approach doesn't work well here because of the "split
// personality" of this provider. See:
// https://github.com/coreos/ignition/issues/1081
if f.Offline {
return types.Config{}, report.Report{}, resource.ErrNeedNet
}

var data []byte
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)

sawErrNeedNet := false

dispatch := func(name string, fn func() ([]byte, error)) {
raw, err := fn()
if err != nil {
switch err {
case context.Canceled:
case context.DeadlineExceeded:
f.Logger.Err("timed out while fetching config from %s", name)
case resource.ErrNeedNet:
sawErrNeedNet = true
fallthrough
default:
f.Logger.Err("failed to fetch config from %s: %v", name, err)
}
Expand All @@ -91,11 +93,6 @@ func FetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) {

<-ctx.Done()
if ctx.Err() == context.DeadlineExceeded {
// Did we hit neednet? If so, propagate that up instead. The OS should
// retry fetching again once networking is up.
if sawErrNeedNet {
return types.Config{}, report.Report{}, resource.ErrNeedNet
}
f.Logger.Info("neither config drive nor metadata service were available in time. Continuing without a config...")
}

Expand Down