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

fix msg in nodestore compare error #2387

Merged
merged 1 commit into from
Dec 3, 2020

Conversation

threestoneliu
Copy link
Member

What type of PR is this?
/kind bug

What this PR does / why we need it:
The managePod method in synccontroller will check pod is exist in kuberntes, if pod not found ,synccontroller will send a delete operation message to cloudhub, but the message's resourceversion is empty. then channelq will overwrite the message that stored in nodestore . next time if trigger synccontroller.CompareResourceVersion will cause the cloudcore panic. So we can check wheather the message in node store is a delete operation message to avoid this panic.

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?:


@kubeedge-bot kubeedge-bot added kind/bug Categorizes issue or PR as related to a bug. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Dec 2, 2020
@fisherxu
Copy link
Member

fisherxu commented Dec 3, 2020

Make sense, thanks, we can also pick it to release-1.5 @threestoneliu
/lgtm
/approve

@kubeedge-bot kubeedge-bot added the lgtm Indicates that a PR is ready to be merged. label Dec 3, 2020
@kubeedge-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fisherxu

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

@kubeedge-bot kubeedge-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 3, 2020
@kubeedge-bot kubeedge-bot merged commit 7e26252 into kubeedge:master Dec 3, 2020
@threestoneliu
Copy link
Member Author

done! 2394

kubeedge-bot added a commit that referenced this pull request Dec 4, 2020
…#2387-upstream-release-1.5

Automated cherry pick of #2387: fix msg in nodestore compare error
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. kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants