feat(agent): fill consistent_cluster_management in NodeInfo

scylladb · Feb 22, 2024 · c69be7a · c69be7a
1 parent b344c8e
commit c69be7a
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 3 deletions.
diff --git a/pkg/scyllaclient/config_client.go b/pkg/scyllaclient/config_client.go
@@ -209,6 +209,18 @@ func (c *ConfigClient) UUIDSStableIdentifiers(ctx context.Context) (bool, error)
 	return resp.Payload, err
 }
 
+// ConsistentClusterManagement returns true if node uses RAFT for cluster management and DDL.
+func (c *ConfigClient) ConsistentClusterManagement(ctx context.Context) (bool, error) {
+	resp, err := c.client.Config.FindConfigConsistentClusterManagement(config.NewFindConfigConsistentClusterManagementParamsWithContext(ctx))
+	if isStatusCode400(err) {
+		return false, nil
+	}
+	if err != nil {
+		return false, err
+	}
+	return resp.Payload, err
+}
+
 // AlternatorEnforceAuthorization returns whether alternator requires authorization.
 func (c *ConfigClient) AlternatorEnforceAuthorization(ctx context.Context) (bool, error) {
 	resp, err := c.client.Config.FindConfigAlternatorEnforceAuthorization(config.NewFindConfigAlternatorEnforceAuthorizationParamsWithContext(ctx))
@@ -278,6 +290,7 @@ func (c *ConfigClient) NodeInfo(ctx context.Context) (*NodeInfo, error) {
 		{Field: &ni.CqlPasswordProtected, Fetcher: c.CQLPasswordProtectionEnabled},
 		{Field: &ni.AlternatorEnforceAuthorization, Fetcher: c.AlternatorEnforceAuthorization},
 		{Field: &ni.SstableUUIDFormat, Fetcher: c.UUIDSStableIdentifiers},
+		{Field: &ni.ConsistentClusterManagement, Fetcher: c.ConsistentClusterManagement},
 	}
 
 	for i, ff := range ffb {

diff --git a/pkg/scyllaclient/config_client_test.go b/pkg/scyllaclient/config_client_test.go
@@ -120,7 +120,7 @@ func TestClientConfigReturnsResponseFromScylla(t *testing.T) {
 			Name:             "Alternator requires authorization",
 			ResponseFilePath: "testdata/scylla_api/v2_config_alternator_enforce_authorization.json",
 			BindClientFunc: func(client *scyllaclient.ConfigClient) configClientFunc {
-				return convertBool(client.UUIDSStableIdentifiers)
+				return convertBool(client.AlternatorEnforceAuthorization)
 			},
 			Golden: true,
 		},
@@ -132,6 +132,14 @@ func TestClientConfigReturnsResponseFromScylla(t *testing.T) {
 			},
 			Golden: true,
 		},
+		{
+			Name:             "Raft schema enabled",
+			ResponseFilePath: "testdata/scylla_api/v2_config_consistent_cluster_management.json",
+			BindClientFunc: func(client *scyllaclient.ConfigClient) configClientFunc {
+				return convertBool(client.ConsistentClusterManagement)
+			},
+			Golden: true,
+		},
 	}
 
 	for i := range table {
@@ -174,6 +182,7 @@ func TestConfigClientPullsNodeInformationUsingScyllaAPI(t *testing.T) {
 			scyllaclienttest.PathFileMatcher("/v2/config/alternator_address", "testdata/scylla_api/v2_config_alternator_address.json"),
 			scyllaclienttest.PathFileMatcher("/v2/config/alternator_enforce_authorization", "testdata/scylla_api/v2_config_alternator_enforce_authorization.json"),
 			scyllaclienttest.PathFileMatcher("/v2/config/uuid_sstable_identifiers_enabled", "testdata/scylla_api/v2_config_uuid_sstable_identifiers_enabled.json"),
+			scyllaclienttest.PathFileMatcher("/v2/config/consistent_cluster_management", "testdata/scylla_api/v2_config_consistent_cluster_management.json"),
 		),
 	)
 	defer closeServer()
@@ -222,6 +231,7 @@ func TestConfigOptionIsNotSupported(t *testing.T) {
 			scyllaclienttest.PathFileMatcher("/v2/config/alternator_address", "testdata/scylla_api/v2_config_alternator_disabled.400.json"),
 			scyllaclienttest.PathFileMatcher("/v2/config/alternator_enforce_authorization", "testdata/scylla_api/v2_config_alternator_disabled.400.json"),
 			scyllaclienttest.PathFileMatcher("/v2/config/uuid_sstable_identifiers_enabled", "testdata/scylla_api/v2_config_uuid_sstable_identifiers_enabled.400.json"),
+			scyllaclienttest.PathFileMatcher("/v2/config/consistent_cluster_management", "testdata/scylla_api/v2_config_consistent_cluster_management.400.json"),
 		),
 	)
 	defer closeServer()

diff --git a/pkg/scyllaclient/testdata/scylla_api/v2_config_consistent_cluster_management.400.json b/pkg/scyllaclient/testdata/scylla_api/v2_config_consistent_cluster_management.400.json
@@ -0,0 +1 @@
+{"message": "No such config entry: consistent_cluster_management", "code": 400}
diff --git a/pkg/scyllaclient/testdata/scylla_api/v2_config_consistent_cluster_management.json b/pkg/scyllaclient/testdata/scylla_api/v2_config_consistent_cluster_management.json
@@ -0,0 +1 @@
+true
diff --git a/pkg/scyllaclient/testdata/scylla_api/v2_config_node_info.golden.json b/pkg/scyllaclient/testdata/scylla_api/v2_config_node_info.golden.json
@@ -16,5 +16,6 @@
   "prometheus_port":"9180",
   "rpc_address":"192.168.100.101",
   "rpc_port":"9160",
-  "sstable_uuid_format":true
+  "sstable_uuid_format":true,
+  "consistent_cluster_management":true
 }
diff --git a/pkg/scyllaclient/testdata/scylla_api/v2_config_node_info_alternator_disabled.golden.json b/pkg/scyllaclient/testdata/scylla_api/v2_config_node_info_alternator_disabled.golden.json
@@ -16,5 +16,6 @@
   "prometheus_port":"9180",
   "rpc_address":"192.168.100.101",
   "rpc_port":"9160",
-  "sstable_uuid_format":false
+  "sstable_uuid_format":false,
+  "consistent_cluster_management":false
 }