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.

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

Jump to bottom

Fix delete nil pointer panic #103232

Merged
merged 1 commit into from
Jul 7, 2021
Merged

Fix delete nil pointer panic #103232

merged 1 commit into from
Jul 7, 2021

Conversation

astraw99
Copy link
Member

What type of PR is this?

/kind bug

What this PR does / why we need it:

check if options.GracePeriodSeconds is nil to avoid delete panic

Which issue(s) this PR fixes:

Fixes #103228

Special notes for your reviewer:

Use apiserver extension(APIService) strategy, impl this function below will lead to panic:

// just impl this method and return true, then will lead to delete resource panic
func (s Strategy) CheckGracefulDelete(ctx context.Context, obj runtime.Object, options *metav1.DeleteOptions) bool {
	return true
}

Does this PR introduce a user-facing change?

NONE

SIG labels

  • sig apiserver
  • sig api-machinery

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/bug Categorizes issue or PR as related to a bug. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Jun 26, 2021
@k8s-ci-robot
Copy link
Contributor

Hi @astraw99. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. do-not-merge/contains-merge-commits Indicates a PR which contains merge commits. area/apiserver sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Jun 26, 2021
@astraw99 astraw99 mentioned this pull request Jun 26, 2021
Closed
yangjunmyfm192085
yangjunmyfm192085 reviewed Jun 26, 2021
View reviewed changes
Copy link
Contributor

@yangjunmyfm192085 yangjunmyfm192085 left a comment

Choose a reason for hiding this comment

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

Maybe you need rebase?

@liggitt liggitt self-assigned this Jun 27, 2021
@astraw99 astraw99 changed the title Fix delete nil pointer Fix delete nil pointer panic Jun 27, 2021
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jun 27, 2021
@lauchokyip
Copy link
Member

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. area/code-generation and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 29, 2021
@k8s-ci-robot k8s-ci-robot added do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. and removed sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API area/code-generation area/kubectl area/kubelet area/network-policy Issues or PRs related to Network Policy subproject area/provider/gcp Issues or PRs related to gcp provider area/test area/release-eng Issues or PRs related to the Release Engineering subproject labels Jun 30, 2021
@astraw99
Copy link
Member Author

astraw99 commented Jul 3, 2021 •
edited
Loading

/cc @liggitt @wojtek-t @yangjunmyfm192085 PTAL, thx.

@liggitt
Copy link
Member

liggitt commented Jul 6, 2021

This looks reasonable, thanks. Please squash to a single commit before merge.

@astraw99 astraw99 force-pushed the fix_delete_nil_pointer branch from fdae959 to af19d7f Compare July 7, 2021 04:45
@k8s-ci-robot k8s-ci-robot added sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. and removed do-not-merge/contains-merge-commits Indicates a PR which contains merge commits. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Jul 7, 2021
@astraw99
Copy link
Member Author

astraw99 commented Jul 7, 2021

/cc @liggitt Have squashed to 1 commit, thanks.

@dims
Copy link
Member

dims commented Jul 7, 2021

do we need a test of some sort @liggitt ?

@liggitt
Copy link
Member

liggitt commented Jul 7, 2021

do we need a test of some sort @liggitt ?

a nil check here is reasonable by inspection... the dereference on the next line ensures this is only improving errors that were already existing.

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 7, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: astraw99, liggitt

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 7, 2021
yangjunmyfm192085
yangjunmyfm192085 reviewed Jul 7, 2021
View reviewed changes
Copy link
Contributor

@yangjunmyfm192085 yangjunmyfm192085 left a comment

Choose a reason for hiding this comment

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

/retest

@k8s-ci-robot k8s-ci-robot merged commit 20be009 into kubernetes:master Jul 7, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.22 milestone Jul 7, 2021
@caesarxuchao
Copy link
Member

/triage accepted

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Jul 8, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yangjunmyfm192085 yangjunmyfm192085 yangjunmyfm192085 left review comments

@hongchaodeng hongchaodeng Awaiting requested review from hongchaodeng

@wojtek-t wojtek-t Awaiting requested review from wojtek-t

@liggitt liggitt Awaiting requested review from liggitt

Assignees

@liggitt liggitt

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/apiserver cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note-none Denotes a PR that doesn't merit a release note. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
SIG Node: code and documentation PRs
Archived in project
Milestone
v1.22
Development

Successfully merging this pull request may close these issues.

[Apiserver-extension] RESTGracefulDeleteStrategy impl leads to nil panic
10 participants
@astraw99 @k8s-ci-robot @lauchokyip @fejta-bot @neolit123 @fedebongio @liggitt @dims @caesarxuchao @yangjunmyfm192085