Skip to content

fix: release START_TXN nesting level on SQLException paths in GenericDaoBase sibling methods #13926

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

Open
waterWang wants to merge 1 commit into
base: main
Choose a base branch
from
+79 −33
Open

fix: release START_TXN nesting level on SQLException paths in GenericDaoBase sibling methods #13926

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
112 changes: 79 additions & 33 deletions framework/db/src/main/java/com/cloud/utils/db/GenericDaoBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -820,28 +820,37 @@ protected int update(ID id, UpdateBuilder ub, T entity) {
}
SearchCriteria<T> sc = createSearchCriteria();
sc.addAnd(_idAttributes.get(_table)[0], SearchCriteria.Op.EQ, id);
TransactionLegacy txn = TransactionLegacy.currentTxn();
txn.start();

final TransactionLegacy txn = TransactionLegacy.currentTxn();
boolean committed = false;
try {
if (ub.getCollectionChanges() != null) {
insertElementCollection(entity, _idAttributes.get(_table)[0], id, ub.getCollectionChanges());
txn.start();

try {
if (ub.getCollectionChanges() != null) {
insertElementCollection(entity, _idAttributes.get(_table)[0], id, ub.getCollectionChanges());
}
} catch (SQLException e) {
throw new CloudRuntimeException("Unable to persist element collection", e);
}
} catch (SQLException e) {
throw new CloudRuntimeException("Unable to persist element collection", e);
}

int rowsUpdated = update(ub, sc, null);
int rowsUpdated = update(ub, sc, null);

txn.commit();
txn.commit();
committed = true;

return rowsUpdated;
return rowsUpdated;
} finally {
if (!committed) {
txn.rollback();
}
}
}

public int update(UpdateBuilder ub, final SearchCriteria<?> sc, Integer rows) {
StringBuilder sql = null;
PreparedStatement pstmt = null;
final TransactionLegacy txn = TransactionLegacy.currentTxn();
boolean committed = false;
try {
final String searchClause = sc.getWhereClause();

Expand Down Expand Up @@ -872,12 +881,17 @@ public int update(UpdateBuilder ub, final SearchCriteria<?> sc, Integer rows) {

int result = pstmt.executeUpdate();
txn.commit();
committed = true;
ub.clear();
return result;
} catch (final SQLException e) {
logger.error("DB Exception on: " + pstmt, e);
handleEntityExistsException(e);
throw new CloudRuntimeException("Unable to update on DB, due to: " + e.getLocalizedMessage());
} finally {
if (!committed) {
txn.rollback();
}
}
}

Expand Down Expand Up @@ -1266,6 +1280,7 @@ public boolean expunge(final ID id) {
final TransactionLegacy txn = TransactionLegacy.currentTxn();
PreparedStatement pstmt = null;
String sql = null;
boolean committed = false;
try {
txn.start();
for (final Pair<String, Attribute[]> deletSql : _deleteSqls) {
Expand All @@ -1281,13 +1296,18 @@ public boolean expunge(final ID id) {
}

txn.commit();
committed = true;
if (_cache != null) {
_cache.remove(id);
}
return true;
} catch (final SQLException e) {
logger.error("DB Exception on: " + pstmt, e);
throw new CloudRuntimeException("Unable to expunge on DB, due to: " + e.getLocalizedMessage());
} finally {
if (!committed) {
txn.rollback();
}
}
}

Expand Down Expand Up @@ -1688,34 +1708,42 @@ public T persist(final T entity) {

protected void insertElementCollection(T entity, Attribute idAttribute, ID id, Map<Attribute, Object> ecAttributes) throws SQLException {
TransactionLegacy txn = TransactionLegacy.currentTxn();
txn.start();
for (Map.Entry<Attribute, Object> entry : ecAttributes.entrySet()) {
Attribute attr = entry.getKey();
Object obj = entry.getValue();

EcInfo ec = (EcInfo)attr.attache;
Enumeration<?> en = null;
if (ec.rawClass == null) {
en = Collections.enumeration(Arrays.asList((Object[])obj));
} else {
en = Collections.enumeration((Collection)obj);
}
PreparedStatement pstmt = txn.prepareAutoCloseStatement(ec.clearSql);
prepareAttribute(1, pstmt, idAttribute, id);
pstmt.executeUpdate();
boolean committed = false;
try {
txn.start();
for (Map.Entry<Attribute, Object> entry : ecAttributes.entrySet()) {
Attribute attr = entry.getKey();
Object obj = entry.getValue();

while (en.hasMoreElements()) {
pstmt = txn.prepareAutoCloseStatement(ec.insertSql);
if (ec.targetClass == Date.class) {
pstmt.setString(1, DateUtil.getDateDisplayString(s_gmtTimeZone, (Date)en.nextElement()));
EcInfo ec = (EcInfo)attr.attache;
Enumeration<?> en = null;
if (ec.rawClass == null) {
en = Collections.enumeration(Arrays.asList((Object[])obj));
} else {
pstmt.setObject(1, en.nextElement());
en = Collections.enumeration((Collection)obj);
}
prepareAttribute(2, pstmt, idAttribute, id);
PreparedStatement pstmt = txn.prepareAutoCloseStatement(ec.clearSql);
prepareAttribute(1, pstmt, idAttribute, id);
pstmt.executeUpdate();

while (en.hasMoreElements()) {
pstmt = txn.prepareAutoCloseStatement(ec.insertSql);
if (ec.targetClass == Date.class) {
pstmt.setString(1, DateUtil.getDateDisplayString(s_gmtTimeZone, (Date)en.nextElement()));
} else {
pstmt.setObject(1, en.nextElement());
}
prepareAttribute(2, pstmt, idAttribute, id);
pstmt.executeUpdate();
}
}
txn.commit();
committed = true;
} finally {
if (!committed) {
txn.rollback();
}
}
txn.commit();
}

@DB()
Expand Down Expand Up @@ -2018,15 +2046,21 @@ public void expunge() {
sql.append(_table).append(" WHERE ").append(_removed.first()).append(" IS NOT NULL");
final TransactionLegacy txn = TransactionLegacy.currentTxn();
PreparedStatement pstmt = null;
boolean committed = false;
try {
txn.start();
pstmt = txn.prepareAutoCloseStatement(sql.toString());

pstmt.executeUpdate();
txn.commit();
committed = true;
} catch (final SQLException e) {
logger.error("DB Exception on: " + pstmt, e);
throw new CloudRuntimeException("Unable to expunge on DB, due to: " + e.getLocalizedMessage());
} finally {
if (!committed) {
txn.rollback();
}
}
}

Expand All @@ -2038,6 +2072,7 @@ public boolean unremove(ID id) {

final TransactionLegacy txn = TransactionLegacy.currentTxn();
PreparedStatement pstmt = null;
boolean committed = false;
try {
txn.start();
pstmt = txn.prepareAutoCloseStatement(_removeSql.first());
Expand All @@ -2049,13 +2084,18 @@ public boolean unremove(ID id) {

final int result = pstmt.executeUpdate();
txn.commit();
committed = true;
if (_cache != null) {
_cache.remove(id);
}
return result > 0;
} catch (final SQLException e) {
logger.error("DB Exception on: " + pstmt, e);
throw new CloudRuntimeException("Unable to unremove on DB, due to: " + e.getLocalizedMessage());
} finally {
if (!committed) {
txn.rollback();
}
}
}

Expand Down Expand Up @@ -2087,6 +2127,7 @@ public boolean remove(final ID id) {

final TransactionLegacy txn = TransactionLegacy.currentTxn();
PreparedStatement pstmt = null;
boolean committed = false;
try {

txn.start();
Expand All @@ -2099,13 +2140,18 @@ public boolean remove(final ID id) {

final int result = pstmt.executeUpdate();
txn.commit();
committed = true;
if (_cache != null) {
_cache.remove(id);
}
return result > 0;
} catch (final SQLException e) {
logger.error("DB Exception on: " + pstmt, e);
throw new CloudRuntimeException("Unable to remove on DB, due to: " + e.getLocalizedMessage());
} finally {
if (!committed) {
txn.rollback();
}
}
}

Expand Down