[rhq-project/rhq] 492194: [1079027] Storage Node (un)deployment can cause de...

Branch: refs/heads/master Home: https://github.com/rhq-project/rhq Commit: 4921949e2e203015cf09f699b5d7a1352daab3a0 https://github.com/rhq-project/rhq/commit/4921949e2e203015cf09f699b5d7a13... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2014-03-20 (Thu, 20 Mar 2014) Changed paths: M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerLocal.java Log Message: ----------- [1079027] Storage Node (un)deployment can cause deadlock in rhq_storage_node table Initial commit that attempts to remove umbrella transactions starting at many entry points, such that scheduling operations happens in their own trans context. Needs review and testing... Commit: b6e70d104756db633df7b4ff642c29e3fad81d2b https://github.com/rhq-project/rhq/commit/b6e70d104756db633df7b4ff642c29e... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2014-03-21 (Fri, 21 Mar 2014) Changed paths: M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossLocal.java Log Message: ----------- Transaction delimiters have been updatedin StorageNode beans to try and prevent db-locking issues. This caused a problem for storage node deployment during mergeInventory, because it relied on an umbrella transaction providing a persisted (but not yet committed) Resource. Added a general mechanism for performing post-commit actions on newly merged resources and leveraged it to perform linking a StorageNode to a Resource. Commit: 710c93131f44dc32ab7397dafdec23c086dc2758 https://github.com/rhq-project/rhq/commit/710c93131f44dc32ab7397dafdec23c... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2014-03-21 (Fri, 21 Mar 2014) Changed paths: M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java Log Message: ----------- Make sure StorageNode is committed before we try and deploy it. Commit: b8523c3bc2bc09eb7a9ce09005ded4a4a9cd364a https://github.com/rhq-project/rhq/commit/b8523c3bc2bc09eb7a9ce09005ded4a... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2014-03-21 (Fri, 21 Mar 2014) Changed paths: M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java Log Message: ----------- More changes to LinkStorageNode to try and get the transactioning right. Commit: 919604ca697644ecf9fc8109395ecac9d21d781c https://github.com/rhq-project/rhq/commit/919604ca697644ecf9fc8109395ecac... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2014-03-31 (Mon, 31 Mar 2014) Changed paths: M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java Log Message: ----------- [1079027] Storage Node (un)deployment can cause deadlock in rhq_storage_node table Fix issue with new transactioning that left some entity changes uncommitted. Commit: a8ba17c7e52518a3086d1e94a099e281c799eeca https://github.com/rhq-project/rhq/commit/a8ba17c7e52518a3086d1e94a099e28... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2014-03-31 (Mon, 31 Mar 2014) Changed paths: M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerLocal.java Log Message: ----------- Merge branch 'jshaughn/storage' Conflicts: modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java Compare: https://github.com/rhq-project/rhq/compare/ca99ddfb1ccf...a8ba17c7e525