Branch: refs/heads/release/jon3.3.x
Home: https://github.com/rhq-project/rhq
Commit: 3e4f9571733ea0c7867acf693efc5fc82110b41a
https://github.com/rhq-project/rhq/commit/3e4f9571733ea0c7867acf693efc5fc82…
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: 2014-08-19 (Tue, 19 Aug 2014)
Changed paths:
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/Install.java
M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Upgrade.java
Log Message:
-----------
[1127029] Agent [null] would like to connect to this server
The issue here is that 'rhqctl install' does not make provisions for an
existing agent on the machine. When installing an RHQ Server or Storage
Node it is then expected that RHQ components be managed by the rhqctl
facility. This is made possible when upgrading from pre-rhqctl versions
by the 'rhqctl upgrade' --from-server-dir and --from-agent-dir options,
which allow an upgrade to "pull in" the existing components on the machine.
The missing use case is this one, when not upgrading but rather installing.
So, this commit adds the --from-agent-dir option to 'rhqctl install'.
Allowing a formerly installed RHQ Agent to be updated (as needed) and
pulled under rhqctl, moving it to the expected location of sibling
directory to the rhq-server installation directory (and not installing
a new agent, which caused the reported issue)
- Also, fix an issue in 'rhqctl upgrade --from-agent-dir' where the new
agent was not actually moved to the proper sibling directory. I believe
this affected RHQ 4.12 (and possibly JON 3.2)
Cherry-pick master: 1106141fb59aefa027602c138f59b33f4347466a
Branch: refs/heads/rc/jon3.3.0.ER01
Home: https://github.com/rhq-project/rhq
Commit: ee293f8361ce549bc58d44a1678e1f31c3422b73
https://github.com/rhq-project/rhq/commit/ee293f8361ce549bc58d44a1678e1f31c…
Author: Michael Burman <miburman(a)redhat.com>
Date: 2014-08-19 (Tue, 19 Aug 2014)
Changed paths:
M modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
Log Message:
-----------
[BZ 1095970] Reapplying patch to fix incorrect sequence name
Commit: bd08052a6a6b66ff1953a5682fba33a7f13767e6
https://github.com/rhq-project/rhq/commit/bd08052a6a6b66ff1953a5682fba33a7f…
Author: Simeon Pinder <spinder(a)redhat.com>
Date: 2014-08-19 (Tue, 19 Aug 2014)
Changed paths:
M modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataParser.java
M modules/core/client-api/src/main/java/org/rhq/core/clientapi/descriptor/AgentPluginDescriptorUtil.java
M modules/core/client-api/src/main/resources/rhq-plugin.xsd
M modules/core/dbutils/pom.xml
M modules/core/dbutils/src/main/scripts/dbsetup/content-schema.xml
M modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
M modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleType.java
M modules/core/domain/src/main/java/org/rhq/core/domain/bundle/ResourceTypeBundleConfiguration.java
M modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceGroupCriteria.java
M modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceTypeCriteria.java
M modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java
M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/bundle/deploy/BundleDeployWizard.java
M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/bundle/deploy/GetDestinationStep.java
M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/bundle/deploy/selection/SingleCompatibleResourceGroupSelector.java
M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/bundle/list/BundleView.java
M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/bundle/list/BundlesListView.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBean.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java
M modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
Log Message:
-----------
[BZ 1069547] Limit the choice of resource groups and destinations
based on the bundle type.
Conflicts:
modules/core/dbutils/pom.xml
modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
Commit: c4d2810d7d125b61f9aeda1f10527f305f710166
https://github.com/rhq-project/rhq/commit/c4d2810d7d125b61f9aeda1f10527f305…
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: 2014-08-19 (Tue, 19 Aug 2014)
Changed paths:
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBean.java
Log Message:
-----------
[BZ 1069547] Fixing the broken change detection when updating bundle types.
Compare: https://github.com/rhq-project/rhq/compare/018ddb5d8580...c4d2810d7d12
Branch: refs/heads/master
Home: https://github.com/rhq-project/rhq
Commit: f03575f1888abfee0552c24f1d6179c91331f19f
https://github.com/rhq-project/rhq/commit/f03575f1888abfee0552c24f1d6179c91…
Author: Michael Burman <miburman(a)redhat.com>
Date: 2014-08-19 (Tue, 19 Aug 2014)
Changed paths:
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/Install.java
M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Upgrade.java
M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/util/ExecutorAssist.java
Log Message:
-----------
[BZ 1128003] Abort installation if there is an error during the rhq.ear installation
Branch: refs/heads/storage_workflow
Home: https://github.com/rhq-project/rhq
Commit: 6f4c916d4aef2629e9f73a8f0bcc6eea1ad2308b
https://github.com/rhq-project/rhq/commit/6f4c916d4aef2629e9f73a8f0bcc6eea1…
Author: John Sanda <jsanda(a)redhat.com>
Date: 2014-08-19 (Tue, 19 Aug 2014)
Changed paths:
M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/storage/FakeStepRunner.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/maintenance/job/DeployCalculator.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/AnnounceStorageNode.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/BaseStepRunner.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/DeleteStorageNode.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/MaintenanceStepRunner.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/ResourceOperationStepRunner.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/ShutdownStorageClient.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/StartStorageClient.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/StepFailureStrategy.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/UpdateSchema.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/UpdateStorageNodeEndpoints.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/UpdateStorageNodeEntity.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/UpdateStorageNodeStatus.java
Log Message:
-----------
[BZ 1120418] abort failed announce job when announce operation fails
The failed step job includes running announce followed by repair. If announce
fails, then it most likely means that the node and/or agent is down, in which
case repair will fail as well. Normally the announce step has a failure
strategy of continue, but in the case of the failed announce job we want to
abort.
I have changed StepRunner to support this use case. The exceute() method no
longer takes a MaintenanceStep argument. There is now a setter for the step.
This makes the step and its configuration more easily available to the
getFailureStrategy() method.
Branch: refs/heads/master
Home: https://github.com/rhq-project/rhq
Commit: a3d337d52b7a9b573aa1b547bbf0e0c01599d828
https://github.com/rhq-project/rhq/commit/a3d337d52b7a9b573aa1b547bbf0e0c01…
Author: Thomas Segismont <tsegismo(a)redhat.com>
Date: 2014-08-19 (Tue, 19 Aug 2014)
Changed paths:
M modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
Log Message:
-----------
JON3-7 doc: do not confuse EAP server group and bundle destination resource group