mirrors/kubernetes
0
0 Fork 0
mirror of https://github.com/kubernetes/kubernetes.git synced 2026-10-28 15:05:03 +08:00
Code Activity

Remove mutex from iptables runner

Browse Source 
This dates back to before the iptables binary itself had lock support.
It serves no purpose now.
This commit is contained in:
Dan Winship committed 2026-05-22 12:03:54 -04:00
1 parent 04d51ea41b
commit 9d8f8d59a5
1 file changed
-26
Download Patch File Download Diff File Expand all files Collapse all files
pkg/util/iptables/iptables.go
-26
View File
@@ -26,7 +26,6 @@ import (
"regexp"
"strconv"
"strings"
"sync"
"time"
v1 "k8s.io/api/core/v1"
@@ -164,7 +163,6 @@ const WaitSecondsValue = "5"
// runner implements Interface in terms of exec("iptables").
type runner struct {
mu sync.Mutex
exec utilexec.Interface
protocol Protocol
}
@@ -212,9 +210,6 @@ func NewBestEffort() map[v1.IPFamily]Interface {
func (runner *runner) EnsureChain(table Table, chain Chain) (bool, error) {
fullArgs := makeFullArgs(table, chain)
runner.mu.Lock()
defer runner.mu.Unlock()
out, err := runner.run(opCreateChain, fullArgs)
if err != nil {
if ee, ok := err.(utilexec.ExitError); ok {
@@ -231,9 +226,6 @@ func (runner *runner) EnsureChain(table Table, chain Chain) (bool, error) {
func (runner *runner) FlushChain(table Table, chain Chain) error {
fullArgs := makeFullArgs(table, chain)
runner.mu.Lock()
defer runner.mu.Unlock()
out, err := runner.run(opFlushChain, fullArgs)
if err != nil {
return fmt.Errorf("error flushing chain %q: %v: %s", chain, err, out)
@@ -245,9 +237,6 @@ func (runner *runner) FlushChain(table Table, chain Chain) error {
func (runner *runner) DeleteChain(table Table, chain Chain) error {
fullArgs := makeFullArgs(table, chain)
runner.mu.Lock()
defer runner.mu.Unlock()
out, err := runner.run(opDeleteChain, fullArgs)
if err != nil {
return fmt.Errorf("error deleting chain %q: %v: %s", chain, err, out)
@@ -259,9 +248,6 @@ func (runner *runner) DeleteChain(table Table, chain Chain) error {
func (runner *runner) EnsureRule(position RulePosition, table Table, chain Chain, args ...string) (bool, error) {
fullArgs := makeFullArgs(table, chain, args...)
runner.mu.Lock()
defer runner.mu.Unlock()
exists, err := runner.checkRule(fullArgs)
if err != nil {
return false, err
@@ -280,9 +266,6 @@ func (runner *runner) EnsureRule(position RulePosition, table Table, chain Chain
func (runner *runner) DeleteRule(table Table, chain Chain, args ...string) error {
fullArgs := makeFullArgs(table, chain, args...)
runner.mu.Lock()
defer runner.mu.Unlock()
exists, err := runner.checkRule(fullArgs)
if err != nil {
return err
@@ -307,9 +290,6 @@ func (runner *runner) Protocol() Protocol {
// SaveInto is part of Interface.
func (runner *runner) SaveInto(table Table, buffer *bytes.Buffer) error {
runner.mu.Lock()
defer runner.mu.Unlock()
trace := utiltrace.New("iptables save")
defer trace.LogIfLong(2 * time.Second)
@@ -345,9 +325,6 @@ func (runner *runner) RestoreAll(data []byte, flush FlushFlag, counters RestoreC
// restoreInternal is the shared part of Restore/RestoreAll
func (runner *runner) restoreInternal(args []string, data []byte, flush FlushFlag, counters RestoreCountersFlag) error {
runner.mu.Lock()
defer runner.mu.Unlock()
trace := utiltrace.New("iptables restore")
defer trace.LogIfLong(2 * time.Second)
@@ -495,9 +472,6 @@ func (runner *runner) Monitor(canary Chain, tables []Table, reloadFunc func(), i
func (runner *runner) ChainExists(table Table, chain Chain) (bool, error) {
fullArgs := makeFullArgs(table, chain)
runner.mu.Lock()
defer runner.mu.Unlock()
trace := utiltrace.New("iptables ChainExists")
defer trace.LogIfLong(2 * time.Second)