1
0
Fork 0

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

This commit is contained in:
Max Neunhoeffer 2014-02-28 17:26:25 +01:00
commit 064e226a1f
7 changed files with 23 additions and 17 deletions

View File

@ -20,11 +20,11 @@ if ENABLE_INTERNAL_GO
else else
cd @top_srcdir@/3rdParty/etcd && ./build cd @top_srcdir@/3rdParty/etcd && ./build
endif 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 if ENABLE_DARWIN
else else
strip @top_srcdir@/bin/etcd-arango strip @top_srcdir@/bin/etcd-arango$(PROGRAM_SUFFIX)
endif endif
@echo @echo

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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