[rhq-project/rhq] 459276: Move purge settings to a new "Advanced Purge Setti...

Friday, 14 November 2014

  Branch: refs/heads/master
  Home:   https://github.com/rhq-project/rhq
  Commit: 459276ab1fb921b1d49aa4cf212904a5bcc1c10d
      https://github.com/rhq-project/rhq/commit/459276ab1fb921b1d49aa4cf212904a...
  Author: Thomas Segismont <tsegismo(a)redhat.com&gt;
  Date:   2014-10-16 (Thu, 16 Oct 2014)

  Changed paths:
    M
modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/SystemSettingsView.java
    M
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages.properties
    M
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_cs.properties
    M
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_de.properties
    M
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ja.properties
    M
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ko.properties
    M
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_pt.properties
    M
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ru.properties
    M
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_zh.properties

  Log Message:
  -----------
  Move purge settings to a new "Advanced Purge Settings" group (hidden by
default)

  Commit: 1bbf842f5177d5866e444b54ff12ee0fcf8a3fbd
      https://github.com/rhq-project/rhq/commit/1bbf842f5177d5866e444b54ff12ee0...
  Author: Thomas Segismont <tsegismo(a)redhat.com&gt;
  Date:   2014-10-16 (Thu, 16 Oct 2014)

  Changed paths:
    M modules/core/dbutils/pom.xml
    M modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml
    M modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
    M
modules/core/domain/src/main/java/org/rhq/core/domain/common/composite/SystemSetting.java
    M
modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/SystemSettingsView.java
    M
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages.properties
    M
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_cs.properties
    M
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_de.properties
    M
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ja.properties
    M
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ko.properties
    M
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_pt.properties
    M
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ru.properties
    M
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_zh.properties
    M
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/scheduler/jobs/DataPurgeJobTest.java
    A
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/purge/PartitionEventDetailsPurge.java
    A
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/purge/PartitionEventPurge.java
    M
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/purge/PurgeManagerBean.java
    M
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/purge/PurgeManagerLocal.java
    M
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/DataPurgeJob.java

  Log Message:
  -----------
  Bug 1145776 - RHQ_PARTITION_EVENT data not purged automatically

Added partition event and partition event details purge
It's disabled by default and configurable through System Settings.

Added partition event test in DataPurgeJobTest

Also, refactoring DataPurgeJob and DataPurgeJobTest

  Commit: a30e115bfbcca665342df5a2a08a7293b37a00cb
      https://github.com/rhq-project/rhq/commit/a30e115bfbcca665342df5a2a08a729...
  Author: Thomas Segismont <tsegismo(a)redhat.com&gt;
  Date:   2014-10-16 (Thu, 16 Oct 2014)

  Changed paths:
    M modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceError.java
    A
modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceErrorTypeComposite.java
    M
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java
    M
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerLocal.java
    M
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/DataPurgeJob.java

  Log Message:
  -----------
  Bug 1139433 - Deadlock in deletion of RHQ_RESOURCE_ERROR, possibly in resource upgrade?

When saving a resource error, we first delete existing errors if the error type is one
of:
* INVALID_PLUGIN_CONFIGURATION
* AVAILABILITY_CHECK
* UPGRADE
I'm not sure why we don't if the error type is DISABLED_TYPE.

The goal is to keep only one copy of these error types.

Here's my analysis of the deadlock report attached to the BZ.

Due to the type of locks (row locks) and the queries involved, it looks like the deadlock
is the consequence of concurrent calls to
ResourceManagerBean#clearResourceConfigErrorByType with the same parameters. Such
concurrent calls would not necessarily lead to a deadlock. It would happen only if the row
locking order is different. My knowledge of Oracle is limited but I'd say this is
possible if the two queries get a different execution plan. I tried to figure out why the
same query could lead to a different execution plan and one possible reason would be that
one is using the index on resourceId and the other one is not.

This commit addresses the issue by changing the way previous errors are deleted. Now
before delete we select an ordered list of primary keys. Then we delete the rows by
primary key. Consequently, two competing sessions will never lock rows in different
orders.

There's another issue due to the way resource errors are implemented. Two competing
sessions will delete previous errors but both will insert a row. A DataPurgeJob task has
been added to remove such duplicates, if any.

  Commit: 830ecfb90e402263f1d1b0cbcfd48a4c132de2c9
      https://github.com/rhq-project/rhq/commit/830ecfb90e402263f1d1b0cbcfd48a4...
  Author: Thomas Segismont <tsegismo(a)redhat.com&gt;
  Date:   2014-10-16 (Thu, 16 Oct 2014)

  Changed paths:
    M modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceError.java
    M
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java

  Log Message:
  -----------
  Bug 1139433 - Deadlock in deletion of RHQ_RESOURCE_ERROR, possibly in resource upgrade?

I checked Git history. From the looks of it, DISABLED_TYPE was added later in the game.
To me there's no reason why we let more than DISABLED_TYPE error per resource be
persisted.

  Commit: 618a60a471995743d5c2cfbd2df47a8846cc2c9a
      https://github.com/rhq-project/rhq/commit/618a60a471995743d5c2cfbd2df47a8...
  Author: Thomas Segismont <tsegismo(a)redhat.com&gt;
  Date:   2014-10-16 (Thu, 16 Oct 2014)

  Changed paths:
    M modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceError.java
    M
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java
    M
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerLocal.java
    M
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/DataPurgeJob.java

  Log Message:
  -----------
  Bug 1145778 - Purge RHQ_RESOURCE_ERROR table as well

The fix for "Bug 1139433 - Deadlock in deletion of RHQ_RESOURCE_ERROR, possibly in
resource upgrade?" enforces "only single error of a type for a given
resource".

This change is to clear stale AVAILABILITY_CHECK errors (if a resource AVAIL is up, then
there's no need to keep the resource error)

* INVALID_PLUGIN_CONFIGURATION -> auto cleaned when the agent starts the resource
container.
* UPGRADE -> we need to keep it to inform the user
* DISABLED_TYPE -> we need to keep it to inform the user

  Commit: 1f08ab39a69fab1c25893b323b41935921c9c7a3
      https://github.com/rhq-project/rhq/commit/1f08ab39a69fab1c25893b323b41935...
  Author: Thomas Segismont <tsegismo(a)redhat.com&gt;
  Date:   2014-10-16 (Thu, 16 Oct 2014)

  Changed paths:
    M modules/core/dbutils/pom.xml
    M modules/core/dbutils/src/main/scripts/dbsetup/inventory-schema.xml
    M modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml
    M modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
    M
modules/core/domain/src/main/java/org/rhq/core/domain/common/composite/SystemSetting.java
    M
modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/SystemSettingsView.java
    M
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages.properties
    M
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_cs.properties
    M
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_de.properties
    M
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ja.properties
    M
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ko.properties
    M
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_pt.properties
    M
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ru.properties
    M
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_zh.properties
    M
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/scheduler/jobs/DataPurgeJobTest.java
    A
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/purge/GroupResourceConfigurationUpdatePurge.java
    M
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/purge/PurgeManagerBean.java
    M
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/purge/PurgeManagerLocal.java
    A
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/purge/ResourceConfigurationUpdateFromGroupPurge.java
    A
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/purge/ResourceConfigurationUpdatePurge.java
    M
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/DataPurgeJob.java

  Log Message:
  -----------
  Bug 1131726 - Data from RHQ_CONFIG_UPDATE never purged

Remove old resource config and group resource config updates from the
database.

The configuration and configuration properties entities get removed as
well.

An old config update may stay in the database if it is the last successful one.

An old group config update may stay in the database if one of the
children config update is the last succesful one for the target resource.

  Commit: 8efb4f275b98d85a8bee2f12110dd955a1ebf67c
      https://github.com/rhq-project/rhq/commit/8efb4f275b98d85a8bee2f12110dd95...
  Author: Libor Zoubek <lzoubek(a)redhat.com&gt;
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M modules/core/dbutils/pom.xml
    M modules/core/dbutils/src/main/scripts/dbsetup/inventory-schema.xml
    M modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml
    M modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
    M
modules/core/domain/src/main/java/org/rhq/core/domain/common/composite/SystemSetting.java
    M modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceError.java
    A
modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceErrorTypeComposite.java
    M
modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/SystemSettingsView.java
    M
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages.properties
    M
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_cs.properties
    M
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_de.properties
    M
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ko.properties
    M
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_pt.properties
    M
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_zh.properties
    M
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/scheduler/jobs/DataPurgeJobTest.java
    A
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/purge/GroupResourceConfigurationUpdatePurge.java
    A
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/purge/PartitionEventDetailsPurge.java
    A
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/purge/PartitionEventPurge.java
    M
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/purge/PurgeManagerBean.java
    M
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/purge/PurgeManagerLocal.java
    A
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/purge/ResourceConfigurationUpdateFromGroupPurge.java
    A
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/purge/ResourceConfigurationUpdatePurge.java
    M
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java
    M
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerLocal.java
    M
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/DataPurgeJob.java

  Log Message:
  -----------
  Merge branch 'purgepurgepurge' of https://github.com/tsegismont/rhq into
tsegismont-purgepurgepurge

Conflicts:
	modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
	modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_de.properties
	modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ja.properties
	modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ru.properties

  Commit: a1fdfb18038c32746e14566420ac36754475713a
      https://github.com/rhq-project/rhq/commit/a1fdfb18038c32746e14566420ac367...
  Author: Libor Zoubek <lzoubek(a)redhat.com&gt;
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M modules/core/dbutils/pom.xml
    M modules/core/dbutils/src/main/scripts/dbsetup/inventory-schema.xml
    M modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml
    M modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
    M
modules/core/domain/src/main/java/org/rhq/core/domain/common/composite/SystemSetting.java
    M modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceError.java
    A
modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceErrorTypeComposite.java
    M
modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/SystemSettingsView.java
    M
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages.properties
    M
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_cs.properties
    M
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_de.properties
    M
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ko.properties
    M
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_pt.properties
    M
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_zh.properties
    M
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/scheduler/jobs/DataPurgeJobTest.java
    A
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/purge/GroupResourceConfigurationUpdatePurge.java
    A
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/purge/PartitionEventDetailsPurge.java
    A
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/purge/PartitionEventPurge.java
    M
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/purge/PurgeManagerBean.java
    M
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/purge/PurgeManagerLocal.java
    A
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/purge/ResourceConfigurationUpdateFromGroupPurge.java
    A
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/purge/ResourceConfigurationUpdatePurge.java
    M
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java
    M
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerLocal.java
    M
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/DataPurgeJob.java

  Log Message:
  -----------
  Merge branch 'tsegismont-purgepurgepurge'

Compare: https://github.com/rhq-project/rhq/compare/a49bc60a5d00...a1fdfb18038c

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

[rhq-project/rhq] 459276: Move purge settings to a new "Advanced Purge Setti...