Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
1412d53b
Commit
1412d53b
authored
Dec 22, 2018
by
Laurent Bernaille
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[kube-proxy/ipvs] Protect Netlink calls with a mutex
parent
aee1ab34
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
23 additions
and
0 deletions
+23
-0
ipvs_linux.go
pkg/util/ipvs/ipvs_linux.go
+23
-0
No files found.
pkg/util/ipvs/ipvs_linux.go
View file @
1412d53b
...
@@ -23,6 +23,7 @@ import (
...
@@ -23,6 +23,7 @@ import (
"fmt"
"fmt"
"net"
"net"
"strings"
"strings"
"sync"
"syscall"
"syscall"
libipvs
"github.com/docker/libnetwork/ipvs"
libipvs
"github.com/docker/libnetwork/ipvs"
...
@@ -34,6 +35,7 @@ import (
...
@@ -34,6 +35,7 @@ import (
type
runner
struct
{
type
runner
struct
{
exec
utilexec
.
Interface
exec
utilexec
.
Interface
ipvsHandle
*
libipvs
.
Handle
ipvsHandle
*
libipvs
.
Handle
mu
sync
.
Mutex
// Protect Netlink calls
}
}
// Protocol is the IPVS service protocol type
// Protocol is the IPVS service protocol type
...
@@ -58,6 +60,8 @@ func (runner *runner) AddVirtualServer(vs *VirtualServer) error {
...
@@ -58,6 +60,8 @@ func (runner *runner) AddVirtualServer(vs *VirtualServer) error {
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
runner
.
mu
.
Lock
()
defer
runner
.
mu
.
Unlock
()
return
runner
.
ipvsHandle
.
NewService
(
svc
)
return
runner
.
ipvsHandle
.
NewService
(
svc
)
}
}
...
@@ -67,6 +71,8 @@ func (runner *runner) UpdateVirtualServer(vs *VirtualServer) error {
...
@@ -67,6 +71,8 @@ func (runner *runner) UpdateVirtualServer(vs *VirtualServer) error {
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
runner
.
mu
.
Lock
()
defer
runner
.
mu
.
Unlock
()
return
runner
.
ipvsHandle
.
UpdateService
(
svc
)
return
runner
.
ipvsHandle
.
UpdateService
(
svc
)
}
}
...
@@ -76,6 +82,8 @@ func (runner *runner) DeleteVirtualServer(vs *VirtualServer) error {
...
@@ -76,6 +82,8 @@ func (runner *runner) DeleteVirtualServer(vs *VirtualServer) error {
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
runner
.
mu
.
Lock
()
defer
runner
.
mu
.
Unlock
()
return
runner
.
ipvsHandle
.
DelService
(
svc
)
return
runner
.
ipvsHandle
.
DelService
(
svc
)
}
}
...
@@ -85,7 +93,10 @@ func (runner *runner) GetVirtualServer(vs *VirtualServer) (*VirtualServer, error
...
@@ -85,7 +93,10 @@ func (runner *runner) GetVirtualServer(vs *VirtualServer) (*VirtualServer, error
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
err
return
nil
,
err
}
}
runner
.
mu
.
Lock
()
ipvsSvc
,
err
:=
runner
.
ipvsHandle
.
GetService
(
svc
)
ipvsSvc
,
err
:=
runner
.
ipvsHandle
.
GetService
(
svc
)
runner
.
mu
.
Unlock
()
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
err
return
nil
,
err
}
}
...
@@ -98,7 +109,9 @@ func (runner *runner) GetVirtualServer(vs *VirtualServer) (*VirtualServer, error
...
@@ -98,7 +109,9 @@ func (runner *runner) GetVirtualServer(vs *VirtualServer) (*VirtualServer, error
// GetVirtualServers is part of ipvs.Interface.
// GetVirtualServers is part of ipvs.Interface.
func
(
runner
*
runner
)
GetVirtualServers
()
([]
*
VirtualServer
,
error
)
{
func
(
runner
*
runner
)
GetVirtualServers
()
([]
*
VirtualServer
,
error
)
{
runner
.
mu
.
Lock
()
ipvsSvcs
,
err
:=
runner
.
ipvsHandle
.
GetServices
()
ipvsSvcs
,
err
:=
runner
.
ipvsHandle
.
GetServices
()
runner
.
mu
.
Unlock
()
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
err
return
nil
,
err
}
}
...
@@ -115,6 +128,8 @@ func (runner *runner) GetVirtualServers() ([]*VirtualServer, error) {
...
@@ -115,6 +128,8 @@ func (runner *runner) GetVirtualServers() ([]*VirtualServer, error) {
// Flush is part of ipvs.Interface. Currently we delete IPVS services one by one
// Flush is part of ipvs.Interface. Currently we delete IPVS services one by one
func
(
runner
*
runner
)
Flush
()
error
{
func
(
runner
*
runner
)
Flush
()
error
{
runner
.
mu
.
Lock
()
defer
runner
.
mu
.
Unlock
()
return
runner
.
ipvsHandle
.
Flush
()
return
runner
.
ipvsHandle
.
Flush
()
}
}
...
@@ -128,6 +143,8 @@ func (runner *runner) AddRealServer(vs *VirtualServer, rs *RealServer) error {
...
@@ -128,6 +143,8 @@ func (runner *runner) AddRealServer(vs *VirtualServer, rs *RealServer) error {
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
runner
.
mu
.
Lock
()
defer
runner
.
mu
.
Unlock
()
return
runner
.
ipvsHandle
.
NewDestination
(
svc
,
dst
)
return
runner
.
ipvsHandle
.
NewDestination
(
svc
,
dst
)
}
}
...
@@ -141,6 +158,8 @@ func (runner *runner) DeleteRealServer(vs *VirtualServer, rs *RealServer) error
...
@@ -141,6 +158,8 @@ func (runner *runner) DeleteRealServer(vs *VirtualServer, rs *RealServer) error
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
runner
.
mu
.
Lock
()
defer
runner
.
mu
.
Unlock
()
return
runner
.
ipvsHandle
.
DelDestination
(
svc
,
dst
)
return
runner
.
ipvsHandle
.
DelDestination
(
svc
,
dst
)
}
}
...
@@ -153,6 +172,8 @@ func (runner *runner) UpdateRealServer(vs *VirtualServer, rs *RealServer) error
...
@@ -153,6 +172,8 @@ func (runner *runner) UpdateRealServer(vs *VirtualServer, rs *RealServer) error
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
runner
.
mu
.
Lock
()
defer
runner
.
mu
.
Unlock
()
return
runner
.
ipvsHandle
.
UpdateDestination
(
svc
,
dst
)
return
runner
.
ipvsHandle
.
UpdateDestination
(
svc
,
dst
)
}
}
...
@@ -162,7 +183,9 @@ func (runner *runner) GetRealServers(vs *VirtualServer) ([]*RealServer, error) {
...
@@ -162,7 +183,9 @@ func (runner *runner) GetRealServers(vs *VirtualServer) ([]*RealServer, error) {
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
err
return
nil
,
err
}
}
runner
.
mu
.
Lock
()
dsts
,
err
:=
runner
.
ipvsHandle
.
GetDestinations
(
svc
)
dsts
,
err
:=
runner
.
ipvsHandle
.
GetDestinations
(
svc
)
runner
.
mu
.
Unlock
()
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
err
return
nil
,
err
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment