zedkube/edgeview: fix stale vmiVNC.run blocking new VNC sessions#5875
Merged
milan-zededa merged 1 commit intolf-edge:masterfrom May 7, 2026
Merged
zedkube/edgeview: fix stale vmiVNC.run blocking new VNC sessions#5875milan-zededa merged 1 commit intolf-edge:masterfrom
milan-zededa merged 1 commit intolf-edge:masterfrom
Conversation
naiming-zededa
requested review from
eriknordmark and
zedi-pramodh
as code owners
naiming-zededa
force-pushed
the
naiming-vnc-cleanup
branch
2 times, most recently
from
b49eec0 to
b32e0c1
Compare
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #5875 +/- ##
==========================================
+ Coverage 21.62% 22.05% +0.43%
==========================================
Files 464 475 +11
Lines 83994 85714 +1720
==========================================
+ Hits 18165 18907 +742
- Misses 64303 65099 +796
- Partials 1526 1708 +182 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
naiming-zededa
force-pushed
the
naiming-vnc-cleanup
branch
from
b32e0c1 to
a2833f4
Compare
| logmsg "monitor_caller_pid: Caller PID $caller_pid is gone (crashed?), cleaning up" | ||
|
|
||
| # Re-check CallerPID in the file before acting, in case a new edgeview | ||
| # process with a recycled PID already wrote a new session file. |
Contributor
There was a problem hiding this comment.
Is this really for "recycled PID" if we are checking for changed CallerPID?
Contributor
Author
There was a problem hiding this comment.
updated comments.
| │ ┌─────────┐ AppInstanceConfig ┌──────────┐ │ | ||
| │ │zedagent │─────────────────────►│ zedkube │ │ | ||
| │ └─────────┘ (RemoteConsole) └────┬─────┘ │ | ||
| │ │ runAppVNC() │ |
Contributor
There was a problem hiding this comment.
Add space to fix the arrow
| │ │edgeview │◄────────────────────│ edgeview │ │ | ||
| │ │ client │ │ (server) │ │ | ||
| │ └──────────┘ └────┬─────┘ │ | ||
| │ │ setupEveKVNC() │ |
Contributor
There was a problem hiding this comment.
Is edgeview used also for Controller-triggered VNC access? Based on this diagram it seems that zedkube talks to edgeview to setup VNC.
Contributor
Author
There was a problem hiding this comment.
redo the drawing to reflect the schemes properly.
|
|
||
| Rules: | ||
|
|
||
| - `CallerPID > 0` → edgeview owns this session; liveness via `/proc/<pid>/comm` |
Contributor
There was a problem hiding this comment.
I believe that in the edgeview-case, the liveness is both PID-check and port-listen check (?)
But the port-listen check is not mentioned for CallerPID > 0
Contributor
Author
There was a problem hiding this comment.
yes, we actually missing the code in checking the vnc port. updated the code and the doc.
|
|
||
| Both `removeStaleVNCFile` (edgeview) and `canClaimVNCFile` (zedkube) probe | ||
| whether a virtctl proxy is actually running before declaring a remote-console | ||
| file stale. They do this differently: |
Contributor
There was a problem hiding this comment.
Do they really do it differently? They use the same helper function after all
naiming-zededa
force-pushed
the
naiming-vnc-cleanup
branch
from
a2833f4 to
b257790
Compare
naiming-zededa
force-pushed
the
naiming-vnc-cleanup
branch
2 times, most recently
from
79515e0 to
6f0c5c2
Compare
milan-zededa
approved these changes
May 6, 2026
Problem: vmiVNC.run was not being cleaned up when an edgeview instance
crashed or was killed.
Fixes:
- clustertypes.go: Add AppUUID field to VmiVNCConfig to identify file
ownership per-app. Add OwnerAlive() which reads /proc/<pid>/comm and
checks the name is edge-view, guarding against PID reuse by
unrelated processes.
- zedkube/vnc.go: Replace the blind os.Stat block with
canClaimVNCFile(). It evicts stale files (dead edgeview PID, reused
PID, or idle virtctl port) and blocks only on a genuinely live
session — a running edgeview process or a virtctl proxy still
listening on the port.
- edgeview/network.go: Replace the blind os.Stat block with
removeStaleVNCFile(), the edgeview-side equivalent. Also call it at
edgeview startup (runOnServer) with evictIdle=false to clear files
left from a previous crash without disturbing a live remote-console
session. Rewrite isPortListening to read /proc/net/tcp directly
instead of spawning ss (avoids disrupting the virtctl WebSocket
connection).
- vnc-proxy.sh: Move monitor_caller_pid start to the top of handle_vnc
before the virtctl retry loop
Signed-off-by: naiming-zededa <naiming@zededa.com>
naiming-zededa
force-pushed
the
naiming-vnc-cleanup
branch
from
6f0c5c2 to
0750c39
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Problem: vmiVNC.run was not being cleaned up when an edgeview instance crashed or was killed.
Fixes:
PR dependencies
How to test and validate this PR
run the edgeview VNC in multiple times, and verify they are not blocked by the stale config file on the device.
Changelog notes
zedkube/edgeview: fix stale vmiVNC.run blocking new VNC sessions
PR Backports
Checklist
For backport PRs (remove it if it's not a backport):
And the last but not least:
check them.