Branch: refs/heads/master
Home: https://github.com/rhq-project/rhq
Commit: ed149e572d7a063ad69d45a47aa97126180ebd4d
https://github.com/rhq-project/rhq/commit/ed149e572d7a063ad69d45a47aa971261…
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: 2014-03-18 (Tue, 18 Mar 2014)
Changed paths:
M modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/discovery/DiscoveryAgentService.java
M modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryContextImpl.java
M modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBeanTest.java
M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/configuration/LargeGroupPluginConfigurationTest.java
M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/TestAgentClient.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
Log Message:
-----------
[1073201] revision due to regression
When updating plugin config we added an optimization to root the ensuing
service discovery at the resource being updated, as opposed to doing a
full service scan. The regression resulted from passing the attached
Resource to the agent. Never pass attached objects to the agent from
the server. Unfortunately, detaching the object was not viable as it
actually needed to stay attached for the overall logic flow. So, I
lightened the API to just require the resourceId, which is a better agent
API anyway.
Branch: refs/heads/master
Home: https://github.com/rhq-project/rhq
Commit: 9f398847849dd5b9f7f94f66719bd95663caa096
https://github.com/rhq-project/rhq/commit/9f398847849dd5b9f7f94f66719bd9566…
Author: John Mazzitelli <mazz(a)redhat.com>
Date: 2014-03-18 (Tue, 18 Mar 2014)
Changed paths:
M .classpath
M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/AdministrationView.java
M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/agent/install/RemoteAgentInstallView.java
M modules/enterprise/server/jar/pom.xml
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/RemoteInstallManagerBean.java
Log Message:
-----------
BZ 1070242 - get remote agent install into non-RHQ product builds.
had to upgrade jsch version to fix a bug that manifested itself as "verify: false" errors that only occurred sometimes. Apparently was a known issue and is fixed in jsch 0.1.51
Branch: refs/heads/master
Home: https://github.com/rhq-project/rhq
Commit: 65e78e6280ca54db1e659c47f6f77a603559ce42
https://github.com/rhq-project/rhq/commit/65e78e6280ca54db1e659c47f6f77a603…
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: 2014-03-17 (Mon, 17 Mar 2014)
Changed paths:
M modules/core/plugin-container-itest/src/test/java/org/rhq/core/pc/inventory/DiscoveryTest.java
M modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
M modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/RuntimeDiscoveryExecutor.java
Log Message:
-----------
[1073201] revisions due to test failures
- Go back to providing a full avail report if there are inventory sync
changes. This isn't really that inefficient agent-side because it's not
a full scan, but rather a full report. We still only check avail for
those resources that have not yet provided avail, and the regularly
scheduled checks.
- Don't just skip a service scan if one is in progress. We should scan again
from the top to guarantee nothing gets missed. So, instead, cancel the
current scan and add interrupt logic such that it reports what it has
discovered to that point. And then start a new scan.
- update Discoverytest to explcitly wait for discovery to complete, the
changes seem to have changed the dynamics of the test.
These changes still need to be monitored to ensure things are behaving...
Branch: refs/heads/feature/cumulative
Home: https://github.com/rhq-project/rhq
Commit: 79ba436411ed1492df422ffd650faf156dd12c91
https://github.com/rhq-project/rhq/commit/79ba436411ed1492df422ffd650faf156…
Author: Thomas Segismont <tsegismo(a)redhat.com>
Date: 2014-03-16 (Sun, 16 Mar 2014)
Changed paths:
M modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
Log Message:
-----------
Bug 1034218 - EAR subdeployments are not discovered for DomainDeployment
Added missing line: a subdeployent can be a child of a ManagedServer deployment
(cherry picked from commit d327d3ffccfdde166a746f42b542150fdd70d984)
Signed-off-by: Jirka Kremser <jkremser(a)redhat.com>
Commit: 9deb1dcdd2ee01d739f102f77b62def81e26b0ac
https://github.com/rhq-project/rhq/commit/9deb1dcdd2ee01d739f102f77b62def81…
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: 2014-03-16 (Sun, 16 Mar 2014)
Changed paths:
M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/storage/StorageNodeAlertHistoryView.java
Log Message:
-----------
[BZ 1005922] - Selecting grouped fired alerts in chosen time range does not work - When switching grouping on, the values of the range filter are stored and the filter is reset in order to fetch all the data (when grouping is on, no filtering can be applied). Similarly, when switching it off, the values are loaded from previously saved filter and applied as start/end date for filtering of alerts.
(cherry picked from commit 85e1e11584d9d0327e9435624abcc38110d6bd6d)
Signed-off-by: Mike Thompson <mithomps(a)redhat.com>
Conflicts:
modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/storage/StorageNodeAlertHistoryView.java
Commit: 152b37228e0dacb473af7d0ef67fc7a83e4327ab
https://github.com/rhq-project/rhq/commit/152b37228e0dacb473af7d0ef67fc7a83…
Author: Simeon Pinder <spinder(a)fulliautomatix.conchfritter.com>
Date: 2014-03-16 (Sun, 16 Mar 2014)
Changed paths:
M pom.xml
Log Message:
-----------
Increment apache commons fileupload to 1.3.1.
Compare: https://github.com/rhq-project/rhq/compare/64aff86db65f...152b37228e0d
Branch: refs/heads/feature/cumulative
Home: https://github.com/rhq-project/rhq
Commit: 2c35d70113181480825054f750f5c28347c06bb1
https://github.com/rhq-project/rhq/commit/2c35d70113181480825054f750f5c2834…
Author: Simeon Pinder <spinder(a)fulliautomatix.conchfritter.com>
Date: 2014-03-10 (Mon, 10 Mar 2014)
Changed paths:
M pom.xml
Log Message:
-----------
Root pom should still use project.version
Commit: 64aff86db65f997c3d9deb3921c46bf4e6126edd
https://github.com/rhq-project/rhq/commit/64aff86db65f997c3d9deb3921c46bf4e…
Author: Simeon Pinder <spinder(a)fulliautomatix.conchfritter.com>
Date: 2014-03-13 (Thu, 13 Mar 2014)
Changed paths:
M etc/apt/pom.xml
M modules/enterprise/agent/ant-run.xml
M modules/enterprise/agent/pom.xml
M modules/enterprise/server/ear/pom.xml
M modules/integration-tests/apache-plugin-test/pom.xml
M modules/integration-tests/mod_cluster-plugin-test/pom.xml
M modules/plugins/aliases/pom.xml
M modules/plugins/ant-bundle/pom.xml
M modules/plugins/apache/pom.xml
M modules/plugins/augeas/pom.xml
M modules/plugins/byteman/pom.xml
M modules/plugins/cobbler/pom.xml
M modules/plugins/cron/pom.xml
M modules/plugins/filetemplate-bundle/pom.xml
M modules/plugins/grub/pom.xml
M modules/plugins/hibernate/pom.xml
M modules/plugins/hosts/pom.xml
M modules/plugins/iis/pom.xml
M modules/plugins/iptables/pom.xml
M modules/plugins/jboss-as-5/pom.xml
M modules/plugins/jboss-as-5/testsuite/pom.xml
M modules/plugins/jboss-as/pom.xml
M modules/plugins/jboss-cache-v3/pom.xml
M modules/plugins/jboss-cache/pom.xml
M modules/plugins/jdbctrace/pom.xml
M modules/plugins/jira/pom.xml
M modules/plugins/jmx/pom.xml
M modules/plugins/lsof/pom.xml
M modules/plugins/mysql/pom.xml
M modules/plugins/netservices/pom.xml
M modules/plugins/platform/pom.xml
M modules/plugins/pom.xml
M modules/plugins/postfix/pom.xml
M modules/plugins/postgres/pom.xml
M modules/plugins/rhq-agent/pom.xml
M modules/plugins/rhq-server/pom.xml
M modules/plugins/rhq-storage/pom.xml
M modules/plugins/samba/pom.xml
M modules/plugins/script/pom.xml
M modules/plugins/sshd/pom.xml
M modules/plugins/sudoers/pom.xml
M modules/plugins/tomcat/pom.xml
M modules/plugins/validate-all-plugins/pom.xml
M pom.xml
Log Message:
-----------
Add independent versioning for script and platform modules.
Compare: https://github.com/rhq-project/rhq/compare/feaad7acdba0...64aff86db65f
Branch: refs/heads/master
Home: https://github.com/rhq-project/rhq
Commit: cdc471aee9fd89f9a5226a19f92e0bdfb0a11f3a
https://github.com/rhq-project/rhq/commit/cdc471aee9fd89f9a5226a19f92e0bdfb…
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: 2014-03-16 (Sun, 16 Mar 2014)
Changed paths:
M modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceErrorType.java
M modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
Log Message:
-----------
[1073201] Agent does a discovery loop if the inventory contains an unknown resource
It's possible to disable a plugin on an agent after resources of that plugin's
types are already in server-side inventory. The server will report those
resources to the agent during an inventory sync. The agent will treat them
as "unknown" resources because those resources will not have containers.
This fixes the handling for unknown resources with disabled resource types.
It ensures they are not merged into agent-side inventory and also do not
trigger further discovery scans. Additionally, it now generates a
ResourceError for the server-side resource to help notify the user that the
resource is no longer being managed, and should be uninventoried. Only
uninventory will stop the inventory sync overhead.
Commit: 72550f24284c25f467107b920f94770041dae117
https://github.com/rhq-project/rhq/commit/72550f24284c25f467107b920f9477004…
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: 2014-03-16 (Sun, 16 Mar 2014)
Changed paths:
M modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/discovery/DiscoveryAgentService.java
M modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
M modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java
M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBeanTest.java
M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/configuration/LargeGroupPluginConfigurationTest.java
M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/TestAgentClient.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
Log Message:
-----------
[1073201] Agent does a discovery loop if the inventory contains an unknown resource
Patch supplied by <elias_ross(a)apple.com>. The patch worked around the issue
although in a prior commit I put in a fix for the core issue. But the patch
is also useful. I'm applying parts of it, manually, as applying it verbatim
was not applicable after my initial change.
Thanks Elias!
-----------------------------------
Original Patch Comment:
The main fix is keeping a reference to the scheduled service rescan Future and
prevent a scan from being scheduled again before execution. This also has
executeServiceScanDeferred() work the same way.
The other related fixes are for:
1) Only do availability checking for synched/merged/deleted resources, not a
full scan. As we have the references for this, it seems worthwhile to prevents
lots of scans (and overloading the server) if an unknown resource shows up.
2) Concurrency. Setters/getters should be synchronized if accessed across threads.
3) Use 0 for scan time, as we can then avoid getting system time.
4) In cases Executor.submit(Callable) is used and Future isn't needed, use
Runnable instead.
-----------------------------------
A couple of modifications:
- set availabilityCheck time to 1, as opposed to 0, because 0 indicates
an initialized state and does not guarantee an avail check is perfomed.
- when requesting an avail check for an unknown resource, make it
recursive so the unknown children also get checked.
Additionally, now when updating plugin config, root the ensuing discovery at
the updated resource.
Compare: https://github.com/rhq-project/rhq/compare/fe43668a7239...72550f24284c