Commit 142d116
kunal.behbudzade
kvm: harden NVRAM freeze status parsing and document UEFI snapshot suspend
Address Copilot's review comment on #13020. `JsonParser.parse(...)`,
`.get("return")` and `.getAsString()` in `verifyVmFilesystemsFrozen` can
throw unchecked exceptions (`JsonSyntaxException`, `IllegalStateException`,
`NullPointerException`) on malformed or unexpected QEMU guest-agent
responses, bypassing the surrounding `catch (LibvirtException | IOException)`
and potentially leaving the guest frozen until the `finally` recovery
runs. Parse defensively, validate that `return` is a JSON string, and
explicitly treat `{"error": {...}}` guest-agent responses as an IO
failure so the outer handler thaws/resumes the guest and surfaces a
proper failure answer.
Also document in PendingReleaseNotes that taking a disk-only instance
snapshot for KVM UEFI VMs now briefly suspends the guest while the
NVRAM sidecar is copied. Non-UEFI VMs are unaffected.
Add regression tests covering the guest-agent error response and the
malformed-JSON path, including verification that the thaw recovery is
invoked when freeze verification fails.
Signed-off-by: kunal.behbudzade <kunal.behbudzade@btsgrp.com>1 parent 43e9809 commit 142d116
File tree
3 files changed
+103
-2
lines changed- plugins/hypervisors/kvm/src
- main/java/com/cloud/hypervisor/kvm/resource/wrapper
- test/java/com/cloud/hypervisor/kvm/resource/wrapper
3 files changed
+103
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
48 | 48 | | |
49 | 49 | | |
50 | 50 | | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
Lines changed: 24 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
41 | 41 | | |
42 | 42 | | |
43 | 43 | | |
| 44 | + | |
| 45 | + | |
44 | 46 | | |
45 | 47 | | |
46 | 48 | | |
| |||
315 | 317 | | |
316 | 318 | | |
317 | 319 | | |
318 | | - | |
| 320 | + | |
319 | 321 | | |
320 | 322 | | |
321 | 323 | | |
322 | | - | |
| 324 | + | |
| 325 | + | |
| 326 | + | |
| 327 | + | |
| 328 | + | |
| 329 | + | |
| 330 | + | |
| 331 | + | |
| 332 | + | |
| 333 | + | |
| 334 | + | |
| 335 | + | |
| 336 | + | |
| 337 | + | |
| 338 | + | |
| 339 | + | |
| 340 | + | |
| 341 | + | |
| 342 | + | |
| 343 | + | |
| 344 | + | |
323 | 345 | | |
324 | 346 | | |
325 | 347 | | |
| |||
Lines changed: 74 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
469 | 469 | | |
470 | 470 | | |
471 | 471 | | |
| 472 | + | |
| 473 | + | |
| 474 | + | |
| 475 | + | |
| 476 | + | |
| 477 | + | |
| 478 | + | |
| 479 | + | |
| 480 | + | |
| 481 | + | |
| 482 | + | |
| 483 | + | |
| 484 | + | |
| 485 | + | |
| 486 | + | |
| 487 | + | |
| 488 | + | |
| 489 | + | |
| 490 | + | |
| 491 | + | |
| 492 | + | |
| 493 | + | |
| 494 | + | |
| 495 | + | |
| 496 | + | |
| 497 | + | |
| 498 | + | |
| 499 | + | |
| 500 | + | |
| 501 | + | |
| 502 | + | |
| 503 | + | |
| 504 | + | |
| 505 | + | |
| 506 | + | |
| 507 | + | |
| 508 | + | |
| 509 | + | |
| 510 | + | |
| 511 | + | |
| 512 | + | |
| 513 | + | |
| 514 | + | |
| 515 | + | |
| 516 | + | |
| 517 | + | |
| 518 | + | |
| 519 | + | |
| 520 | + | |
| 521 | + | |
| 522 | + | |
| 523 | + | |
| 524 | + | |
| 525 | + | |
| 526 | + | |
| 527 | + | |
| 528 | + | |
| 529 | + | |
| 530 | + | |
| 531 | + | |
| 532 | + | |
| 533 | + | |
| 534 | + | |
| 535 | + | |
| 536 | + | |
| 537 | + | |
| 538 | + | |
| 539 | + | |
| 540 | + | |
| 541 | + | |
| 542 | + | |
| 543 | + | |
| 544 | + | |
| 545 | + | |
472 | 546 | | |
473 | 547 | | |
474 | 548 | | |
| |||
0 commit comments