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

Merge 8022/health to 8012/8013 #5524

Merged
merged 20 commits into from
Sep 20, 2019

Conversation

yanweiguo
Copy link
Contributor

Part of #5465.

Proposed Changes

  • Change HealthState to return queue as body if probe succeeds and return 503 instead of 400 if probe fails.
  • Use HealthState to probe user-container in 8012/8013 just like 8022/health.
  • Add -port flag to ExecProbe command to tell which port to send request, 8012 or 8013.
  • Remove 8022/health and let ExecProbe send probe request to 8012/8013 with header K-Network-Probe=queue.

@googlebot googlebot added the cla: yes Indicates the PR's author has signed the CLA. label Sep 12, 2019
@knative-prow-robot knative-prow-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Sep 12, 2019
Copy link
Contributor

@knative-prow-robot knative-prow-robot left a comment

Choose a reason for hiding this comment

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

@yanweiguo: 0 warnings.

In response to this:

Part of #5465.

Proposed Changes

  • Change HealthState to return queue as body if probe succeeds and return 503 instead of 400 if probe fails.
  • Use HealthState to probe user-container in 8012/8013 just like 8022/health.
  • Add -port flag to ExecProbe command to tell which port to send request, 8012 or 8013.
  • Remove 8022/health and let ExecProbe send probe request to 8012/8013 with header K-Network-Probe=queue.

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.

@knative-prow-robot knative-prow-robot added area/API API objects and controllers area/networking labels Sep 12, 2019
Copy link
Contributor

@markusthoemmes markusthoemmes left a comment

Choose a reason for hiding this comment

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

Not an entire review, I'm having somewhat of a hard time following the paths so I might need another look.

pkg/queue/health/health_state.go Outdated Show resolved Hide resolved
pkg/reconciler/revision/resources/queue.go Outdated Show resolved Hide resolved
cmd/queue/main.go Show resolved Hide resolved
cmd/queue/main.go Outdated Show resolved Hide resolved
cmd/queue/main.go Outdated Show resolved Hide resolved
pkg/queue/health/health_state_test.go Outdated Show resolved Hide resolved
pkg/queue/health/health_state.go Outdated Show resolved Hide resolved
@yanweiguo
Copy link
Contributor Author

/test pull-knative-serving-upgrade-tests

@yanweiguo
Copy link
Contributor Author

It's ready for another look.

Copy link
Contributor

@vagababov vagababov left a comment

Choose a reason for hiding this comment

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

I have just nits.
In general looks good to me, but someone has to look as well.

/approve

pkg/queue/health/health_state.go Outdated Show resolved Hide resolved
cmd/queue/main_test.go Outdated Show resolved Hide resolved
@knative-prow-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vagababov, yanweiguo

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@knative-prow-robot knative-prow-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 16, 2019
@yanweiguo
Copy link
Contributor Author

@markusthoemmes any more comments?

@yanweiguo
Copy link
Contributor Author

/test pull-knative-serving-unit-tests
/test pull-knative-serving-integration-tests

cmd/queue/main.go Outdated Show resolved Hide resolved
pkg/reconciler/revision/resources/queue.go Outdated Show resolved Hide resolved
cmd/queue/main.go Outdated Show resolved Hide resolved
cmd/queue/main.go Show resolved Hide resolved
@yanweiguo
Copy link
Contributor Author

/test pull-knative-serving-unit-tests

@knative-test-reporter-robot

The following jobs failed:

Test name Triggers Retries
pull-knative-serving-unit-tests 0/3

Failed non-flaky tests preventing automatic retry of pull-knative-serving-unit-tests:

pkg/activator/net.TestRevisionWatcher
pkg/activator/net.TestRevisionWatcher/podIP_slow_ready_then_clusterIP

@yanweiguo
Copy link
Contributor Author

/test pull-knative-serving-unit-tests

1 similar comment
@yanweiguo
Copy link
Contributor Author

/test pull-knative-serving-unit-tests

@tcnghia
Copy link
Contributor

tcnghia commented Sep 20, 2019

/lgtm

@knative-prow-robot knative-prow-robot added the lgtm Indicates that a PR is ready to be merged. label Sep 20, 2019
@knative-prow-robot knative-prow-robot merged commit c71820d into knative:master Sep 20, 2019
@yanweiguo yanweiguo deleted the move_health_path branch September 25, 2019 18:43
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. area/API API objects and controllers area/networking cla: yes Indicates the PR's author has signed the CLA. lgtm Indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants