Merge pull request #7 from contiv/shaleman

Get current lock holder by reading from statestore

Author: shaleman

etcdLock.go

@@ -124,7 +124,17 @@ func (ep *Lock) IsAcquired() bool {
 func (ep *Lock) GetHolder() string {
 	ep.mutex.Lock()
 	defer ep.mutex.Unlock()
-	return ep.holderID
+
+	keyName := "/contiv.io/lock/" + ep.name
+
+	// Get the current value
+	resp, err := ep.client.Get(keyName, false, false)
+	if err != nil {
+		log.Warnf("Could not get current holder for lock %s", ep.name)
+		return ""
+	}
+
+	return resp.Node.Value
 }
 
 // *********************** Internal functions *************

etcdService.go

@@ -32,6 +32,11 @@ func (self *etcdPlugin) RegisterService(serviceInfo ServiceInfo) error {
 
 	log.Infof("Registering service key: %s, value: %+v", keyName, serviceInfo)
 
+	// if there is a previously registered service, de-register it
+	if self.serviceDb[keyName] != nil {
+		self.DeregisterService(serviceInfo)
+	}
+
 	// JSON format the object
 	jsonVal, err := json.Marshal(serviceInfo)
 	if err != nil {

objdb.go

@@ -51,6 +51,8 @@ type LockInterface interface {
 //      identify an instance of a service
 type ServiceInfo struct {
 	ServiceName string // Name of the service
+	Role        string // Role of the service. (leader, follower etc)
+	Version     string // Version string for the service
 	HostAddr    string // Host name or IP address where its running
 	Port        int    // Port number where its listening
 }