Skip to content

Commit 52890e5

Browse files
committed
undo sending transport_reset event on snapshot creation
Signed-off-by: Amory Hoste <[email protected]>
1 parent 398d6b9 commit 52890e5

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

src/vmm/src/device_manager/persist.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,11 +239,12 @@ impl<'a> Persist<'a> for MMIODeviceManager {
239239

240240
// Send Transport event to reset connections if device
241241
// is activated.
242-
if vsock.is_activated() {
242+
// TODO: temporarily disabled to avoid FC agent becoming unavailable when restoring snapshots
243+
/*if vsock.is_activated() {
243244
vsock.send_transport_reset_event().unwrap_or_else(|e| {
244245
error!("Failed to send reset transport event: {:?}", e);
245246
});
246-
}
247+
}*/
247248

248249
states.vsock_device = Some(ConnectedVsockState {
249250
device_id: devid.clone(),

src/vmm/src/persist.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ pub fn restore_from_snapshot(
425425
if ! new_snapshot_path.eq("") {
426426
let n = microvm_state.device_states.block_devices.len();
427427
for i in 0..n {
428-
if microvm_state.device_states.block_devices[i].device_state.disk_path.contains("fc-dev-thinpool-") {
428+
if microvm_state.device_states.block_devices[i].device_state.disk_path.contains("thinpool-snap") {
429429
microvm_state.device_states.block_devices[i].device_state.disk_path = new_snapshot_path.clone();
430430
}
431431
}

0 commit comments

Comments
 (0)