Skip to content

return an error from GetMonitorProcessConfiguration #2450

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nicmorales9 merged 1 commit into from
Mar 26, 2026
Merged

return an error from GetMonitorProcessConfiguration #2450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion controllers/cluster_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,13 +592,16 @@ func (r *FoundationDBClusterReconciler) updatePodDynamicConf(
var expectedConf string
imageType := internal.GetImageType(pod)
if imageType == fdbv1beta2.ImageTypeUnified {
config := internal.GetMonitorProcessConfiguration(
config, err := internal.GetMonitorProcessConfiguration(
cluster,
processClass,
serversPerPod,
imageType,
currentPodIPFamily,
)
if err != nil {
return false, err
}
configData, err := json.Marshal(config)
if err != nil {
return false, err
Expand Down
5 changes: 4 additions & 1 deletion internal/configmap_helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,10 @@ func getDataForMonitorConf(
pClass fdbv1beta2.ProcessClass,
serversPerPod int,
) (string, []byte, error) {
config := GetMonitorProcessConfiguration(cluster, pClass, serversPerPod, imageType, nil)
config, err := GetMonitorProcessConfiguration(cluster, pClass, serversPerPod, imageType, nil)
if err != nil {
return "", nil, err
}
jsonData, err := json.Marshal(config)
if err != nil {
return "", nil, err
Expand Down
15 changes: 10 additions & 5 deletions internal/configmap_helper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,14 @@ var _ = Describe("configmap_helper", func() {
config := monitorapi.ProcessConfiguration{}
err = json.Unmarshal([]byte(jsonData), &config)
Expect(err).NotTo(HaveOccurred())
expectedConfig := GetMonitorProcessConfiguration(
expectedConfig, err := GetMonitorProcessConfiguration(
cluster,
fdbv1beta2.ProcessClassStorage,
1,
fdbv1beta2.ImageTypeUnified,
nil,
)
Expect(err).NotTo(HaveOccurred())
Expect(config).To(Equal(expectedConfig))
})

Expand Down Expand Up @@ -202,27 +203,29 @@ var _ = Describe("configmap_helper", func() {
config := monitorapi.ProcessConfiguration{}
err = json.Unmarshal([]byte(jsonData), &config)
Expect(err).NotTo(HaveOccurred())
expectedConfig := GetMonitorProcessConfiguration(
expectedConfig, err := GetMonitorProcessConfiguration(
cluster,
fdbv1beta2.ProcessClassStorage,
1,
fdbv1beta2.ImageTypeUnified,
nil,
)
Expect(err).NotTo(HaveOccurred())
Expect(config).To(Equal(expectedConfig))

jsonData, present = configMap.Data["fdbmonitor-conf-storage-json"]
Expect(present).To(BeTrue())
config = monitorapi.ProcessConfiguration{}
err = json.Unmarshal([]byte(jsonData), &config)
Expect(err).NotTo(HaveOccurred())
expectedConfig = GetMonitorProcessConfiguration(
expectedConfig, err = GetMonitorProcessConfiguration(
cluster,
fdbv1beta2.ProcessClassStorage,
2,
fdbv1beta2.ImageTypeUnified,
nil,
)
Expect(err).NotTo(HaveOccurred())
Expect(config).To(Equal(expectedConfig))
})
})
Expand Down Expand Up @@ -273,27 +276,29 @@ var _ = Describe("configmap_helper", func() {
config := monitorapi.ProcessConfiguration{}
err = json.Unmarshal([]byte(jsonData), &config)
Expect(err).NotTo(HaveOccurred())
expectedConfig := GetMonitorProcessConfiguration(
expectedConfig, err := GetMonitorProcessConfiguration(
cluster,
fdbv1beta2.ProcessClassLog,
1,
fdbv1beta2.ImageTypeUnified,
nil,
)
Expect(err).NotTo(HaveOccurred())
Expect(config).To(Equal(expectedConfig))

jsonData, present = configMap.Data["fdbmonitor-conf-log-json"]
Expect(present).To(BeTrue())
config = monitorapi.ProcessConfiguration{}
err = json.Unmarshal([]byte(jsonData), &config)
Expect(err).NotTo(HaveOccurred())
expectedConfig = GetMonitorProcessConfiguration(
expectedConfig, err = GetMonitorProcessConfiguration(
cluster,
fdbv1beta2.ProcessClassLog,
2,
fdbv1beta2.ImageTypeUnified,
nil,
)
Expect(err).NotTo(HaveOccurred())
Expect(config).To(Equal(expectedConfig))
})

Expand Down
17 changes: 12 additions & 5 deletions internal/monitor_conf.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,17 @@ func GetStartCommandWithSubstitutions(
return "", nil
}

config := GetMonitorProcessConfiguration(
config, err := GetMonitorProcessConfiguration(
cluster,
processClass,
processCount,
imageType,
getIPFamilyFromPodIfPresent(currentPod),
)
if err != nil {
return "", err
}

extractPlaceholderEnvVars(substitutions, config.Arguments)

config.BinaryPath = fmt.Sprintf("%s/fdbserver", substitutions[fdbv1beta2.EnvNameBinaryDir])
Expand Down Expand Up @@ -189,13 +193,16 @@ func getMonitorConfStartCommandLines(
) ([]string, error) {
confLines := make([]string, 0, 20)

config := GetMonitorProcessConfiguration(
config, err := GetMonitorProcessConfiguration(
cluster,
processClass,
processCount,
fdbv1beta2.ImageTypeSplit,
podIPFamily,
)
if err != nil {
return nil, err
}

if substitutions == nil {
substitutions = make(map[string]string)
Expand Down Expand Up @@ -233,10 +240,10 @@ func GetMonitorProcessConfiguration(
processCount int,
imageType fdbv1beta2.ImageType,
podIPFamily *int,
) monitorapi.ProcessConfiguration {
) (monitorapi.ProcessConfiguration, error) {
version, err := monitorapi.ParseFdbVersion(cluster.Spec.Version)
if err != nil {
return monitorapi.ProcessConfiguration{}
return monitorapi.ProcessConfiguration{}, err
}

configuration := monitorapi.ProcessConfiguration{
Expand Down Expand Up @@ -435,7 +442,7 @@ func GetMonitorProcessConfiguration(
)
}

return configuration
return configuration, nil
}

// Generate the monitor API configuration based on the provided custom parameter
Expand Down
Loading
Loading