Merge pull request #522 from liquibase/DAT-17365

[DAT-17365] Release lock even if update fails on timeout

src/main/java/liquibase/ext/mongodb/lockservice/MongoLockService.java

@@ -20,9 +20,11 @@
  * #L%
  */
 
+import com.mongodb.MongoInterruptedException;
 import liquibase.Scope;
 import liquibase.database.Database;
 import liquibase.exception.DatabaseException;
+import liquibase.exception.LockException;
 import liquibase.ext.mongodb.database.MongoLiquibaseDatabase;
 import liquibase.ext.mongodb.statement.CountCollectionByNameStatement;
 import liquibase.ext.mongodb.statement.DropCollectionStatement;
@@ -66,9 +68,26 @@ protected Boolean isLocked() throws DatabaseException {
 
     @Override
     protected int replaceLock(final boolean locked) throws DatabaseException {
-        return getExecutor().update(
-                new ReplaceChangeLogLockStatement(getDatabaseChangeLogLockTableName(), locked)
-        );
+        try {
+            return getExecutor().update(
+                    new ReplaceChangeLogLockStatement(getDatabaseChangeLogLockTableName(), locked)
+            );
+        } catch (DatabaseException e) {
+            // Mongo driver does not allow to release lock if thread is interrupted
+            // Next code clears interrupted flag if it is happened due to of the timeout
+            // Tries to release lock again
+            // Restore thread interrupt status
+            if (e.getCause() instanceof MongoInterruptedException && e.getCause().getSuppressed().length > 0
+                    && e.getCause().getSuppressed()[0].getMessage().equals("Interrupted waiting for lock") && Thread.interrupted()) {
+                try {
+                    releaseLock();
+                } catch (LockException ex) {
+                    throw new DatabaseException(ex);
+                }
+                Thread.currentThread().interrupt();
+            }
+            throw e;
+        }
     }
 
     @Override