Skip to content

Effectively release the dhcp lease #440

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
w13915984028 merged 1 commit into from
Oct 19, 2026
Merged

Effectively release the dhcp lease #440

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
5 changes: 3 additions & 2 deletions pkg/controller/agent/hostnetworkconfig/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,12 +244,13 @@ func (h *Handler) removeHostNetworkInterface(hnc *networkv1.HostNetworkConfig, o
}
}

// Release the dhcp lease before tearing down the vlan
h.stopLeaseManager(utils.GetClusterNetworkBrVlanDevice(bridgelink.Attrs().Name, hnc.Spec.VlanID))

if err := bridgelink.DelBridgeVlanSelf(hnc.Spec.VlanID); err != nil {
return nil, fmt.Errorf("del bridge vlanconfig %d failed for %s, error: %w", hnc.Spec.VlanID, v.Bridge().Name, err)
}

h.stopLeaseManager(utils.GetClusterNetworkBrVlanDevice(bridgelink.Attrs().Name, hnc.Spec.VlanID))

if err := bridgelink.DelVlanSubInterface(hnc.Spec.VlanID); err != nil {
return nil, fmt.Errorf("del vlan subinterface %d failed for %s, error: %w", hnc.Spec.VlanID, v.Bridge().Name, err)
}
Expand Down
19 changes: 16 additions & 3 deletions pkg/controller/agent/hostnetworkconfig/leasemanager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import (
"sync"
"time"

"github.com/sirupsen/logrus"

"github.com/harvester/harvester-network-controller/pkg/network/iface"
"github.com/insomniacslk/dhcp/dhcpv4"
"github.com/insomniacslk/dhcp/dhcpv4/nclient4"
Expand Down Expand Up @@ -166,14 +168,25 @@ func (lm *LeaseManager) Stop() {
lm.lease = nil
lm.mu.Unlock()

// if renew failed to get a lease
if lease == nil {
return
}

// 1. Cancel the long-running go thread to avoid conflicts with renewLoop
if cancel != nil {
cancel()
}

// Release DHCP lease
if lease != nil {
_ = lm.client.Release(lease)
// 2. Release DHCP and log
err := lm.client.Release(lease)
if err != nil {
logrus.Warnf("Failed to release dhcp lease %v err %v", lease, err.Error())
} else {
logrus.Infof("Released dhcp lease %v", lease)
}

_ = lm.client.Close()
}

func ipAddrFromLease(lease *nclient4.Lease) (string, error) {
Expand Down
Loading