Skip to content

Commit

Permalink
Avoid race condition when deleting HNS networks
Browse files Browse the repository at this point in the history
Signed-off-by: Manuel Buil <mbuil@suse.com>
  • Loading branch information
manuelbuil committed Jan 31, 2024
1 parent a4986a5 commit 5b20bfa
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/windows/calico.go
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ func (c *Calico) Start(ctx context.Context) error {
// generateCalicoNetworks creates the overlay networks for internode networking
func (c *Calico) generateCalicoNetworks() error {
if err := deleteAllNetworks(); err != nil {
return err
return errors.Wrapf(err, "failed to delete all networks before bootstrapping calico")
}

// There are four ways to select the vxlan interface. In order of priority:
Expand Down
21 changes: 21 additions & 0 deletions pkg/windows/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
opv1 "github.com/tigera/operator/api/v1"
"k8s.io/apimachinery/pkg/util/wait"
)

// createHnsNetwork creates the network that will connect nodes and returns its managementIP
Expand Down Expand Up @@ -101,15 +102,35 @@ func deleteAllNetworks() error {
return err
}

var ips []string

for _, network := range networks {
if network.Name != "nat" {
logrus.Debugf("Deleting network: %s before starting calico", network.Name)
ips = append(ips, network.ManagementIP)
_, err = network.Delete()
if err != nil {
return err
}
}
}

// HNS overlay networks restart the physical interface when they are deleted. Wait until it comes back before returning
waitErr := wait.Poll(2*time.Second, 20*time.Second, func() (bool, error) {
for _, ip := range ips {
logrus.Debugf("Calico is waiting for the interface with ip: %s to come back", ip)
_, err := findInterface(ip)
if err != nil {
return false, nil
}
}
return true, nil
})

if waitErr == wait.ErrWaitTimeout {
return fmt.Errorf("timed out waiting for the network interfaces to come back")
}

return nil
}

Expand Down

0 comments on commit 5b20bfa

Please sign in to comment.