Merge pull request #207 from arangodb-helper/bug-fix/findengine

Find ENGINE file even if there is no DBServer.

Author: neunhoef

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Changes from version 0.13.8 to master
 
+- Fix finding the storage engine if the master does not run a dbserver.
+
 ## Changes from version 0.13.7 to 0.13.8
 
 - Redo previous release because github was offline. No other changes.

service/storage_engine.go

@@ -58,11 +58,17 @@ func (s *Service) readActualStorageEngine() (string, error) {
 		return features.DefaultStorageEngine(), nil
 	}
 
-	_, _, mode := s.ClusterConfig()
+	_, peer, mode := s.ClusterConfig()
 	var serverType ServerType
 	if mode.IsClusterMode() {
 		// Read engine from dbserver data directory
-		serverType = ServerTypeDBServer
+		if peer.HasDBServer() {
+			serverType = ServerTypeDBServer
+		} else if peer.HasAgent() {
+			serverType = ServerTypeAgent
+		} else {
+			serverType = ServerTypeCoordinator
+		}
 	} else if mode.IsActiveFailoverMode() {
 		// Read engine from agent data directory
 		serverType = ServerTypeAgent

test/process_cluster_upgrade_test.go

@@ -93,11 +93,14 @@ func testUpgradeProcess(t *testing.T, endpoint string) {
 				t.Fatalf("Upgrade failed: %s", status.Reason)
 			}
 			if status.Ready {
+				if isVerbose {
+					t.Logf("UpgradeStatus good: %v", status)
+				}
 				break
 			}
 		}
 		if time.Now().After(deadline) {
-			t.Fatal("Upgrade failed to finished in time")
+			t.Fatal("Upgrade failed to finish in time")
 		}
 		time.Sleep(time.Second)
 	}

test/util.go

@@ -205,7 +205,7 @@ func SendIntrAndWait(t *testing.T, starters ...*SubProcess) bool {
 		g.Add(1)
 		go func() {
 			defer g.Done()
-			if err := starter.WaitTimeout(time.Second * 30); err != nil {
+			if err := starter.WaitTimeout(time.Second * 300); err != nil {
 				result = false
 				t.Errorf("Starter is not stopped in time: %s", describe(err))
 			}