Skip to content

Commit

Permalink
Merge pull request #47 from divyenpatel/cns-csi-driver-common-code
Browse files Browse the repository at this point in the history
Common library for CNS CSI driver
  • Loading branch information
k8s-ci-robot authored Aug 29, 2019
2 parents 725a721 + 15303a0 commit 99f9c17
Show file tree
Hide file tree
Showing 26 changed files with 3,552 additions and 5 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
# Ignore the build output.
/.build

# Ingore project specific setting files created by Intellij IDE
/.idea

# Ignore the environment variable and Prow configuration files at
# the root of the project.
/config.env
Expand Down
16 changes: 11 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ require (
github.com/akutz/gosync v0.1.0 // indirect
github.com/akutz/memconn v0.1.0
github.com/container-storage-interface/spec v1.0.0
github.com/davecgh/go-spew v1.1.1
github.com/google/btree v1.0.0 // indirect
github.com/google/uuid v1.1.1 // indirect
github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc // indirect
Expand All @@ -17,16 +18,21 @@ require (
github.com/sirupsen/logrus v1.4.1
github.com/thecodeteam/gofsutil v0.1.2 // indirect
github.com/thecodeteam/gosync v0.1.0 // indirect
github.com/vmware/govmomi v0.20.0
golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 // indirect
golang.org/x/net v0.0.0-20190628185345-da137c7871d7
golang.org/x/sync v0.0.0-20190423024810-112230192c58 // indirect
golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7 // indirect
github.com/vmware/govmomi v0.21.1-0.20190821201433-8bdc2d6fc858
golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586 // indirect
golang.org/x/lint v0.0.0-20190409202823-959b441ac422 // indirect
golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297
golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456 // indirect
golang.org/x/text v0.3.2 // indirect
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect
golang.org/x/tools v0.0.0-20190827205025-b29f5f60c37a // indirect
google.golang.org/grpc v1.19.0
gopkg.in/gcfg.v1 v1.2.3
k8s.io/apimachinery v0.0.0-20180621070125-103fd098999d
k8s.io/client-go v8.0.0+incompatible
k8s.io/cloud-provider-vsphere v0.2.1
k8s.io/klog v0.2.0
k8s.io/kubernetes v1.11.2
k8s.io/sample-controller v0.0.0-20180822125000-be98dc6210ab
k8s.io/utils v0.0.0-20190308190857-21c4ce38f2a7 // indirect
)
21 changes: 21 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfc
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-xdr v0.0.0-20161123171359-e6a2ba005892/go.mod h1:CTDl0pzVzE5DEzZhPfvhY/9sPFMQIxaJ9VAMs9AagrE=
github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
github.com/docker/distribution v0.0.0-20180820212402-02bf4a2887a4 h1:8UiRPZ+dol3ndYHduUTj2JM4gG4wcsHW6kZoSAJowBc=
Expand Down Expand Up @@ -60,6 +61,7 @@ github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ
github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf h1:+RRA9JqSOZFfKrOeqr2z77+8R2RKyh8PG66dcu1V0ck=
github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
github.com/google/uuid v0.0.0-20161128191214-064e2069ce9c/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v0.0.0-20170306145142-6a5e28554805/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/googleapis/gnostic v0.2.0 h1:l6N3VoaVzTncYYW+9yOz2LJJammFZGBO13sqgEhpy9g=
Expand Down Expand Up @@ -149,6 +151,9 @@ github.com/ugorji/go v1.1.1 h1:gmervu+jDMvXTbcHQ0pd2wee85nEoE0BsVyEuzkfK8w=
github.com/ugorji/go v1.1.1/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ=
github.com/vmware/govmomi v0.20.0 h1:+1IyhvoVb5JET2Wvgw9J3ZDv6CK4sxzUunpH8LhQqm4=
github.com/vmware/govmomi v0.20.0/go.mod h1:URlwyTFZX72RmxtxuaFL2Uj3fD1JTvZdx59bHWk6aFU=
github.com/vmware/govmomi v0.21.1-0.20190821201433-8bdc2d6fc858 h1:kVY/A59m1eRowd1b9ECtZsm0jieqcmOm48p7JAeyFug=
github.com/vmware/govmomi v0.21.1-0.20190821201433-8bdc2d6fc858/go.mod h1:zbnFoBQ9GIjs2RVETy8CNEpb+L+Lwkjs3XZUL0B3/m0=
github.com/vmware/vmw-guestinfo v0.0.0-20170707015358-25eff159a728/go.mod h1:x9oS4Wk2s2u4tS29nEaDLdzvuHdB19CvSGJjPgkZJNk=
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8=
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
go.etcd.io/bbolt v1.3.2 h1:Z/90sZLPOeCy2PwprqkFa25PdkusRzaj9P8zm/KNyvk=
Expand All @@ -158,14 +163,22 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90Pveol
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 h1:HuIa8hRrWRSrqYzx1qI49NNxhdi2PrY7gxVSq1JjLDc=
golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586 h1:7KByu05hhLed2MO29w7p1XfZvZ13m8mub3shuVftRs0=
golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3 h1:x/bBzNauLQAlE3fLku/xy92Y8QwKX5HZymrMz2IiKFc=
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
golang.org/x/lint v0.0.0-20190409202823-959b441ac422 h1:QzoH/1pFpZguR8NrRHLcO6jKqfv2zpuSqZLgdm7ZmjI=
golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20190628185345-da137c7871d7 h1:rTIdg5QFRR7XCaK4LCjBiPbx8j4DQRpdYMnGn/bJUEU=
golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 h1:k7pJ2yAPLPgbskkFdhRCsA77k2fySZ1zf2zCjvQCiIM=
golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be h1:vEDujvNQGv4jgYKudGeI/+DAX4Jffq6hpD55MmoEvKs=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
Expand All @@ -182,6 +195,8 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7 h1:LepdCS8Gf/MVejFIt8lsiexZATdoGVyp5bcyS+rYoUI=
golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456 h1:ng0gs1AKnRRuEMZoTLLlbOd+C17zUDepwGQBb/n+JVg=
golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
Expand All @@ -192,6 +207,12 @@ golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxb
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b h1:qMK98NmNCRVDIYFycQ5yVRkvgDUFfdP8Ip4KqmDEB7g=
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
golang.org/x/tools v0.0.0-20190827152308-062dbaebb618 h1:WtF22n/HcPWMhvZm4KWiQ0FcC1m8kk5ILpXYtY+qN7s=
golang.org/x/tools v0.0.0-20190827152308-062dbaebb618/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20190827205025-b29f5f60c37a h1:0JEq5ZQ3TgsRlFmz4BcD+E6U6cOk4pOImCQSyIG59ZM=
golang.org/x/tools v0.0.0-20190827205025-b29f5f60c37a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc=
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
Expand Down
190 changes: 190 additions & 0 deletions pkg/common/cns-lib/node/cache.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,190 @@
/*
Copyright 2019 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 node

import (
"errors"
"strings"
"sync"

"k8s.io/klog"
)

// ErrNodeAlreadyExists is returned if there's exists a node with
// the same name but different UUID.
var ErrNodeAlreadyExists = errors.New("another node with the same name exists")

// Cache provides thread-safe functionality to cache node information. Note that
// node names are handled in a case sensitive manner, and must be unique.
type Cache interface {
// DeleteNodeByUUID deletes a node entry by its UUID and returns its current name.
DeleteNodeByUUID(nodeUUID string) (string, error)
// DeleteNodeByName deletes a node entry by its name and returns its current UUID.
DeleteNodeByName(nodeName string) (string, error)
// LoadNodeNameByUUID returns a node's name given its UUID.
LoadNodeNameByUUID(nodeUUID string) (string, error)
// LoadNodeUUIDByName returns a node's UUID given its name.
LoadNodeUUIDByName(nodeName string) (string, error)
// Range calls f sequentially for each node entry.
Range(f func(nodeUUID, nodeName string) bool)
// Store associates the node UUID with its name. If the node UUID already
// exists in the Cache, the name associated with it is updated.
Store(nodeUUID, nodeName string) error
}

var (
// cacheInstance is a Cache singleton.
cacheInstance *defaultCache
// onceForCache is used for initializing the Cache singleton.
onceForCache sync.Once
)

// GetCache returns the Cache singleton.
func GetCache() Cache {
onceForCache.Do(func() {
klog.V(1).Info("Initializing node.defaultCache")
cacheInstance = &defaultCache{
uuidsToNames: make(map[string]string),
namesToUUIDs: make(map[string]string),
}
klog.V(1).Info("node.defaultCache initialized")
})
return cacheInstance
}

// defaultCache caches node information and provides functionality around it.
type defaultCache struct {
// mutex is used to ensure atomicity.
sync.Mutex
// uuidsToNames map node UUIDs to their names.
uuidsToNames map[string]string
// namesToUUIDs map node names to their UUIDs.
namesToUUIDs map[string]string
}

func normalizeUUID(nodeUUID string) string {
return strings.ToLower(nodeUUID)
}

func (c *defaultCache) DeleteNodeByUUID(nodeUUID string) (string, error) {
c.Lock()
defer c.Unlock()

nodeUUID = normalizeUUID(nodeUUID)
nodeName, exists := c.uuidsToNames[nodeUUID]
if !exists {
klog.Warningf("Node entry wasn't found with nodeUUID %s", nodeUUID)
return "", ErrNodeNotFound
}

delete(c.uuidsToNames, nodeUUID)
delete(c.namesToUUIDs, nodeName)
klog.V(2).Infof("Node entry was deleted with nodeUUID %s and nodeName %s", nodeUUID, nodeName)

return nodeName, nil
}

func (c *defaultCache) DeleteNodeByName(nodeName string) (string, error) {
c.Lock()
defer c.Unlock()

nodeUUID, exists := c.namesToUUIDs[nodeName]
if !exists {
klog.Warningf("Node entry wasn't found with nodeName %s", nodeName)
return "", ErrNodeNotFound
}

delete(c.namesToUUIDs, nodeName)
delete(c.uuidsToNames, nodeUUID)
klog.V(2).Infof("Node entry was deleted with nodeUUID %s and nodeName %s", nodeUUID, nodeName)
return nodeUUID, nil
}

func (c *defaultCache) LoadNodeNameByUUID(nodeUUID string) (string, error) {
nodeUUID = normalizeUUID(nodeUUID)
c.Lock()
nodeName, exists := c.uuidsToNames[nodeUUID]
c.Unlock()

if !exists {
klog.Warningf("Node entry wasn't found with nodeUUID %s", nodeUUID)
return "", ErrNodeNotFound
}
klog.V(2).Infof("Node entry was loaded with nodeUUID %s and nodeName %s", nodeUUID, nodeName)
return nodeName, nil
}

func (c *defaultCache) LoadNodeUUIDByName(nodeName string) (string, error) {
c.Lock()
nodeUUID, exists := c.namesToUUIDs[nodeName]
c.Unlock()

if !exists {
klog.Warningf("Node entry wasn't found with nodeName %s", nodeName)
return "", ErrNodeNotFound
}

klog.V(2).Infof("Node entry was loaded with nodeUUID %s and nodeName %s", nodeUUID, nodeName)
return nodeUUID, nil
}

func (c *defaultCache) Range(findNodeEntry func(string, string) bool) {
c.Lock()
defer c.Unlock()

for nodeUUID, nodeName := range c.uuidsToNames {
klog.V(4).Infof("Calling findNodeEntry func for node entry with nodeUUID %s and nodeName %s",
nodeUUID, nodeName)

if !findNodeEntry(nodeUUID, nodeName) {
klog.V(4).Infof("findNodeEntry func returned false for node entry with nodeUUID %s and nodeName %s, "+
"breaking", nodeUUID, nodeName)
break
}
}
}

func (c *defaultCache) Store(nodeUUID, nodeName string) error {
c.Lock()
defer c.Unlock()

// Return an error if there exists a node with the same name but different UUID.
nodeUUID = normalizeUUID(nodeUUID)
prevNameForUUID, prevNameExistsForUUID := c.uuidsToNames[nodeUUID]
prevUUIDForName, prevUUIDExistsForName := c.namesToUUIDs[nodeName]
if prevNameExistsForUUID && prevUUIDExistsForName && prevUUIDForName != nodeUUID {
klog.Errorf("Another node with the same name %s exists with nodeUUID %s and prevUUIDForName %s",
nodeName, nodeUUID, prevUUIDForName)
return ErrNodeAlreadyExists
}

// Clear cache entry for the given UUID and name, along with previously associated values.
delete(c.uuidsToNames, nodeUUID)
delete(c.namesToUUIDs, nodeName)
if prevNameExistsForUUID {
delete(c.namesToUUIDs, prevNameForUUID)
}
if prevUUIDExistsForName {
delete(c.uuidsToNames, prevUUIDForName)
}

// Store the new node UUID and name.
c.uuidsToNames[nodeUUID] = nodeName
c.namesToUUIDs[nodeName] = nodeUUID
klog.V(2).Infof("Node entry was stored with nodeUUID %s and nodeName %s", nodeUUID, nodeName)
return nil
}
Loading

0 comments on commit 99f9c17

Please sign in to comment.