Skip to content

Commit 68dc1c3

Browse files
zbb88888zbb88888
authored
add log near err (#3098)
1 parent c6c472a commit 68dc1c3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+472
-10
lines changed

‎cmd/daemon/cniserver.go

+1
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ func mvCNIConf(configDir, configFile, confName string) error {
127127
// #nosec
128128
data, err := os.ReadFile(configFile)
129129
if err != nil {
130+
klog.Errorf("failed to read cni config file %s, %v", configFile, err)
130131
return err
131132
}
132133

‎pkg/controller/config.go

+2
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,7 @@ func ParseFlags() (*Configuration, error) {
259259
if config.DefaultGateway == "" {
260260
gw, err := util.GetGwByCidr(config.DefaultCIDR)
261261
if err != nil {
262+
klog.Error(err)
262263
return nil, err
263264
}
264265
config.DefaultGateway = gw
@@ -271,6 +272,7 @@ func ParseFlags() (*Configuration, error) {
271272
if config.NodeSwitchGateway == "" {
272273
gw, err := util.GetGwByCidr(config.NodeSwitchCIDR)
273274
if err != nil {
275+
klog.Error(err)
274276
return nil, err
275277
}
276278
config.NodeSwitchGateway = gw

‎pkg/controller/endpoint.go

+2
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ func (c *Controller) handleUpdateEndpoint(key string) error {
100100
if errors.IsNotFound(err) {
101101
return nil
102102
}
103+
klog.Error(err)
103104
return err
104105
}
105106

@@ -108,6 +109,7 @@ func (c *Controller) handleUpdateEndpoint(key string) error {
108109
if errors.IsNotFound(err) {
109110
return nil
110111
}
112+
klog.Error(err)
111113
return err
112114
}
113115
svc := cachedService.DeepCopy()

‎pkg/controller/external_vpc.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,18 @@ func (c *Controller) syncExternalVpc() {
3636
}
3737
_, err = c.config.KubeOvnClient.KubeovnV1().Vpcs().UpdateStatus(context.Background(), vpc, metav1.UpdateOptions{})
3838
if err != nil {
39-
klog.V(4).Infof("update vpc %s status failed", vpcName)
39+
klog.Errorf("update vpc %s status failed: %v", vpcName, err)
4040
continue
4141
}
4242
delete(logicalRouters, vpcName)
4343
klog.V(4).Infof("patch vpc %s", vpcName)
4444
} else {
4545
err = c.config.KubeOvnClient.KubeovnV1().Vpcs().Delete(context.Background(), vpcName, metav1.DeleteOptions{})
4646
if err != nil {
47-
klog.V(4).Infof("delete vpc %s failed", vpcName)
47+
klog.Error("delete vpc %s failed: %v", vpcName, err)
4848
continue
4949
}
50-
klog.V(4).Infof("delete vpc %s ", vpcName)
50+
klog.Infof("deleted vpc %s ", vpcName)
5151
}
5252
}
5353
if len(logicalRouters) != 0 {

‎pkg/controller/gc.go

+4
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,7 @@ func (c *Controller) gcLoadBalancer() error {
395395
// remove lb from logical switch
396396
vpcs, err := c.vpcsLister.List(labels.Everything())
397397
if err != nil {
398+
klog.Error(err)
398399
return err
399400
}
400401
for _, cachedVpc := range vpcs {
@@ -405,6 +406,7 @@ func (c *Controller) gcLoadBalancer() error {
405406
if k8serrors.IsNotFound(err) {
406407
continue
407408
}
409+
klog.Error(err)
408410
return err
409411
}
410412
if !isOvnSubnet(subnet) {
@@ -425,10 +427,12 @@ func (c *Controller) gcLoadBalancer() error {
425427
vpc.Status.SctpSessionLoadBalancer = ""
426428
bytes, err := vpc.Status.Bytes()
427429
if err != nil {
430+
klog.Error(err)
428431
return err
429432
}
430433
_, err = c.config.KubeOvnClient.KubeovnV1().Vpcs().Patch(context.Background(), vpc.Name, types.MergePatchType, bytes, metav1.PatchOptions{}, "status")
431434
if err != nil {
435+
klog.Error(err)
432436
return err
433437
}
434438
}

‎pkg/controller/init.go

+6
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ func (c *Controller) InitDefaultVpc() error {
8686

8787
bytes, err := vpc.Status.Bytes()
8888
if err != nil {
89+
klog.Error(err)
8990
return err
9091
}
9192
_, err = c.config.KubeOvnClient.KubeovnV1().Vpcs().Patch(context.Background(), vpc.Name, types.MergePatchType, bytes, metav1.PatchOptions{}, "status")
@@ -263,10 +264,12 @@ func (c *Controller) initLoadBalancer() error {
263264
vpc.Status.SctpSessionLoadBalancer = vpcLb.SctpSessLoadBalancer
264265
bytes, err := vpc.Status.Bytes()
265266
if err != nil {
267+
klog.Error(err)
266268
return err
267269
}
268270
_, err = c.config.KubeOvnClient.KubeovnV1().Vpcs().Patch(context.Background(), vpc.Name, types.MergePatchType, bytes, metav1.PatchOptions{}, "status")
269271
if err != nil {
272+
klog.Error(err)
270273
return err
271274
}
272275
}
@@ -588,6 +591,7 @@ func (c *Controller) initDefaultVlan() error {
588591
}
589592

590593
if err := c.initDefaultProviderNetwork(); err != nil {
594+
klog.Error(err)
591595
return err
592596
}
593597

@@ -664,6 +668,7 @@ func (c *Controller) initSyncCrdSubnets() error {
664668
if k8serrors.IsNotFound(err) {
665669
return nil
666670
}
671+
klog.Error(err)
667672
return err
668673
}
669674
for _, orisubnet := range subnets {
@@ -745,6 +750,7 @@ func (c *Controller) initSyncCrdVlans() error {
745750
if k8serrors.IsNotFound(err) {
746751
return nil
747752
}
753+
klog.Error(err)
748754
return err
749755
}
750756

‎pkg/controller/inspection.go

+2
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ func (c *Controller) inspectPod() error {
4343
portName := ovs.PodNameToPortName(podName, pod.Namespace, podNet.ProviderName)
4444
exists, err := c.ovnClient.LogicalSwitchPortExists(portName)
4545
if err != nil {
46+
klog.Errorf("failed to check port %s exists, %v", portName, err)
4647
return err
4748
}
4849

@@ -51,6 +52,7 @@ func (c *Controller) inspectPod() error {
5152
delete(pod.Annotations, fmt.Sprintf(util.RoutedAnnotationTemplate, podNet.ProviderName))
5253
patch, err := util.GenerateStrategicMergePatchPayload(oriPod, pod)
5354
if err != nil {
55+
klog.Errorf("failed to generate patch payload, %v", err)
5456
return err
5557
}
5658
if _, err := c.config.KubeClient.CoreV1().Pods(pod.Namespace).Patch(context.Background(), pod.Name,

‎pkg/controller/ovn-ic.go

+7
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,7 @@ func (c *Controller) startOvnIC(icHost, icNbPort, icSbPort string) error {
323323
}
324324
output, err := cmd.CombinedOutput()
325325
if err != nil {
326+
klog.Error(err)
326327
return fmt.Errorf("%s", output)
327328
}
328329
return nil
@@ -332,6 +333,7 @@ func (c *Controller) stopOvnIC() error {
332333
cmd := exec.Command("/usr/share/ovn/scripts/ovn-ctl", "stop_ic")
333334
output, err := cmd.CombinedOutput()
334335
if err != nil {
336+
klog.Error(err)
335337
return fmt.Errorf("%s", output)
336338
}
337339
return nil
@@ -342,6 +344,7 @@ func (c *Controller) waitTsReady() error {
342344
for retry > 0 {
343345
ready, err := c.allSubnetReady(util.InterconnectionSwitch)
344346
if err != nil {
347+
klog.Error(err)
345348
return err
346349
}
347350

@@ -406,16 +409,19 @@ func (c *Controller) RemoveOldChassisInSbDB(azName string) error {
406409
azUUID, err := c.ovnLegacyClient.GetAzUUID(azName)
407410
if err != nil {
408411
klog.Errorf("failed to get UUID of AZ %s: %v", lastIcCm["az-name"], err)
412+
return err
409413
}
410414

411415
gateways, err := c.ovnLegacyClient.GetGatewayUUIDsInOneAZ(azUUID)
412416
if err != nil {
413417
klog.Errorf("failed to get gateway UUIDs in AZ %s: %v", azUUID, err)
418+
return err
414419
}
415420

416421
routes, err := c.ovnLegacyClient.GetRouteUUIDsInOneAZ(azUUID)
417422
if err != nil {
418423
klog.Errorf("failed to get route UUIDs in AZ %s: %v", azUUID, err)
424+
return err
419425
}
420426

421427
c.ovnLegacyClient.DestroyGateways(gateways)
@@ -504,6 +510,7 @@ func (c *Controller) listRemoteLogicalSwitchPortAddress() (*strset.Set, error) {
504510
return lsp.Type == "remote"
505511
})
506512
if err != nil {
513+
klog.Error(err)
507514
return nil, fmt.Errorf("list remote logical switch ports: %v", err)
508515
}
509516

‎pkg/controller/ovn_dnat.go

+7
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ func (c *Controller) isOvnDnatDuplicated(eipName, dnatName, externalPort string)
183183
}))
184184
if err != nil {
185185
if !k8serrors.IsNotFound(err) {
186+
klog.Error(err)
186187
return false, err
187188
}
188189
}
@@ -203,6 +204,7 @@ func (c *Controller) handleAddOvnDnatRule(key string) error {
203204
if k8serrors.IsNotFound(err) {
204205
return nil
205206
}
207+
klog.Error(err)
206208
return err
207209
}
208210

@@ -318,6 +320,7 @@ func (c *Controller) handleDelOvnDnatRule(key string) error {
318320
if k8serrors.IsNotFound(err) {
319321
return nil
320322
}
323+
klog.Error(err)
321324
return err
322325
}
323326

@@ -345,6 +348,7 @@ func (c *Controller) handleUpdateOvnDnatRule(key string) error {
345348
if k8serrors.IsNotFound(err) {
346349
return nil
347350
}
351+
klog.Error(err)
348352
return err
349353
}
350354

@@ -458,6 +462,7 @@ func (c *Controller) patchOvnDnatAnnotations(key, eipName string) error {
458462
if k8serrors.IsNotFound(err) {
459463
return nil
460464
}
465+
klog.Error(err)
461466
return err
462467
}
463468

@@ -495,6 +500,7 @@ func (c *Controller) patchOvnDnatStatus(key, vpcName, v4Eip, podIp, podMac strin
495500
if k8serrors.IsNotFound(err) {
496501
return nil
497502
}
503+
klog.Error(err)
498504
return err
499505
}
500506
dnat := oriDnat.DeepCopy()
@@ -562,6 +568,7 @@ func (c *Controller) patchOvnDnatStatus(key, vpcName, v4Eip, podIp, podMac strin
562568
if changed {
563569
bytes, err := dnat.Status.Bytes()
564570
if err != nil {
571+
klog.Error(err)
565572
return err
566573
}
567574
if _, err = c.config.KubeOvnClient.KubeovnV1().OvnDnatRules().Patch(context.Background(), dnat.Name,

‎pkg/controller/ovn_eip.go

+5
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,7 @@ func (c *Controller) handleAddOvnEip(key string) error {
217217
if k8serrors.IsNotFound(err) {
218218
return nil
219219
}
220+
klog.Error(err)
220221
return err
221222
}
222223
if cachedEip.Status.MacAddress != "" {
@@ -281,6 +282,7 @@ func (c *Controller) handleUpdateOvnEip(key string) error {
281282
if k8serrors.IsNotFound(err) {
282283
return nil
283284
}
285+
klog.Error(err)
284286
return err
285287
}
286288
klog.V(3).Infof("handle update ovn eip %s", cachedEip.Name)
@@ -316,6 +318,7 @@ func (c *Controller) handleResetOvnEip(key string) error {
316318
if k8serrors.IsNotFound(err) {
317319
return nil
318320
}
321+
klog.Error(err)
319322
return err
320323
}
321324
if !cachedEip.DeletionTimestamp.IsZero() {
@@ -384,6 +387,7 @@ func (c *Controller) createOrUpdateCrdOvnEip(key, subnet, v4ip, v6ip, mac, usage
384387
}, metav1.CreateOptions{})
385388
if err != nil {
386389
err := fmt.Errorf("failed to create crd ovn eip '%s', %v", key, err)
390+
klog.Error(err)
387391
return err
388392
}
389393
// wait local cache ready
@@ -513,6 +517,7 @@ func (c *Controller) natLabelAndAnnoOvnEip(eipName, natName, vpcName string) err
513517
if k8serrors.IsNotFound(err) {
514518
return nil
515519
}
520+
klog.Error(err)
516521
return err
517522
}
518523
eip := cachedEip.DeepCopy()

‎pkg/controller/ovn_fip.go

+5
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@ func (c *Controller) handleAddOvnFip(key string) error {
195195
if k8serrors.IsNotFound(err) {
196196
return nil
197197
}
198+
klog.Error(err)
198199
return err
199200
}
200201
if cachedFip.Status.Ready && cachedFip.Status.V4Ip != "" {
@@ -406,6 +407,7 @@ func (c *Controller) handleDelOvnFip(key string) error {
406407
if k8serrors.IsNotFound(err) {
407408
return nil
408409
}
410+
klog.Error(err)
409411
return err
410412
}
411413
eipName := cachedFip.Spec.OvnEip
@@ -430,6 +432,7 @@ func (c *Controller) patchOvnFipAnnotations(key, eipName string) error {
430432
if k8serrors.IsNotFound(err) {
431433
return nil
432434
}
435+
klog.Error(err)
433436
return err
434437
}
435438
fip := oriFip.DeepCopy()
@@ -466,6 +469,7 @@ func (c *Controller) patchOvnFipStatus(key, vpcName, v4Eip, podIp, podMac string
466469
if k8serrors.IsNotFound(err) {
467470
return nil
468471
}
472+
klog.Error(err)
469473
return err
470474
}
471475
fip := oriFip.DeepCopy()
@@ -510,6 +514,7 @@ func (c *Controller) patchOvnFipStatus(key, vpcName, v4Eip, podIp, podMac string
510514
if changed {
511515
bytes, err := fip.Status.Bytes()
512516
if err != nil {
517+
klog.Error(err)
513518
return err
514519
}
515520
if _, err = c.config.KubeOvnClient.KubeovnV1().OvnFips().Patch(context.Background(), fip.Name,

‎pkg/controller/ovn_snat.go

+4
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ func (c *Controller) handleAddOvnSnatRule(key string) error {
177177
if k8serrors.IsNotFound(err) {
178178
return nil
179179
}
180+
klog.Error(err)
180181
return err
181182
}
182183
if cachedSnat.Status.Ready && cachedSnat.Status.V4IpCidr != "" {
@@ -272,6 +273,7 @@ func (c *Controller) handleUpdateOvnSnatRule(key string) error {
272273
if k8serrors.IsNotFound(err) {
273274
return nil
274275
}
276+
klog.Error(err)
275277
return err
276278
}
277279
klog.V(3).Infof("handle update ovn snat %s", key)
@@ -376,6 +378,7 @@ func (c *Controller) patchOvnSnatStatus(key, vpc, v4Eip, v4IpCidr string, ready
376378
if k8serrors.IsNotFound(err) {
377379
return nil
378380
}
381+
klog.Error(err)
379382
return err
380383
}
381384
snat := oriSnat.DeepCopy()
@@ -436,6 +439,7 @@ func (c *Controller) patchOvnSnatAnnotation(key, eipName string) error {
436439
if k8serrors.IsNotFound(err) {
437440
return nil
438441
}
442+
klog.Error(err)
439443
return err
440444
}
441445
snat := oriFip.DeepCopy()

0 commit comments

Comments
 (0)