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

Bug 1834989: hashableDeployment: Fix liveness/readiness probes #391

Conversation

Miciah
Copy link
Contributor

@Miciah Miciah commented Apr 16, 2020

updateRouterDeployment: Add diff to log message

  • pkg/operator/controller/ingress/deployment.go (updateRouterDeployment): Add the diff of the previous and updated deployments to the "updated router deployment" log message.

hashableDeployment: Fix liveness/readiness probes

When comparing deployments to determine whether an update is required, treat implicit and explicit default values as equal.

Before this commit, the update logic would keep trying to revert the default values that the API set for probe parameters.

  • pkg/operator/controller/ingress/deployment.go (hashableDeployment): Use the new hashableProbe function so that two deployments have the same hash if the only difference between them is that one does not specify liveness or readiness probe parameters and the other specifies the default parameter values.
    (hashableProbe): New function. Return a copy of the given probe, copying exactly the fields that should be used for computing a deployment's hash, and zeroing out any fields where the values are equal to their defaults.

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 16, 2020
@ironcladlou
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 20, 2020
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@Miciah Miciah force-pushed the updateRouterDeployment-add-diff-to-log-message branch from c041c29 to 9c1dc22 Compare April 24, 2020 20:42
@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Apr 24, 2020
* pkg/operator/controller/ingress/deployment.go
(updateRouterDeployment): Add the diff of the previous and updated
deployments to the "updated router deployment" log message.
When comparing deployments to determine whether an update is required,
treat implicit and explicit default values as equal.

Before this commit, the update logic would keep trying to revert the
default values that the API set for probe parameters.

This commit fixes bug 1834989.

https://bugzilla.redhat.com/show_bug.cgi?id=1834989

* pkg/operator/controller/ingress/deployment.go (hashableDeployment): Use
the new hashableProbe function so that two deployments have the same hash
if the only difference between them is that one does not specify liveness
or readiness probe parameters and the other specifies the default parameter
values.
(hashableProbe): New function.  Return a copy of the given probe, copying
exactly the fields that should be used for computing a deployment's hash,
and zeroing out any fields where the values are equal to their defaults.
@Miciah Miciah force-pushed the updateRouterDeployment-add-diff-to-log-message branch from a819178 to a9e00bb Compare May 12, 2020 20:03
@Miciah Miciah changed the title updateRouterDeployment: Add diff to log message Bug 1834989: hashableDeployment: Fix liveness/readiness probes May 12, 2020
@openshift-ci-robot
Copy link
Contributor

@Miciah: An error was encountered updating to the POST state for bug 1834989 on the Bugzilla server at https://bugzilla.redhat.com:

code 32000: Red Hat Bugzilla's database reported a query serialization error. Most likely this occurred because another user or process attempted to change the same data that you were attempting to change. Please press Back and retry the transaction.

 UPDATE bugs SET bug_status = ? WHERE bug_id = ? at /var/www/html/bugzilla/Bugzilla/Object.pm line 544. Bugzilla::Object::update('Bugzilla::Bug=HASH(0x55fed3444e88)') called at /var/www/html/bugzilla/Bugzilla/Bug.pm line 1168 Bugzilla::Bug::update('Bugzilla::Bug=HASH(0x55fed3444e88)') called at /var/www/html/bugzilla/Bugzilla/WebService/Bug.pm line 847 Bugzilla::WebService::Bug::update('Bugzilla::WebService::Server::REST::Bugzilla::WebService::Bug...', 'HASH(0x55fed364be90)') called at (eval 2514) line 1 eval ' $procedure->{code}->($self, $params) ;' called at /usr/share/perl5/vendor_perl/JSON/RPC/Legacy/Server.pm line 208 JSON::RPC::Legacy::Server::_handle('Bugzilla::WebService::Server::REST::Bugzilla::WebService::Bug...', 'HASH(0x55fed32a68a0)') called at /var/www/html/bugzilla/Bugzilla/WebService/Server/JSONRPC.pm line 295 Bugzilla::WebService::Server::JSONRPC::_handle('Bugzilla::WebService::Server::REST::Bugzilla::WebService::Bug...', 'HASH(0x55fed32a68a0)') called at /var/www/html/bugzilla/Bugzilla/WebService/Server/REST.pm line 98 Bugzilla::WebService::Server::REST::handle('Bugzilla::WebService::Server::REST::Bugzilla::WebService::Bug...') called at /var/www/html/bugzilla/rest.cgi line 30 ModPerl::ROOT::Bugzilla::ModPerl::ResponseHandler::var_www_html_bugzilla_rest_2ecgi::handler('Apache2::RequestRec=SCALAR(0x55fed3bf1ff0)') called at /usr/lib64/perl5/vendor_perl/ModPerl/RegistryCooker.pm line 207 eval {...} called at /usr/lib64/perl5/vendor_perl/ModPerl/RegistryCooker.pm line 207 ModPerl::RegistryCooker::run('Bugzilla::ModPerl::ResponseHandler=HASH(0x55fed3607b78)') called at /usr/lib64/perl5/vendor_perl/ModPerl/RegistryCooker.pm line 173 ModPerl::RegistryCooker::default_handler('Bugzilla::ModPerl::ResponseHandler=HASH(0x55fed3607b78)') called at /usr/lib64/perl5/vendor_perl/ModPerl/Registry.pm line 32 ModPerl::Registry::handler('Bugzilla::ModPerl::ResponseHandler', 'Apache2::RequestRec=SCALAR(0x55fed3bf1ff0)') called at /var/www/html/bugzilla/mod_perl.pl line 139 Bugzilla::ModPerl::ResponseHandler::handler('Bugzilla::ModPerl::ResponseHandler', 'Apache2::RequestRec=SCALAR(0x55fed3bf1ff0)') called at (eval 2514) line 0 eval {...} called at (eval 2514) line 0 

Please contact an administrator to resolve this issue, then request a bug refresh with /bugzilla refresh.

In response to this:

Bug 1834989: hashableDeployment: Fix liveness/readiness probes

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci-robot openshift-ci-robot added the bugzilla/severity-unspecified Referenced Bugzilla bug's severity is unspecified for the PR. label May 12, 2020
@openshift-ci-robot
Copy link
Contributor

@Miciah: This pull request references Bugzilla bug 1834989, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.5.0) matches configured target release for branch (4.5.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1834989: hashableDeployment: Fix liveness/readiness probes

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci-robot openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label May 12, 2020
@Miciah
Copy link
Contributor Author

Miciah commented May 12, 2020

/retest

@danehans
Copy link
Contributor

e2e-aws-operator failed due to an e2e polling timeout fixed by 17c6350.

/test e2e-aws-operator

@danehans
Copy link
Contributor

Same as #391 (comment)

/test e2e-aws-operator

@danehans
Copy link
Contributor

/lgtm

@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: danehans, ironcladlou, 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:
  • OWNERS [Miciah,danehans,ironcladlou]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label May 16, 2020
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

5 similar comments
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

27 similar comments
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit 8a8beb1 into openshift:master May 17, 2020
@openshift-ci-robot
Copy link
Contributor

@Miciah: All pull requests linked via external trackers have merged: openshift/cluster-ingress-operator#391. Bugzilla bug 1834989 has been moved to the MODIFIED state.

In response to this:

Bug 1834989: hashableDeployment: Fix liveness/readiness probes

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-unspecified Referenced Bugzilla bug's severity is unspecified for the PR. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants