+
image
string
diff --git a/pkg/apis/ndbcontroller/v1alpha1/types.go b/pkg/apis/ndbcontroller/v1alpha1/types.go
index 6da8dd4..5237ea8 100644
--- a/pkg/apis/ndbcontroller/v1alpha1/types.go
+++ b/pkg/apis/ndbcontroller/v1alpha1/types.go
@@ -84,6 +84,11 @@ type NdbClusterSpec struct {
// +kubebuilder:validation:Pattern="[0-9]+[MGT]"
DataMemory string `json:"dataMemory,omitempty"`
+ // Number of free API slots for other NDBAPI applications
+ // +kubebuilder:default=3
+ // +optional
+ ApiFreeSlots int32 `json:"apiFreeSlots,omitempty"`
+
// The name of the MySQL Ndb Cluster image to be used.
// If not specified, "mysql/mysql-cluster:latest" will be used.
// Lowest supported version is 8.0.26.
diff --git a/pkg/helpers/testutils/ndbtestcreator.go b/pkg/helpers/testutils/ndbtestcreator.go
index a88c5dd..edaa633 100644
--- a/pkg/helpers/testutils/ndbtestcreator.go
+++ b/pkg/helpers/testutils/ndbtestcreator.go
@@ -22,6 +22,7 @@ func NewTestNdb(namespace string, name string, noOfNodes int32) *ndbcontroller.N
},
Spec: ndbcontroller.NdbClusterSpec{
NodeCount: noOfNodes,
+ ApiFreeSlots: 3,
RedundancyLevel: 2,
Mysqld: &ndbcontroller.NdbMysqldSpec{
NodeCount: noOfNodes,
diff --git a/pkg/resources/config.go b/pkg/resources/config.go
index 46917da..ec33de7 100644
--- a/pkg/resources/config.go
+++ b/pkg/resources/config.go
@@ -90,8 +90,8 @@ func GetConfigString(ndb *v1alpha1.NdbCluster, oldResourceContext *ResourceConte
}
// Calculate the total number of API slots to be set in the config.
- // slots required for mysql servers + 3 free slot for other NDBAPi apps
- requiredNumOfAPISlots := requiredNumOfSlotsForMySQLServer + 3
+ // slots required for mysql servers + free slot for other NDBAPi apps
+ requiredNumOfAPISlots := requiredNumOfSlotsForMySQLServer + ndb.Spec.ApiFreeSlots
tmpl := template.New("config.ini")
tmpl.Funcs(template.FuncMap{
diff --git a/pkg/resources/config_test.go b/pkg/resources/config_test.go
index 2f1cc0e..608927a 100644
--- a/pkg/resources/config_test.go
+++ b/pkg/resources/config_test.go
@@ -134,3 +134,91 @@ NodeId=149
}
}
+
+func Test_GetConfigString_ApiFreeSlots(t *testing.T) {
+ ndb := testutils.NewTestNdb("default", "example-ndb-2", 1)
+ ndb.Spec.DataMemory = "80M"
+ ndb.Spec.ApiFreeSlots = 10
+ configString, err := GetConfigString(ndb, nil)
+ if err != nil {
+ t.Errorf("Failed to generate config string from Ndb : %s", err)
+ }
+
+ expectedConfigString := `# auto generated config.ini - do not edit
+#
+# ConfigHash=######
+# NumOfMySQLServers=1
+
+[system]
+ConfigGenerationNumber=0
+Name=example-ndb-2
+
+[ndbd default]
+NoOfReplicas=2
+DataMemory=80M
+# Use a fixed ServerPort for all data nodes
+ServerPort=1186
+
+[tcp default]
+AllowUnresolvedHostnames=1
+
+[ndb_mgmd]
+NodeId=1
+Hostname=example-ndb-2-mgmd-0.example-ndb-2-mgmd.default.svc.cluster.local
+DataDir=/var/lib/ndb
+
+[ndb_mgmd]
+NodeId=2
+Hostname=example-ndb-2-mgmd-1.example-ndb-2-mgmd.default.svc.cluster.local
+DataDir=/var/lib/ndb
+
+[ndbd]
+NodeId=3
+Hostname=example-ndb-2-ndbd-0.example-ndb-2-ndbd.default.svc.cluster.local
+DataDir=/var/lib/ndb
+
+[api]
+NodeId=145
+
+[api]
+NodeId=146
+
+[api]
+NodeId=147
+
+[api]
+NodeId=148
+
+[api]
+NodeId=149
+
+[api]
+NodeId=150
+
+[api]
+NodeId=151
+
+[api]
+NodeId=152
+
+[api]
+NodeId=153
+
+[api]
+NodeId=154
+
+[api]
+NodeId=155
+
+`
+ // replace the config hash
+ re := regexp.MustCompile(`ConfigHash=.*`)
+ configString = re.ReplaceAllString(configString, "ConfigHash=######")
+
+ if configString != expectedConfigString {
+ t.Error("The generated config string does not match the expected value")
+ t.Errorf("Expected :\n%s\n", expectedConfigString)
+ t.Errorf("Generated :\n%s\n", configString)
+ }
+
+}
|