Lower flock LOG(FATAL) to LOG(WARNING)
Failing to unlock a file should not be a fatal error.
The lock will usually be cleared right after this anyway by the file
being closed. Even if it isn't though this should not cause deadlocks
since most places either don't retry if they don't get the lock the
first time or are separate binaries (such as dex2oat) that are run
with external timeouts.
Bug: 36369345
Test: ./test.py --host -j40
Change-Id: Icd783c038de3c263805e8de1bbc35b2ee8918340
diff --git a/runtime/base/scoped_flock.cc b/runtime/base/scoped_flock.cc
index 5394e53..842f922 100644
--- a/runtime/base/scoped_flock.cc
+++ b/runtime/base/scoped_flock.cc
@@ -117,8 +117,12 @@
if (file_.get() != nullptr) {
int flock_result = TEMP_FAILURE_RETRY(flock(file_->Fd(), LOCK_UN));
if (flock_result != 0) {
- PLOG(FATAL) << "Unable to unlock file " << file_->GetPath();
- UNREACHABLE();
+ // Only printing a warning is okay since this is only used with either:
+ // 1) a non-blocking Init call, or
+ // 2) as a part of a seperate binary (eg dex2oat) which has it's own timeout logic to prevent
+ // deadlocks.
+ // This means we can be sure that the warning won't cause a deadlock.
+ PLOG(WARNING) << "Unable to unlock file " << file_->GetPath();
}
int close_result = -1;
if (file_->ReadOnlyMode()) {