Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding

3rdParty/Makefile.etcd

@@ -20,11 +20,11 @@ if ENABLE_INTERNAL_GO
 else
 	cd @top_srcdir@/3rdParty/etcd && ./build
 endif
-	cp @top_srcdir@/3rdParty/etcd/bin/etcd @top_srcdir@/bin/etcd-arango
+	cp @top_srcdir@/3rdParty/etcd/bin/etcd @top_srcdir@/bin/etcd-arango$(PROGRAM_SUFFIX)
 
 if ENABLE_DARWIN
 else
-	strip @top_srcdir@/bin/etcd-arango
+	strip @top_srcdir@/bin/etcd-arango$(PROGRAM_SUFFIX)
 endif
 
 	@echo

Makefile.am

@@ -65,6 +65,16 @@ BISONXX_FILES =
 ## --SECTION--                                                             PATHS
 ## -----------------------------------------------------------------------------
 
+################################################################################
+### @brief program suffix
+################################################################################
+
+PROGRAM_SUFFIX=$(shell echo | sed '$(program_transform_name)')
+
+################################################################################
+### @brief system directory
+################################################################################
+
 if ENABLE_RELATIVE
 
 TRI_PKGDATADIR = .
@@ -149,15 +159,6 @@ LIBS += @MRUBY_LIBS@
 
 endif
 
-################################################################################
-### @brief program suffix
-################################################################################
-
-PROGRAM_SUFFIX=$(shell echo | sed '$(program_transform_name)')
-
-emil:
-	echo $(PROGRAM_SUFFIX)
-
 ## -----------------------------------------------------------------------------
 ## --SECTION--                                              LIBRARIES & PROGRAMS
 ## -----------------------------------------------------------------------------
@@ -211,7 +212,7 @@ noinst_bin =
 pkglibexec_SCRIPTS =
 
 if ENABLE_ALL_IN_ONE_ETCD
-pkglibexec_SCRIPTS += bin/etcd-arango
+pkglibexec_SCRIPTS += bin/etcd-arango$(PROGRAM_SUFFIX)
 endif
 
 ################################################################################

etc/Makefile.files

@@ -27,6 +27,7 @@ etc/arangodb/%$(PROGRAM_SUFFIX).conf: etc/arangodb/%.conf.in Makefile
 		-e 's%@LOCALSTATEDIR@%${TRI_LOCALSTATEDIR}%g' \
 		-e 's%@PKGDATADIR@%${TRI_PKGDATADIR}%g' \
 		-e 's%@SYSCONFDIR@%${TRI_SYSCONFDIR}%g' \
+		-e 's%@PROGRAM_SUFFIX@%${PROGRAM_SUFFIX}%g' \
 		$< > $@
 
 ## -----------------------------------------------------------------------------

etc/arangodb/arangod.conf.in

@@ -64,7 +64,7 @@ disable-dispatcher-kickstarter = false
 disable-dispatcher-frontend = false
 data-path = @LOCALSTATEDIR@/lib/arangodb/cluster
 log-path = @LOCALSTATEDIR@/log/arangodb/cluster
-agent-path = @LIBEXECDIR@/arangodb/etcd-arango
-arangod-path = @SBINDIR@/arangod
+agent-path = @LIBEXECDIR@/arangodb/etcd-arango@PROGRAM_SUFFIX@
+arangod-path = @SBINDIR@/arangod@PROGRAM_SUFFIX@
 dbserver-config = @SYSCONFDIR@/arangod.conf
 coordinator-config = @SYSCONFDIR@/arangod.conf

js/apps/system/aardvark/cluster.js

@@ -100,7 +100,7 @@
             "d1": {
               "username": uname,
               "passwd": pwd,
-              "endpoint": "tcp://" + input.dispatcher
+              "endpoint": "tcp://" + input.dispatchers
             }
           };
           config.numberOfDBservers = input.numberDBServers;
@@ -110,7 +110,7 @@
           config.dispatchers = {};
           config.numberOfDBservers = 0;
           config.numberOfCoordinators = 0;
-          _.each(input.dispatcher, function(d) {
+          _.each(input.dispatchers, function(d) {
             i++;
             var inf = {};
             inf.username = uname;

js/apps/system/aardvark/clusterFrontend/js/views/planSymmetricView.js

@@ -35,7 +35,11 @@
           if (!self.isSymmetric) {
               hostObject.isDBServer = !!$(".isDBServer", dispatcher).attr('checked');
               hostObject.isCoordinator = !!$(".isCoordinator", dispatcher).attr('checked');
+          } else {
+            hostObject.isDBServer = true;
+            hostObject.isCoordinator = true;
           }
+
           foundCoordinator = foundCoordinator || hostObject.isCoordinator;
           foundDBServer = foundDBServer || hostObject.isDBServer;
 

js/apps/system/aardvark/clusterFrontend/js/views/planTestView.js

@@ -41,7 +41,7 @@
       this.model.save(
         {
           type: "testSetup",
-          dispatcher: h + ":" + p,
+          dispatchers: h + ":" + p,
           numberDBServers: parseInt(d, 10),
           numberCoordinators: parseInt(c, 10)
         },