Moved worker flag to server, removed numInstance flag

query/query_test.go

@@ -103,7 +103,7 @@ func TestNewGraph(t *testing.T) {
 		t.Error(err)
 	}
 
-	worker.Init(ps, nil)
+	worker.Init(ps, nil, nil)
 
 	uo := flatbuffers.GetUOffsetT(sg.result)
 	r := new(task.Result)
@@ -134,7 +134,7 @@ func populateGraph(t *testing.T) (string, *store.Store) {
 	ps := new(store.Store)
 	ps.Init(dir)
 
-	worker.Init(ps, nil)
+	worker.Init(ps, nil, nil)
 
 	clog := commit.NewLogger(dir, "mutations", 50<<20)
 	clog.Init()

server/main.go

@@ -22,6 +22,7 @@ import (
 	"io/ioutil"
 	"net/http"
 	"runtime"
+	"strings"
 	"time"
 
 	"github.com/Sirupsen/logrus"
@@ -45,8 +46,8 @@ var numcpu = flag.Int("numCpu", runtime.NumCPU(),
 	"Number of cores to be used by the process")
 var instanceIdx = flag.Uint64("instanceIdx", 0,
 	"serves only entities whose Fingerprint % numInstance == instanceIdx.")
-var numInstances = flag.Uint64("numInstances", 1,
-	"Total number of server instances")
+var workers = flag.String("workers", "",
+	"Comma separated list of IP addresses of workers")
 
 func addCorsHeaders(w http.ResponseWriter) {
 	w.Header().Set("Access-Control-Allow-Origin", "*")
@@ -142,16 +143,18 @@ func main() {
 	clog.Init()
 	defer clog.Close()
 
+	addrs := strings.Split(*workers, ",")
+
 	posting.Init(clog)
 	if *instanceIdx != 0 {
-		worker.Init(ps, nil)
+		worker.Init(ps, nil, addrs)
 		uid.Init(nil)
 	} else {
 		uidStore := new(store.Store)
 		uidStore.Init(*uidDir)
 		defer uidStore.Close()
 		// Only server instance 0 will have uidStore
-		worker.Init(ps, uidStore)
+		worker.Init(ps, uidStore, addrs)
 		uid.Init(uidStore)
 	}
 

server/main_test.go

@@ -62,7 +62,7 @@ func prepare() (dir1, dir2 string, ps *store.Store, clog *commit.Logger, rerr er
 	clog.Init()
 
 	posting.Init(clog)
-	worker.Init(ps, nil)
+	worker.Init(ps, nil, nil)
 	uid.Init(ps)
 	loader.Init(ps, ps)
 

worker/worker.go

@@ -5,7 +5,6 @@ import (
 	"io"
 	"net"
 	"net/rpc"
-	"strings"
 
 	"github.com/dgraph-io/dgraph/conn"
 	"github.com/dgraph-io/dgraph/posting"
@@ -15,18 +14,18 @@ import (
 	"github.com/google/flatbuffers/go"
 )
 
-var workers = flag.String("workers", "",
-	"Comma separated list of IP addresses of workers")
 var workerPort = flag.String("workerport", ":12345",
 	"Port used by worker for internal communication.")
 
 var glog = x.Log("worker")
 var dataStore, xiduidStore *store.Store
 var pools []*conn.Pool
+var addrs []string
 
-func Init(ps, xuStore *store.Store) {
+func Init(ps, xuStore *store.Store, workerList []string) {
 	dataStore = ps
 	xiduidStore = xuStore
+	addrs = workerList
 }
 
 func Connect() {
@@ -38,7 +37,6 @@ func Connect() {
 		glog.Fatal(err)
 	}
 
-	addrs := strings.Split(*workers, ",")
 	for _, addr := range addrs {
 		if len(addr) == 0 {
 			continue

worker/worker_test.go

@@ -58,7 +58,7 @@ func TestProcessTask(t *testing.T) {
 	defer clog.Close()
 
 	posting.Init(clog)
-	Init(ps, nil)
+	Init(ps, nil, nil)
 
 	edge := x.DirectedEdge{
 		ValueId:   23,