Merge pull request #17 from cosminrentea/feature/disable-cluster

disable/enable the "cluster" feature from the build phase

.travis.yml

@@ -8,19 +8,19 @@ services:
 before_script:
   - psql -c 'create database guble;' -U postgres
 before_install:
-  - go get github.com/wadey/gocovmerge
-  - go get github.com/mattn/goveralls
-  - go get golang.org/x/tools/cmd/cover
+  - go get github.com/wadey/gocovmerge github.com/mattn/goveralls golang.org/x/tools/cmd/cover
 script:
-  - GO_TEST_DISABLED=true go test -v ./...
+  - GO_TEST_DISABLED=true go test -v ./... && GO_TEST_DISABLED=true go test -v -tags cluster ./...
 after_success:
   - scripts/generate_coverage.sh
   - goveralls -coverprofile=full_cov.out -service=travis-ci
-  - if [ "$TRAVIS_BRANCH" == "master" ]; then
-      GOOS=linux go build -a --ldflags '-linkmode external -extldflags "-static"' . ;
-      GOOS=linux go build -a --ldflags '-linkmode external -extldflags "-static"' -o ./guble-cli/guble-cli ./guble-cli ;
-    fi
-
+#  - if [ "$TRAVIS_BRANCH" == "master" ]; then
+#      GOOS=linux go build -a --ldflags '-linkmode external -extldflags "-static"' . ;
+#      GOOS=linux go build -a --ldflags '-linkmode external -extldflags "-static"' -o ./guble-cli/guble-cli ./guble-cli ;
+#    fi
+#    docker build -t cosminrentea/gobbler . ;
+#    docker login -e="$DOCKER_EMAIL" -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" ;
+#    docker push cosminrentea/gobbler ;
 env:
   global:
   - secure: V9+UswYO6l0EuekA5YBviUdz0OcWfT3QsY1Bgoml8lmWP3/Rdq0fpxGh1hHUWt1pyAl3Aymw5Sc9DU/STmb5k6YjimS649Hu3jZ2AJfjLxh8ZA+vTgFiQc4mN4FqDAFhnPVB/aOSQhGyRlWalxikNy3nhcJrN+uWOpzRqzg0icNOdfTKpSH1cRJO0Ja34f4AEmLuNvGUAyZVpLuZJFL5mE9sJ1G1baqgFf/kTQ67jF+Ezg+1AY+NYaYwd5PUGFgIKf/qVT5Wqtrff26Yxzr/hECEBypAvNmCdLSoV/qyzZvzUTgYZTPmUnDks0uUEup9YzEQZ9XxwIQyHSXZ9D6h2vZxyr0TlZvBtdzWNiLHjBSISF8ZzOthI7NIi/e4YRYlqCF3apZuRo6o2fneHqzonza0OpJQdCKACXgycFe0ZTXk1o7SdT1d1JgeFckmL0kS8H2N4E/DaIAPq8zaC4bOlaYaUYt6vXNwEKK99q0X97gLJFdrBBY7lzKs9bbVa7b2Dhkh67PUt6WhoHUjLSN+9jTn+oda8VEKtXxyaWM6AsCRHgBiy0VaxuHbU2k1mpSCLdBfJGbrDITA4+nyPopv/oky4xHX1FGSMGFw73Ejafu9Xo0cpvIpVcNjeagUugQ5ThPQMSua9hxSZJx6alIUhptDUesiYHJAWUVPQi4N/3A=

server/benchmarking_test.go

@@ -19,7 +19,7 @@ type testgroup struct {
 	t                   *testing.T
 	groupID             int
 	addr                string
-	done                chan bool
+	doneC               chan bool
 	messagesToSend      int
 	consumer, publisher client.Client
 	topic               string
@@ -30,7 +30,7 @@ func newTestgroup(t *testing.T, groupID int, addr string, messagesToSend int) *t
 		t:              t,
 		groupID:        groupID,
 		addr:           addr,
-		done:           make(chan bool),
+		doneC:          make(chan bool),
 		messagesToSend: messagesToSend,
 	}
 }
@@ -89,13 +89,13 @@ func TestThroughput(t *testing.T) {
 	log.Print("wait for finishing")
 	for i, test := range testgroups {
 		select {
-		case successFlag := <-test.done:
+		case successFlag := <-test.doneC:
 			if !successFlag {
 				t.Logf("testgroup %v returned with error", i)
 				t.FailNow()
 				return
 			}
-		case <-time.After(time.Second * 20):
+		case <-time.After(time.Second * 10):
 			t.Log("timeout. testgroups not ready before timeout")
 			t.Fail()
 			return
@@ -139,7 +139,7 @@ func (tg *testgroup) expectStatusMessage(name string, arg string) {
 		assert.Equal(tg.t, arg, notify.Arg)
 	case <-time.After(time.Second * 1):
 		tg.t.Logf("[%v] no notification of type %s until timeout", tg.groupID, name)
-		tg.done <- false
+		tg.doneC <- false
 		tg.t.Fail()
 		return
 	}
@@ -161,21 +161,21 @@ func (tg *testgroup) Start() {
 			assert.Equal(tg.t, tg.topic, string(msg.Path))
 			if !assert.Equal(tg.t, body, string(msg.Body)) {
 				tg.t.FailNow()
-				tg.done <- false
+				tg.doneC <- false
 			}
 		case msg := <-tg.consumer.Errors():
 			tg.t.Logf("[%v] received error: %v", tg.groupID, msg)
-			tg.done <- false
+			tg.doneC <- false
 			tg.t.Fail()
 			return
 		case <-time.After(time.Second * 5):
 			tg.t.Logf("[%v] no message received until timeout, expected message %v", tg.groupID, i)
-			tg.done <- false
+			tg.doneC <- false
 			tg.t.Fail()
 			return
 		}
 	}
-	tg.done <- true
+	tg.doneC <- true
 }
 
 func (tg *testgroup) Clean() {

server/cluster/cluster.go

@@ -13,6 +13,7 @@ import (
 	"fmt"
 	"net"
 	"strconv"
+	"time"
 )
 
 var (
@@ -122,6 +123,7 @@ func (cluster *Cluster) Stop() error {
 	if cluster.synchronizer != nil {
 		close(cluster.synchronizer.stopC)
 	}
+	cluster.memberlist.Leave(time.Second)
 	return cluster.memberlist.Shutdown()
 }
 

server/cluster/cluster_test.go

@@ -1,8 +1,6 @@
 package cluster
 
 import (
-	"io/ioutil"
-
 	"github.com/cosminrentea/gobbler/server/store/filestore"
 
 	"github.com/cosminrentea/gobbler/protocol"
@@ -12,6 +10,7 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"errors"
+	"io/ioutil"
 	"net"
 	"testing"
 	"time"
@@ -51,13 +50,14 @@ func TestCluster_StartCheckStop(t *testing.T) {
 	node.Router = newDummyRouter(t)
 
 	err = node.Start()
+	defer func() {
+		err := node.Stop()
+		a.NoError(err, "No error should be raised when Stopping the Cluster")
+	}()
 	a.NoError(err, "No error should be raised when Starting the Cluster")
 
 	err = node.Check()
 	a.NoError(err, "Health-check score of a Cluster with a single node should be OK")
-
-	err = node.Stop()
-	a.NoError(err, "No error should be raised when Stopping the Cluster")
 }
 
 func TestCluster_BroadcastStringAndMessageAndCheck(t *testing.T) {
@@ -70,8 +70,11 @@ func TestCluster_BroadcastStringAndMessageAndCheck(t *testing.T) {
 	node1.Router = newDummyRouter(t)
 
 	//start the cluster node 1
-	defer node1.Stop()
 	err = node1.Start()
+	defer func() {
+		err := node1.Stop()
+		a.NoError(err, "No error should be raised when Stopping the Cluster")
+	}()
 	a.NoError(err, "No error should be raised when starting node 1 of the Cluster")
 
 	config2 := testConfigAnother()
@@ -81,8 +84,11 @@ func TestCluster_BroadcastStringAndMessageAndCheck(t *testing.T) {
 	node2.Router = newDummyRouter(t)
 
 	//start the cluster node 2
-	defer node2.Stop()
 	err = node2.Start()
+	defer func() {
+		err := node2.Stop()
+		a.NoError(err, "No error should be raised when Stopping the Cluster")
+	}()
 	a.NoError(err, "No error should be raised when starting node 2 of the Cluster")
 
 	// Send a String Message
@@ -135,8 +141,11 @@ func TestCluster_StartShouldReturnErrorWhenNoRemotes(t *testing.T) {
 
 	node.Router = newDummyRouter(t)
 
-	defer node.Stop()
 	err = node.Start()
+	defer func() {
+		err := node.Stop()
+		a.NoError(err, "No error should be raised when Stopping the Cluster")
+	}()
 	if a.Error(err, "An error is expected when Starting the Cluster") {
 		a.Equal(err, errors.New("No remote hosts were successfully contacted when this node wanted to join the cluster"),
 			"Error should be precisely defined")
@@ -157,8 +166,11 @@ func TestCluster_StartShouldReturnErrorWhenInvalidRemotes(t *testing.T) {
 
 	node.Router = newDummyRouter(t)
 
-	defer node.Stop()
 	err = node.Start()
+	defer func() {
+		err := node.Stop()
+		a.NoError(err, "No error should be raised when Stopping the Cluster")
+	}()
 	if a.Error(err, "An error is expected when Starting the Cluster") {
 		expected := multierror.Append(errors.New("Failed to join 127.0.0.1: dial tcp 127.0.0.1:0: getsockopt: connection refused"))
 		a.Equal(err, expected, "Error should be precisely defined")
@@ -172,8 +184,11 @@ func TestCluster_StartShouldReturnErrorWhenNoMessageHandler(t *testing.T) {
 	node, err := New(&config)
 	a.NoError(err, "No error should be raised when Creating the Cluster")
 
-	defer node.Stop()
 	err = node.Start()
+	defer func() {
+		err := node.Stop()
+		a.NoError(err, "No error should be raised when Stopping the Cluster")
+	}()
 	if a.Error(err, "An error is expected when Starting the Cluster") {
 		expected := errors.New("There should be a valid Router already set-up")
 		a.Equal(expected, err, "Error should be precisely defined")
@@ -189,8 +204,11 @@ func TestCluster_NotifyMsgShouldSimplyReturnWhenDecodingInvalidMessage(t *testin
 
 	node.Router = newDummyRouter(t)
 
-	defer node.Stop()
 	err = node.Start()
+	defer func() {
+		err := node.Stop()
+		a.NoError(err, "No error should be raised when Stopping the Cluster")
+	}()
 	a.NoError(err, "No error should be raised when Starting the Cluster")
 
 	node.NotifyMsg([]byte{})
@@ -207,8 +225,11 @@ func TestCluster_broadcastClusterMessage(t *testing.T) {
 
 	node.Router = newDummyRouter(t)
 
-	defer node.Stop()
 	err = node.Start()
+	defer func() {
+		err := node.Stop()
+		a.NoError(err, "No error should be raised when Stopping the Cluster")
+	}()
 	a.NoError(err, "No error should be raised when Starting the Cluster")
 
 	err = node.broadcastClusterMessage(nil)

server/cluster_integration_test.go

@@ -1,3 +1,5 @@
+// +build cluster
+
 package server
 
 import (

server/redundancy_test.go → server/cluster_redundancy_test.go

@@ -1,3 +1,5 @@
+// +build cluster
+
 package server
 
 import (

server/gobbler.go

@@ -6,7 +6,6 @@ import (
 	"github.com/cosminrentea/gobbler/logformatter"
 	"github.com/cosminrentea/gobbler/protocol"
 	"github.com/cosminrentea/gobbler/server/apns"
-	"github.com/cosminrentea/gobbler/server/cluster"
 	"github.com/cosminrentea/gobbler/server/fcm"
 	"github.com/cosminrentea/gobbler/server/kvstore"
 	"github.com/cosminrentea/gobbler/server/metrics"
@@ -251,25 +250,7 @@ func StartService() *service.Service {
 	messageStore := CreateMessageStore()
 	kvStore := CreateKVStore()
 
-	var cl *cluster.Cluster
-	var err error
-
-	if *Config.Cluster.NodeID > 0 {
-		exitIfInvalidClusterParams(*Config.Cluster.NodeID, *Config.Cluster.NodePort, *Config.Cluster.Remotes)
-		logger.Info("Starting in cluster-mode")
-		cl, err = cluster.New(&cluster.Config{
-			ID:      *Config.Cluster.NodeID,
-			Port:    *Config.Cluster.NodePort,
-			Remotes: *Config.Cluster.Remotes,
-		})
-		if err != nil {
-			logger.WithField("err", err).Fatal("Module could not be started (cluster)")
-		}
-	} else {
-		logger.Info("Starting in standalone-mode")
-	}
-
-	r := router.New(messageStore, kvStore, cl)
+	r := router.New(messageStore, kvStore, createCluster())
 	websrv := webserver.New(*Config.HttpListen)
 
 	srv := service.New(r, websrv).
@@ -280,7 +261,7 @@ func StartService() *service.Service {
 	srv.RegisterModules(0, 6, kvStore, messageStore)
 	srv.RegisterModules(4, 3, CreateModules(r)...)
 
-	if err = srv.Start(); err != nil {
+	if err := srv.Start(); err != nil {
 		logger.WithField("error", err.Error()).Error("errors occurred while starting service")
 		if err = srv.Stop(); err != nil {
 			logger.WithField("error", err.Error()).Error("errors occurred when stopping service after it failed to start")

server/gobbler_cluster_disabled.go

@@ -0,0 +1,9 @@
+// +build !cluster
+
+package server
+
+import "github.com/cosminrentea/gobbler/server/cluster"
+
+func createCluster() *cluster.Cluster {
+	return nil
+}

server/gobbler_cluster_enabled.go

@@ -0,0 +1,25 @@
+// +build cluster
+
+package server
+
+import "github.com/cosminrentea/gobbler/server/cluster"
+
+func createCluster() (cl *cluster.Cluster) {
+	var err error
+
+	if *Config.Cluster.NodeID > 0 {
+		exitIfInvalidClusterParams(*Config.Cluster.NodeID, *Config.Cluster.NodePort, *Config.Cluster.Remotes)
+		logger.Info("Starting in cluster-mode")
+		cl, err = cluster.New(&cluster.Config{
+			ID:      *Config.Cluster.NodeID,
+			Port:    *Config.Cluster.NodePort,
+			Remotes: *Config.Cluster.Remotes,
+		})
+		if err != nil {
+			logger.WithField("err", err).Fatal("Module could not be started (cluster)")
+		}
+	} else {
+		logger.Info("Starting in standalone-mode")
+	}
+	return
+}