[prev in list] [next in list] [prev in thread] [next in thread] 

List:       rhq-commits
Subject:    [rhq-project/rhq] a6597c: [1079027] Storage Node (un)deployment can cause de...
From:       Jay Shaughnessy <jshaughn () redhat ! com>
Date:       2014-05-27 20:30:33
Message-ID: 5384f5e970b06_51c0c65d40562b0 () hookshot-fe2-cp1-prd ! iad ! github ! net ! mail
[Download RAW message or body]

Branch: refs/heads/release/jon3.2.x
  Home:   https://github.com/rhq-project/rhq
  Commit: a6597c38bbe77fda9df9dd9a831b91aeed459fd5
      https://github.com/rhq-project/rhq/commit/a6597c38bbe77fda9df9dd9a831b91aeed459fd5
  Author: Jay Shaughnessy <jshaughn@redhat.com>
  Date:   2014-05-27 (Tue, 27 May 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...

Conflicts:
	modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java


Cherry-Pick master 4921949e2e203015cf09f699b5d7a1352daab3a0


  Commit: d413e07e6c129e7bafcfd468f0890eff50ee50ca
      https://github.com/rhq-project/rhq/commit/d413e07e6c129e7bafcfd468f0890eff50ee50ca
  Author: Jay Shaughnessy <jshaughn@redhat.com>
  Date:   2014-05-27 (Tue, 27 May 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.

Conflicts:
	modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java


Cherry-Pick master b6e70d104756db633df7b4ff642c29e3fad81d2b


  Commit: 5c4dc2d09b20d1eb73dbc2191920759d660b7c16
      https://github.com/rhq-project/rhq/commit/5c4dc2d09b20d1eb73dbc2191920759d660b7c16
  Author: Jay Shaughnessy <jshaughn@redhat.com>
  Date:   2014-05-27 (Tue, 27 May 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: 7a711090fbcc8effa86dc918e1e543568ad4d28f
      https://github.com/rhq-project/rhq/commit/7a711090fbcc8effa86dc918e1e543568ad4d28f
  Author: Jay Shaughnessy <jshaughn@redhat.com>
  Date:   2014-05-27 (Tue, 27 May 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.

Cherry-Pick master b8523c3bc2bc09eb7a9ce09005ded4a4a9cd364a


  Commit: e2363d24122bcf734ccf00e2b55c12a9b17cee29
      https://github.com/rhq-project/rhq/commit/e2363d24122bcf734ccf00e2b55c12a9b17cee29
  Author: Jay Shaughnessy <jshaughn@redhat.com>
  Date:   2014-05-27 (Tue, 27 May 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.

Cherry-Pick master 919604ca697644ecf9fc8109395ecac9d21d781c


Compare: https://github.com/rhq-project/rhq/compare/d0da89a6e214...e2363d24122b


[Attachment #3 (text/plain)]

_______________________________________________
rhq-commits mailing list
rhq-commits@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/rhq-commits


[prev in list] [next in list] [prev in thread] [next in thread]