From 055551a0c854dc6ba3b7d27526dc6a821b4442ae Mon Sep 17 00:00:00 2001
From: Alexandre Beslic <abronan@docker.com>
Date: Thu, 21 May 2015 11:19:38 -0700
Subject: [PATCH 1/2] Enhance zookeeper lock with value support

Signed-off-by: Alexandre Beslic <abronan@docker.com>
---
 pkg/store/zookeeper.go | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/pkg/store/zookeeper.go b/pkg/store/zookeeper.go
index 9a558e644c..dba67e16b1 100644
--- a/pkg/store/zookeeper.go
+++ b/pkg/store/zookeeper.go
@@ -17,7 +17,10 @@ type Zookeeper struct {
 }
 
 type zookeeperLock struct {
-	lock *zk.Lock
+	client *zk.Conn
+	lock   *zk.Lock
+	key    string
+	value  []byte
 }
 
 // InitializeZookeeper creates a new Zookeeper client
@@ -225,20 +228,34 @@ func (s *Zookeeper) AtomicDelete(key string, previous *KVPair) (bool, error) {
 // NewLock returns a handle to a lock struct which can be used to acquire and
 // release the mutex.
 func (s *Zookeeper) NewLock(key string, options *LockOptions) (Locker, error) {
-	// FIXME: `options.Value` is not being used since there is no support in
-	// zk.NewLock().
+	value := []byte("")
+
+	// Apply options
+	if options != nil {
+		if options.Value != nil {
+			value = options.Value
+		}
+	}
+
 	return &zookeeperLock{
-		lock: zk.NewLock(s.client, normalize(key), zk.WorldACL(zk.PermAll)),
+		client: s.client,
+		key:    normalize(key),
+		value:  value,
+		lock:   zk.NewLock(s.client, normalize(key), zk.WorldACL(zk.PermAll)),
 	}, nil
 }
 
 // Lock attempts to acquire the lock and blocks while doing so.
 // Returns a channel that is closed if our lock is lost or an error.
 func (l *zookeeperLock) Lock() (<-chan struct{}, error) {
-	if err := l.lock.Lock(); err != nil {
-		return nil, err
+	err := l.lock.Lock()
+
+	if err == nil {
+		// We hold the lock, we can set our value
+		_, err = l.client.Set(l.key, l.value, -1)
 	}
-	return make(<-chan struct{}), nil
+
+	return nil, err
 }
 
 // Unlock released the lock. It is an error to call this

From 86b144859a58e4bfcbf87f0c719b59c44c0cb914 Mon Sep 17 00:00:00 2001
From: Alexandre Beslic <abronan@docker.com>
Date: Thu, 21 May 2015 18:30:54 -0700
Subject: [PATCH 2/2] Add FIXME for the leader value staying set although all
 machines are gone

Signed-off-by: Alexandre Beslic <abronan@docker.com>
---
 pkg/store/zookeeper.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkg/store/zookeeper.go b/pkg/store/zookeeper.go
index dba67e16b1..06eebbe1d5 100644
--- a/pkg/store/zookeeper.go
+++ b/pkg/store/zookeeper.go
@@ -252,6 +252,7 @@ func (l *zookeeperLock) Lock() (<-chan struct{}, error) {
 
 	if err == nil {
 		// We hold the lock, we can set our value
+		// FIXME: When the last leader leaves the election, this value will be left behind
 		_, err = l.client.Set(l.key, l.value, -1)
 	}