Skip to content

Commit 5efa19b

Browse files
committed
Add logging for host query soft failures
1 parent b9a2193 commit 5efa19b

File tree

2 files changed

+15
-7
lines changed

2 files changed

+15
-7
lines changed

ipam/azure.go

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"time"
1212

1313
"github.com/Azure/azure-container-networking/common"
14+
"github.com/Azure/azure-container-networking/log"
1415
)
1516

1617
const (
@@ -143,19 +144,22 @@ func (s *azureSource) refresh() error {
143144

144145
// Skip if interface is not found.
145146
if ifName == "" {
147+
log.Printf("[ipam] Failed to find interface with MAC address:%v.", i.MacAddress)
146148
continue
147149
}
148150

149151
// For each subnet on the interface...
150152
for _, s := range i.IPSubnet {
151153
_, subnet, err := net.ParseCIDR(s.Prefix)
152154
if err != nil {
153-
return err
155+
log.Printf("[ipam] Failed to parse subnet:%v err:%v.", s.Prefix, err)
156+
continue
154157
}
155158

156159
ap, err := local.newAddressPool(ifName, priority, subnet)
157-
if err != nil && err != errAddressExists {
158-
return err
160+
if err != nil {
161+
log.Printf("[ipam] Failed to create pool:%v ifName:%v err:%v.", subnet, ifName, err)
162+
continue
159163
}
160164

161165
// For each address in the subnet...
@@ -169,7 +173,8 @@ func (s *azureSource) refresh() error {
169173

170174
_, err = ap.newAddressRecord(&address)
171175
if err != nil {
172-
return err
176+
log.Printf("[ipam] Failed to create address:%v err:%v.", address, err)
177+
continue
173178
}
174179
}
175180
}

ipam/mas.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"time"
1111

1212
"github.com/Azure/azure-container-networking/common"
13+
"github.com/Azure/azure-container-networking/log"
1314
)
1415

1516
const (
@@ -113,13 +114,15 @@ func (s *masSource) refresh() error {
113114
}
114115

115116
ap, err := local.newAddressPool("eth0", 0, &subnet)
116-
if err != nil && err != errAddressExists {
117-
return err
117+
if err != nil {
118+
log.Printf("[ipam] Failed to create pool:%v err:%v.", subnet, err)
119+
continue
118120
}
119121

120122
_, err = ap.newAddressRecord(&address)
121123
if err != nil {
122-
return err
124+
log.Printf("[ipam] Failed to create address:%v err:%v.", address, err)
125+
continue
123126
}
124127
}
125128

0 commit comments

Comments
 (0)