Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Add context #84

Merged
merged 1 commit into from
Jul 26, 2022
Merged

Add context #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions etcd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ func newEtcd(ip, port string, cert, key []byte, insecureskip bool) *etcd {
}
}

func (e *etcd) CreatePrefix(prefix Prefix) (Prefix, error) {
func (e *etcd) CreatePrefix(ctx context.Context, prefix Prefix) (Prefix, error) {
e.lock.Lock()
defer e.lock.Unlock()

ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
get, err := e.etcdDB.Get(ctx, prefix.Cidr)
defer cancel()
if err != nil {
Expand All @@ -75,7 +75,7 @@ func (e *etcd) CreatePrefix(prefix Prefix) (Prefix, error) {
if err != nil {
return Prefix{}, err
}
ctx, cancel = context.WithTimeout(context.Background(), 5*time.Second)
ctx, cancel = context.WithTimeout(ctx, 5*time.Second)
_, err = e.etcdDB.Put(ctx, prefix.Cidr, string(pfx))
defer cancel()
if err != nil {
Expand All @@ -85,11 +85,11 @@ func (e *etcd) CreatePrefix(prefix Prefix) (Prefix, error) {
return prefix, nil
}

func (e *etcd) ReadPrefix(prefix string) (Prefix, error) {
func (e *etcd) ReadPrefix(ctx context.Context, prefix string) (Prefix, error) {
e.lock.Lock()
defer e.lock.Unlock()

ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
get, err := e.etcdDB.Get(ctx, prefix)
defer cancel()
if err != nil {
Expand All @@ -103,10 +103,10 @@ func (e *etcd) ReadPrefix(prefix string) (Prefix, error) {
return fromJSON(get.Kvs[0].Value)
}

func (e *etcd) DeleteAllPrefixes() error {
func (e *etcd) DeleteAllPrefixes(ctx context.Context) error {
e.lock.RLock()
defer e.lock.RUnlock()
ctx, cancel := context.WithTimeout(context.Background(), 50*time.Minute)
ctx, cancel := context.WithTimeout(ctx, 50*time.Minute)
defaultOpts := []clientv3.OpOption{clientv3.WithPrefix(), clientv3.WithKeysOnly(), clientv3.WithSerializable()}
pfxs, err := e.etcdDB.Get(ctx, "", defaultOpts...)
defer cancel()
Expand All @@ -123,11 +123,11 @@ func (e *etcd) DeleteAllPrefixes() error {
return nil
}

func (e *etcd) ReadAllPrefixes() (Prefixes, error) {
func (e *etcd) ReadAllPrefixes(ctx context.Context) (Prefixes, error) {
e.lock.Lock()
defer e.lock.Unlock()

ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
defaultOpts := []clientv3.OpOption{clientv3.WithPrefix(), clientv3.WithKeysOnly(), clientv3.WithSerializable()}
pfxs, err := e.etcdDB.Get(ctx, "", defaultOpts...)
defer cancel()
Expand All @@ -149,12 +149,12 @@ func (e *etcd) ReadAllPrefixes() (Prefixes, error) {
}
return result, nil
}
func (e *etcd) ReadAllPrefixCidrs() ([]string, error) {
func (e *etcd) ReadAllPrefixCidrs(ctx context.Context) ([]string, error) {
e.lock.Lock()
defer e.lock.Unlock()

allPrefix := []string{}
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
defaultOpts := []clientv3.OpOption{clientv3.WithPrefix(), clientv3.WithKeysOnly(), clientv3.WithSerializable()}
pfxs, err := e.etcdDB.Get(ctx, "", defaultOpts...)
defer cancel()
Expand All @@ -168,7 +168,7 @@ func (e *etcd) ReadAllPrefixCidrs() ([]string, error) {

return allPrefix, nil
}
func (e *etcd) UpdatePrefix(prefix Prefix) (Prefix, error) {
func (e *etcd) UpdatePrefix(ctx context.Context, prefix Prefix) (Prefix, error) {
e.lock.Lock()
defer e.lock.Unlock()

Expand All @@ -179,7 +179,7 @@ func (e *etcd) UpdatePrefix(prefix Prefix) (Prefix, error) {
return Prefix{}, err
}

ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
p, err := e.etcdDB.Get(ctx, prefix.Cidr)
defer cancel()
if err != nil {
Expand All @@ -201,7 +201,7 @@ func (e *etcd) UpdatePrefix(prefix Prefix) (Prefix, error) {
}

// Operation is committed only if the watched keys remain unchanged.
ctx, cancel = context.WithTimeout(context.Background(), 5*time.Second)
ctx, cancel = context.WithTimeout(ctx, 5*time.Second)
_, err = e.etcdDB.Put(ctx, prefix.Cidr, string(pn))
defer cancel()
if err != nil {
Expand All @@ -210,11 +210,11 @@ func (e *etcd) UpdatePrefix(prefix Prefix) (Prefix, error) {

return prefix, nil
}
func (e *etcd) DeletePrefix(prefix Prefix) (Prefix, error) {
func (e *etcd) DeletePrefix(ctx context.Context, prefix Prefix) (Prefix, error) {
e.lock.Lock()
defer e.lock.Unlock()

ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
_, err := e.etcdDB.Delete(ctx, prefix.Cidr)
defer cancel()
if err != nil {
Expand Down
Loading