github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #110723 from yangjunmyfm192085/fixklog

Browse Source 
Fix incorrect log information and log structure
This commit is contained in:
Kubernetes Prow Robot 2022-12-16 19:17:41 -08:00 committed by GitHub
commit 112a7a590c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pkg/util/iptables/iptables.go
View File

@ -218,7 +218,7 @@ type runner struct {
func newInternal(exec utilexec.Interface, protocol Protocol, lockfilePath14x, lockfilePath16x string) Interface { func newInternal(exec utilexec.Interface, protocol Protocol, lockfilePath14x, lockfilePath16x string) Interface {
version, err := getIPTablesVersion(exec, protocol) version, err := getIPTablesVersion(exec, protocol)
if err != nil { if err != nil {
klog.Warningf("Error checking iptables version, assuming version at least %s: %v", MinCheckVersion, err) klog.InfoS("Error checking iptables version, assuming version at least", "version", MinCheckVersion, "err", err)
version = MinCheckVersion version = MinCheckVersion
} }
@ -355,7 +355,7 @@ func (runner *runner) SaveInto(table Table, buffer *bytes.Buffer) error {
// run and return // run and return
iptablesSaveCmd := iptablesSaveCommand(runner.protocol) iptablesSaveCmd := iptablesSaveCommand(runner.protocol)
args := []string{"-t", string(table)} args := []string{"-t", string(table)}
klog.V(4).Infof("running %s %v", iptablesSaveCmd, args) klog.V(4).InfoS("Running", "command", iptablesSaveCmd, "arguments", args)
cmd := runner.exec.Command(iptablesSaveCmd, args...) cmd := runner.exec.Command(iptablesSaveCmd, args...)
cmd.SetStdout(buffer) cmd.SetStdout(buffer)
stderrBuffer := bytes.NewBuffer(nil) stderrBuffer := bytes.NewBuffer(nil)
@ -412,7 +412,7 @@ func (runner *runner) restoreInternal(args []string, data []byte, flush FlushFla
trace.Step("Locks grabbed") trace.Step("Locks grabbed")
defer func(locker iptablesLocker) { defer func(locker iptablesLocker) {
if err := locker.Close(); err != nil { if err := locker.Close(); err != nil {
klog.Errorf("Failed to close iptables locks: %v", err) klog.ErrorS(err, "Failed to close iptables locks")
} }
}(locker) }(locker)
} }
@ -420,7 +420,7 @@ func (runner *runner) restoreInternal(args []string, data []byte, flush FlushFla
// run the command and return the output or an error including the output and error // run the command and return the output or an error including the output and error
fullArgs := append(runner.restoreWaitFlag, args...) fullArgs := append(runner.restoreWaitFlag, args...)
iptablesRestoreCmd := iptablesRestoreCommand(runner.protocol) iptablesRestoreCmd := iptablesRestoreCommand(runner.protocol)
klog.V(4).Infof("running %s %v", iptablesRestoreCmd, fullArgs) klog.V(4).InfoS("Running", "command", iptablesRestoreCmd, "arguments", fullArgs)
cmd := runner.exec.Command(iptablesRestoreCmd, fullArgs...) cmd := runner.exec.Command(iptablesRestoreCmd, fullArgs...)
cmd.SetStdin(bytes.NewBuffer(data)) cmd.SetStdin(bytes.NewBuffer(data))
b, err := cmd.CombinedOutput() b, err := cmd.CombinedOutput()
@ -464,7 +464,7 @@ func (runner *runner) runContext(ctx context.Context, op operation, args []strin
iptablesCmd := iptablesCommand(runner.protocol) iptablesCmd := iptablesCommand(runner.protocol)
fullArgs := append(runner.waitFlag, string(op)) fullArgs := append(runner.waitFlag, string(op))
fullArgs = append(fullArgs, args...) fullArgs = append(fullArgs, args...)
klog.V(5).Infof("running iptables: %s %v", iptablesCmd, fullArgs) klog.V(5).InfoS("Running", "command", iptablesCmd, "arguments", fullArgs)
if ctx == nil { if ctx == nil {
return runner.exec.Command(iptablesCmd, fullArgs...).CombinedOutput() return runner.exec.Command(iptablesCmd, fullArgs...).CombinedOutput()
} }
@ -492,7 +492,7 @@ func trimhex(s string) string {
// of hack and half-measures. We should nix this ASAP. // of hack and half-measures. We should nix this ASAP.
func (runner *runner) checkRuleWithoutCheck(table Table, chain Chain, args ...string) (bool, error) { func (runner *runner) checkRuleWithoutCheck(table Table, chain Chain, args ...string) (bool, error) {
iptablesSaveCmd := iptablesSaveCommand(runner.protocol) iptablesSaveCmd := iptablesSaveCommand(runner.protocol)
klog.V(1).Infof("running %s -t %s", iptablesSaveCmd, string(table)) klog.V(1).InfoS("Running", "command", iptablesSaveCmd, "table", string(table))
out, err := runner.exec.Command(iptablesSaveCmd, "-t", string(table)).CombinedOutput() out, err := runner.exec.Command(iptablesSaveCmd, "-t", string(table)).CombinedOutput()
if err != nil { if err != nil {
return false, fmt.Errorf("error checking rule: %v", err) return false, fmt.Errorf("error checking rule: %v", err)
@ -531,7 +531,7 @@ func (runner *runner) checkRuleWithoutCheck(table Table, chain Chain, args ...st
if sets.NewString(fields...).IsSuperset(argset) { if sets.NewString(fields...).IsSuperset(argset) {
return true, nil return true, nil
} }
klog.V(5).Infof("DBG: fields is not a superset of args: fields=%v args=%v", fields, args) klog.V(5).InfoS("DBG: fields is not a superset of args", "fields", fields, "arguments", args)
} }
return false, nil return false, nil
@ -572,7 +572,7 @@ func (runner *runner) Monitor(canary Chain, tables []Table, reloadFunc func(), i
_ = utilwait.PollImmediateUntil(interval, func() (bool, error) { _ = utilwait.PollImmediateUntil(interval, func() (bool, error) {
for _, table := range tables { for _, table := range tables {
if _, err := runner.EnsureChain(table, canary); err != nil { if _, err := runner.EnsureChain(table, canary); err != nil {
klog.Warningf("Could not set up iptables canary %s/%s: %v", string(table), string(canary), err) klog.ErrorS(err, "Could not set up iptables canary", "table", table, "chain", canary)
return false, nil return false, nil
} }
} }
@ -584,11 +584,10 @@ func (runner *runner) Monitor(canary Chain, tables []Table, reloadFunc func(), i
if exists, err := runner.ChainExists(tables[0], canary); exists { if exists, err := runner.ChainExists(tables[0], canary); exists {
return false, nil return false, nil
} else if isResourceError(err) { } else if isResourceError(err) {
klog.Warningf("Could not check for iptables canary %s/%s: %v", string(tables[0]), string(canary), err) klog.ErrorS(err, "Could not check for iptables canary", "table", tables[0], "chain", canary)
return false, nil return false, nil
} }
klog.V(2).Infof("iptables canary %s/%s deleted", string(tables[0]), string(canary)) klog.V(2).InfoS("IPTables canary deleted", "table", tables[0], "chain", canary)
// Wait for the other canaries to be deleted too before returning // Wait for the other canaries to be deleted too before returning
// so we don't start reloading too soon. // so we don't start reloading too soon.
err := utilwait.PollImmediate(iptablesFlushPollTime, iptablesFlushTimeout, func() (bool, error) { err := utilwait.PollImmediate(iptablesFlushPollTime, iptablesFlushTimeout, func() (bool, error) {
@ -600,7 +599,7 @@ func (runner *runner) Monitor(canary Chain, tables []Table, reloadFunc func(), i
return true, nil return true, nil
}) })
if err != nil { if err != nil {
klog.Warning("Inconsistent iptables state detected.") klog.InfoS("Inconsistent iptables state detected")
} }
return true, nil return true, nil
}, stopCh) }, stopCh)
@ -613,7 +612,7 @@ func (runner *runner) Monitor(canary Chain, tables []Table, reloadFunc func(), i
return return
} }
klog.V(2).Infof("Reloading after iptables flush") klog.V(2).InfoS("Reloading after iptables flush")
reloadFunc() reloadFunc()
} }
} }
@ -694,11 +693,11 @@ func getIPTablesRestoreWaitFlag(version *utilversion.Version, exec utilexec.Inte
// --version, assume it also supports --wait // --version, assume it also supports --wait
vstring, err := getIPTablesRestoreVersionString(exec, protocol) vstring, err := getIPTablesRestoreVersionString(exec, protocol)
if err != nil || vstring == "" { if err != nil || vstring == "" {
klog.V(3).Infof("couldn't get iptables-restore version; assuming it doesn't support --wait") klog.V(3).InfoS("Couldn't get iptables-restore version; assuming it doesn't support --wait")
return nil return nil
} }
if _, err := utilversion.ParseGeneric(vstring); err != nil { if _, err := utilversion.ParseGeneric(vstring); err != nil {
klog.V(3).Infof("couldn't parse iptables-restore version; assuming it doesn't support --wait") klog.V(3).InfoS("Couldn't parse iptables-restore version; assuming it doesn't support --wait")
return nil return nil
} }
return []string{WaitString} return []string{WaitString}