etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge release branch 4.8 to 4.9 

* 4.8:
  CLOUDSTACK-9460: For long running transactions, if the connection is timed out by the mysql server then refresh it
This commit is contained in:
John Burwell 2016-11-17 00:54:38 -05:00
parent dc1a7b4338 8c3ca15995
commit 22d074607c
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
framework/db/src/com/cloud/utils/db/TransactionLegacy.java
View File

@ -168,7 +168,7 @@ public class TransactionLegacy implements Closeable {
isNew = true;
}
}
txn.checkConnection();
txn.takeOver(name, false);
if (isNew) {
s_mbean.addTransaction(txn);
@ -176,6 +176,16 @@ public class TransactionLegacy implements Closeable {
return txn;
}
public void checkConnection() {
try {
if (_conn != null && !_conn.isValid(3)) {
_conn = null;
}
} catch (SQLException e) {
_conn = null;
}
}
protected StackElement peekInStack(Object obj) {
final Iterator<StackElement> it = _stack.iterator();
while (it.hasNext()) {