-
Notifications
You must be signed in to change notification settings - Fork 38.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
util/iptables: fix cross-build failures due to syscall.Flock() #45601
Merged
k8s-github-robot
merged 1 commit into
kubernetes:master
from
dcbw:fix-iptables-crossbuild
May 15, 2017
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,93 @@ | ||
// +build linux | ||
|
||
/* | ||
Copyright 2017 The Kubernetes Authors. | ||
|
||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
|
||
http://www.apache.org/licenses/LICENSE-2.0 | ||
|
||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
package iptables | ||
|
||
import ( | ||
"fmt" | ||
"net" | ||
"os" | ||
"time" | ||
|
||
"golang.org/x/sys/unix" | ||
"k8s.io/apimachinery/pkg/util/wait" | ||
) | ||
|
||
type locker struct { | ||
lock16 *os.File | ||
lock14 *net.UnixListener | ||
} | ||
|
||
func (l *locker) Close() { | ||
if l.lock16 != nil { | ||
l.lock16.Close() | ||
} | ||
if l.lock14 != nil { | ||
l.lock14.Close() | ||
} | ||
} | ||
|
||
func grabIptablesLocks(lockfilePath string) (iptablesLocker, error) { | ||
var err error | ||
var success bool | ||
|
||
l := &locker{} | ||
defer func(l *locker) { | ||
// Clean up immediately on failure | ||
if !success { | ||
l.Close() | ||
} | ||
}(l) | ||
|
||
// Grab both 1.6.x and 1.4.x-style locks; we don't know what the | ||
// iptables-restore version is if it doesn't support --wait, so we | ||
// can't assume which lock method it'll use. | ||
|
||
// Roughly duplicate iptables 1.6.x xtables_lock() function. | ||
l.lock16, err = os.OpenFile(lockfilePath, os.O_CREATE, 0600) | ||
if err != nil { | ||
return nil, fmt.Errorf("failed to open iptables lock %s: %v", lockfilePath, err) | ||
} | ||
|
||
if err := wait.PollImmediate(200*time.Millisecond, 2*time.Second, func() (bool, error) { | ||
if err := grabIptablesFileLock(l.lock16); err != nil { | ||
return false, nil | ||
} | ||
return true, nil | ||
}); err != nil { | ||
return nil, fmt.Errorf("failed to acquire new iptables lock: %v", err) | ||
} | ||
|
||
// Roughly duplicate iptables 1.4.x xtables_lock() function. | ||
if err := wait.PollImmediate(200*time.Millisecond, 2*time.Second, func() (bool, error) { | ||
l.lock14, err = net.ListenUnix("unix", &net.UnixAddr{Name: "@xtables", Net: "unix"}) | ||
if err != nil { | ||
return false, nil | ||
} | ||
return true, nil | ||
}); err != nil { | ||
return nil, fmt.Errorf("failed to acquire old iptables lock: %v", err) | ||
} | ||
|
||
success = true | ||
return l, nil | ||
} | ||
|
||
func grabIptablesFileLock(f *os.File) error { | ||
return unix.Flock(int(f.Fd()), unix.LOCK_EX|unix.LOCK_NB) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
// +build !linux | ||
|
||
/* | ||
Copyright 2017 The Kubernetes Authors. | ||
|
||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
|
||
http://www.apache.org/licenses/LICENSE-2.0 | ||
|
||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
package iptables | ||
|
||
import ( | ||
"fmt" | ||
"os" | ||
) | ||
|
||
func grabIptablesLocks(lockfilePath string) (iptablesLocker, error) { | ||
return nil, fmt.Errorf("iptables unsupported on this platform") | ||
} | ||
|
||
func grabIptablesFileLock(f *os.File) error { | ||
return fmt.Errorf("iptables unsupported on this platform") | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are the build tags necessary even with explicit naming?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
https://golang.org/pkg/go/build/#hdr-Build_Constraints