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

make iptables wait flag generic; increase the max wait time from 2 seconds to 5 seconds

pull/6/head
Rajat Chopra 2017-10-29 13:30:48 -04:00
parent 4eadfbb30e
commit c5740a3737
2 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -118,9 +118,11 @@ const NoFlushTables FlushFlag = false
// (test whether a rule exists). // (test whether a rule exists).
const MinCheckVersion = "1.4.11" const MinCheckVersion = "1.4.11"
// Minimum iptables versions supporting the -w and -w2 flags // Minimum iptables versions supporting the -w and -w<seconds> flags
const MinWaitVersion = "1.4.20" const WaitMinVersion = "1.4.20"
const MinWait2Version = "1.4.22" const WaitSecondsMinVersion = "1.4.22"
const WaitString = "-w"
const WaitSecondsString = "-w5"
const LockfilePath16x = "/run/xtables.lock" const LockfilePath16x = "/run/xtables.lock"
@ -537,24 +539,24 @@ func getIPTablesWaitFlag(vstring string) []string {
return nil return nil
} }
minVersion, err := utilversion.ParseGeneric(MinWaitVersion) minVersion, err := utilversion.ParseGeneric(WaitMinVersion)
if err != nil { if err != nil {
glog.Errorf("MinWaitVersion (%s) is not a valid version string: %v", MinWaitVersion, err) glog.Errorf("WaitMinVersion (%s) is not a valid version string: %v", WaitMinVersion, err)
return nil return nil
} }
if version.LessThan(minVersion) { if version.LessThan(minVersion) {
return nil return nil
} }
minVersion, err = utilversion.ParseGeneric(MinWait2Version) minVersion, err = utilversion.ParseGeneric(WaitSecondsMinVersion)
if err != nil { if err != nil {
glog.Errorf("MinWait2Version (%s) is not a valid version string: %v", MinWait2Version, err) glog.Errorf("WaitSecondsMinVersion (%s) is not a valid version string: %v", WaitSecondsMinVersion, err)
return nil return nil
} }
if version.LessThan(minVersion) { if version.LessThan(minVersion) {
return []string{"-w"} return []string{WaitString}
} else { } else {
return []string{"-w2"} return []string{WaitSecondsString}
} }
} }

20
pkg/util/iptables/iptables_test.go
View File

@ -686,11 +686,11 @@ func TestIPTablesWaitFlag(t *testing.T) {
{"0.55.55", ""}, {"0.55.55", ""},
{"1.0.55", ""}, {"1.0.55", ""},
{"1.4.19", ""}, {"1.4.19", ""},
{"1.4.20", "-w"}, {"1.4.20", WaitString},
{"1.4.21", "-w"}, {"1.4.21", WaitString},
{"1.4.22", "-w2"}, {"1.4.22", WaitSecondsString},
{"1.5.0", "-w2"}, {"1.5.0", WaitSecondsString},
{"2.0.0", "-w2"}, {"2.0.0", WaitSecondsString},
} }
for _, testCase := range testCases { for _, testCase := range testCases {
@ -730,7 +730,7 @@ func TestWaitFlagUnavailable(t *testing.T) {
if fcmd.CombinedOutputCalls != 3 { if fcmd.CombinedOutputCalls != 3 {
t.Errorf("expected 3 CombinedOutput() calls, got %d", fcmd.CombinedOutputCalls) t.Errorf("expected 3 CombinedOutput() calls, got %d", fcmd.CombinedOutputCalls)
} }
if sets.NewString(fcmd.CombinedOutputLog[2]...).HasAny("-w", "-w2") { if sets.NewString(fcmd.CombinedOutputLog[2]...).HasAny(WaitString, WaitSecondsString) {
t.Errorf("wrong CombinedOutput() log, got %s", fcmd.CombinedOutputLog[2]) t.Errorf("wrong CombinedOutput() log, got %s", fcmd.CombinedOutputLog[2])
} }
} }
@ -762,10 +762,10 @@ func TestWaitFlagOld(t *testing.T) {
if fcmd.CombinedOutputCalls != 3 { if fcmd.CombinedOutputCalls != 3 {
t.Errorf("expected 3 CombinedOutput() calls, got %d", fcmd.CombinedOutputCalls) t.Errorf("expected 3 CombinedOutput() calls, got %d", fcmd.CombinedOutputCalls)
} }
if !sets.NewString(fcmd.CombinedOutputLog[2]...).HasAll("iptables", "-w") { if !sets.NewString(fcmd.CombinedOutputLog[2]...).HasAll("iptables", WaitString) {
t.Errorf("wrong CombinedOutput() log, got %s", fcmd.CombinedOutputLog[2]) t.Errorf("wrong CombinedOutput() log, got %s", fcmd.CombinedOutputLog[2])
} }
if sets.NewString(fcmd.CombinedOutputLog[2]...).HasAny("-w2") { if sets.NewString(fcmd.CombinedOutputLog[2]...).HasAny(WaitSecondsString) {
t.Errorf("wrong CombinedOutput() log, got %s", fcmd.CombinedOutputLog[2]) t.Errorf("wrong CombinedOutput() log, got %s", fcmd.CombinedOutputLog[2])
} }
} }
@ -797,10 +797,10 @@ func TestWaitFlagNew(t *testing.T) {
if fcmd.CombinedOutputCalls != 3 { if fcmd.CombinedOutputCalls != 3 {
t.Errorf("expected 3 CombinedOutput() calls, got %d", fcmd.CombinedOutputCalls) t.Errorf("expected 3 CombinedOutput() calls, got %d", fcmd.CombinedOutputCalls)
} }
if !sets.NewString(fcmd.CombinedOutputLog[2]...).HasAll("iptables", "-w2") { if !sets.NewString(fcmd.CombinedOutputLog[2]...).HasAll("iptables", WaitSecondsString) {
t.Errorf("wrong CombinedOutput() log, got %s", fcmd.CombinedOutputLog[2]) t.Errorf("wrong CombinedOutput() log, got %s", fcmd.CombinedOutputLog[2])
} }
if sets.NewString(fcmd.CombinedOutputLog[2]...).HasAny("-w") { if sets.NewString(fcmd.CombinedOutputLog[2]...).HasAny(WaitString) {
t.Errorf("wrong CombinedOutput() log, got %s", fcmd.CombinedOutputLog[2]) t.Errorf("wrong CombinedOutput() log, got %s", fcmd.CombinedOutputLog[2])
} }
} }