github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Log long operations on iptables

pull/8/head
wojtekt 2018-06-19 14:31:29 +02:00
parent 0f9dfca8e7
commit 0f9df22616
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/util/iptables/BUILD
View File

@ -55,6 +55,7 @@ go_library(
"//vendor/github.com/godbus/dbus:go_default_library", "//vendor/github.com/godbus/dbus:go_default_library",
"//vendor/github.com/golang/glog:go_default_library", "//vendor/github.com/golang/glog:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
"//vendor/k8s.io/apiserver/pkg/util/trace:go_default_library",
"//vendor/k8s.io/utils/exec:go_default_library", "//vendor/k8s.io/utils/exec:go_default_library",
] + select({ ] + select({
"@io_bazel_rules_go//go/platform:linux": [ "@io_bazel_rules_go//go/platform:linux": [

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

@ -28,6 +28,7 @@ import (
godbus "github.com/godbus/dbus" godbus "github.com/godbus/dbus"
"github.com/golang/glog" "github.com/golang/glog"
"k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/sets"
utiltrace "k8s.io/apiserver/pkg/util/trace"
utildbus "k8s.io/kubernetes/pkg/util/dbus" utildbus "k8s.io/kubernetes/pkg/util/dbus"
utilversion "k8s.io/kubernetes/pkg/util/version" utilversion "k8s.io/kubernetes/pkg/util/version"
utilexec "k8s.io/utils/exec" utilexec "k8s.io/utils/exec"
@ -317,6 +318,9 @@ func (runner *runner) SaveInto(table Table, buffer *bytes.Buffer) error {
runner.mu.Lock() runner.mu.Lock()
defer runner.mu.Unlock() defer runner.mu.Unlock()
trace := utiltrace.New("iptables save")
defer trace.LogIfLong(2 * time.Second)
// run and return // run and return
iptablesSaveCmd := iptablesSaveCommand(runner.protocol) iptablesSaveCmd := iptablesSaveCommand(runner.protocol)
args := []string{"-t", string(table)} args := []string{"-t", string(table)}
@ -355,6 +359,9 @@ func (runner *runner) restoreInternal(args []string, data []byte, flush FlushFla
runner.mu.Lock() runner.mu.Lock()
defer runner.mu.Unlock() defer runner.mu.Unlock()
trace := utiltrace.New("iptables restore")
defer trace.LogIfLong(2 * time.Second)
if !flush { if !flush {
args = append(args, "--noflush") args = append(args, "--noflush")
} }
@ -370,6 +377,7 @@ func (runner *runner) restoreInternal(args []string, data []byte, flush FlushFla
if err != nil { if err != nil {
return err return err
} }
trace.Step("Locks grabbed")
defer func(locker iptablesLocker) { defer func(locker iptablesLocker) {
if err := locker.Close(); err != nil { if err := locker.Close(); err != nil {
glog.Errorf("Failed to close iptables locks: %v", err) glog.Errorf("Failed to close iptables locks: %v", err)