Skip to content

Fix kmesh daemon graceful exit#651

Merged
hzxuzhonghu merged 2 commits intokmesh-net:mainfrom
hzxuzhonghu:fix-cni-uninstall
Jul 30, 2024
Merged

Fix kmesh daemon graceful exit#651
hzxuzhonghu merged 2 commits intokmesh-net:mainfrom
hzxuzhonghu:fix-cni-uninstall

Conversation

@hzxuzhonghu
Copy link
Copy Markdown
Member

@hzxuzhonghu hzxuzhonghu commented Jul 30, 2024

What type of PR is this?

/kind bug

What this PR does / why we need it:

Which issue(s) this PR fixes:
Fixes #646

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

@hzxuzhonghu
Fix kmesh daemon graceful exit
2955a45 
Signed-off-by: Zhonghu Xu <xuzhonghu@huawei.com>
@kmesh-bot kmesh-bot added the kind/bug Something isn't working label Jul 30, 2024
@hzxuzhonghu hzxuzhonghu added cherrypick/release-0.4 and removed kind/bug Something isn't working labels Jul 30, 2024
@hzxuzhonghu
Fix typo
68d7f31 
Signed-off-by: Zhonghu Xu <xuzhonghu@huawei.com>
@codecov
Copy link
Copy Markdown

codecov bot commented Jul 30, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 20.00000% with 4 lines in your changes missing coverage. Please review.

Project coverage is 49.01%. Comparing base (4f55115) to head (68d7f31).
Report is 1 commits behind head on main.

Files Coverage Δ
pkg/status/status_server.go 33.18% <0.00%> (ø)
pkg/bpf/bpf_restart.go 65.11% <25.00%> (ø)

... and 1 file with indirect coverage changes

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 354bba4...68d7f31. Read the comment docs.

@nlgwcy
Copy link
Copy Markdown
Contributor

nlgwcy commented Jul 30, 2024

/lgtm
/approve

@kmesh-bot kmesh-bot added the lgtm label Jul 30, 2024
@kmesh-bot
Copy link
Copy Markdown
Collaborator

kmesh-bot commented Jul 30, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nlgwcy

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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

@hzxuzhonghu hzxuzhonghu enabled auto-merge July 30, 2024 08:18
@hzxuzhonghu hzxuzhonghu disabled auto-merge July 30, 2024 08:18
@hzxuzhonghu hzxuzhonghu enabled auto-merge July 30, 2024 08:19
@hzxuzhonghu hzxuzhonghu disabled auto-merge July 30, 2024 08:20
@hzxuzhonghu hzxuzhonghu merged commit e4143c2 into kmesh-net:main Jul 30, 2024
@hzxuzhonghu hzxuzhonghu deleted the fix-cni-uninstall branch July 30, 2024 08:21
@kmesh-bot
Copy link
Copy Markdown
Collaborator

kmesh-bot commented Jul 30, 2024

In response to a cherrypick label: #651 failed to apply on top of branch "release-0.4":

Applying: Fix kmesh daemon graceful exit
Using index info to reconstruct a base tree...
M	build/docker/start_kmesh.sh
A	pkg/bpf/bpf_restart.go
M	pkg/status/status_server.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/status/status_server.go
CONFLICT (modify/delete): pkg/bpf/bpf_restart.go deleted in HEAD and modified in Fix kmesh daemon graceful exit. Version Fix kmesh daemon graceful exit of pkg/bpf/bpf_restart.go left in tree.
Auto-merging build/docker/start_kmesh.sh
CONFLICT (content): Merge conflict in build/docker/start_kmesh.sh
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix kmesh daemon graceful exit
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

@kmesh-bot kmesh-bot mentioned this pull request Jul 30, 2024
Closed
@kmesh-bot
Copy link
Copy Markdown
Collaborator

kmesh-bot commented Jul 30, 2024

In response to a cherrypick label: new issue created for failed cherrypick: #654

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bitcoffeeiux bitcoffeeiux Awaiting requested review from bitcoffeeiux

@Okabe-Rintarou-0 Okabe-Rintarou-0 Awaiting requested review from Okabe-Rintarou-0

Assignees

@nlgwcy nlgwcy

Labels

approved cherrypick/release-0.4 lgtm size/S

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Failed to restart Kmash daemon pod

3 participants

@hzxuzhonghu @nlgwcy @kmesh-bot