Skip to content
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.

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

role count fix #1172

Merged
Merged

Conversation

ltsampros
Copy link
Contributor

@ltsampros ltsampros commented Apr 14, 2022

Description

Fixes #1150 #1151.
If proxies are set to 0, then grv_proxies/commit_proxies will be used in the configure string correctly and vice versa. Defaults have been set for all cases and added some extra logic in normalization of the status to account for that so that reconciliation completes.

Type of change

Please select one of the options below.

  • Bug fix (non-breaking change which fixes an issue)

Testing

Unit tests and local dev environment.

@foundationdb-ci
Copy link

AWS CodeBuild CI Report for Linux CentOS 7

  • CodeBuild project: fdb-kubernetes-operator-pr
  • Commit ID: 1b32ec3ab4bb152a55844e95622ed74b94cbcc62
  • Result: FAILED
  • Error: Error while executing command: make -C tests -kj prOperator. Reason: exit status 2
  • Build Logs (available for 30 days)

@ltsampros ltsampros marked this pull request as ready for review April 14, 2022 19:21
@foundationdb-ci
Copy link

AWS CodeBuild CI Report for Linux CentOS 7

  • CodeBuild project: fdb-kubernetes-operator-pr
  • Commit ID: a381f3b
  • Result: FAILED
  • Error: Error while executing command: make -C tests -kj prOperator. Reason: exit status 2
  • Build Logs (available for 30 days)

@foundationdb-ci
Copy link

AWS CodeBuild CI Report for Linux CentOS 7

  • CodeBuild project: fdb-kubernetes-operator-pr
  • Commit ID: 9812b21
  • Result: FAILED
  • Error: Build has timed out.
  • Build Logs (available for 30 days)

@@ -150,9 +150,19 @@ func (configuration *DatabaseConfiguration) FailOver() DatabaseConfiguration {
//
// This will fill in defaults of -1 for some fields that have a default of 0,
// and will ensure that the region configuration is ordered consistently.
func (configuration DatabaseConfiguration) NormalizeConfiguration() DatabaseConfiguration {
func (configuration DatabaseConfiguration) NormalizeConfiguration(version string, areSeparatedProxiesConfigured bool) DatabaseConfiguration {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like a breaking change. Can we implement this by defining a new function and having the old function call the new one?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is fixed now.

@foundationdb-ci
Copy link

AWS CodeBuild CI Report for Linux CentOS 7

  • CodeBuild project: fdb-kubernetes-operator-pr
  • Commit ID: b2fab00
  • Result: SUCCEEDED
  • Error: N/A
  • Build Logs (available for 30 days)

Copy link
Member

@brownleej brownleej left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@ltsampros ltsampros merged commit 34f473b into FoundationDB:main Apr 20, 2022
JoshuaMcManus pushed a commit to JoshuaMcManus/fdb-kubernetes-operator that referenced this pull request Apr 20, 2022
* fix: apply correct proxy settings per documentation
@foundationdb-ci
Copy link

AWS CodeBuild CI Report for Linux CentOS 7

  • CodeBuild project: fdb-kubernetes-operator-pr
  • Commit ID: 4b35fc3
  • Result: FAILED
  • Error: Build has timed out.
  • Build Logs (available for 30 days)

Copy link
Member

@johscheuer johscheuer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know that these changes are already merged but I still have some questions: Those changes imply that proxies and grv/commit proxies can't be set at the same time correct? Is this documented somewhere outside of the code e.g. in our docs?

09harsh pushed a commit to 09harsh/fdb-kubernetes-operator that referenced this pull request Aug 1, 2022
* fix: apply correct proxy settings per documentation
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Proxies setting doesn't work as expected for 7.0+
4 participants