Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 1 addition & 12 deletions framework/cluster/src/com/cloud/cluster/ClusterManagerImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import java.nio.channels.SocketChannel;
import java.rmi.RemoteException;
import java.sql.Connection;
import java.sql.SQLException;
import java.sql.SQLNonTransientException;
import java.sql.SQLRecoverableException;
import java.util.ArrayList;
Expand Down Expand Up @@ -546,7 +545,7 @@ protected void runInContext() {
profiler.start();

profilerHeartbeatUpdate.start();
txn.transitToUserManagedConnection(getHeartbeatConnection());
txn.transitToAutoManagedConnection(TransactionLegacy.CLOUD_DB);
if (s_logger.isTraceEnabled()) {
s_logger.trace("Cluster manager heartbeat update, id:" + _mshostId);
}
Expand Down Expand Up @@ -597,7 +596,6 @@ protected void runInContext() {
invalidHeartbeatConnection();
}
} finally {
txn.transitToAutoManagedConnection(TransactionLegacy.CLOUD_DB);
txn.close("ClusterHeartbeat");
}
}
Expand All @@ -616,15 +614,6 @@ private boolean isRootCauseConnectionRelated(Throwable e) {
return false;
}

private Connection getHeartbeatConnection() throws SQLException {
if (_heartbeatConnection == null) {
final Connection conn = TransactionLegacy.getStandaloneConnectionWithException();
_heartbeatConnection = new ConnectionConcierge("ClusterManagerHeartbeat", conn, false);
}

return _heartbeatConnection.conn();
}

private void invalidHeartbeatConnection() {
if (_heartbeatConnection != null) {
final Connection conn = TransactionLegacy.getStandaloneConnection();
Expand Down
166 changes: 0 additions & 166 deletions framework/db/test/com/cloud/utils/db/TransactionTest.java

This file was deleted.