Branch: refs/heads/storage_workflow
Home: https://github.com/rhq-project/rhq
Commit: ad71799a25e47b46eb128ab95b0c9122632ab3f7
https://github.com/rhq-project/rhq/commit/ad71799a25e47b46eb128ab95b0c91226…
Author: John Sanda <jsanda(a)redhat.com>
Date: 2014-08-18 (Mon, 18 Aug 2014)
Changed paths:
M modules/core/domain/src/main/java/org/rhq/core/domain/storage/MaintenanceStep.java
M modules/core/domain/src/test/java/org/rhq/core/domain/storage/MaintenanceStepTest.java
M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/storage/StorageClusterMaintenanceManagerBeanTest.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterMaintenanceManagerBean.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterMaintenanceManagerLocal.java
Log Message:
-----------
[BZ 1120418] remove recursive calls during job execution
One of my prior commits added support for continuing execution after a failed
step. It involved a recursive call which I really do not since it can be done
easily in an iterative way. The loadJob() method has also been updated to
eagerly load each step's configuration to avoid lazy init exceptions.
Branch: refs/heads/storage_workflow
Home: https://github.com/rhq-project/rhq
Commit: a17a9902a57b2af09841560d1cc695b85eb94ba0
https://github.com/rhq-project/rhq/commit/a17a9902a57b2af09841560d1cc695b85…
Author: John Sanda <jsanda(a)redhat.com>
Date: 2014-08-18 (Mon, 18 Aug 2014)
Changed paths:
M modules/core/domain/src/main/java/org/rhq/core/domain/storage/MaintenanceStep.java
M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/storage/StorageClusterMaintenanceManagerBeanTest.java
M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/storage/TestStepCalculator.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterMaintenanceManagerBean.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterMaintenanceManagerLocal.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/job/DeployCalculator.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/job/StepCalculator.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/job/UndeployCalculator.java
Log Message:
-----------
[BZ 1120418] schedule new job for failed step
This commit adds/fixes some logic for adding a new job to the queue for the
failed step. Any steps in the current job that are added or removed will be
persisted or deleted from the db respectively.
I also introduced logic to detect whether or not a job for the failed step is
already in the queue so that we do not keep adding duplicate jobs over and
over. This logic is not yet working as expected.
Branch: refs/heads/storage_workflow
Home: https://github.com/rhq-project/rhq
Commit: dbb749ef2b8d906b4c7a82a5be455767d7bb34f7
https://github.com/rhq-project/rhq/commit/dbb749ef2b8d906b4c7a82a5be455767d…
Author: John Sanda <jsanda(a)redhat.com>
Date: 2014-08-18 (Mon, 18 Aug 2014)
Changed paths:
M modules/common/cassandra-ccm/cassandra-ccm-arquillian/src/main/java/org/rhq/cassandra/ccm/arquillian/CCMSuiteDeploymentExtension.java
M modules/enterprise/server/itests-2/pom.xml
M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/storage/StorageClusterMaintenanceManagerBeanTest.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/DefaultCalculatorLookup.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterMaintenanceManagerBean.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterMaintenanceManagerLocal.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/job/DeployCalculator.java
Log Message:
-----------
[BZ 1120418] more refactoring for continuing job after failed step
A few things happen when there is a step failure, and we can continue the job.
We need to determine if any steps need to be added to or removed from the
current job and then make those changes in the database. Then we need to create
a new job for the failed step and add it to the job queue. Lastly, we need to
reload the current job to pick up any changes to it and resume execution.
Currently resuming execution is done via recursion which I don't like. I think
this can be refactored to be done iteratively without too much effort. I will
look to make that change in a subsequent commit after some more testing.
Branch: refs/heads/release/jon3.3.x
Home: https://github.com/rhq-project/rhq
Commit: e84427436990ff8229e9c6c66043f19046412ad1
https://github.com/rhq-project/rhq/commit/e84427436990ff8229e9c6c66043f1904…
Author: Libor Zoubek <lzoubek(a)redhat.com>
Date: 2014-08-18 (Mon, 18 Aug 2014)
Changed paths:
M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java
M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java
M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Console.java
M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Start.java
Log Message:
-----------
Bug 1113593 - Blank space around value of rhq.server.email.smtp-host
property in rhq-server.properties is not removed and causes
java.net.UnknownHostException when starting RHQ server
Added a check to rhqctl start & install commands that prints warnings in
case it finds lines with trailing spaces in rhq-server.properties file
(cherry picked from commit 8b3c5958208ab48b9a7c63e90824aa43a8b76958)
Signed-off-by: Libor Zoubek <lzoubek(a)redhat.com>
Branch: refs/heads/master
Home: https://github.com/rhq-project/rhq
Commit: 8b3c5958208ab48b9a7c63e90824aa43a8b76958
https://github.com/rhq-project/rhq/commit/8b3c5958208ab48b9a7c63e90824aa43a…
Author: Libor Zoubek <lzoubek(a)redhat.com>
Date: 2014-08-18 (Mon, 18 Aug 2014)
Changed paths:
M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java
M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java
M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Console.java
M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Start.java
Log Message:
-----------
Bug 1113593 - Blank space around value of rhq.server.email.smtp-host
property in rhq-server.properties is not removed and causes
java.net.UnknownHostException when starting RHQ server
Added a check to rhqctl start & install commands that prints warnings in
case it finds lines with trailing spaces in rhq-server.properties file
Branch: refs/heads/release/jon3.3.x
Home: https://github.com/rhq-project/rhq
Commit: 9c648e9445b06aafb5ba32a31af11b36660430d6
https://github.com/rhq-project/rhq/commit/9c648e9445b06aafb5ba32a31af11b366…
Author: Libor Zoubek <lzoubek(a)redhat.com>
Date: 2014-08-18 (Mon, 18 Aug 2014)
Changed paths:
M modules/core/plugin-container/src/main/java/org/rhq/core/pc/configuration/ConfigurationCheckExecutor.java
Log Message:
-----------
Bug 1129304 - Newly imported resources are not included in dynagroups which
use resourceConfiguration in expression for several hours
Fixed ConfigurationCheckExecutor which was due to typo (incorrectly nested
code inside if/else) not able to load configuration for all resources.
(cherry picked from commit c79d87fc02caabad3e7ad306f831d895644d2652)
Signed-off-by: Libor Zoubek <lzoubek(a)redhat.com>