Branch: refs/heads/hotfix/jon3.1.2 Home: https://github.com/rhq-project/rhq Commit: dbab1189aba8cb6ab60d2729d81f7fb93499180c https://github.com/rhq-project/rhq/commit/dbab1189aba8cb6ab60d2729d81f7fb... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2014-11-12 (Wed, 12 Nov 2014) Changed paths: M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertConditionLogManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertConditionManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertConditionManagerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/CachedConditionManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/CachedConditionManagerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/jms/AlertConditionConsumerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/instance/CacheConsistencyManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/instance/CacheConsistencyManagerLocal.java Log Message: ----------- [1159003] Alert notification sending fails due to database deadlock error Remove the umbrella Tx surrounding sending of alert notifications. It used to be that all notifications would be sent in one REQUIRES_NEW SLSB call. It was necessary to do this because the notifications were themselves sent within a larger, very heavy, umbrella Tx that involved the alert generation itself (among other things). Prior work restructured that logic and moved notification sending to a more logical place, executing after alert generation, cache update and recovery logic handling. But the prior work left the notification sending under a single transaction. This isn't really necessary or desirable. Each notification should be processed individually, not holding any resources past its execution, and persisting each notification log in its own Tx. Although not proven, the deadlock situation was likely caused when an alert definition defined multiple notifications, and one held resources required by another. Also, rename some local SLSB methods with "Tx" suffixes to better reflect their behavior. (cherry picked from commit 9485d519fffbcaa55f100c691def6b6cae2564d9) Conflicts: modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertConditionManagerBean.java modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java (cherry picked from commit 4dd2dfcb5936ab6a2459528a4aee805243442923)