apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 10322: Transaction is using the new Merovingian

Browse Source
This commit is contained in:
Alex Huang 2011-06-29 12:35:30 -07:00
parent 63f552995f
commit 81213c2be2
4 changed files with 60 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/com/cloud/cluster/LockMasterListener.java
View File

@ -21,12 +21,16 @@ import java.util.List;
import com.cloud.utils.db.Merovingian2;
/**
* This listener is specifically written to cause cleanups in the Merovingian
* when a management server is down.
*
*/
public class LockMasterListener implements ClusterManagerListener {
Merovingian2 _lockMaster;
public LockMasterListener(long msId) {
_lockMaster = Merovingian2.createLockMaster(msId);
_lockMaster.clear();
}
@Override
@ -36,7 +40,7 @@ public class LockMasterListener implements ClusterManagerListener {
@Override
public void onManagementNodeLeft(List<ManagementServerHostVO> nodeList, long selfNodeId) {
for (ManagementServerHostVO node : nodeList) {
_lockMaster.clear(node.getMsid());
_lockMaster.cleanupForServer(node.getMsid());
}
}

61
utils/src/com/cloud/utils/db/Merovingian2.java
View File

@ -42,16 +42,17 @@ public class Merovingian2 extends StandardMBean implements MerovingianMBean {
private static final String ACQUIRE_SQL = "INSERT INTO op_lock (op_lock.key, op_lock.mac, op_lock.ip, op_lock.thread, op_lock.acquired_on, waiters) VALUES (?, ?, ?, ?, ?, 1)";
private static final String INCREMENT_SQL = "UPDATE op_lock SET waiters=waiters+1 where op_lock.key=? AND op_lock.mac=? AND op_lock.ip=? AND op_lock.thread=?";
private static final String SELECT_ALL_SQL = "SELECT op_lock.key, mac, ip, thread, acquired_on, waiters FROM op_lock";
private static final String INQUIRE_SQL = SELECT_ALL_SQL + " WHERE op_lock.key=?";
private static final String SELECT_SQL = "SELECT op_lock.key, mac, ip, thread, acquired_on, waiters FROM op_lock";
private static final String INQUIRE_SQL = SELECT_SQL + " WHERE op_lock.key=?";
private static final String DECREMENT_SQL = "UPDATE op_lock SET waiters=waiters-1 where op_lock.key=? AND op_lock.mac=? AND op_lock.ip=? AND op_lock.thread=?";
private static final String RELEASE_SQL = "DELETE FROM op_lock WHERE op_lock.key = ? AND op_lock.mac=? AND waiters=0";
private static final String CLEAR_SQL = "DELETE FROM op_lock WHERE op_lock.mac = ?";
private static final String SELECT_SQL = SELECT_ALL_SQL + " WHERE mac=?";
private static final String SELECT_LOCKS_SQL = SELECT_ALL_SQL + " WHERE mac=? AND ip=?";
private static final String CLEANUP_MGMT_LOCKS_SQL = "DELETE FROM op_lock WHERE op_lock.mac = ?";
private static final String SELECT_MGMT_LOCKS_SQL = SELECT_SQL + " WHERE mac=?";
private static final String SELECT_THREAD_LOCKS_SQL = SELECT_SQL + " WHERE mac=? AND ip=?";
private static final String SELECT_OWNER_SQL = "SELECT mac, ip, thread FROM op_lock WHERE op_lock.key=?";
private static final String DEADLOCK_DETECT_SQL = "SELECT l2.key FROM op_lock l2 WHERE l2.mac=? AND l2.ip=? AND l2.thread=? AND l2.key in " +
"(SELECT l1.key from op_lock l1 WHERE l1.mac=? AND l1.ip=? AND l1.thread=?)";
private static final String CLEANUP_THREAD_LOCKS_SQL = "DELETE FROM op_lock WHERE mac=? AND ip=? AND thread=?";
TimeZone s_gmtTimeZone = TimeZone.getTimeZone("GMT");
@ -67,6 +68,7 @@ public class Merovingian2 extends StandardMBean implements MerovingianMBean {
public static synchronized Merovingian2 createLockMaster(long msId) {
assert s_instance == null : "No lock can serve two masters. Either he will hate the one and love the other, or he will be devoted to the one and despise the other.";
s_instance = new Merovingian2(msId);
s_instance.cleanupThisServer();
try {
JmxUtil.registerMBean("Locks", "Locks", s_instance);
} catch (Exception e) {
@ -217,15 +219,15 @@ public class Merovingian2 extends StandardMBean implements MerovingianMBean {
}
}
public void clear() {
clear(_msId);
public void cleanupThisServer() {
cleanupForServer(_msId);
}
public void clear(long msId) {
public void cleanupForServer(long msId) {
Connection conn = null;
try {
conn = Transaction.getStandaloneConnectionWithException();
clear(conn, msId);
cleanup(conn, msId);
} catch (SQLException e) {
throw new CloudRuntimeException("Unable to clear the locks", e);
} finally {
@ -238,11 +240,11 @@ public class Merovingian2 extends StandardMBean implements MerovingianMBean {
}
}
protected void clear(Connection conn, long msId) {
protected void cleanup(Connection conn, long msId) {
PreparedStatement pstmt = null;
try {
conn = Transaction.getStandaloneConnectionWithException();
pstmt = conn.prepareStatement(CLEAR_SQL);
pstmt = conn.prepareStatement(CLEANUP_MGMT_LOCKS_SQL);
pstmt.setLong(1, _msId);
pstmt.executeUpdate();
} catch (SQLException e) {
@ -354,12 +356,12 @@ public class Merovingian2 extends StandardMBean implements MerovingianMBean {
@Override
public List<Map<String, String>> getAllLocks() {
return getLocks(SELECT_ALL_SQL, null);
return getLocks(SELECT_SQL, null);
}
@Override
public List<Map<String, String>> getLocksAcquiredByThisServer() {
return getLocks(SELECT_SQL, _msId);
return getLocks(SELECT_MGMT_LOCKS_SQL, _msId);
}
public int owns(Connection conn, String key) {
@ -398,7 +400,7 @@ public class Merovingian2 extends StandardMBean implements MerovingianMBean {
ResultSet rs = null;
try {
conn = Transaction.getStandaloneConnectionWithException();
pstmt = conn.prepareStatement(SELECT_LOCKS_SQL);
pstmt = conn.prepareStatement(SELECT_THREAD_LOCKS_SQL);
pstmt.setLong(1, msId);
pstmt.setString(2, threadName);
rs = pstmt.executeQuery();
@ -420,4 +422,35 @@ public class Merovingian2 extends StandardMBean implements MerovingianMBean {
}
}
}
public void cleanupThread() {
Thread th = Thread.currentThread();
String threadName = th.getName();
int threadId = System.identityHashCode(th);
Connection conn = null;
PreparedStatement pstmt = null;
try {
conn = Transaction.getStandaloneConnectionWithException();
pstmt = conn.prepareStatement(CLEANUP_THREAD_LOCKS_SQL);
pstmt.setLong(1, _msId);
pstmt.setString(2, threadName);
pstmt.setInt(3, threadId);
int rows = pstmt.executeUpdate();
assert (rows == 0) : "Abandon hope, all ye who enter here....There were still " + rows + " locks not released when the transaction ended!";
} catch (SQLException e) {
throw new CloudRuntimeException("Can't clear locks " + pstmt, e);
} finally {
try {
if (pstmt != null) {
pstmt.close();
}
if (conn != null) {
conn.close();
}
} catch (SQLException e) {
}
}
}
}

22
utils/src/com/cloud/utils/db/Transaction.java
View File

@ -79,6 +79,8 @@ public class Transaction {
public static final short USAGE_DB = 1;
public static final short CONNECTED_DB = -1;
private static final Merovingian2 s_lockMaster = Merovingian2.getLockMaster();
private static AtomicLong s_id = new AtomicLong();
private static final TransactionMBeanImpl s_mbean = new TransactionMBeanImpl();
static {
try {
@ -89,7 +91,6 @@ public class Transaction {
}
private final LinkedList<StackElement> _stack;
private static AtomicLong s_id = new AtomicLong();
private long _id;
private final LinkedList<Pair<String, Long>> _lockTimes = new LinkedList<Pair<String, Long>>();
@ -100,15 +101,10 @@ public class Transaction {
private final short _dbId;
private long _txnTime;
private Statement _stmt;
private final Merovingian _lockMaster;
private String _creator;
private Transaction _prev = null;
public Merovingian getLockMaster() {
return _lockMaster;
}
public static Transaction currentTxn() {
Transaction txn = tls.get();
assert txn != null : "No Transaction on stack. Did you mark the method with @DB?";
@ -308,7 +304,6 @@ public class Transaction {
_stack = new LinkedList<StackElement>();
_txn = false;
_dbId = databaseId;
_lockMaster = forLocking ? null : new Merovingian(_dbId);
_id = s_id.incrementAndGet();
_creator = Thread.currentThread().getName();
}
@ -347,15 +342,11 @@ public class Transaction {
}
public boolean lock(final String name, final int timeoutSeconds) {
assert (_lockMaster != null) : "Nah nah nah....you can't call lock if you are the lock!";
return _lockMaster.acquire(name, timeoutSeconds);
return s_lockMaster.acquire(name, timeoutSeconds);
}
public boolean release(final String name) {
assert (_lockMaster != null) : "Nah nah nah....you can't call lock if you are the lock!";
return _lockMaster.release(name);
return s_lockMaster.release(name);
}
public void start() {
@ -597,9 +588,7 @@ public class Transaction {
closeConnection();
_stack.clear();
if (_lockMaster != null) {
_lockMaster.clear();
}
s_lockMaster.cleanupThread();
}
public void close() {
@ -929,7 +918,6 @@ public class Transaction {
_stack = null;
_txn = false;
_dbId = -1;
_lockMaster = null;
}
@Override

4
utils/test/com/cloud/utils/db/Merovingian2Test.java
View File

@ -31,12 +31,12 @@ public class Merovingian2Test extends TestCase {
@Override @Before
protected void setUp() throws Exception {
_lockMaster.clear();
_lockMaster.cleanupThisServer();
}
@Override @After
protected void tearDown() throws Exception {
_lockMaster.clear();
_lockMaster.cleanupThisServer();
}
@Test