mirrors/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2025-09-01 20:11:09 +02:00
Code Issues Projects Releases Wiki Activity

Etcd3: Write lock item with lease to ensure release on bad shutdown (#2526)

Browse Source
This commit is contained in:
Marshall Brekka 2017-03-28 08:08:41 -07:00 committed by Jeff Mitchell
parent af29cca7c0
commit f06c69e2f9
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
physical/etcd3.go
View File

@ -32,6 +32,9 @@ type EtcdBackend struct {
etcd *clientv3.Client etcd *clientv3.Client
} }
// etcd default lease duration is 60s. set to 15s for faster recovery.
const etcd3LockTimeoutInSeconds = 15
// newEtcd3Backend constructs a etcd3 backend. // newEtcd3Backend constructs a etcd3 backend.
func newEtcd3Backend(conf map[string]string, logger log.Logger) (Backend, error) { func newEtcd3Backend(conf map[string]string, logger log.Logger) (Backend, error) {
// Get the etcd path form the configuration. // Get the etcd path form the configuration.
@ -228,7 +231,7 @@ type EtcdLock struct {
// Lock is used for mutual exclusion based on the given key. // Lock is used for mutual exclusion based on the given key.
func (c *EtcdBackend) LockWith(key, value string) (Lock, error) { func (c *EtcdBackend) LockWith(key, value string) (Lock, error) {
session, err := concurrency.NewSession(c.etcd) session, err := concurrency.NewSession(c.etcd, concurrency.WithTTL(etcd3LockTimeoutInSeconds))
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -262,7 +265,7 @@ func (c *EtcdLock) Lock(stopCh <-chan struct{}) (<-chan struct{}, error) {
} }
return nil, err return nil, err
} }
if _, err := c.etcd.Put(ctx, c.etcdMu.Key(), c.value); err != nil { if _, err := c.etcd.Put(ctx, c.etcdMu.Key(), c.value, clientv3.WithLease(c.etcdSession.Lease())); err != nil {
return nil, err return nil, err
} }