Fixes & docs

Author: ewoutp

.vscode/settings.json

@@ -1,5 +1,10 @@
 // Place your settings in this file to overwrite default and user settings.
 {
     "go.testFlags": ["-v"],
-    "go.testTimeout": "600s"
+    "go.testTimeout": "600s",
+    "search.exclude": {
+        "**/node_modules": true,
+        "**/bower_components": true,
+        "vendor": true
+    }
 }

README.md

@@ -194,6 +194,62 @@ docker run -it --name=adb --rm -p 8528:8528 \
     --starter.mode=single
 ```
 
+Starting a resilient single server pair
+---------------------------------------
+
+If you want to start a resilient single database server, use `--starter.mode=resilientsingle`.
+In this mode a 3 machine agency is started and 2 single servers that perform 
+asynchronous replication an failover if needed.
+
+```
+arangodb --starter.mode=resilientsingle --starter.join A,B,C
+```
+
+Run this on machine A, B & C.
+
+The starter will decide on which 2 machines to run a single server instance.
+To override this decision (only valid while bootstrapping), add a 
+`--cluster.start-single=false` to the machine where the single server 
+instance should NOT be scheduled.
+
+Starting a resilient single server pair in Docker
+-------------------------------------------------
+
+If you want to start a resilient single database server running in docker containers,
+use the normal docker arguments, combined with `--starter.mode=resilientsingle`.
+
+```
+export IP=<IP of docker host>
+docker volume create arangodb
+docker run -it --name=adb --rm -p 8528:8528 \
+    -v arangodb:/data \
+    -v /var/run/docker.sock:/var/run/docker.sock \
+    arangodb/arangodb-starter \
+    --starter.address=$IP \
+    --starter.mode=resilientsingle \
+    --starter.join=A,B,C
+```
+
+Run this on machine A, B & C.
+
+The starter will decide on which 2 machines to run a single server instance.
+To override this decision (only valid while bootstrapping), add a 
+`--cluster.start-single=false` to the machine where the single server 
+instance should NOT be scheduled.
+
+Starting a local test resilient single sever pair
+-------------------------------------------------
+
+If you want to start a local resilient server pair quickly, use the `--starter.local` flag. 
+It will start all servers within the context of a single starter process.
+
+```
+arangodb --starter.local --starter.mode=resilientsingle
+```
+
+Note: When you restart the started, it remembers the original `--starter.local` flag.
+
+
 Starting & stopping in detached mode 
 ------------------------------------
 

service/arangod_config_builder.go

@@ -250,7 +250,7 @@ func createArangodArgs(log *logging.Logger, config Config, clusterConfig Cluster
 		options = append(options,
 			optionPair{"--foxx.queues", "true"},
 			optionPair{"--server.statistics", "true"},
-			optionPair{"--replication.auto-failover", "true"},
+			optionPair{"--replication.automatic-failover", "true"},
 			optionPair{"--cluster.my-role", "SINGLE"},
 		)
 	}

service/runtime_server_manager.go

@@ -222,7 +222,7 @@ func (s *runtimeServerManager) runArangod(ctx context.Context, log *logging.Logg
 				if up, version, statusTrail, cancelled := runtimeContext.TestInstance(ctx, myHostAddress, port, statusChanged); !cancelled {
 					if up {
 						log.Infof("%s up and running (version %s).", serverType, version)
-						if (serverType == ServerTypeCoordinator && !runtimeContext.IsLocalSlave()) || serverType == ServerTypeSingle {
+						if (serverType == ServerTypeCoordinator && !runtimeContext.IsLocalSlave()) || serverType == ServerTypeSingle || serverType == ServerTypeResilientSingle {
 							hostPort, err := p.HostPort(port)
 							if err != nil {
 								if id := p.ContainerID(); id != "" {

service/service.go

@@ -818,7 +818,7 @@ func (s *Service) Run(rootCtx context.Context, bsCfg BootstrapConfig, myPeers Cl
 	s.sslKeyFile = bsCfg.SslKeyFile
 
 	// Check mode & flags
-	if bsCfg.Mode.IsClusterMode() {
+	if bsCfg.Mode.IsClusterMode() || bsCfg.Mode.IsResilientSingleMode() {
 		if bsCfg.AgencySize < 1 {
 			return maskAny(fmt.Errorf("AgentSize must be >= 1"))
 		}