ITQC/containernetworking-plugins
24
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 34 Wiki Activity

Merge pull request #66 from rosenhouse/filelock-vet

Browse Source 
host-local FileLock is used by value instead of by reference
This commit is contained in:
Gabe Rosenhouse
2017-08-30 08:21:28 -07:00
committed by GitHub
parent b49379d284 92e62b9f4d
commit 8fe8460c72
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/ipam/host-local/backend/disk/backend.go
View File

@ -31,7 +31,7 @@ var defaultDataDir = "/var/lib/cni/networks"
// Store is a simple disk-backed store that creates one file per IP // Store is a simple disk-backed store that creates one file per IP
// address in a given directory. The contents of the file are the container ID. // address in a given directory. The contents of the file are the container ID.
type Store struct { type Store struct {
FileLock *FileLock
dataDir string dataDir string
} }
@ -51,7 +51,7 @@ func New(network, dataDir string) (*Store, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
return &Store{*lk, dir}, nil return &Store{lk, dir}, nil
} }
func (s *Store) Reserve(id string, ip net.IP, rangeID string) (bool, error) { func (s *Store) Reserve(id string, ip net.IP, rangeID string) (bool, error) {

2
test.sh
View File

@ -10,7 +10,7 @@ source ./build.sh
echo "Running tests" echo "Running tests"
TESTABLE="plugins/ipam/dhcp plugins/ipam/host-local plugins/ipam/host-local/backend/allocator plugins/main/loopback plugins/main/ipvlan plugins/main/macvlan plugins/main/bridge plugins/main/ptp plugins/meta/flannel plugins/main/vlan plugins/sample pkg/ip pkg/ipam pkg/ns pkg/utils pkg/utils/hwaddr pkg/utils/sysctl plugins/meta/portmap" TESTABLE="plugins/ipam/dhcp plugins/ipam/host-local plugins/ipam/host-local/backend/allocator plugins/ipam/host-local/backend/disk plugins/main/loopback plugins/main/ipvlan plugins/main/macvlan plugins/main/bridge plugins/main/ptp plugins/meta/flannel plugins/main/vlan plugins/sample pkg/ip pkg/ipam pkg/ns pkg/utils pkg/utils/hwaddr pkg/utils/sysctl plugins/meta/portmap"
# user has not provided PKG override # user has not provided PKG override
if [ -z "$PKG" ]; then if [ -z "$PKG" ]; then