Use simpler expressions for error messages

1. Do not describe port type in message because lp.String() already has the
information.

2. Remove duplicate error detail from event log.
Previous log is like this.

47s         Warning   listen tcp4 :30764: socket: too many open files   node/127.0.0.1   can't open port "nodePort for default/temp-svc:834" (:30764/tcp4), skipping it: listen tcp4 :30764: socket: too many open files
This commit is contained in:
Masashi Honma 2021-04-01 09:13:45 +09:00
parent 3266136c1d
commit d43b8dbf4e
2 changed files with 8 additions and 8 deletions

View File

@ -1110,7 +1110,7 @@ func (proxier *Proxier) syncProxyRules() {
} else {
socket, err := proxier.portMapper.OpenLocalPort(&lp)
if err != nil {
msg := fmt.Sprintf("can't open %s, skipping this externalIP: %v", lp.String(), err)
msg := fmt.Sprintf("can't open port %s, skipping it", lp.String())
proxier.recorder.Eventf(
&v1.ObjectReference{
@ -1119,7 +1119,7 @@ func (proxier *Proxier) syncProxyRules() {
UID: types.UID(proxier.hostname),
Namespace: "",
}, v1.EventTypeWarning, err.Error(), msg)
klog.ErrorS(err, "can't open port, skipping externalIP", "port", lp.String())
klog.ErrorS(err, "can't open port, skipping it", "port", lp.String())
continue
}
klog.V(2).InfoS("Opened local port", "port", lp.String())
@ -1283,7 +1283,7 @@ func (proxier *Proxier) syncProxyRules() {
} else if svcInfo.Protocol() != v1.ProtocolSCTP {
socket, err := proxier.portMapper.OpenLocalPort(&lp)
if err != nil {
msg := fmt.Sprintf("can't open %s, skipping this nodePort: %v", lp.String(), err)
msg := fmt.Sprintf("can't open port %s, skipping it", lp.String())
proxier.recorder.Eventf(
&v1.ObjectReference{
@ -1292,7 +1292,7 @@ func (proxier *Proxier) syncProxyRules() {
UID: types.UID(proxier.hostname),
Namespace: "",
}, v1.EventTypeWarning, err.Error(), msg)
klog.ErrorS(err, "can't open port, skipping this nodePort", "port", lp.String())
klog.ErrorS(err, "can't open port, skipping it", "port", lp.String())
continue
}
klog.V(2).InfoS("Opened local port", "port", lp.String())

View File

@ -1263,7 +1263,7 @@ func (proxier *Proxier) syncProxyRules() {
} else {
socket, err := proxier.portMapper.OpenLocalPort(&lp)
if err != nil {
msg := fmt.Sprintf("can't open %s, skipping this externalIP: %v", lp.String(), err)
msg := fmt.Sprintf("can't open port %s, skipping it", lp.String())
proxier.recorder.Eventf(
&v1.ObjectReference{
@ -1272,7 +1272,7 @@ func (proxier *Proxier) syncProxyRules() {
UID: types.UID(proxier.hostname),
Namespace: "",
}, v1.EventTypeWarning, err.Error(), msg)
klog.Error(msg)
klog.ErrorS(err, "can't open port, skipping it", "port", lp.String())
continue
}
klog.V(2).Infof("Opened local port %s", lp.String())
@ -1466,7 +1466,7 @@ func (proxier *Proxier) syncProxyRules() {
} else if svcInfo.Protocol() != v1.ProtocolSCTP {
socket, err := proxier.portMapper.OpenLocalPort(&lp)
if err != nil {
msg := fmt.Sprintf("can't open %s, skipping this nodePort: %v", lp.String(), err)
msg := fmt.Sprintf("can't open port %s, skipping it", lp.String())
proxier.recorder.Eventf(
&v1.ObjectReference{
@ -1475,7 +1475,7 @@ func (proxier *Proxier) syncProxyRules() {
UID: types.UID(proxier.hostname),
Namespace: "",
}, v1.EventTypeWarning, err.Error(), msg)
klog.Errorf("can't open %s, skipping this nodePort: %v", lp.String(), err)
klog.ErrorS(err, "can't open port, skipping it", "port", lp.String())
continue
}
klog.V(2).Infof("Opened local port %s", lp.String())