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

Return a useful error for etcd Lock when aborting the Lock operation instead of nil, nil #64

Merged
merged 1 commit into from
Sep 24, 2015
Merged

Return a useful error for etcd Lock when aborting the Lock operation instead of nil, nil #64

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
10 changes: 9 additions & 1 deletion store/etcd/etcd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package etcd

import (
"crypto/tls"
"errors"
"net"
"net/http"
"strings"
Expand All @@ -12,6 +13,13 @@ import (
"github.com/docker/libkv/store"
)

var (
// ErrAbortTryLock is thrown when a user stops trying to seek the lock
// by sending a signal to the stop chan, this is used to verify if the
// operation succeeded
ErrAbortTryLock = errors.New("lock operation aborted")
)

// Etcd is the receiver type for the
// Store interface
type Etcd struct {
Expand Down Expand Up @@ -470,7 +478,7 @@ func (l *etcdLock) Lock(stopChan chan struct{}) (<-chan struct{}, error) {
case _ = <-free:
break
case _ = <-stopChan:
return nil, nil
return nil, ErrAbortTryLock
}

// Delete or Expire event occured
Expand Down