MTX-3262 mpower lockfile: additional fd check on lock

1 files changed, 13 insertions, 9 deletions

diff --git a/src/MTS_IO_LockFile.cpp b/src/MTS_IO_LockFile.cpp
index 4312ce4..842ffb7 100644
--- a/src/MTS_IO_LockFile.cpp
+++ b/src/MTS_IO_LockFile.cpp
@@ -48,19 +48,23 @@ LockFile::~LockFile()
 
 bool LockFile::lock(uint32_t attemptMillis)
 {
-    if (isLocked())
+    if (isLocked()) {
         return true;
+    }
 
-    MTS::Timer timer;
-    timer.start();
     m_iLockFd = ::open(m_sFile.c_str(), O_CREAT | O_RDWR, 0666);
-    while (timer.getMillis() < attemptMillis) {
-        m_iLockErr = ::flock(m_iLockFd, LOCK_EX | LOCK_NB);
-        if (m_iLockErr == 0)
-            return true;
-        ::usleep(((rand() % 10) + 1) * 100000); //Sleep from 100ms to 1 Second
+    if (m_iLockFd >= 0) {
+        MTS::Timer timer;
+        timer.start();
+        while (timer.getMillis() < attemptMillis) {
+            m_iLockErr = ::flock(m_iLockFd, LOCK_EX | LOCK_NB);
+            if (m_iLockErr == 0) {
+                return true;
+            }
+            ::usleep(((rand() % 10) + 1) * 100000); //Sleep from 100ms to 1 Second
+        }
+        ::close(m_iLockFd);
     }
-    ::close(m_iLockFd);
     m_iLockFd = -1;
     return false;
 }