kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

libnetwork: drop InitOSContext()

Browse source 
The function is a no-op on all platforms.

Signed-off-by: Cory Snider <csnider@mirantis.com>
This commit is contained in:
Cory Snider 2022-10-24 14:42:27 -04:00
parent 7fc29c1435
commit 22529b81f8
12 changed files with 0 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libnetwork/drivers/bridge/bridge.go
View file

@ -22,7 +22,6 @@ import (
"github.com/docker/docker/libnetwork/netutils" "github.com/docker/docker/libnetwork/netutils"
"github.com/docker/docker/libnetwork/ns" "github.com/docker/docker/libnetwork/ns"
"github.com/docker/docker/libnetwork/options" "github.com/docker/docker/libnetwork/options"
"github.com/docker/docker/libnetwork/osl"
"github.com/docker/docker/libnetwork/portmapper" "github.com/docker/docker/libnetwork/portmapper"
"github.com/docker/docker/libnetwork/types" "github.com/docker/docker/libnetwork/types"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
@ -671,8 +670,6 @@ func (d *driver) checkConflict(config *networkConfiguration) error {
} }
func (d *driver) createNetwork(config *networkConfiguration) (err error) { func (d *driver) createNetwork(config *networkConfiguration) (err error) {
defer osl.InitOSContext()()
// Initialize handle when needed // Initialize handle when needed
d.Lock() d.Lock()
if d.nlh == nil { if d.nlh == nil {
@ -811,7 +808,6 @@ func (d *driver) DeleteNetwork(nid string) error {
func (d *driver) deleteNetwork(nid string) error { func (d *driver) deleteNetwork(nid string) error {
var err error var err error
defer osl.InitOSContext()()
// Get network handler and remove it from driver // Get network handler and remove it from driver
d.Lock() d.Lock()
n, ok := d.networks[nid] n, ok := d.networks[nid]
@ -934,8 +930,6 @@ func setHairpinMode(nlh *netlink.Handle, link netlink.Link, enable bool) error {
} }
func (d *driver) CreateEndpoint(nid, eid string, ifInfo driverapi.InterfaceInfo, epOptions map[string]interface{}) error { func (d *driver) CreateEndpoint(nid, eid string, ifInfo driverapi.InterfaceInfo, epOptions map[string]interface{}) error {
defer osl.InitOSContext()()
if ifInfo == nil { if ifInfo == nil {
return errors.New("invalid interface info passed") return errors.New("invalid interface info passed")
} }
@ -1121,8 +1115,6 @@ func (d *driver) CreateEndpoint(nid, eid string, ifInfo driverapi.InterfaceInfo,
func (d *driver) DeleteEndpoint(nid, eid string) error { func (d *driver) DeleteEndpoint(nid, eid string) error {
var err error var err error
defer osl.InitOSContext()()
// Get the network handler and make sure it exists // Get the network handler and make sure it exists
d.Lock() d.Lock()
n, ok := d.networks[nid] n, ok := d.networks[nid]
@ -1242,8 +1234,6 @@ func (d *driver) EndpointOperInfo(nid, eid string) (map[string]interface{}, erro
// Join method is invoked when a Sandbox is attached to an endpoint. // Join method is invoked when a Sandbox is attached to an endpoint.
func (d *driver) Join(nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, options map[string]interface{}) error { func (d *driver) Join(nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, options map[string]interface{}) error {
defer osl.InitOSContext()()
network, err := d.getNetwork(nid) network, err := d.getNetwork(nid)
if err != nil { if err != nil {
return err return err
@ -1288,8 +1278,6 @@ func (d *driver) Join(nid, eid string, sboxKey string, jinfo driverapi.JoinInfo,
// Leave method is invoked when a Sandbox detaches from an endpoint. // Leave method is invoked when a Sandbox detaches from an endpoint.
func (d *driver) Leave(nid, eid string) error { func (d *driver) Leave(nid, eid string) error {
defer osl.InitOSContext()()
network, err := d.getNetwork(nid) network, err := d.getNetwork(nid)
if err != nil { if err != nil {
return types.InternalMaskableErrorf("%s", err) return types.InternalMaskableErrorf("%s", err)
@ -1314,8 +1302,6 @@ func (d *driver) Leave(nid, eid string) error {
} }
func (d *driver) ProgramExternalConnectivity(nid, eid string, options map[string]interface{}) error { func (d *driver) ProgramExternalConnectivity(nid, eid string, options map[string]interface{}) error {
defer osl.InitOSContext()()
network, err := d.getNetwork(nid) network, err := d.getNetwork(nid)
if err != nil { if err != nil {
return err return err
@ -1368,8 +1354,6 @@ func (d *driver) ProgramExternalConnectivity(nid, eid string, options map[string
} }
func (d *driver) RevokeExternalConnectivity(nid, eid string) error { func (d *driver) RevokeExternalConnectivity(nid, eid string) error {
defer osl.InitOSContext()()
network, err := d.getNetwork(nid) network, err := d.getNetwork(nid)
if err != nil { if err != nil {
return err return err

3
libnetwork/drivers/ipvlan/ipvlan_endpoint.go
View file

@ -9,7 +9,6 @@ import (
"github.com/docker/docker/libnetwork/driverapi" "github.com/docker/docker/libnetwork/driverapi"
"github.com/docker/docker/libnetwork/netlabel" "github.com/docker/docker/libnetwork/netlabel"
"github.com/docker/docker/libnetwork/ns" "github.com/docker/docker/libnetwork/ns"
"github.com/docker/docker/libnetwork/osl"
"github.com/docker/docker/libnetwork/types" "github.com/docker/docker/libnetwork/types"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )
@ -17,7 +16,6 @@ import (
// CreateEndpoint assigns the mac, ip and endpoint id for the new container // CreateEndpoint assigns the mac, ip and endpoint id for the new container
func (d *driver) CreateEndpoint(nid, eid string, ifInfo driverapi.InterfaceInfo, func (d *driver) CreateEndpoint(nid, eid string, ifInfo driverapi.InterfaceInfo,
epOptions map[string]interface{}) error { epOptions map[string]interface{}) error {
defer osl.InitOSContext()()
if err := validateID(nid, eid); err != nil { if err := validateID(nid, eid); err != nil {
return err return err
@ -66,7 +64,6 @@ func (d *driver) CreateEndpoint(nid, eid string, ifInfo driverapi.InterfaceInfo,
// DeleteEndpoint remove the endpoint and associated netlink interface // DeleteEndpoint remove the endpoint and associated netlink interface
func (d *driver) DeleteEndpoint(nid, eid string) error { func (d *driver) DeleteEndpoint(nid, eid string) error {
defer osl.InitOSContext()()
if err := validateID(nid, eid); err != nil { if err := validateID(nid, eid); err != nil {
return err return err
} }

3
libnetwork/drivers/ipvlan/ipvlan_joinleave.go
View file

@ -10,7 +10,6 @@ import (
"github.com/docker/docker/libnetwork/driverapi" "github.com/docker/docker/libnetwork/driverapi"
"github.com/docker/docker/libnetwork/netutils" "github.com/docker/docker/libnetwork/netutils"
"github.com/docker/docker/libnetwork/ns" "github.com/docker/docker/libnetwork/ns"
"github.com/docker/docker/libnetwork/osl"
"github.com/docker/docker/libnetwork/types" "github.com/docker/docker/libnetwork/types"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )
@ -28,7 +27,6 @@ const (
// Join method is invoked when a Sandbox is attached to an endpoint. // Join method is invoked when a Sandbox is attached to an endpoint.
func (d *driver) Join(nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, options map[string]interface{}) error { func (d *driver) Join(nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, options map[string]interface{}) error {
defer osl.InitOSContext()()
n, err := d.getNetwork(nid) n, err := d.getNetwork(nid)
if err != nil { if err != nil {
return err return err
@ -139,7 +137,6 @@ func (d *driver) Join(nid, eid string, sboxKey string, jinfo driverapi.JoinInfo,
// Leave method is invoked when a Sandbox detaches from an endpoint. // Leave method is invoked when a Sandbox detaches from an endpoint.
func (d *driver) Leave(nid, eid string) error { func (d *driver) Leave(nid, eid string) error {
defer osl.InitOSContext()()
network, err := d.getNetwork(nid) network, err := d.getNetwork(nid)
if err != nil { if err != nil {
return err return err

3
libnetwork/drivers/ipvlan/ipvlan_network.go
View file

@ -10,7 +10,6 @@ import (
"github.com/docker/docker/libnetwork/netlabel" "github.com/docker/docker/libnetwork/netlabel"
"github.com/docker/docker/libnetwork/ns" "github.com/docker/docker/libnetwork/ns"
"github.com/docker/docker/libnetwork/options" "github.com/docker/docker/libnetwork/options"
"github.com/docker/docker/libnetwork/osl"
"github.com/docker/docker/libnetwork/types" "github.com/docker/docker/libnetwork/types"
"github.com/docker/docker/pkg/parsers/kernel" "github.com/docker/docker/pkg/parsers/kernel"
"github.com/docker/docker/pkg/stringid" "github.com/docker/docker/pkg/stringid"
@ -19,7 +18,6 @@ import (
// CreateNetwork the network for the specified driver type // CreateNetwork the network for the specified driver type
func (d *driver) CreateNetwork(nid string, option map[string]interface{}, nInfo driverapi.NetworkInfo, ipV4Data, ipV6Data []driverapi.IPAMData) error { func (d *driver) CreateNetwork(nid string, option map[string]interface{}, nInfo driverapi.NetworkInfo, ipV4Data, ipV6Data []driverapi.IPAMData) error {
defer osl.InitOSContext()()
kv, err := kernel.GetKernelVersion() kv, err := kernel.GetKernelVersion()
if err != nil { if err != nil {
return fmt.Errorf("failed to check kernel version for ipvlan driver support: %v", err) return fmt.Errorf("failed to check kernel version for ipvlan driver support: %v", err)
@ -118,7 +116,6 @@ func (d *driver) createNetwork(config *configuration) (bool, error) {
// DeleteNetwork deletes the network for the specified driver type // DeleteNetwork deletes the network for the specified driver type
func (d *driver) DeleteNetwork(nid string) error { func (d *driver) DeleteNetwork(nid string) error {
defer osl.InitOSContext()()
n := d.network(nid) n := d.network(nid)
if n == nil { if n == nil {
return fmt.Errorf("network id %s not found", nid) return fmt.Errorf("network id %s not found", nid)

3
libnetwork/drivers/macvlan/macvlan_endpoint.go
View file

@ -10,7 +10,6 @@ import (
"github.com/docker/docker/libnetwork/netlabel" "github.com/docker/docker/libnetwork/netlabel"
"github.com/docker/docker/libnetwork/netutils" "github.com/docker/docker/libnetwork/netutils"
"github.com/docker/docker/libnetwork/ns" "github.com/docker/docker/libnetwork/ns"
"github.com/docker/docker/libnetwork/osl"
"github.com/docker/docker/libnetwork/types" "github.com/docker/docker/libnetwork/types"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )
@ -18,7 +17,6 @@ import (
// CreateEndpoint assigns the mac, ip and endpoint id for the new container // CreateEndpoint assigns the mac, ip and endpoint id for the new container
func (d *driver) CreateEndpoint(nid, eid string, ifInfo driverapi.InterfaceInfo, func (d *driver) CreateEndpoint(nid, eid string, ifInfo driverapi.InterfaceInfo,
epOptions map[string]interface{}) error { epOptions map[string]interface{}) error {
defer osl.InitOSContext()()
if err := validateID(nid, eid); err != nil { if err := validateID(nid, eid); err != nil {
return err return err
@ -71,7 +69,6 @@ func (d *driver) CreateEndpoint(nid, eid string, ifInfo driverapi.InterfaceInfo,
// DeleteEndpoint removes the endpoint and associated netlink interface // DeleteEndpoint removes the endpoint and associated netlink interface
func (d *driver) DeleteEndpoint(nid, eid string) error { func (d *driver) DeleteEndpoint(nid, eid string) error {
defer osl.InitOSContext()()
if err := validateID(nid, eid); err != nil { if err := validateID(nid, eid); err != nil {
return err return err
} }

3
libnetwork/drivers/macvlan/macvlan_joinleave.go
View file

@ -10,13 +10,11 @@ import (
"github.com/docker/docker/libnetwork/driverapi" "github.com/docker/docker/libnetwork/driverapi"
"github.com/docker/docker/libnetwork/netutils" "github.com/docker/docker/libnetwork/netutils"
"github.com/docker/docker/libnetwork/ns" "github.com/docker/docker/libnetwork/ns"
"github.com/docker/docker/libnetwork/osl"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )
// Join method is invoked when a Sandbox is attached to an endpoint. // Join method is invoked when a Sandbox is attached to an endpoint.
func (d *driver) Join(nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, options map[string]interface{}) error { func (d *driver) Join(nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, options map[string]interface{}) error {
defer osl.InitOSContext()()
n, err := d.getNetwork(nid) n, err := d.getNetwork(nid)
if err != nil { if err != nil {
return err return err
@ -100,7 +98,6 @@ func (d *driver) Join(nid, eid string, sboxKey string, jinfo driverapi.JoinInfo,
// Leave method is invoked when a Sandbox detaches from an endpoint. // Leave method is invoked when a Sandbox detaches from an endpoint.
func (d *driver) Leave(nid, eid string) error { func (d *driver) Leave(nid, eid string) error {
defer osl.InitOSContext()()
network, err := d.getNetwork(nid) network, err := d.getNetwork(nid)
if err != nil { if err != nil {
return err return err

4
libnetwork/drivers/macvlan/macvlan_network.go
View file

@ -10,7 +10,6 @@ import (
"github.com/docker/docker/libnetwork/netlabel" "github.com/docker/docker/libnetwork/netlabel"
"github.com/docker/docker/libnetwork/ns" "github.com/docker/docker/libnetwork/ns"
"github.com/docker/docker/libnetwork/options" "github.com/docker/docker/libnetwork/options"
"github.com/docker/docker/libnetwork/osl"
"github.com/docker/docker/libnetwork/types" "github.com/docker/docker/libnetwork/types"
"github.com/docker/docker/pkg/stringid" "github.com/docker/docker/pkg/stringid"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
@ -18,8 +17,6 @@ import (
// CreateNetwork the network for the specified driver type // CreateNetwork the network for the specified driver type
func (d *driver) CreateNetwork(nid string, option map[string]interface{}, nInfo driverapi.NetworkInfo, ipV4Data, ipV6Data []driverapi.IPAMData) error { func (d *driver) CreateNetwork(nid string, option map[string]interface{}, nInfo driverapi.NetworkInfo, ipV4Data, ipV6Data []driverapi.IPAMData) error {
defer osl.InitOSContext()()
// reject a null v4 network // reject a null v4 network
if len(ipV4Data) == 0 || ipV4Data[0].Pool.String() == "0.0.0.0/0" { if len(ipV4Data) == 0 || ipV4Data[0].Pool.String() == "0.0.0.0/0" {
return fmt.Errorf("ipv4 pool is empty") return fmt.Errorf("ipv4 pool is empty")
@ -109,7 +106,6 @@ func (d *driver) createNetwork(config *configuration) (bool, error) {
// DeleteNetwork deletes the network for the specified driver type // DeleteNetwork deletes the network for the specified driver type
func (d *driver) DeleteNetwork(nid string) error { func (d *driver) DeleteNetwork(nid string) error {
defer osl.InitOSContext()()
n := d.network(nid) n := d.network(nid)
if n == nil { if n == nil {
return fmt.Errorf("network id %s not found", nid) return fmt.Errorf("network id %s not found", nid)

10
libnetwork/drivers/overlay/ov_utils.go
View file

@ -11,7 +11,6 @@ import (
"github.com/docker/docker/libnetwork/drivers/overlay/overlayutils" "github.com/docker/docker/libnetwork/drivers/overlay/overlayutils"
"github.com/docker/docker/libnetwork/netutils" "github.com/docker/docker/libnetwork/netutils"
"github.com/docker/docker/libnetwork/ns" "github.com/docker/docker/libnetwork/ns"
"github.com/docker/docker/libnetwork/osl"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/vishvananda/netlink" "github.com/vishvananda/netlink"
"github.com/vishvananda/netns" "github.com/vishvananda/netns"
@ -32,7 +31,6 @@ func validateID(nid, eid string) error {
} }
func createVethPair() (string, string, error) { func createVethPair() (string, string, error) {
defer osl.InitOSContext()()
nlh := ns.NlHandle() nlh := ns.NlHandle()
// Generate a name for what will be the host side pipe interface // Generate a name for what will be the host side pipe interface
@ -59,8 +57,6 @@ func createVethPair() (string, string, error) {
} }
func createVxlan(name string, vni uint32, mtu int) error { func createVxlan(name string, vni uint32, mtu int) error {
defer osl.InitOSContext()()
vxlan := &netlink.Vxlan{ vxlan := &netlink.Vxlan{
LinkAttrs: netlink.LinkAttrs{Name: name, MTU: mtu}, LinkAttrs: netlink.LinkAttrs{Name: name, MTU: mtu},
VxlanId: int(vni), VxlanId: int(vni),
@ -79,8 +75,6 @@ func createVxlan(name string, vni uint32, mtu int) error {
} }
func deleteInterfaceBySubnet(brPrefix string, s *subnet) error { func deleteInterfaceBySubnet(brPrefix string, s *subnet) error {
defer osl.InitOSContext()()
nlh := ns.NlHandle() nlh := ns.NlHandle()
links, err := nlh.LinkList() links, err := nlh.LinkList()
if err != nil { if err != nil {
@ -109,8 +103,6 @@ func deleteInterfaceBySubnet(brPrefix string, s *subnet) error {
} }
func deleteInterface(name string) error { func deleteInterface(name string) error {
defer osl.InitOSContext()()
link, err := ns.NlHandle().LinkByName(name) link, err := ns.NlHandle().LinkByName(name)
if err != nil { if err != nil {
return fmt.Errorf("failed to find interface with name %s: %v", name, err) return fmt.Errorf("failed to find interface with name %s: %v", name, err)
@ -124,8 +116,6 @@ func deleteInterface(name string) error {
} }
func deleteVxlanByVNI(path string, vni uint32) error { func deleteVxlanByVNI(path string, vni uint32) error {
defer osl.InitOSContext()()
nlh := ns.NlHandle() nlh := ns.NlHandle()
if path != "" { if path != "" {
ns, err := netns.GetFromPath(path) ns, err := netns.GetFromPath(path)

3
libnetwork/netutils/utils_linux.go
View file

@ -12,7 +12,6 @@ import (
"github.com/docker/docker/libnetwork/ipamutils" "github.com/docker/docker/libnetwork/ipamutils"
"github.com/docker/docker/libnetwork/ns" "github.com/docker/docker/libnetwork/ns"
"github.com/docker/docker/libnetwork/osl"
"github.com/docker/docker/libnetwork/resolvconf" "github.com/docker/docker/libnetwork/resolvconf"
"github.com/docker/docker/libnetwork/types" "github.com/docker/docker/libnetwork/types"
"github.com/pkg/errors" "github.com/pkg/errors"
@ -73,8 +72,6 @@ func GenerateIfaceName(nlh *netlink.Handle, prefix string, len int) (string, err
func ElectInterfaceAddresses(name string) ([]*net.IPNet, []*net.IPNet, error) { func ElectInterfaceAddresses(name string) ([]*net.IPNet, []*net.IPNet, error) {
var v4Nets, v6Nets []*net.IPNet var v4Nets, v6Nets []*net.IPNet
defer osl.InitOSContext()()
link, _ := ns.NlHandle().LinkByName(name) link, _ := ns.NlHandle().LinkByName(name)
if link != nil { if link != nil {
v4addr, err := ns.NlHandle().AddrList(link, netlink.FAMILY_V4) v4addr, err := ns.NlHandle().AddrList(link, netlink.FAMILY_V4)

5
libnetwork/osl/namespace_linux.go
View file

@ -419,11 +419,6 @@ func (n *networkNamespace) DisableARPForVIP(srcName string) (Err error) {
return return
} }
// InitOSContext initializes OS context while configuring network resources
func InitOSContext() func() {
return func() {}
}
func (n *networkNamespace) InvokeFunc(f func()) error { func (n *networkNamespace) InvokeFunc(f func()) error {
origNS, err := netns.Get() origNS, err := netns.Get()
if err != nil { if err != nil {

5
libnetwork/osl/namespace_windows.go
View file

@ -21,11 +21,6 @@ func GetSandboxForExternalKey(path string, key string) (Sandbox, error) {
func GC() { func GC() {
} }
// InitOSContext initializes OS context while configuring network resources
func InitOSContext() func() {
return func() {}
}
// SetBasePath sets the base url prefix for the ns path // SetBasePath sets the base url prefix for the ns path
func SetBasePath(path string) { func SetBasePath(path string) {
} }

5
libnetwork/osl/sandbox_freebsd.go
View file

@ -27,11 +27,6 @@ func GetSandboxForExternalKey(path string, key string) (Sandbox, error) {
func GC() { func GC() {
} }
// InitOSContext initializes OS context while configuring network resources
func InitOSContext() func() {
return func() {}
}
// SetBasePath sets the base url prefix for the ns path // SetBasePath sets the base url prefix for the ns path
func SetBasePath(path string) { func SetBasePath(path string) {
} }