Skip to content

Reduce chances of race condition when closing connections to kill job #6035

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-jeckels merged 2 commits into from
Nov 8, 2024
Merged

Reduce chances of race condition when closing connections to kill job #6035

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba17ac1
Reduce chances of race condition when closing connections to kill pip…
labkey-jeckels Nov 8, 2024
f80bd12
Remove change intended for another FB
labkey-jeckels Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 21 additions & 7 deletions api/src/org/labkey/api/data/DbScope.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1157,6 +1157,9 @@ public synchronized boolean release(Connection conn)
{
log(() -> 1 == _refCount ? "Releasing connection [1]: " + conn.toString() : "Attempting to decrease count of connection [" + _refCount + "]: " + conn.toString());

if (_conn == null)
throw new ConnectionAlreadyReleaseException("Connection has already been nulled out, but was passed: " + conn);

if (_conn != conn)
throw new IllegalStateException("Incorrect Connection: " + conn + " vs. " + _conn);

Expand All @@ -1174,6 +1177,19 @@ public synchronized boolean release(Connection conn)
}
}

/**
* Special case for when the connection being closed doesn't match the expected
* connection for this thread, to help scenarios that are prone to race conditions
* (like killing pipeline jobs) ignore it.
*/
public static class ConnectionAlreadyReleaseException extends IllegalStateException
{
public ConnectionAlreadyReleaseException(String s)
{
super(s);
}
}

private void log(Supplier<String> supplier)
{
if (LOG.isDebugEnabled())
Expand Down Expand Up @@ -2080,7 +2096,6 @@ public static void clearFailedDbScopes()
*/
public static void closeAllConnectionsForCurrentThread()
{
Thread thread = getEffectiveThread();
for (DbScope scope : getInitializedDbScopes())
{
TransactionImpl t = scope.getCurrentTransactionImpl();
Expand All @@ -2097,7 +2112,11 @@ public static void closeAllConnectionsForCurrentThread()
{
LOG.warn("Forcing close of still-pending transaction object. Current stack is ", new Throwable());
LOG.warn("Forcing close of still-pending transaction object started at ", t._creation);
t.close(thread);
t.close();
}
catch (ConnectionAlreadyReleaseException ignored)
{
// The code in another thread has already released the connection
}
catch (Exception x)
{
Expand Down Expand Up @@ -2566,11 +2585,6 @@ public String getId()

@Override
public void close()
{
close(getEffectiveThread());
}

public void close(Thread thread)
{
if (_closesToIgnore == 0)
{
Expand Down