Add warning message for the failure of deleting link device
Signed-off-by: ZhiPeng Lu <lu.zhipeng@zte.com.cn>
This commit is contained in:
parent
5bbc19d7fe
commit
9ba57c93b8
|
@ -782,7 +782,9 @@ func (d *driver) deleteNetwork(nid string) error {
|
||||||
logrus.Warn(err)
|
logrus.Warn(err)
|
||||||
}
|
}
|
||||||
if link, err := d.nlh.LinkByName(ep.srcName); err == nil {
|
if link, err := d.nlh.LinkByName(ep.srcName); err == nil {
|
||||||
d.nlh.LinkDel(link)
|
if err := d.nlh.LinkDel(link); err != nil {
|
||||||
|
logrus.WithError(err).Errorf("Failed to delete interface (%s)'s link on endpoint (%s) delete", ep.srcName, ep.id)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := d.storeDelete(ep); err != nil {
|
if err := d.storeDelete(ep); err != nil {
|
||||||
|
@ -969,7 +971,9 @@ func (d *driver) CreateEndpoint(nid, eid string, ifInfo driverapi.InterfaceInfo,
|
||||||
}
|
}
|
||||||
defer func() {
|
defer func() {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
d.nlh.LinkDel(host)
|
if err := d.nlh.LinkDel(host); err != nil {
|
||||||
|
logrus.WithError(err).Warnf("Failed to delete host side interface (%s)'s link", hostIfName)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
|
@ -980,7 +984,9 @@ func (d *driver) CreateEndpoint(nid, eid string, ifInfo driverapi.InterfaceInfo,
|
||||||
}
|
}
|
||||||
defer func() {
|
defer func() {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
d.nlh.LinkDel(sbox)
|
if err := d.nlh.LinkDel(sbox); err != nil {
|
||||||
|
logrus.WithError(err).Warnf("Failed to delete sandbox side interface (%s)'s link", containerIfName)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
|
@ -1117,7 +1123,9 @@ func (d *driver) DeleteEndpoint(nid, eid string) error {
|
||||||
// Try removal of link. Discard error: it is a best effort.
|
// Try removal of link. Discard error: it is a best effort.
|
||||||
// Also make sure defer does not see this error either.
|
// Also make sure defer does not see this error either.
|
||||||
if link, err := d.nlh.LinkByName(ep.srcName); err == nil {
|
if link, err := d.nlh.LinkByName(ep.srcName); err == nil {
|
||||||
d.nlh.LinkDel(link)
|
if err := d.nlh.LinkDel(link); err != nil {
|
||||||
|
logrus.WithError(err).Errorf("Failed to delete interface (%s)'s link on endpoint (%s) delete", ep.srcName, ep.id)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := d.storeDelete(ep); err != nil {
|
if err := d.storeDelete(ep); err != nil {
|
||||||
|
|
|
@ -76,7 +76,9 @@ func (d *driver) DeleteEndpoint(nid, eid string) error {
|
||||||
return fmt.Errorf("endpoint id %q not found", eid)
|
return fmt.Errorf("endpoint id %q not found", eid)
|
||||||
}
|
}
|
||||||
if link, err := ns.NlHandle().LinkByName(ep.srcName); err == nil {
|
if link, err := ns.NlHandle().LinkByName(ep.srcName); err == nil {
|
||||||
ns.NlHandle().LinkDel(link)
|
if err := ns.NlHandle().LinkDel(link); err != nil {
|
||||||
|
logrus.WithError(err).Warnf("Failed to delete interface (%s)'s link on endpoint (%s) delete", ep.srcName, ep.id)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := d.storeDelete(ep); err != nil {
|
if err := d.storeDelete(ep); err != nil {
|
||||||
|
|
|
@ -150,7 +150,9 @@ func (d *driver) DeleteNetwork(nid string) error {
|
||||||
}
|
}
|
||||||
for _, ep := range n.endpoints {
|
for _, ep := range n.endpoints {
|
||||||
if link, err := ns.NlHandle().LinkByName(ep.srcName); err == nil {
|
if link, err := ns.NlHandle().LinkByName(ep.srcName); err == nil {
|
||||||
ns.NlHandle().LinkDel(link)
|
if err := ns.NlHandle().LinkDel(link); err != nil {
|
||||||
|
logrus.WithError(err).Warnf("Failed to delete interface (%s)'s link on endpoint (%s) delete", ep.srcName, ep.id)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := d.storeDelete(ep); err != nil {
|
if err := d.storeDelete(ep); err != nil {
|
||||||
|
|
|
@ -81,7 +81,9 @@ func (d *driver) DeleteEndpoint(nid, eid string) error {
|
||||||
return fmt.Errorf("endpoint id %q not found", eid)
|
return fmt.Errorf("endpoint id %q not found", eid)
|
||||||
}
|
}
|
||||||
if link, err := ns.NlHandle().LinkByName(ep.srcName); err == nil {
|
if link, err := ns.NlHandle().LinkByName(ep.srcName); err == nil {
|
||||||
ns.NlHandle().LinkDel(link)
|
if err := ns.NlHandle().LinkDel(link); err != nil {
|
||||||
|
logrus.WithError(err).Warnf("Failed to delete interface (%s)'s link on endpoint (%s) delete", ep.srcName, ep.id)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := d.storeDelete(ep); err != nil {
|
if err := d.storeDelete(ep); err != nil {
|
||||||
|
|
|
@ -154,7 +154,9 @@ func (d *driver) DeleteNetwork(nid string) error {
|
||||||
}
|
}
|
||||||
for _, ep := range n.endpoints {
|
for _, ep := range n.endpoints {
|
||||||
if link, err := ns.NlHandle().LinkByName(ep.srcName); err == nil {
|
if link, err := ns.NlHandle().LinkByName(ep.srcName); err == nil {
|
||||||
ns.NlHandle().LinkDel(link)
|
if err := ns.NlHandle().LinkDel(link); err != nil {
|
||||||
|
logrus.WithError(err).Warnf("Failed to delete interface (%s)'s link on endpoint (%s) delete", ep.srcName, ep.id)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := d.storeDelete(ep); err != nil {
|
if err := d.storeDelete(ep); err != nil {
|
||||||
|
|
|
@ -243,7 +243,9 @@ func (d *driver) DeleteNetwork(nid string) error {
|
||||||
for _, ep := range n.endpoints {
|
for _, ep := range n.endpoints {
|
||||||
if ep.ifName != "" {
|
if ep.ifName != "" {
|
||||||
if link, err := ns.NlHandle().LinkByName(ep.ifName); err == nil {
|
if link, err := ns.NlHandle().LinkByName(ep.ifName); err == nil {
|
||||||
ns.NlHandle().LinkDel(link)
|
if err := ns.NlHandle().LinkDel(link); err != nil {
|
||||||
|
logrus.WithError(err).Warnf("Failed to delete interface (%s)'s link on endpoint (%s) delete", ep.ifName, ep.id)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue