Merge pull request #203 from arangodb-helper/bug-fix/instance-up-timeout

Make instance up timeout configurable and by default higher.
Do not use --javascript.copy-installation for 3.3.17 and 3.3.18

Author: neunhoef

CHANGELOG.md

@@ -1,9 +1,20 @@
 # ArangoDB Starter Changelog
 
-## Changes from version 0.13.3 to master
+## Changes from version 0.13.6 to master
+
+## Changes from version 0.13.5 to 0.13.6
+
+- Do not use --javascript.copy-installation for 3.3.18 any more.
+- Increase timeout when checking instances for readiness and make it
+  configurable.
+
+## Changes from version 0.13.3 to 0.13.5
 
 - Starter cluster configuration no longer written to `setup.json` when
   it has not changed.
+- Added advertised endpoint to coordinators and active failover servers.
+- Give option --javascript.copy-installation to versions of ArangoDB
+  which have it.
 
 ## Changes from version 0.13.2 to 0.13.3
 
@@ -24,8 +35,6 @@
 
 ## Changes from version 0.12.0 to 0.13.0
 
-- Added advertised endpoint to coordinators and active failover servers.
-
 - Database upgrade procedure has changed.
   It is now much more automated and can be triggered using
   an `arangodb upgrade --starter.endpoint=...` command.

main.go

@@ -54,20 +54,23 @@ import (
 // Configuration data with defaults:
 
 const (
-	projectName                 = "arangodb"
-	logFileName                 = projectName + ".log"
-	defaultDockerGCDelay        = time.Minute * 10
-	defaultDockerStarterImage   = "arangodb/arangodb-starter"
-	defaultArangodPath          = "/usr/sbin/arangod"
-	defaultArangoSyncPath       = "/usr/sbin/arangosync"
-	defaultLogRotateFilesToKeep = 5
-	defaultLogRotateInterval    = time.Minute * 60 * 24
+	projectName                     = "arangodb"
+	logFileName                     = projectName + ".log"
+	defaultDockerGCDelay            = time.Minute * 10
+	defaultDockerStarterImage       = "arangodb/arangodb-starter"
+	defaultArangodPath              = "/usr/sbin/arangod"
+	defaultArangoSyncPath           = "/usr/sbin/arangosync"
+	defaultLogRotateFilesToKeep     = 5
+	defaultLogRotateInterval        = time.Minute * 60 * 24
+	defaultInstanceUpTimeoutLinux   = time.Second * 300
+	defaultInstanceUpTimeoutWindows = time.Second * 900
 )
 
 var (
-	projectVersion = "dev"
-	projectBuild   = "dev"
-	cmdMain        = &cobra.Command{
+	defaultInstanceUpTimeout = defaultInstanceUpTimeoutLinux
+	projectVersion           = "dev"
+	projectBuild             = "dev"
+	cmdMain                  = &cobra.Command{
 		Use:   projectName,
 		Short: "Start ArangoDB clusters & single servers with ease",
 		Run:   cmdMainRun,
@@ -141,6 +144,7 @@ var (
 	passthroughOptions       = make(map[string]*service.PassthroughOption)
 	debugCluster             bool
 	enableSync               bool
+	instanceUpTimeout        time.Duration
 	syncMonitoringToken      string
 	syncMasterKeyFile        string // TLS keyfile of local sync master
 	syncMasterClientCAFile   string // CA Certificate used for client certificate verification
@@ -166,6 +170,10 @@ func init() {
 		defaultLogColor = false
 	}
 
+	if runtime.GOOS == "windows" {
+		defaultInstanceUpTimeout = defaultInstanceUpTimeoutWindows
+	}
+
 	// Prepare commandline parser
 	cmdMain.AddCommand(cmdVersion)
 
@@ -186,6 +194,7 @@ func init() {
 	f.BoolVar(&debugCluster, "starter.debug-cluster", getEnvVar("DEBUG_CLUSTER", "") != "", "If set, log more information to debug a cluster")
 	f.BoolVar(&disableIPv6, "starter.disable-ipv6", !net.IsIPv6Supported(), "If set, no IPv6 notation will be used. Use this only when IPv6 address family is disabled")
 	f.BoolVar(&enableSync, "starter.sync", false, "If set, the starter will also start arangosync instances")
+	f.DurationVar(&instanceUpTimeout, "starter.instance-up-timeout", defaultInstanceUpTimeout, "Timeout to wait for an instance start")
 
 	pf.BoolVar(&verbose, "log.verbose", false, "Turn on debug logging")
 	pf.BoolVar(&logOutput.Console, "log.console", true, "Send log output to console")
@@ -727,6 +736,7 @@ func mustPrepareService(generateAutoKeyFile bool) (*service.Service, service.Boo
 		AllPortOffsetsUnique:    allPortOffsetsUnique,
 		LogRotateFilesToKeep:    logRotateFilesToKeep,
 		LogRotateInterval:       logRotateInterval,
+		InstanceUpTimeout:       instanceUpTimeout,
 		RunningInDocker:         isRunningInDocker(),
 		DockerContainerName:     dockerContainerName,
 		DockerEndpoint:          dockerEndpoint,

service/database_features.go

@@ -30,7 +30,7 @@ type DatabaseFeatures driver.Version
 
 const (
 	v32    driver.Version = "3.2.0"
-	v33_17 driver.Version = "3.3.17"
+	v33_19 driver.Version = "3.3.19"
 	v34    driver.Version = "3.4.0"
 )
 
@@ -59,7 +59,7 @@ func (v DatabaseFeatures) HasCopyInstallationFiles() bool {
 	if driver.Version(v).CompareTo(v34) >= 0 {
 		return true
 	}
-	if driver.Version(v).CompareTo(v33_17) >= 0 {
+	if driver.Version(v).CompareTo(v33_19) >= 0 {
 		return true
 	}
 	return false

service/service.go

@@ -74,6 +74,7 @@ type Config struct {
 	DebugCluster         bool
 	LogRotateFilesToKeep int
 	LogRotateInterval    time.Duration
+	InstanceUpTimeout    time.Duration
 
 	DockerContainerName   string // Name of the container running this process
 	DockerEndpoint        string // Where to reach the docker daemon
@@ -763,7 +764,9 @@ func (s *Service) TestInstance(ctx context.Context, serverType ServerType, addre
 			return false
 		}
 
-		for i := 0; i < 300; i++ {
+		var maxNumberOfRounds int
+		maxNumberOfRounds = int(s.cfg.InstanceUpTimeout * 2 / time.Second)
+		for i := 0; i < maxNumberOfRounds; i++ {
 			if checkInstanceOnce() {
 				return
 			}