diff options
| author | Ben Pfaff <blp@nicira.com> | 2014-03-25 15:50:14 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2014-04-07 10:23:26 -0700 |
| commit | 607bfcb5b86374b3842282579384b19ad86f3395 (patch) | |
| tree | a4f3cff8355a10c325b64f1b664cf9b90b554c6a /tests/lockfile.at | |
| parent | f5ca49d849c9526f7aabbca1a6d171d4132f7ea3 (diff) | |
| download | openvswitch-607bfcb5b86374b3842282579384b19ad86f3395.tar.gz | |
lockfile: Improve log message when a process tries to relock a file.
"Resource deadlock avoided" is a pretty obscure message.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Alex Wang <alexw@nicira.com>
Diffstat (limited to 'tests/lockfile.at')
| -rw-r--r-- | tests/lockfile.at | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/lockfile.at b/tests/lockfile.at index ba10fd44f..2e2a74b47 100644 --- a/tests/lockfile.at +++ b/tests/lockfile.at @@ -14,12 +14,12 @@ CHECK_LOCKFILE([lock_and_unlock], [0]) CHECK_LOCKFILE([lock_and_unlock_twice], [0]) CHECK_LOCKFILE([lock_blocks_same_process], [0], - [lockfile|WARN|.file.~lock~: failed to lock file: Resource deadlock avoided + [lockfile|WARN|.file.~lock~: cannot lock file because this process has already locked it ]) CHECK_LOCKFILE([lock_blocks_same_process_twice], [0], - [lockfile|WARN|.file.~lock~: failed to lock file: Resource deadlock avoided -lockfile|WARN|.file.~lock~: failed to lock file: Resource deadlock avoided + [lockfile|WARN|.file.~lock~: cannot lock file because this process has already locked it +lockfile|WARN|.file.~lock~: cannot lock file because this process has already locked it ]) CHECK_LOCKFILE([lock_blocks_other_process], [1], @@ -28,7 +28,7 @@ lockfile|WARN|.file.~lock~: cannot lock file because it is already locked by pid ]) CHECK_LOCKFILE([lock_twice_blocks_other_process], [1], - [lockfile|WARN|.file.~lock~: failed to lock file: Resource deadlock avoided + [lockfile|WARN|.file.~lock~: cannot lock file because this process has already locked it lockfile|WARN|.file.~lock~: child does not inherit lock lockfile|WARN|.file.~lock~: cannot lock file because it is already locked by pid <pid> ]) @@ -36,16 +36,16 @@ lockfile|WARN|.file.~lock~: cannot lock file because it is already locked by pid CHECK_LOCKFILE([lock_and_unlock_allows_other_process], [1]) CHECK_LOCKFILE([lock_multiple], [0], - [lockfile|WARN|.a.~lock~: failed to lock file: Resource deadlock avoided + [lockfile|WARN|.a.~lock~: cannot lock file because this process has already locked it ]) CHECK_LOCKFILE([lock_symlink], [0], - [lockfile|WARN|.a.~lock~: failed to lock file: Resource deadlock avoided -lockfile|WARN|.b.~lock~: failed to lock file: Resource deadlock avoided -lockfile|WARN|.b.~lock~: failed to lock file: Resource deadlock avoided -lockfile|WARN|.a.~lock~: failed to lock file: Resource deadlock avoided + [lockfile|WARN|.a.~lock~: cannot lock file because this process has already locked it +lockfile|WARN|.b.~lock~: cannot lock file because this process has already locked it +lockfile|WARN|.b.~lock~: cannot lock file because this process has already locked it +lockfile|WARN|.a.~lock~: cannot lock file because this process has already locked it ]) CHECK_LOCKFILE([lock_symlink_to_dir], [0], - [lockfile|WARN|dir/.b.~lock~: failed to lock file: Resource deadlock avoided + [lockfile|WARN|dir/.b.~lock~: cannot lock file because this process has already locked it ]) |