Merge pull request #104 from 9corp/dselans/leader-election-bug

Dselans/leader election bug
9corp · Mar 4, 2017 · ac8aedd · ac8aedd
2 parents 60db736 + 9e939b0
commit ac8aedd
Show file tree

Hide file tree

Showing 5 changed files with 278 additions and 34 deletions.
diff --git a/Makefile b/Makefile
@@ -57,10 +57,10 @@ build/linux: clean/linux build/ui ## Build for linux (save to OUTPUT_DIR/BIN)
 build/darwin: clean/darwin build/ui ## Build for darwin (save to OUTPUT_DIR/BIN)
 	GOOS=darwin go build -a -installsuffix cgo -ldflags "-X main.version=$(RELEASE_VER)" -o $(OUTPUT_DIR)/$(BIN)-darwin .
 
-build/docker: clean/linux build/ui build/linux ## Build docker image
+build/docker: build/linux ## Build docker image
 	docker build -t "9volt:$(RELEASE_VER)" .
 
-build/docker-compose: clean/linux build/ui build/linux ## Build and start 9volt (and etcd) using docker-compose
+build/docker-compose: build/linux ## Build and start 9volt (and etcd) using docker-compose
 	docker-compose up -d
 
 build/docs: ## Build markdown docs from swagger comments

diff --git a/cluster/cluster.go b/cluster/cluster.go
@@ -403,7 +403,7 @@ func (c *Cluster) handleState(directorJSON *DirectorJSON) error {
 		if !c.amDirector() {
 			log.Infof("%v-directorMonitor: Not a director, but etcd says we are (updating state)!",
 				c.Identifier)
-			return c.changeState(START, nil, NOOP)
+			return c.changeState(START, directorJSON, UPDATE) // update so we can compareAndSwap
 		}
 	}
 

diff --git a/dal/dalfakes/fake_idal.go b/dal/dalfakes/fake_idal.go
@@ -141,12 +141,13 @@ type FakeIDal struct {
 	clearCheckReferencesReturns struct {
 		result1 error
 	}
-	FetchAllMemberRefsStub        func() (map[string]string, error)
+	FetchAllMemberRefsStub        func() (map[string]string, []string, error)
 	fetchAllMemberRefsMutex       sync.RWMutex
 	fetchAllMemberRefsArgsForCall []struct{}
 	fetchAllMemberRefsReturns     struct {
 		result1 map[string]string
-		result2 error
+		result2 []string
+		result3 error
 	}
 	FetchCheckStatsStub        func() (map[string]int, error)
 	fetchCheckStatsMutex       sync.RWMutex
@@ -719,7 +720,7 @@ func (fake *FakeIDal) ClearCheckReferencesReturns(result1 error) {
 	}{result1}
 }
 
-func (fake *FakeIDal) FetchAllMemberRefs() (map[string]string, error) {
+func (fake *FakeIDal) FetchAllMemberRefs() (map[string]string, []string, error) {
 	fake.fetchAllMemberRefsMutex.Lock()
 	fake.fetchAllMemberRefsArgsForCall = append(fake.fetchAllMemberRefsArgsForCall, struct{}{})
 	fake.guard("FetchAllMemberRefs")
@@ -728,7 +729,7 @@ func (fake *FakeIDal) FetchAllMemberRefs() (map[string]string, error) {
 	if fake.FetchAllMemberRefsStub != nil {
 		return fake.FetchAllMemberRefsStub()
 	} else {
-		return fake.fetchAllMemberRefsReturns.result1, fake.fetchAllMemberRefsReturns.result2
+		return fake.fetchAllMemberRefsReturns.result1, fake.fetchAllMemberRefsReturns.result2, fake.fetchAllMemberRefsReturns.result3
 	}
 }
 
@@ -738,12 +739,13 @@ func (fake *FakeIDal) FetchAllMemberRefsCallCount() int {
 	return len(fake.fetchAllMemberRefsArgsForCall)
 }
 
-func (fake *FakeIDal) FetchAllMemberRefsReturns(result1 map[string]string, result2 error) {
+func (fake *FakeIDal) FetchAllMemberRefsReturns(result1 map[string]string, result2 []string, result3 error) {
 	fake.FetchAllMemberRefsStub = nil
 	fake.fetchAllMemberRefsReturns = struct {
 		result1 map[string]string
-		result2 error
-	}{result1, result2}
+		result2 []string
+		result3 error
+	}{result1, result2, result3}
 }
 
 func (fake *FakeIDal) FetchCheckStats() (map[string]int, error) {

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,26 +1,38 @@
 version: '2'
 services:
-  9volt:
+  9volt1:
     depends_on: 
       - etcd
     image: 9corp/9volt:latest
     ports:
-      - "8080:8080"
+      - "8081:8080"
     links: 
      - etcd
     environment:
       - NINEV_ETCD_MEMBERS=http://etcd:2379
-  9volt2:
-    depends_on: 
-      - etcd
-    image: 9corp/9volt:latest
-    ports:
-      - "8181:8181"
-    links: 
-     - etcd
-    environment:
-      - NINEV_ETCD_MEMBERS=http://etcd:2379
-      - NINEV_LISTEN_ADDRESS=:8181
+      - NINEV_DEBUG=true
+  # 9volt2:
+  #   depends_on: 
+  #     - etcd
+  #   image: 9corp/9volt:latest
+  #   ports:
+  #     - "8082:8080"
+  #   links: 
+  #    - etcd
+  #   environment:
+  #     - NINEV_ETCD_MEMBERS=http://etcd:2379
+  #     - NINEV_DEBUG=true
+  # 9volt3:
+  #   depends_on: 
+  #     - etcd
+  #   image: 9corp/9volt:latest
+  #   ports:
+  #     - "8083:8080"
+  #   links: 
+  #    - etcd
+  #   environment:
+  #     - NINEV_ETCD_MEMBERS=http://etcd:2379
+  #     - NINEV_DEBUG=true
   etcd:
     image: quay.io/coreos/etcd:v3.1.2
     ports: