Skip to content

Commit 3c5ae5d

Browse files
committed
Handled address not found during release address as false positive
1 parent bfb151c commit 3c5ae5d

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

cni/network/network.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,8 @@ func (plugin *netPlugin) Delete(args *cniSkel.CmdArgs) error {
330330
nwCfg.Ipam.Address = address.IP.String()
331331
err = plugin.DelegateDel(nwCfg.Ipam.Type, nwCfg)
332332
if err != nil {
333-
log.Printf("Failed to release address: %v", err)
333+
plugin.Errorf("Failed to release address: %v", err)
334+
return err
334335
}
335336
}
336337

ipam/pool.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -542,13 +542,13 @@ func (ap *addressPool) releaseAddress(address string, options map[string]string)
542542

543543
// Fail if an address record with a matching ID is not found.
544544
if ar == nil || (id != "" && id != ar.ID) {
545-
err = errAddressNotFound
546-
return err
545+
log.Printf("Address not found. Not Returning error")
546+
return nil
547547
}
548548

549549
if !ar.InUse {
550-
err = errAddressNotInUse
551-
return err
550+
log.Printf("Address not in use. Not Returning error")
551+
return nil
552552
}
553553

554554
if ar.ID != "" {

0 commit comments

Comments
 (0)