Fix error log not printed nearby in ipam package

Signed-off-by: dolibali <zhangzihao2_yewu@cmss.chinamobile.com>
kubeovn · Sep 30, 2024 · 67e5194 · 67e5194
1 parent 5193704
commit 67e5194
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/pkg/ipam/ip_range_list.go b/pkg/ipam/ip_range_list.go
@@ -7,6 +7,8 @@ import (
  "sort"
  "strings"
 
+ "k8s.io/klog/v2"
+
  "github.com/kubeovn/kube-ovn/pkg/internal"
 )
 
@@ -40,10 +42,12 @@ func NewIPRangeListFrom(x ...string) (*IPRangeList, error) {
  ips := strings.Split(s, "..")
  start, err := NewIP(ips[0])
  if err != nil {
+ klog.Error(err)
  return nil, err
  }
  end, err := NewIP(ips[1])
  if err != nil {
+ klog.Error(err)
  return nil, err
  }
  if start.GreaterThan(end) {
@@ -53,12 +57,14 @@ func NewIPRangeListFrom(x ...string) (*IPRangeList, error) {
  case strings.ContainsRune(s, '/'):
  _, cidr, err := net.ParseCIDR(s)
  if err != nil {
+ klog.Error(err)
  return nil, err
  }
  r = NewIPRangeFromCIDR(*cidr)
  default:
  start, err := NewIP(s)
  if err != nil {
+ klog.Error(err)
  return nil, err
  }
  r = NewIPRange(start, start.Clone())

diff --git a/pkg/ipam/subnet.go b/pkg/ipam/subnet.go
@@ -47,6 +47,7 @@ func NewSubnet(name, cidrStr string, excludeIps []string) (*Subnet, error) {
  for _, cidrBlock := range strings.Split(cidrStr, ",") {
  _, cidr, err := net.ParseCIDR(cidrBlock)
  if err != nil {
+ klog.Error(err)
  return nil, ErrInvalidCIDR
  }
  cidrs = append(cidrs, cidr)
@@ -57,10 +58,12 @@ func NewSubnet(name, cidrStr string, excludeIps []string) (*Subnet, error) {
  v4ExcludeIps, v6ExcludeIps := util.SplitIpsByProtocol(excludeIps)
  v4Reserved, err := NewIPRangeListFrom(v4ExcludeIps...)
  if err != nil {
+ klog.Error(err)
  return nil, err
  }
  v6Reserved, err := NewIPRangeListFrom(v6ExcludeIps...)
  if err != nil {
+ klog.Error(err)
  return nil, err
  }
 
@@ -192,10 +195,12 @@ func (s *Subnet) GetRandomAddress(poolName, podName, nicName string, mac *string
 func (s *Subnet) getDualRandomAddress(poolName, podName, nicName string, mac *string, skippedAddrs []string, checkConflict bool) (IP, IP, string, error) {
  v4IP, _, _, err := s.getV4RandomAddress(poolName, podName, nicName, mac, skippedAddrs, checkConflict)
  if err != nil {
+ klog.Error(err)
  return nil, nil, "", err
  }
  _, v6IP, macStr, err := s.getV6RandomAddress(poolName, podName, nicName, mac, skippedAddrs, checkConflict)
  if err != nil {
+ klog.Error(err)
  return nil, nil, "", err
  }
 
@@ -639,6 +644,7 @@ func (s *Subnet) AddOrUpdateIPPool(name string, ips []string) error {
  v4IPs, v6IPs := util.SplitIpsByProtocol(ips)
  if s.V4CIDR != nil {
  if pool.V4IPs, err = NewIPRangeListFrom(v4IPs...); err != nil {
+ klog.Error(err)
  return err
  }
  for k, v := range s.IPPools {
@@ -659,6 +665,7 @@ func (s *Subnet) AddOrUpdateIPPool(name string, ips []string) error {
  }
  if s.V6CIDR != nil {
  if pool.V6IPs, err = NewIPRangeListFrom(v6IPs...); err != nil {
+ klog.Error(err)
  return err
  }
  for k, v := range s.IPPools {