app-dependency: support new failover params

Author: yngvar-antonsson

cli/commands/failover.go

@@ -9,7 +9,7 @@ import (
 )
 
 var (
-	failoverModes = []string{"stateful", "eventual", "disabled"}
+	failoverModes = []string{"stateful", "eventual", "disabled", "raft"}
 )
 
 func init() {

cli/failover/set_test.go

@@ -14,14 +14,14 @@ func TestBadValidateFailoverSet(t *testing.T) {
 	ctx := context.Ctx{}
 	ctx.Failover.Mode = "some-invalid-mode"
 	_, err := getFailoverOpts(&ctx)
-	assert.Equal("Failover mode should be `stateful`, `eventual` or `disabled`", err.Error())
+	assert.Equal("Failover mode should be `stateful`, `eventual`, `raft` or `disabled`", err.Error())
 
 	// Specifying no mode
 	ctx = context.Ctx{}
 	ctx.Failover.Mode = ""
 	ctx.Failover.ParamsJSON = `{"fencing_pause": 4}`
 	_, err = getFailoverOpts(&ctx)
-	assert.Equal("Failover mode should be `stateful`, `eventual` or `disabled`", err.Error())
+	assert.Equal("Failover mode should be `stateful`, `eventual`, `raft` or `disabled`", err.Error())
 
 	// Eventual mode with with passing state-provider
 	ctx = context.Ctx{}

cli/failover/status.go

@@ -104,15 +104,15 @@ func internalRecFailoverStatusPrettyString(result interface{}, indentCnt int) st
 		switch value.(type) {
 		case map[string]interface{}:
 			status = fmt.Sprintf("%s \n%s", status, internalRecFailoverStatusPrettyString(value, indentCnt+1))
-		case int, int8:
+		case int, int8, uint16:
 			status = fmt.Sprintf("%s %d\n", status, value)
 		case bool:
 			status = fmt.Sprintf("%s %t\n", status, value)
 		case string:
 			switch value {
 			case "disabled":
 				status = fmt.Sprintf("%s %s\n", status, common.ColorRed.Sprintf(value.(string)))
-			case "eventual", "stateful":
+			case "eventual", "stateful", "raft":
 				status = fmt.Sprintf("%s %s\n", status, common.ColorGreen.Sprintf(value.(string)))
 			default:
 				status = fmt.Sprintf("%s %s\n", status, value)
@@ -124,7 +124,7 @@ func internalRecFailoverStatusPrettyString(result interface{}, indentCnt int) st
 
 			status = fmt.Sprintf("%s\n", status[:len(status)-1])
 		default:
-			panic(project.InternalError("Unknown type: %s", reflect.TypeOf(value)))
+			panic(project.InternalError("Field %s has unknown type: %s", fieldName, reflect.TypeOf(value)))
 		}
 	}
 

cli/failover/validate.go

@@ -19,10 +19,14 @@ func validateSetFailoverOpts(opts *FailoverOpts) error {
 		if err := validateStatefulMode(opts); err != nil {
 			return err
 		}
+	case "raft":
+		if err := validateEventualMode(opts); err != nil {
+			return err
+		}
 	case "disabled":
 		return nil
 	default:
-		return fmt.Errorf("Failover mode should be `stateful`, `eventual` or `disabled`")
+		return fmt.Errorf("Failover mode should be `stateful`, `eventual`, `raft` or `disabled`")
 	}
 
 	return nil

test/integration/failover/test_failover.py

@@ -1,8 +1,8 @@
 import os
 
 import yaml
-from integration.failover.utils import (get_etcd2_failover_info,
-                                        get_eventual_failover_info,
+from integration.failover.utils import (get_common_failover_info,
+                                        get_etcd2_failover_info,
                                         get_stateboard_failover_info)
 from utils import run_command_and_get_output
 
@@ -22,6 +22,8 @@ def test_default_app_stateboard_failover(cartridge_cmd, project_with_topology_an
         'failover_timeout': 20,
         'fencing_pause': 2,
         'fencing_timeout': 10,
+        'autoreturn_delay': 300,
+        'leader_autoreturn': False,
         'tarantool_params': {
             'uri': 'localhost:4401', 'password': '******'
         },
@@ -42,7 +44,7 @@ def test_setup_eventual_failover(cartridge_cmd, project_with_topology_and_vshard
     assert rc == 0
     assert "Failover configured successfully" in output
 
-    failover_info = get_eventual_failover_info()
+    failover_info = get_common_failover_info()
     assert failover_info == {
         # Because this parameter (fencing_enabled) suitable in
         # stateful mode only - and we don't check it
@@ -54,6 +56,33 @@ def test_setup_eventual_failover(cartridge_cmd, project_with_topology_and_vshard
     }
 
 
+def test_setup_raft_failover(cartridge_cmd, project_with_topology_and_vshard):
+    project = project_with_topology_and_vshard
+
+    cmd = [
+        cartridge_cmd, "failover", "set", "raft", "--params",
+        "{\"fencing_enabled\": true, \"failover_timeout\": 30, \"fencing_pause\": 140, \"fencing_timeout\": 15}",
+    ]
+
+    rc, output = run_command_and_get_output(cmd, cwd=project.path)
+    if rc == 0:
+        assert "Failover configured successfully" in output
+
+        failover_info = get_common_failover_info()
+        assert failover_info == {
+            # Because this parameter (fencing_enabled) suitable in
+            # stateful mode only - and we don't check it
+            'fencing_enabled': False,
+            'failover_timeout': 30,
+            'fencing_pause': 140,
+            'fencing_timeout': 15,
+            'mode': 'raft',
+        }
+    else:
+        assert "Your Tarantool version doesn't support raft failover mode, " + \
+            "need Tarantool 2.10 or higher" in output
+
+
 def test_setup_etcd2_failover(cartridge_cmd, project_with_topology_and_vshard):
     project = project_with_topology_and_vshard
 
@@ -76,6 +105,8 @@ def test_setup_etcd2_failover(cartridge_cmd, project_with_topology_and_vshard):
         'fencing_timeout': 12,
         'mode': 'stateful',
         'state_provider': 'etcd2',
+        'autoreturn_delay': 300,
+        'leader_autoreturn': False,
         'etcd2_params': {
             'endpoints': ['http://127.0.0.1:4001', 'http://127.0.0.1:2379'],
             'lock_delay': 15,
@@ -97,7 +128,7 @@ def test_failover_disabled_command(cartridge_cmd, project_with_topology_and_vsha
     assert rc == 0
     assert "Failover disabled successfully" in output
 
-    failover_info = get_eventual_failover_info()["mode"]
+    failover_info = get_common_failover_info()["mode"]
     assert failover_info == "disabled"
 
 
@@ -113,7 +144,7 @@ def test_disable_failover_from_sub_command(cartridge_cmd, project_with_topology_
     assert rc == 0
     assert "Failover disabled successfully" in output
 
-    failover_info = get_eventual_failover_info()
+    failover_info = get_common_failover_info()
     assert failover_info == {
         'fencing_enabled': False,
         'failover_timeout': 31,
@@ -130,7 +161,7 @@ def test_disable_failover_from_sub_command(cartridge_cmd, project_with_topology_
     assert rc == 0
     assert "Failover configured successfully" in output
 
-    failover_info = get_eventual_failover_info()
+    failover_info = get_common_failover_info()
     assert failover_info == {
         'fencing_enabled': False,
         'failover_timeout': 31,
@@ -150,7 +181,7 @@ def test_set_invalid_mode(cartridge_cmd, project_without_dependencies):
 
     rc, output = run_command_and_get_output(cmd, cwd=project.path)
     assert rc == 1
-    assert "Failover mode should be `stateful`, `eventual` or `disabled`" in output
+    assert "Failover mode should be `stateful`, `eventual`, `raft` or `disabled`" in output
 
 
 def test_set_invalid_provider(cartridge_cmd, project_without_dependencies):

test/integration/failover/test_status.py

@@ -1,6 +1,6 @@
 from integration.failover.utils import (assert_mode_and_params_state,
+                                        get_common_failover_info,
                                         get_etcd2_failover_info,
-                                        get_eventual_failover_info,
                                         get_stateboard_failover_info)
 from utils import run_command_and_get_output
 
@@ -17,7 +17,7 @@ def test_status_eventual(cartridge_cmd, project_with_topology_and_vshard):
     assert rc == 0
     assert "Failover configured successfully" in output
 
-    failover_info = get_eventual_failover_info()
+    failover_info = get_common_failover_info()
 
     cmd = [cartridge_cmd, "failover", "status"]
     rc, output = run_command_and_get_output(cmd, cwd=project.path)
@@ -29,6 +29,31 @@ def test_status_eventual(cartridge_cmd, project_with_topology_and_vshard):
     assert "etcd2_params" not in output
 
 
+def test_status_raft(cartridge_cmd, project_with_topology_and_vshard):
+    project = project_with_topology_and_vshard
+
+    cmd = [
+        cartridge_cmd, "failover", "set", "raft",
+        "--params", "{\"fencing_enabled\": true, \"failover_timeout\": 30, \"fencing_timeout\": 12}"
+    ]
+
+    rc, output = run_command_and_get_output(cmd, cwd=project.path)
+
+    if rc == 0:
+        assert "Failover configured successfully" in output
+
+        failover_info = get_common_failover_info()
+
+        cmd = [cartridge_cmd, "failover", "status"]
+        rc, output = run_command_and_get_output(cmd, cwd=project.path)
+
+        assert rc == 0
+        assert_mode_and_params_state(failover_info, output)
+    else:
+        assert "Your Tarantool version doesn't support raft failover mode, " + \
+            "need Tarantool 2.10 or higher" in output
+
+
 def test_status_stateful_stateboard(cartridge_cmd, project_with_topology_and_vshard):
     project = project_with_topology_and_vshard
 
@@ -53,7 +78,7 @@ def test_status_stateful_stateboard(cartridge_cmd, project_with_topology_and_vsh
 
     assert "stateboard_params" in output
     assert f"uri: {failover_info['tarantool_params']['uri']}" in output
-    assert f"password: {failover_info['tarantool_params']['password']}" in output
+    assert "password: pass" in output
 
 
 def test_status_stateful_etcd2(cartridge_cmd, project_with_topology_and_vshard):
@@ -79,7 +104,7 @@ def test_status_stateful_etcd2(cartridge_cmd, project_with_topology_and_vshard):
     assert "stateboard_params" not in output
 
     assert "etcd2_params" in output
-    assert f"password: {failover_info['etcd2_params']['password']}" in output
+    assert "password" in output
     assert f"lock_delay: {failover_info['etcd2_params']['lock_delay']}" in output
     assert f"endpoints: {', '.join(failover_info['etcd2_params']['endpoints'])}" in output
     assert f"username: {failover_info['etcd2_params']['username']}" in output
@@ -94,7 +119,7 @@ def test_status_disabled(cartridge_cmd, project_with_topology_and_vshard):
     assert rc == 0
     assert "Failover disabled successfully" in output
 
-    failover_info = get_eventual_failover_info()
+    failover_info = get_common_failover_info()
 
     cmd = [cartridge_cmd, "failover", "status"]
     rc, output = run_command_and_get_output(cmd, cwd=project.path)

test/integration/failover/utils.py

@@ -17,6 +17,8 @@ def get_stateboard_failover_info():
                 fencing_enabled
                 fencing_timeout
                 fencing_pause
+                autoreturn_delay
+                leader_autoreturn
             }
           }
         }
@@ -26,7 +28,7 @@ def get_stateboard_failover_info():
     return get_response_data(response)["cluster"]["failover_params"]
 
 
-def get_eventual_failover_info():
+def get_common_failover_info():
     query = """
         query {
           cluster {
@@ -63,6 +65,8 @@ def get_etcd2_failover_info():
                 fencing_enabled
                 fencing_timeout
                 fencing_pause
+                autoreturn_delay
+                leader_autoreturn
             }
           }
         }