Skip to content

Commit

Permalink
Log near err (#3739)
Browse files Browse the repository at this point in the history 
log near err
  • Loading branch information
@bobz965
bobz965 committed Feb 20, 2024
1 parent 08fa821 commit fbbe6e7
Show file tree
Hide file tree
Showing 37 changed files with 413 additions and 78 deletions.
2 changes: 2 additions & 0 deletions pkg/controller/endpoint.go
View file
Expand Up @@ -98,6 +98,7 @@ func (c *Controller) handleUpdateEndpoint(key string) error {
if errors.IsNotFound(err) {
return nil
}
klog.Error(err)
return err
}

Expand All @@ -106,6 +107,7 @@ func (c *Controller) handleUpdateEndpoint(key string) error {
if errors.IsNotFound(err) {
return nil
}
klog.Error(err)
return err
}
svc := cachedService.DeepCopy()
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/external-gw.go
View file
Expand Up @@ -150,6 +150,7 @@ func (c *Controller) establishExternalGateway(config map[string]string) error {
lrpName := fmt.Sprintf("%s-%s", c.config.ClusterRouter, c.config.ExternalGatewaySwitch)
exist, err := c.ovnClient.LogicalRouterPortExists(lrpName)
if err != nil {
klog.Error(err)
return err
}
if exist {
Expand Down
14 changes: 14 additions & 0 deletions pkg/controller/gc.go
View file
Expand Up @@ -38,6 +38,7 @@ func (c *Controller) gc() error {
}
for _, gcFunc := range gcFunctions {
if err := gcFunc(); err != nil {
klog.Error(err)
return err
}
}
Expand Down Expand Up @@ -270,6 +271,7 @@ func (c *Controller) gcVip() error {
}
return nil
}
klog.Error(err)
return err
}
}
Expand Down Expand Up @@ -394,6 +396,7 @@ func (c *Controller) gcLoadBalancer() error {
// remove lb from logical switch
vpcs, err := c.vpcsLister.List(labels.Everything())
if err != nil {
klog.Error(err)
return err
}
for _, cachedVpc := range vpcs {
Expand All @@ -404,6 +407,7 @@ func (c *Controller) gcLoadBalancer() error {
if k8serrors.IsNotFound(err) {
continue
}
klog.Error(err)
return err
}
if !isOvnSubnet(subnet) {
Expand All @@ -419,6 +423,7 @@ func (c *Controller) gcLoadBalancer() error {
vpc.Status.SctpLoadBalancer,
vpc.Status.SctpSessionLoadBalancer)
if err != nil {
klog.Error(err)
return err
}
}
Expand All @@ -431,10 +436,12 @@ func (c *Controller) gcLoadBalancer() error {
vpc.Status.SctpSessionLoadBalancer = ""
bytes, err := vpc.Status.Bytes()
if err != nil {
klog.Error(err)
return err
}
_, err = c.config.KubeOvnClient.KubeovnV1().Vpcs().Patch(context.Background(), vpc.Name, types.MergePatchType, bytes, metav1.PatchOptions{}, "status")
if err != nil {
klog.Error(err)
return err
}
}
Expand Down Expand Up @@ -528,21 +535,27 @@ func (c *Controller) gcLoadBalancer() error {
}

if err = removeVIP(tcpLb, tcpVips); err != nil {
klog.Error(err)
return err
}
if err = removeVIP(tcpSessLb, tcpSessionVips); err != nil {
klog.Error(err)
return err
}
if err = removeVIP(udpLb, udpVips); err != nil {
klog.Error(err)
return err
}
if err = removeVIP(udpSessLb, udpSessionVips); err != nil {
klog.Error(err)
return err
}
if err = removeVIP(sctpLb, sctpVips); err != nil {
klog.Error(err)
return err
}
if err = removeVIP(sctpSessLb, sctpSessionVips); err != nil {
klog.Error(err)
return err
}
}
Expand All @@ -561,6 +574,7 @@ func (c *Controller) gcLoadBalancer() error {
}
klog.Infof("start to destroy load balancer %s", lb)
if err := c.ovnLegacyClient.DeleteLoadBalancer(lb); err != nil {
klog.Error(err)
return err
}
}
Expand Down
25 changes: 21 additions & 4 deletions pkg/controller/init.go
View file
Expand Up @@ -77,6 +77,7 @@ func (c *Controller) InitDefaultVpc() error {

bytes, err := vpc.Status.Bytes()
if err != nil {
klog.Error(err)
return err
}
_, err = c.config.KubeOvnClient.KubeovnV1().Vpcs().Patch(context.Background(), vpc.Name, types.MergePatchType, bytes, metav1.PatchOptions{}, "status")
Expand Down Expand Up @@ -137,8 +138,11 @@ func (c *Controller) initDefaultLogicalSwitch() error {
defaultSubnet.Spec.U2OInterconnection = c.config.DefaultU2OInterconnection
}

_, err = c.config.KubeOvnClient.KubeovnV1().Subnets().Create(context.Background(), &defaultSubnet, metav1.CreateOptions{})
return err
if _, err = c.config.KubeOvnClient.KubeovnV1().Subnets().Create(context.Background(), &defaultSubnet, metav1.CreateOptions{}); err != nil {
klog.Error(err)
return err
}
return nil
}

// InitNodeSwitch init node switch to connect host and pod
Expand Down Expand Up @@ -179,8 +183,7 @@ func (c *Controller) initNodeSwitch() error {
},
}

_, err = c.config.KubeOvnClient.KubeovnV1().Subnets().Create(context.Background(), &nodeSubnet, metav1.CreateOptions{})
if err != nil {
if _, err = c.config.KubeOvnClient.KubeovnV1().Subnets().Create(context.Background(), &nodeSubnet, metav1.CreateOptions{}); err != nil {
klog.Errorf("failed to create subnet %s: %v", c.config.NodeSwitch, err)
return err
}
Expand All @@ -191,6 +194,7 @@ func (c *Controller) initNodeSwitch() error {
func (c *Controller) initClusterRouter() error {
lrs, err := c.ovnLegacyClient.ListLogicalRouter(c.config.EnableExternalVpc)
if err != nil {
klog.Error(err)
return err
}
klog.Infof("exists routers: %v", lrs)
Expand Down Expand Up @@ -237,21 +241,27 @@ func (c *Controller) initLoadBalancer() error {
vpc := cachedVpc.DeepCopy()
vpcLb := c.GenVpcLoadBalancer(vpc.Name)
if err = c.initLB(vpcLb.TcpLoadBalancer, string(v1.ProtocolTCP), false); err != nil {
klog.Error(err)
return err
}
if err = c.initLB(vpcLb.TcpSessLoadBalancer, string(v1.ProtocolTCP), true); err != nil {
klog.Error(err)
return err
}
if err = c.initLB(vpcLb.UdpLoadBalancer, string(v1.ProtocolUDP), false); err != nil {
klog.Error(err)
return err
}
if err = c.initLB(vpcLb.UdpSessLoadBalancer, string(v1.ProtocolUDP), true); err != nil {
klog.Error(err)
return err
}
if err = c.initLB(vpcLb.SctpLoadBalancer, string(v1.ProtocolSCTP), false); err != nil {
klog.Error(err)
return err
}
if err = c.initLB(vpcLb.SctpSessLoadBalancer, string(v1.ProtocolSCTP), true); err != nil {
klog.Error(err)
return err
}

Expand All @@ -263,10 +273,12 @@ func (c *Controller) initLoadBalancer() error {
vpc.Status.SctpSessionLoadBalancer = vpcLb.SctpSessLoadBalancer
bytes, err := vpc.Status.Bytes()
if err != nil {
klog.Error(err)
return err
}
_, err = c.config.KubeOvnClient.KubeovnV1().Vpcs().Patch(context.Background(), vpc.Name, types.MergePatchType, bytes, metav1.PatchOptions{}, "status")
if err != nil {
klog.Error(err)
return err
}
}
Expand Down Expand Up @@ -525,6 +537,7 @@ func (c *Controller) initDefaultVlan() error {
}

if err := c.initDefaultProviderNetwork(); err != nil {
klog.Error(err)
return err
}

Expand Down Expand Up @@ -565,6 +578,7 @@ func (c *Controller) initSyncCrdIPs() error {
if k8serrors.IsNotFound(err) {
return nil
}
klog.Error(err)
return err
}

Expand Down Expand Up @@ -610,6 +624,7 @@ func (c *Controller) initSyncCrdSubnets() error {
if k8serrors.IsNotFound(err) {
return nil
}
klog.Error(err)
return err
}
for _, orisubnet := range subnets {
Expand Down Expand Up @@ -663,6 +678,7 @@ func (c *Controller) initSyncCrdVlans() error {
if k8serrors.IsNotFound(err) {
return nil
}
klog.Error(err)
return err
}

Expand Down Expand Up @@ -695,6 +711,7 @@ func (c *Controller) migrateNodeRoute(af int, node, ip, nexthop string) error {
match := fmt.Sprintf("ip%d.dst == %s", af, ip)
consistent, err := c.ovnLegacyClient.CheckPolicyRouteNexthopConsistent(c.config.ClusterRouter, match, nexthop, util.NodeRouterPolicyPriority)
if err != nil {
klog.Error(err)
return err
}
if consistent {
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/inspection.go
View file
Expand Up @@ -57,6 +57,7 @@ func (c *Controller) inspectPod() error {
delete(pod.Annotations, fmt.Sprintf(util.RoutedAnnotationTemplate, podNet.ProviderName))
patch, err := util.GenerateStrategicMergePatchPayload(oriPod, pod)
if err != nil {
klog.Error(err)
return err
}
if _, err := c.config.KubeClient.CoreV1().Pods(pod.Namespace).Patch(context.Background(), pod.Name,
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/ip.go
View file
Expand Up @@ -189,6 +189,7 @@ func (c *Controller) handleAddIP(key string) error {
if k8serrors.IsNotFound(err) {
return nil
}
klog.Error(err)
return err
}
klog.V(3).Infof("handle add ip %s", cachedIP.Name)
Expand Down
5 changes: 4 additions & 1 deletion pkg/controller/namespace.go
View file
Expand Up @@ -112,6 +112,7 @@ func (c *Controller) handleAddNamespace(key string) error {
if errors.IsNotFound(err) {
return nil
}
klog.Error(err)
return err
}
namespace := cachedNs.DeepCopy()
Expand Down Expand Up @@ -184,11 +185,13 @@ func (c *Controller) handleAddNamespace(key string) error {

patch, err := util.GenerateStrategicMergePatchPayload(cachedNs, namespace)
if err != nil {
klog.Error(err)
return err
}
if _, err = c.config.KubeClient.CoreV1().Namespaces().Patch(context.Background(), key,
types.StrategicMergePatchType, patch, metav1.PatchOptions{}, ""); err != nil {
klog.Errorf("patch namespace %s failed %v", key, err)
return err
}
return err
return nil
}
1 change: 1 addition & 0 deletions pkg/controller/network_policy.go
View file
Expand Up @@ -143,6 +143,7 @@ func (c *Controller) handleUpdateNp(key string) error {
if k8serrors.IsNotFound(err) {
return nil
}
klog.Error(err)
return err
}

Expand Down

0 comments on commit fbbe6e7

Please sign in to comment.