Add unsupported config override for maxconn #638
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* test/e2e/operator_test.go (waitForDeploymentEnvVar): Use the provided timeout parameter instead of a hard-coded value of 1 minute.
Specify a time unit suffix "s" for seconds in the value of the
RELOAD_INTERVAL environment variable in router deployments. Omitting the
time unit causes the following warning:
router "msg"="invalid interval, using default" "default"=5 "interval"="5" "name"="RELOAD_INTERVAL"
* pkg/operator/controller/ingress/deployment.go (desiredRouterDeployment):
Add "s" time unit suffix to the reload interval.
* pkg/operator/controller/ingress/deployment_test.go
(TestDesiredRouterDeployment):
* test/e2e/operator_test.go (TestReloadIntervalUnsupportedConfigOverride):
Expect the time unit suffix.
openshift-ci
bot
added
the
approved
|
error getting cluster version: Get "https://api.ci-op-3v7xm0xs-2945d.origin-ci-int-aws.dev.rhcloud.com:6443/apis/config.openshift.io/v1/clusterversions/version": dial tcp 52.200.26.31:6443: i/o timeout /retest |
|
Failure:
/retest |
|
/lgtm |
|
Looks like cluster is not stood up:
/retest |
|
/retest-required Please review the full test history for this PR and help us cut down flakes. |
1 similar comment
|
/retest-required Please review the full test history for this PR and help us cut down flakes. |
Add an unsupported config override for setting HAProxy's global maxconn setting. If the config override is unspecified, the current default of 20000 is used. If the config override has the value "-1", the maxconn setting is omitted so that HAProxy automatically detects a reasonable value based on the value of ulimit -n. * pkg/operator/controller/ingress/deployment.go (RouterMaxConnectionsEnvName): New const. (desiredRouterDeployment): Add unsupported config override for ROUTER_MAX_CONNECTIONS. * pkg/operator/controller/ingress/deployment_test.go (TestDesiredRouterDeployment): Verify that desiredRouterDeployment sets ROUTER_MAX_CONNECTIONS as expected. * test/e2e/operator_test.go (TestMaxConnectionsUnsupportedConfigOverride): Verify that the operator sets ROUTER_MAX_CONNECTIONS to the appropriate value based on the value specified in the unsupported configuration override if an override is specified.
When updating an ingresscontroller, do a get immediately before doing the update. This is a cleanup and should have no significant functional effect. * test/e2e/operator_test.go (TestProxyProtocolAPI) (TestLoadBalancingAlgorithmUnsupportedConfigOverride) (TestDynamicConfigManagerUnsupportedConfigOverride) (TestReloadIntervalUnsupportedConfigOverride): Get ingresscontroller immediately before updating it.
|
Working on a fix for this: |
Ignore not-found errors when deleting client pods. These pods run and then exit, and it is possible that they get garbage collected before the test code deletes them, in which case it is expected that they be not found. * test/e2e/canary_test.go (TestCanaryRoute): * test/e2e/client_tls_test.go (TestClientTLS): * test/e2e/http_header_buffer_test.go (TestHTTPHeaderBufferSize): * test/e2e/http_header_name_case_adjustment_test.go (TestHeaderNameCaseAdjustment): * test/e2e/operator_test.go (TestHTTPHeaderCapture, TestHTTPCookieCapture) (TestUniqueIdHeader): Ignore not-found errors when deleting client pods.
Miciah
force-pushed
the
add-unsupported-config-override-for-maxconn
branch
from
e0519a0
to
8041f49
Compare
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: frobware, Miciah The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR bundles (in logically separate commits) a fix to the reload interval override, a small fix to the E2E tests, and a new unsupported config override for
ROUTER_MAX_CONNECTIONS.waitForDeploymentComplete: Actually use timeout argtest/e2e/operator_test.go(waitForDeploymentEnvVar): Use the provided timeout parameter instead of a hard-coded value of 1 minute.Specify a time unit in
RELOAD_INTERVALSpecify a time unit suffix "s" for seconds in the value of the
RELOAD_INTERVALenvironment variable in router deployments. Omitting the time unit causes the following warning:pkg/operator/controller/ingress/deployment.go(desiredRouterDeployment): Add "s" time unit suffix to the reload interval.pkg/operator/controller/ingress/deployment_test.go(TestDesiredRouterDeployment):test/e2e/operator_test.go(TestReloadIntervalUnsupportedConfigOverride): Expect the time unit suffix.Add unsupported config override for
maxconnAdd an unsupported config override for setting HAProxy's global
maxconnsetting. If the config override is unspecified, the current default of 20000 is used. If the config override has the value "-1", themaxconnsetting is omitted so that HAProxy automatically detects a reasonable value based on the value ofulimit -n.pkg/operator/controller/ingress/deployment.go(RouterMaxConnectionsEnvName): New const.(
desiredRouterDeployment): Add unsupported config override forROUTER_MAX_CONNECTIONS.pkg/operator/controller/ingress/deployment_test.go(TestDesiredRouterDeployment): Verify thatdesiredRouterDeploymentsetsROUTER_MAX_CONNECTIONSas expected.test/e2e/operator_test.go(TestMaxConnectionsUnsupportedConfigOverride): Verify that the operator setsROUTER_MAX_CONNECTIONSto the appropriate value based on the value specified in the unsupported configuration override if an override is specified.test/e2e: Get ingresscontroller before updateWhen updating an ingresscontroller, do a get immediately before doing the update.
This is a cleanup and should have no significant functional effect.
test/e2e/operator_test.go(TestProxyProtocolAPI,TestLoadBalancingAlgorithmUnsupportedConfigOverride,TestDynamicConfigManagerUnsupportedConfigOverride,TestReloadIntervalUnsupportedConfigOverride): Get ingresscontroller immediately before updating it.test/e2e: Ignore some not-found errors on deleteIgnore not-found errors when deleting client pods. These pods run and then exit, and it is possible that they get garbage collected before the test code deletes them, in which case it is expected that they be not found.
test/e2e/canary_test.go(TestCanaryRoute):test/e2e/client_tls_test.go(TestClientTLS):test/e2e/http_header_buffer_test.go(TestHTTPHeaderBufferSize):test/e2e/http_header_name_case_adjustment_test.go(TestHeaderNameCaseAdjustment):test/e2e/operator_test.go(TestHTTPHeaderCapture,TestHTTPCookieCapture,TestUniqueIdHeader): Ignore not-found errors when deleting client pods.Setting a config override of
maxConnections: -1requires openshift/router#304 to work properly.