Revision 7734de0a
| ID | 7734de0a18cb4c900113ee4206e26cb314b1306b |
Revert breakage introduced in e4e9b80
Commit e4e9b8064787df01a79846a40f49c8ae06a8eb0e introduced two problems
in backend.InstanceShutdown():
- first, it reduced the check interval significantly (especially for the
first few checks); there are very few production VMs that shutdown in
one second, and while not breaking anything this creates unnecessary
load for the hypervisor
- second, a wrong test added to the while condition (“not tried_once”)
means that we only sleep once for an instance, and after that we
immediately kill it forcefully
These two together means that any instance which is not lucky enough to
finish in roughly 1-1.5 seconds (the time it takes to sleep and verify
again the instance list) will have this happen:
2009-10-21 23:33:46,034: pid=16634 INFO Called for inst9 w. False/False
2009-10-21 23:33:47,440: pid=16634 ERROR Shutdown of 'inst9' unsuccessful, forcing
2009-10-21 23:33:47,440: pid=16634 INFO Called for inst9 w. True/False
The “Called…” are logs from the hypervisor shutdown function. This means
of course that at restart time:
[12775866.644682] EXT3-fs: INFO: recovery required on readonly filesystem.
[12775866.644689] EXT3-fs: write access will be enabled during recovery.
[12775868.533674] kjournald starting. Commit interval 5 seconds
[12775868.533697] EXT3-fs: sda1: orphan cleanup on readonly fs
[12775868.551797] EXT3-fs: sda1: 12 orphan inodes deleted
[12775868.551803] EXT3-fs: recovery complete.
[12775868.586275] EXT3-fs: mounted filesystem with ordered data mode.
This patch reverts the broken test and changes the sleep to a fixed
duration of five seconds, since it makes no sense to check that often
for shutdown (and after ~20 seconds we anyway reach a stable value of
five seconds).
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
Files
- added
- modified
- copied
- renamed
- deleted