diff --git a/etc/samples/mbeans-on-as7-plugin/pom.xml b/etc/samples/mbeans-on-as7-plugin/pom.xml index 38c87d23a70..0643057a74e 100644 --- a/etc/samples/mbeans-on-as7-plugin/pom.xml +++ b/etc/samples/mbeans-on-as7-plugin/pom.xml @@ -46,7 +46,7 @@ org.rhq.maven.plugins rhq-agent-plugin-plugin - 0.6 + 1.0-SNAPSHOT true @@ -65,13 +65,16 @@ ${buildTime} + ${rhq.version} 127.0.0.1 7080 rhqadmin rhqadmin - true + false + true false - ${rhq.version} + false + 300 diff --git a/modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/FakeServerInventory.java b/modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/FakeServerInventory.java index 8c56ff1b270..e2fd9df96f1 100644 --- a/modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/FakeServerInventory.java +++ b/modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/FakeServerInventory.java @@ -395,6 +395,11 @@ public int getId() { resp.setUpgradedResourceDescription(resource.getDescription()); } + if (request.getNewVersion() != null) { + resource.setVersion(request.getNewVersion()); + resp.setUpgradedResourceVersion(resource.getVersion()); + } + if (request.getNewName() != null) { resource.setName(request.getNewName()); resp.setUpgradedResourceName(resource.getName()); diff --git a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/discovery/DiscoveryAgentService.java b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/discovery/DiscoveryAgentService.java index 042ed49335c..8ed8674bb31 100644 --- a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/discovery/DiscoveryAgentService.java +++ b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/discovery/DiscoveryAgentService.java @@ -33,9 +33,7 @@ import org.rhq.core.domain.discovery.MergeResourceResponse; import org.rhq.core.domain.discovery.PlatformSyncInfo; import org.rhq.core.domain.discovery.ResourceSyncInfo; -import org.rhq.core.domain.measurement.AvailabilityType; import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.resource.ResourceError; import org.rhq.core.domain.resource.ResourceType; /** @@ -129,13 +127,13 @@ void updatePluginConfiguration(int resourceId, Configuration newPluginConfigurat AvailabilityReport executeAvailabilityScanImmediately(boolean changedOnlyReport); /** - * Returns the current availability for the specified resource. + * Return an availability report for the specified root resource and its descendants. *

- * This call returns an availability report (rather just a simple availability of a single resource) - * because it also scans for the changes in availability in the child resources. Notice that the returned report may - * contain no results if {@code changesOnly} is set to true. If it is false, the report will always contain - * the availability of the supplied resource but can also additionally contain the availabilities of some of its - * child resources, if they were eligible for availability collection at the time of calling this method. + * The returned report may contain no results if {@code changesOnly} is set to true. Otherwise it will return + * the availability of the root resource and its descendants. Note, a live availability check (i.e. a call + * to getAvailability()) is always performed on the root resource. Only descendants normally eligible for + * availability collection at the time of this call will also have live availability. Others will report their + * most recently reported availability. *

* Also note that the availability types of the resources in the report may have any of the following values from * the {@link AvailabilityType} enum - it may happen that the availability of the resource is @@ -146,13 +144,10 @@ void updatePluginConfiguration(int resourceId, Configuration newPluginConfigurat * correctly handle the report within the server. * * @param resource the resource to return the availability of. - * @param changesOnly if true, only changes in availability will be reported, if false the report will contain - * the availabilities of all resources eligible for collection at the time of the call regardless - * of whether their availability changed or not. - * @return an availability report containing at least the availability of the supplied resource + possibly avails - * of some of the child resources that were eligible for avail collection at the time. The rest of the - * children are scheduled for availability collection in the next collector run (which happens - * approximately 30 seconds after this call). + * @param changesOnly if true, only changes in availability will be reported. if false the report will contain + * the availabilities of the root resource and all descendants, whether their availability + * changed or not. + * @return an availability report populated as described in the above options. */ @NotNull AvailabilityReport getCurrentAvailability(Resource resource, boolean changesOnly); diff --git a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/upgrade/ResourceUpgradeRequest.java b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/upgrade/ResourceUpgradeRequest.java index bc26a1efff4..3d99a890b41 100644 --- a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/upgrade/ResourceUpgradeRequest.java +++ b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/upgrade/ResourceUpgradeRequest.java @@ -31,7 +31,7 @@ /** * Represents a request to upgrade a resource. - * + * * @author Lukas Krejci */ public class ResourceUpgradeRequest extends ResourceUpgradeReport { @@ -119,6 +119,8 @@ public void fillInFromReport(ResourceUpgradeReport report) { setNewName(report.getNewName()); setNewResourceKey(report.getNewResourceKey()); setNewPluginConfiguration(report.getNewPluginConfiguration()); + setNewVersion(report.getNewVersion()); + setForceGenericPropertyUpgrade(report.isForceGenericPropertyUpgrade()); } public void fillInFromResource(Resource resource) { @@ -126,6 +128,7 @@ public void fillInFromResource(Resource resource) { setNewName(resource.getName()); setNewResourceKey(resource.getResourceKey()); setNewPluginConfiguration(resource.getPluginConfiguration()); + setNewVersion(resource.getVersion()); } public void updateResource(Resource resource) { @@ -144,6 +147,10 @@ public void updateResource(Resource resource) { if (getNewPluginConfiguration() != null) { resource.setPluginConfiguration(getNewPluginConfiguration()); } + + if (getNewVersion() != null) { + resource.setVersion(getNewVersion()); + } } /** @@ -154,6 +161,8 @@ public void clearUpgradeData() { setNewName(null); setNewResourceKey(null); setNewPluginConfiguration(null); + setNewVersion(null); + setForceGenericPropertyUpgrade(false); } @Override @@ -183,9 +192,8 @@ public boolean equals(Object other) { @Override public String toString() { - return "ResourceUpgradeRequest[resourceId = '" + resourceId + "', newResourceKey = '" + getNewResourceKey() - + "', newName = '" + getNewName() + "', newDescription = '" + getNewDescription() - + "', hasNewPluginConfig = '" + (null != getNewPluginConfiguration()) + "', upgradeErrorMessage = '" - + upgradeErrorMessage + "', upgradeErrorStackTrace = '" + upgradeErrorStackTrace + "']"; + return "ResourceUpgradeRequest [resourceId=" + resourceId + ", upgradeErrorMessage=" + upgradeErrorMessage + + ", upgradeErrorStackTrace=" + upgradeErrorStackTrace + ", timestamp=" + timestamp + ", toString()=" + + super.toString() + "]"; } } diff --git a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/upgrade/ResourceUpgradeResponse.java b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/upgrade/ResourceUpgradeResponse.java index b4cd1cfb520..7adb05c0c1b 100644 --- a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/upgrade/ResourceUpgradeResponse.java +++ b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/upgrade/ResourceUpgradeResponse.java @@ -31,22 +31,22 @@ * Represents a response to a resource upgrade request. * The upgraded* properties contain the values of the corresponding resource properties * as they were stored on the server. - * + * * @author Lukas Krejci */ public class ResourceUpgradeResponse implements Serializable { - private static final long serialVersionUID = 2L; + private static final long serialVersionUID = 3L; private int resourceId; - + private String upgradedResourceName; private String upgradedResourceKey; private String upgradedResourceDescription; + private String upgradedResourceVersion; private Configuration upgradedResourcePluginConfiguration; - + public ResourceUpgradeResponse() { - } public int getResourceId() { @@ -85,6 +85,14 @@ public void setUpgradedResourceDescription(String upgradedResourceDescription) { this.upgradedResourceDescription = upgradedResourceDescription; } + public String getUpgradedResourceVersion() { + return upgradedResourceVersion; + } + + public void setUpgradedResourceVersion(String upgradedResourceVersion) { + this.upgradedResourceVersion = upgradedResourceVersion; + } + public void setUpgradedResourcePluginConfiguration(Configuration upgradedResourcePluginConfiguration) { this.upgradedResourcePluginConfiguration = upgradedResourcePluginConfiguration; } diff --git a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/configuration/ConfigurationServerService.java b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/configuration/ConfigurationServerService.java index e9e5b36c449..c5aa87e90ee 100644 --- a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/configuration/ConfigurationServerService.java +++ b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/configuration/ConfigurationServerService.java @@ -25,8 +25,6 @@ import org.rhq.core.communications.command.annotation.Asynchronous; import org.rhq.core.communications.command.annotation.LimitedConcurrency; import org.rhq.core.domain.configuration.Configuration; -import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; -import org.rhq.core.domain.configuration.Property; /** * Interface that allows an agent to provide information about a resource's configuration. @@ -71,4 +69,18 @@ public interface ConfigurationServerService { @LimitedConcurrency(CONCURRENCY_LIMIT_CONFIG_UPDATE) void persistUpdatedResourceConfiguration(int resourceId, Configuration resourceConfiguration); + /** + * This is for when the agent needs to notify the server that a new Plugin configuration has been + * discovered on the agent side. This happens when resource discovery discovers a new version of a resource. + * The properties set by discovery are merged into the existing config, and need to be updated + * server-side. + * + * @param resourceId the resourceId to update + * @param resourceConfiguration the newly detected configuration + * + * @return The persisted plugin configuration + */ + @LimitedConcurrency(CONCURRENCY_LIMIT_CONFIG_UPDATE) + Configuration persistUpdatedPluginConfiguration(int resourceId, Configuration pluginConfiguration); + } \ No newline at end of file diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertCriteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertCriteria.java index 3bd12bb11d5..7023b0cafff 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertCriteria.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertCriteria.java @@ -60,6 +60,7 @@ public class AlertCriteria extends Criteria { private List filterPriorities; // requires overrides private String filterResourceTypeId; // requires overrides private String filterResourceTypeName; // requires overrides + private String filterPluginName; // requires overrides private List filterResourceIds; // requires overrides private List filterResourceGroupIds; // requires overrides private List filterAlertDefinitionIds; // requires overrides @@ -88,6 +89,7 @@ public AlertCriteria() { filterOverrides.put("priorities", "alertDefinition.priority IN ( ? )"); filterOverrides.put("resourceTypeId", "alertDefinition.resource.resourceType.id = ?"); filterOverrides.put("resourceTypeName", "alertDefinition.resource.resourceType.name like ?"); + filterOverrides.put("pluginName", "alertDefinition.resource.resourceType.plugin like ?"); filterOverrides.put("resourceIds", "alertDefinition.resource.id IN ( ? )"); filterOverrides.put("resourceGroupIds", "alertDefinition.resource.id IN " // + "( SELECT res.id " // @@ -143,6 +145,10 @@ public void addFilterResourceTypeName(String filterResourceTypeName) { this.filterResourceTypeName = filterResourceTypeName; } + public void addFilterPluginName(String filterPluginName) { + this.filterPluginName = filterPluginName; + } + public void addFilterEntityContext(EntityContext filterEntityContext) { if (filterEntityContext.getType() == EntityContext.Type.Resource) { addFilterResourceIds(filterEntityContext.getResourceId()); diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/MeasurementDefinitionCriteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/MeasurementDefinitionCriteria.java index c0d0045b637..0455f7541da 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/MeasurementDefinitionCriteria.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/MeasurementDefinitionCriteria.java @@ -45,6 +45,7 @@ public class MeasurementDefinitionCriteria extends Criteria { private String filterDisplayName; private String filterDescription; private String filterResourceTypeName; // requires overrides + private String filterPluginName; // requires overrides private Integer filterResourceTypeId; // requires overrides private MeasurementCategory filterCategory; private MeasurementUnits filterUnits; @@ -69,6 +70,7 @@ public class MeasurementDefinitionCriteria extends Criteria { public MeasurementDefinitionCriteria() { filterOverrides.put("resourceTypeName", "resourceType.name like ?"); + filterOverrides.put("pluginName", "resourceType.plugin like ?"); filterOverrides.put("resourceTypeId", "resourceType.id = ?"); sortOverrides.put("resourceTypeName", "resourceType.name"); @@ -95,6 +97,10 @@ public void addFilterResourceTypeName(String filterResourceTypeName) { this.filterResourceTypeName = filterResourceTypeName; } + public void addFilterPluginName(String filterPluginName) { + this.filterPluginName = filterPluginName; + } + public void addFilterResourceTypeId(Integer filterResourceTypeId) { this.filterResourceTypeId = filterResourceTypeId; } diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceUpgradeReport.java b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceUpgradeReport.java index a47d86ae0a2..2619a20b43c 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceUpgradeReport.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceUpgradeReport.java @@ -28,8 +28,8 @@ import org.rhq.core.domain.configuration.Configuration; /** - * Represents the changes that should be applied to the existing resource - * in order to upgrade it to conform to the new requirements set by the + * Represents the changes that should be applied to the existing resource + * in order to upgrade it to conform to the new requirements set by the * changed resource component. *

* Null values of the properties mean no change, non-null values represent @@ -38,30 +38,31 @@ * Configuration updates are limited to only changing values for existing * properties. The Configuration must still reflect the types configuration * definition. Also, updates must be judicious as config values can also - * be updated by users. - * + * be updated by users. + * * @author Lukas Krejci */ public class ResourceUpgradeReport implements Serializable { - private static final long serialVersionUID = 2L; + private static final long serialVersionUID = 3L; private String newResourceKey; private String newName; - - // version changes are handled differently. - // private String newVersion; - + // version changes are typically handled differently, but in certain cases may be done here. + private String newVersion; + private String newDescription; // Plugin configuration changes must still conform to the configuration definition. private Configuration newPluginConfiguration; // Is resource config update useful? Wouldn't resource config change discovery handle this? // private Configuration newResourceConfiguration; - private String newDescription; + // In some cases assume the plugin knows best, and let it force upgrade of what we call "generic" resource + // properties (name, description). If set to true by the plugin code the server will obey, + // regardless of the value of SystemSetting.ALLOW_RESOURCE_GENERIC_PROPERTIES_UPGRADE. + private boolean forceGenericPropertyUpgrade = false; public ResourceUpgradeReport() { - } public String getNewResourceKey() { @@ -80,13 +81,14 @@ public void setNewName(String newName) { this.newName = newName; } - // public String getNewVersion() { - // return newVersion; - // } - // - // public void setNewVersion(String newVersion) { - // this.newVersion = newVersion; - // } + public String getNewVersion() { + return newVersion; + } + + public void setNewVersion(String newVersion) { + this.newVersion = newVersion; + } + // // public Configuration getNewResourceConfiguration() { // return newResourceConfiguration; @@ -109,18 +111,38 @@ public Configuration getNewPluginConfiguration() { } /** - * See class javadoc for restrictions. + * See class javadoc for restrictions. */ public void setNewPluginConfiguration(Configuration newPluginConfiguration) { this.newPluginConfiguration = newPluginConfiguration; } + public boolean isForceGenericPropertyUpgrade() { + return forceGenericPropertyUpgrade; + } + + /** + * In some cases assume the plugin knows best. Set true (with care) to force upgrade of what we call "generic" + * resource properties (name, description). If set to true by the plugin code the server will obey, + * regardless of the value of SystemSetting.ALLOW_RESOURCE_GENERIC_PROPERTIES_UPGRADE, which is false by default + * in order to protect hand-edited resource names. + * + * @param forceGenericPropertyUpgrade + */ + public void setForceGenericPropertyUpgrade(boolean forceGenericPropertyUpgrade) { + this.forceGenericPropertyUpgrade = forceGenericPropertyUpgrade; + } + public boolean hasSomethingToUpgrade() { - return newResourceKey != null || newName != null || newDescription != null || newPluginConfiguration != null; + return newResourceKey != null || newName != null || newVersion != null || newDescription != null + || newPluginConfiguration != null; } + @Override public String toString() { - return "ResourceUpgradeReport[newResourceKey = '" + newResourceKey + "', newName = '" + newName - + "', newDescription = '" + newDescription + "']"; + return "ResourceUpgradeReport [newResourceKey=" + newResourceKey + ", newName=" + newName + ", newVersion=" + + newVersion + ", newDescription=" + newDescription + ", newPluginConfiguration=" + newPluginConfiguration + + ", forceGenericPropertyUpgrade=" + forceGenericPropertyUpgrade + "]"; } + } diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/upgrade/ResourceUpgradeContext.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/upgrade/ResourceUpgradeContext.java index c4056866dbd..5b309232411 100644 --- a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/upgrade/ResourceUpgradeContext.java +++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/upgrade/ResourceUpgradeContext.java @@ -46,6 +46,7 @@ public class ResourceUpgradeContext> extends Reso private final Configuration resourceConfiguration; private final String name; private final String description; + private final String version; /** * @see ResourceContext#ResourceContext(org.rhq.core.domain.resource.Resource, org.rhq.core.pluginapi.inventory.ResourceComponent, org.rhq.core.pluginapi.inventory.ResourceContext, org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent, org.rhq.core.system.SystemInfo, java.io.File, java.io.File, String, org.rhq.core.pluginapi.event.EventContext, org.rhq.core.pluginapi.operation.OperationContext, org.rhq.core.pluginapi.content.ContentContext, org.rhq.core.pluginapi.availability.AvailabilityContext, org.rhq.core.pluginapi.inventory.InventoryContext, org.rhq.core.pluginapi.inventory.PluginContainerDeployment) @@ -65,11 +66,10 @@ public ResourceUpgradeContext(Resource resource, ResourceContext parentResour this.resourceConfiguration = resource.getResourceConfiguration(); this.name = resource.getName(); this.description = resource.getDescription(); + this.version = resource.getVersion(); } /** - * Returns the context of the Resource component's parent Resource component. - * * @return the context of the Resource component's parent Resource component * * @since 4.0 @@ -91,4 +91,8 @@ public String getDescription() { return description; } + public String getVersion() { + return version; + } + } diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java index 9a7d685f305..6d395cab167 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java @@ -61,6 +61,7 @@ import org.rhq.core.clientapi.agent.metadata.ResourceTypeNotEnabledException; import org.rhq.core.clientapi.agent.upgrade.ResourceUpgradeRequest; import org.rhq.core.clientapi.agent.upgrade.ResourceUpgradeResponse; +import org.rhq.core.clientapi.server.configuration.ConfigurationServerService; import org.rhq.core.clientapi.server.discovery.DiscoveryServerService; import org.rhq.core.clientapi.server.discovery.InvalidInventoryReportException; import org.rhq.core.clientapi.server.discovery.InventoryReport; @@ -68,6 +69,7 @@ import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.ConfigurationUtility; import org.rhq.core.domain.configuration.Property; +import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; import org.rhq.core.domain.discovery.AvailabilityReport; import org.rhq.core.domain.discovery.MergeInventoryReportResults; import org.rhq.core.domain.discovery.MergeInventoryReportResults.ResourceTypeFlyweight; @@ -1692,16 +1694,18 @@ public void mergeResourcesFromUpgrade(Set upgradeRequest String resourceKey = upgradeResponse.getUpgradedResourceKey(); String name = upgradeResponse.getUpgradedResourceName(); String description = upgradeResponse.getUpgradedResourceDescription(); + String version = upgradeResponse.getUpgradedResourceVersion(); Configuration pluginConfig = upgradeResponse.getUpgradedResourcePluginConfiguration(); //only bother if there's something to upgrade at all on this resource. - if (resourceKey != null || name != null || description != null || pluginConfig != null) { + if (resourceKey != null || name != null || version != null || description != null + || pluginConfig != null) { ResourceContainer existingResourceContainer = getResourceContainer(upgradeResponse.getResourceId()); if (existingResourceContainer != null) { Resource existingResource = existingResourceContainer.getResource(); StringBuilder logMessage = new StringBuilder("Resource [").append(existingResource.toString()) - .append("] upgraded its "); + .append("] upgraded ["); if (resourceKey != null) { existingResource.setResourceKey(resourceKey); @@ -1713,6 +1717,11 @@ public void mergeResourcesFromUpgrade(Set upgradeRequest logMessage.append("name, "); } + if (version != null) { + existingResource.setVersion(version); + logMessage.append("version, "); + } + if (description != null) { existingResource.setDescription(description); logMessage.append("description, "); @@ -1723,7 +1732,7 @@ public void mergeResourcesFromUpgrade(Set upgradeRequest logMessage.append("pluginConfiguration, "); } - logMessage.replace(logMessage.length() - 1, logMessage.length(), "to become [") + logMessage.replace(logMessage.length() - 1, logMessage.length(), "] to become [") .append(existingResource.toString()).append("]"); log.info(logMessage.toString()); @@ -1737,11 +1746,21 @@ public void mergeResourcesFromUpgrade(Set upgradeRequest } public Resource mergeResourceFromDiscovery(Resource resource, Resource parent) throws PluginContainerException { - // If the Resource is already in inventory, make sure its version is up-to-date, then simply return the - // existing Resource. + // If the Resource is already in inventory, make sure its version is up to date. If the version + // has been updated make sure the plugin config is up-to-date. Then simply return the existing Resource. Resource existingResource = findMatchingChildResource(resource, parent); if (existingResource != null) { - updateResourceVersion(existingResource, resource.getVersion()); + if (mergeExistingResource(existingResource, resource)) { + try { + refreshResourceComponentState(getResourceContainer(existingResource), true); + } catch (Exception e) { + log.warn( + "Failed to refresh resource component after version change. Resource=" + + existingResource + + ". Will continue with old container. The resource may not perform as expected until after a plugin container restart.", + e); + } + } return existingResource; } @@ -1804,6 +1823,130 @@ public Resource mergeResourceFromDiscovery(Resource resource, Resource parent) t return resource; } + /** + * @param existingResource Current resource for reskey X + * @param discoveredResource Discovered resource for reskey X + * @return true if the version (and possibly pluginConfig) have been updated in the existing resource. Otherwise false. + */ + private boolean mergeExistingResource(Resource existingResource, Resource discoveredResource) { + String existingVersion = existingResource.getVersion(); + String discoveredVersion = discoveredResource.getVersion(); + boolean versionChanged = (existingVersion != null) ? !existingVersion.equals(discoveredVersion) + : discoveredVersion != null && !discoveredVersion.isEmpty(); + if (versionChanged) { + if (log.isDebugEnabled()) { + log.debug("Discovery reported that version of [" + existingResource + "] changed from [" + + existingVersion + "] to [" + discoveredVersion + "]"); + } + + boolean versionUpdated = existingResource.getInventoryStatus() != InventoryStatus.COMMITTED + || mergeExistingResourceVersionOnServer(existingResource, discoveredVersion); + + // If the version has been updated make sure we also update the plugin config if it has been updated. + if (versionUpdated) { + Configuration mergedPluginConfiguration = mergeExistingResourcePluginConfiguration(existingResource, + discoveredResource.getPluginConfiguration()); + + // Only update the version in local inventory if the server syncs succeeded, otherwise we won't know + // to try again the next time this method is called. + // TODO: It would be safer to combine the two possible server syncs into one server/transaction + if (null != mergedPluginConfiguration) { + existingResource.setVersion(discoveredVersion); + existingResource.setPluginConfiguration(mergedPluginConfiguration); + log.info("Version of [" + existingResource + "] changed from [" + existingVersion + "] to [" + + discoveredVersion + "]"); + + return true; + } + } + } + + return false; + } + + private boolean mergeExistingResourceVersionOnServer(Resource resource, String newVersion) { + boolean versionUpdated = false; + ServerServices serverServices = this.configuration.getServerServices(); + if (serverServices != null) { + try { + DiscoveryServerService discoveryServerService = serverServices.getDiscoveryServerService(); + discoveryServerService.updateResourceVersion(resource.getId(), newVersion); + // Only update the version in local inventory if the server sync succeeded, otherwise we won't know + // to try again the next time this method is called. + versionUpdated = true; + if (log.isDebugEnabled()) { + log.debug("New version for [" + resource + "] (" + newVersion + + ") was successfully synced to the Server."); + } + } catch (Exception e) { + log.error("Failed to sync-to-Server new version for [" + resource + "]"); + } + } else { + if (log.isDebugEnabled()) { + log.debug("Sync-to-Server of new version for [" + resource + + "] cannot be done, because Plugin Container is not connected to Server."); + } + } + return versionUpdated; + } + + private Configuration mergeExistingResourcePluginConfiguration(Resource resource, Configuration pluginConfig) { + + // If there is no update necessary just return the current plugin config of the existing resource + Configuration result = resource.getPluginConfiguration(); + + ConfigurationDefinition configDef = resource.getResourceType().getPluginConfigurationDefinition(); + if (null == configDef) { + return result; + } + + Configuration existingPluginConfig = resource.getPluginConfiguration().deepCopy(false); + Configuration defaultPluginConfig = ConfigurationUtility.createDefaultConfiguration(configDef); + boolean configChanged = false; + + // for each property, update the existing plugin config if discovery has set a non-default value + for (String propertyName : pluginConfig.getAllProperties().keySet()) { + Property discoveredProp = pluginConfig.get(propertyName); + Property defaultProp = defaultPluginConfig.get(propertyName); + if (!discoveredProp.equals(defaultProp)) { + if (log.isDebugEnabled()) { + log.debug("Discovery reported a new version of " + resource + ". Updating value of config property" + + " from [" + existingPluginConfig.get(propertyName) + "] to [" + discoveredProp + "]."); + } + existingPluginConfig.put(discoveredProp); + configChanged = true; + } + } + + if (configChanged) { + result = mergeExistingResourcePluginConfigurationOnServer(resource, existingPluginConfig); + } + + return result; + } + + private Configuration mergeExistingResourcePluginConfigurationOnServer(Resource resource, + Configuration updatedPluginConfig) { + + Configuration result = null; + ServerServices serverServices = this.configuration.getServerServices(); + + if (serverServices != null) { + try { + ConfigurationServerService configServerService = serverServices.getConfigurationServerService(); + result = configServerService.persistUpdatedPluginConfiguration(resource.getId(), updatedPluginConfig); + } catch (Exception e) { + log.error("Failed to sync-to-Server new plugin configuration for [" + resource + "]"); + } + } else { + if (log.isDebugEnabled()) { + log.debug("Sync-to-Server of new plugin configuration for [" + resource + + "] cannot be done, because Plugin Container is not connected to Server."); + } + } + return result; + } + /** * During initialization time, the inventory manager will active resources after loading them * from disk. Any other manager that starts up and is initialized after the Inventory Manager @@ -2936,51 +3079,6 @@ private InventoryContext getInventoryContext(Resource resource) { return inventoryContext; } - private void updateResourceVersion(Resource resource, String version) { - String existingVersion = resource.getVersion(); - boolean versionChanged = (existingVersion != null) ? !existingVersion.equals(version) : version != null - && !version.isEmpty(); - if (versionChanged) { - if (log.isDebugEnabled()) { - log.debug("Discovery reported that version of [" + resource + "] changed from [" + existingVersion - + "] to [" + version + "]"); - } - boolean versionShouldBeUpdated = resource.getInventoryStatus() != InventoryStatus.COMMITTED - || updateResourceVersionOnServer(resource, version); - if (versionShouldBeUpdated) { - resource.setVersion(version); - log.info("Version of [" + resource + "] changed from [" + existingVersion + "] to [" + version + "]"); - } - } - } - - private boolean updateResourceVersionOnServer(Resource resource, String newVersion) { - boolean versionUpdated = false; - ServerServices serverServices = this.configuration.getServerServices(); - if (serverServices != null) { - try { - DiscoveryServerService discoveryServerService = serverServices.getDiscoveryServerService(); - discoveryServerService.updateResourceVersion(resource.getId(), newVersion); - // Only update the version in local inventory if the server sync succeeded, otherwise we won't know - // to try again the next time this method is called. - versionUpdated = true; - if (log.isDebugEnabled()) { - log.debug("New version for [" + resource + "] (" + newVersion - + ") was successfully synced to the Server."); - } - } catch (Exception e) { - log.error("Failed to sync-to-Server new version for [" + resource + "]"); - } - // TODO: It would be cool to publish a Resource-version-changed Event here. (ips, 02/29/08) - } else { - if (log.isDebugEnabled()) { - log.debug("Sync-to-Server of new version for [" + resource - + "] cannot be done, because Plugin Container is not connected to Server."); - } - } - return versionUpdated; - } - private void processSyncInfo(Collection syncInfos, Set syncedResources, Set unknownResourceSyncInfos, Set modifiedResourceIds, Set deletedResourceIds, Set newlyCommittedResources, Set ignoredResources) { diff --git a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/FakeServerInventory.java b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/FakeServerInventory.java index f5ebb5d3634..9963adcf8aa 100644 --- a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/FakeServerInventory.java +++ b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/FakeServerInventory.java @@ -209,6 +209,11 @@ public int getId() { resp.setUpgradedResourceDescription(resource.getDescription()); } + if (request.getNewVersion() != null) { + resource.setVersion(request.getNewVersion()); + resp.setUpgradedResourceVersion(resource.getVersion()); + } + if (request.getNewName() != null) { resource.setName(request.getNewName()); resp.setUpgradedResourceName(resource.getName()); diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/RhqManager.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/RhqManager.java index 95cdf228952..3831cbb6b80 100644 --- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/RhqManager.java +++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/RhqManager.java @@ -28,6 +28,7 @@ import org.rhq.enterprise.server.configuration.ConfigurationManagerRemote; import org.rhq.enterprise.server.content.ContentManagerRemote; import org.rhq.enterprise.server.content.RepoManagerRemote; +import org.rhq.enterprise.server.core.AgentManagerRemote; import org.rhq.enterprise.server.discovery.DiscoveryBossRemote; import org.rhq.enterprise.server.drift.DriftManagerRemote; import org.rhq.enterprise.server.drift.DriftTemplateManagerRemote; @@ -40,6 +41,7 @@ import org.rhq.enterprise.server.measurement.MeasurementDefinitionManagerRemote; import org.rhq.enterprise.server.measurement.MeasurementScheduleManagerRemote; import org.rhq.enterprise.server.operation.OperationManagerRemote; +import org.rhq.enterprise.server.plugin.ServerPluginsRemote; import org.rhq.enterprise.server.report.DataAccessManagerRemote; import org.rhq.enterprise.server.resource.ResourceFactoryManagerRemote; import org.rhq.enterprise.server.resource.ResourceManagerRemote; @@ -60,6 +62,10 @@ * @author Greg Hinkle */ public enum RhqManager { + /** + * @since 4.12 + */ + AgentManager(AgentManagerRemote.class, "${AgentManager}"), // AlertManager(AlertManagerRemote.class, "${AlertManager}"), // AlertDefinitionManager(AlertDefinitionManagerRemote.class, "${AlertDefinitionManager}"), // AvailabilityManager(AvailabilityManagerRemote.class, "${AvailabilityManager}"), // @@ -79,18 +85,20 @@ public enum RhqManager { MeasurementDefinitionManager(MeasurementDefinitionManagerRemote.class, "${MeasurementDefinitionManager}"), // MeasurementScheduleManager(MeasurementScheduleManagerRemote.class, "${MeasurementScheduleManager}"), // OperationManager(OperationManagerRemote.class, "${OperationManager}"), // - /** * @since 4.11 */ PluginManager(PluginManagerRemote.class, "${PluginManagerRemote}"), // - ResourceManager(ResourceManagerRemote.class, "${ResourceManager}"), // ResourceFactoryManager(ResourceFactoryManagerRemote.class, "${ResourceFactoryManager}"), // ResourceGroupManager(ResourceGroupManagerRemote.class, "${ResourceGroupManager}"), // ResourceTypeManager(ResourceTypeManagerRemote.class, "${ResourceTypeManager}"), // RoleManager(RoleManagerRemote.class, "${RoleManager}"), // SavedSearchManager(SavedSearchManagerRemote.class, "${SavedSearchManager}"), // + /** + * @since 4.12 + */ + ServerPluginManager(ServerPluginsRemote.class, "${ServerPluginManager}"), // StorageNodeManager(StorageNodeManagerRemote.class, "${StorageNodeManager}"), // SubjectManager(SubjectManagerRemote.class, "${SubjectManager}"), // SupportManager(SupportManagerRemote.class, "${SupportManager}"), // diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/menu/MenuBarView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/menu/MenuBarView.java index c8d5f9f72ea..4d4c173c200 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/menu/MenuBarView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/menu/MenuBarView.java @@ -285,7 +285,9 @@ private String createBarContent() { +"" +"" +"" - +"" + + "" +"" +"" +"
" diff --git a/modules/enterprise/gui/coregui/src/main/webapp/img/logo-login.png b/modules/enterprise/gui/coregui/src/main/webapp/img/logo.png similarity index 100% rename from modules/enterprise/gui/coregui/src/main/webapp/img/logo-login.png rename to modules/enterprise/gui/coregui/src/main/webapp/img/logo.png diff --git a/modules/enterprise/gui/coregui/src/main/webapp/img/logo-login.svg b/modules/enterprise/gui/coregui/src/main/webapp/img/logo.svg similarity index 100% rename from modules/enterprise/gui/coregui/src/main/webapp/img/logo-login.svg rename to modules/enterprise/gui/coregui/src/main/webapp/img/logo.svg diff --git a/modules/enterprise/gui/coregui/src/main/webapp/login b/modules/enterprise/gui/coregui/src/main/webapp/login index 54e163a9ca4..3b1bc6a3fdb 100644 --- a/modules/enterprise/gui/coregui/src/main/webapp/login +++ b/modules/enterprise/gui/coregui/src/main/webapp/login @@ -40,9 +40,9 @@
- logo - - + logo + +

Log in to RHQ

diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/contentProvider-plain.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/contentProvider-plain.xhtml index ffc3567df46..0048be0c99d 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/contentProvider-plain.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/contentProvider-plain.xhtml @@ -288,7 +288,7 @@ - + @@ -421,7 +421,7 @@ - + @@ -493,7 +493,7 @@ - + diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/importRepos-plain.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/importRepos-plain.xhtml index fc82d0b311a..430219bffb7 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/importRepos-plain.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/importRepos-plain.xhtml @@ -104,7 +104,7 @@ - + diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/listContentProviders-plain.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/listContentProviders-plain.xhtml index 123bf37301f..146de0071f0 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/listContentProviders-plain.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/listContentProviders-plain.xhtml @@ -148,7 +148,7 @@ - + diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/listRepos-plain.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/listRepos-plain.xhtml index 52099cb11e6..6f24c7e74a9 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/listRepos-plain.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/listRepos-plain.xhtml @@ -131,7 +131,7 @@ - + diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo-plain.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo-plain.xhtml index 0b32e1fa26c..070575d562d 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo-plain.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo-plain.xhtml @@ -350,7 +350,7 @@ value="#{repoContentProvidersDataModel}" /> - + @@ -469,7 +469,7 @@ value="#{repoResourcesDataModel}" /> - + @@ -633,7 +633,7 @@ + src="../resource/include/pagination-plain.xhtml" /> @@ -796,7 +796,7 @@ + src="../resource/include/pagination-plain.xhtml" /> @@ -880,7 +880,7 @@ + src="../resource/include/pagination-plain.xhtml" /> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repoAssociations-plain.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repoAssociations-plain.xhtml index 3b2de3dddcc..8e26c27df76 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repoAssociations-plain.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repoAssociations-plain.xhtml @@ -146,7 +146,7 @@ - + @@ -270,7 +270,7 @@ - + diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repoSubscriptions-plain.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repoSubscriptions-plain.xhtml index 0502efd9678..7e3e272a6df 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repoSubscriptions-plain.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repoSubscriptions-plain.xhtml @@ -130,7 +130,7 @@ - + @@ -264,7 +264,7 @@ - + diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/confirm-create-plain.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/confirm-create-plain.xhtml index 87af65ad858..91bef8f3f23 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/confirm-create-plain.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/confirm-create-plain.xhtml @@ -139,7 +139,7 @@ - + diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/history-request-plain.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/history-request-plain.xhtml index 1e759154418..ec4e63a353f 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/history-request-plain.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/history-request-plain.xhtml @@ -161,7 +161,7 @@ - + diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/installed_package_details-plain.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/installed_package_details-plain.xhtml index ede7478045c..87fe1783cf1 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/installed_package_details-plain.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/installed_package_details-plain.xhtml @@ -129,7 +129,7 @@ - + diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/subscription_packages-plain.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/subscription_packages-plain.xhtml index 91fb21c0fdc..70f012850ed 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/subscription_packages-plain.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/subscription_packages-plain.xhtml @@ -87,7 +87,7 @@ - + diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/update-plain.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/update-plain.xhtml index ab99878224e..b6652ab4138 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/update-plain.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/update-plain.xhtml @@ -114,7 +114,7 @@ value="DEPLOY SELECTED" target="selectedPackages" styleClass="on-pager-button buttonsmall" rendered="${ResourceUIBean.permissions.content}"/> - + diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/include/pagination.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/include/pagination.xhtml index 7cde89f05fb..5f5b51e6eca 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/include/pagination.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/include/pagination.xhtml @@ -111,4 +111,4 @@ - \ No newline at end of file + diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/monitor/schedules-plain.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/monitor/schedules-plain.xhtml index 8854225336a..d229e403b8b 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/monitor/schedules-plain.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/monitor/schedules-plain.xhtml @@ -143,7 +143,7 @@ - + @@ -155,4 +155,4 @@ - \ No newline at end of file + diff --git a/modules/enterprise/server/jar/intentional-api-changes-since-4.11.0.xml b/modules/enterprise/server/jar/intentional-api-changes-since-4.11.0.xml new file mode 100644 index 00000000000..30492f98eb6 --- /dev/null +++ b/modules/enterprise/server/jar/intentional-api-changes-since-4.11.0.xml @@ -0,0 +1,30 @@ + + + + + + + org/rhq/enterprise/server/measurement/MeasurementDataManagerRemote + 7012 + org.rhq.core.domain.measurement.MeasurementAggregate getAggregate(org.rhq.core.domain.auth.Subject, int, int, long, long) + Adding a method to a remote API interface is safe. This is a newly exposed method. + + + diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerLocal.java index 4a2a8521a10..3a30831c3db 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerLocal.java @@ -36,16 +36,13 @@ import org.rhq.core.domain.configuration.ResourceConfigurationUpdate; import org.rhq.core.domain.configuration.composite.ConfigurationUpdateComposite; import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; -import org.rhq.core.domain.configuration.definition.ConfigurationTemplate; import org.rhq.core.domain.configuration.group.AbstractGroupConfigurationUpdate; import org.rhq.core.domain.configuration.group.GroupPluginConfigurationUpdate; import org.rhq.core.domain.configuration.group.GroupResourceConfigurationUpdate; import org.rhq.core.domain.criteria.PluginConfigurationUpdateCriteria; import org.rhq.core.domain.criteria.ResourceConfigurationUpdateCriteria; -import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; -import org.rhq.enterprise.server.configuration.job.GroupPluginConfigurationUpdateJob; import org.rhq.enterprise.server.resource.ResourceNotFoundException; /** @@ -469,9 +466,11 @@ ConfigurationDefinition getOptionsForConfigurationDefinition(Subject subject, in /** * Dedicated method for supporting resource upgrade of plugin configuration. Similar to - * {@link #updatePluginConfiguration(Subject, int, Configuration) but does not inform the agent for + * {@link #updatePluginConfiguration(Subject, int, Configuration)} but does not inform the agent for * two reasons: first, the agent is already updated (it initiates the update and two, callingback into - * the agent would lock the plugin container, as this is during PC initialization. + * the agent would lock the plugin container, as this is during PC initialization. Also, it does not + * validate the newConfiguration because the agent is allowed to update read-only properties during an + * upgrade. * * @param subject The logged in user's subject. * @param resourceId a {@link Resource} id diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationServerServiceImpl.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationServerServiceImpl.java index be32c535552..1d9ab04fdc7 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationServerServiceImpl.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationServerServiceImpl.java @@ -26,6 +26,7 @@ import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; +import org.rhq.core.domain.configuration.PluginConfigurationUpdate; import org.rhq.core.domain.configuration.ResourceConfigurationUpdate; import org.rhq.core.domain.resource.Resource; import org.rhq.enterprise.server.auth.SubjectManagerLocal; @@ -34,6 +35,7 @@ public class ConfigurationServerServiceImpl implements ConfigurationServerService { private static final Log LOG = LogFactory.getLog(ConfigurationServerServiceImpl.class); + @Override public void completeConfigurationUpdate(ConfigurationUpdateResponse response) { /* * Would be nice to get the resource name, but it is not in the response, so we could bring back the log message @@ -62,6 +64,7 @@ public void completeConfigurationUpdate(ConfigurationUpdateResponse response) { configurationManager.checkForCompletedGroupResourceConfigurationUpdate(configUpdateId); } + @Override public void persistUpdatedResourceConfiguration(int resourceId, Configuration resourceConfiguration) { ConfigurationManagerLocal configurationManager = LookupUtil.getConfigurationManager(); SubjectManagerLocal subjectManager = LookupUtil.getSubjectManager(); @@ -79,4 +82,16 @@ public void persistUpdatedResourceConfiguration(int resourceId, Configuration re Configuration configuration = update.getConfiguration().deepCopy(false); // clone the config, zeroing out ids configurationManager.setResourceConfiguration(resourceId, configuration); // now set it as the current config on the Resource } + + @Override + public Configuration persistUpdatedPluginConfiguration(int resourceId, Configuration pluginConfiguration) { + ConfigurationManagerLocal configurationManager = LookupUtil.getConfigurationManager(); + SubjectManagerLocal subjectManager = LookupUtil.getSubjectManager(); + + Subject overlord = subjectManager.getOverlord(); + PluginConfigurationUpdate update = configurationManager.upgradePluginConfiguration(overlord, resourceId, + pluginConfiguration); + + return update.getResource().getPluginConfiguration(); + } } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerBean.java index 1fe2e7966b7..3da542aab3a 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerBean.java @@ -88,7 +88,7 @@ * @author John Mazzitelli */ @Stateless -public class AgentManagerBean implements AgentManagerLocal { +public class AgentManagerBean implements AgentManagerLocal, AgentManagerRemote { private static final Log LOG = LogFactory.getLog(AgentManagerBean.class); @PersistenceContext(unitName = RHQConstants.PERSISTENCE_UNIT_NAME) @@ -866,4 +866,9 @@ public PageList findAgentsByCriteria(Subject subject, AgentCriteria crite return runner.execute(); } + @RequiredPermission(Permission.MANAGE_SETTINGS) + public void deleteAgent(Subject subject, Agent agent) { + deleteAgent(agent); + } + } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerLocal.java index 5c729580bd8..56637b91077 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerLocal.java @@ -25,12 +25,10 @@ import javax.ejb.Local; import org.jetbrains.annotations.NotNull; - import org.rhq.core.clientapi.server.core.AgentVersion; import org.rhq.core.clientapi.server.core.CoreServerService; import org.rhq.core.clientapi.server.core.PingRequest; import org.rhq.core.domain.auth.Subject; -import org.rhq.core.domain.criteria.AgentCriteria; import org.rhq.core.domain.install.remote.AgentInstall; import org.rhq.core.domain.resource.Agent; import org.rhq.core.domain.util.PageControl; @@ -43,7 +41,7 @@ * @author John Mazzitelli */ @Local -public interface AgentManagerLocal { +public interface AgentManagerLocal extends AgentManagerRemote { /** * Persists install information on a new agent. If the agent install record doesn't exist, a new one will be created. @@ -356,15 +354,4 @@ public interface AgentManagerLocal { * @return The updated request object. */ public PingRequest handlePingRequest(PingRequest request); - - /** - * Fetches the agents based on provided criteria. - * - * Subject needs MANAGE_SETTINGS and MANAGE_INVENTORY permissions. - * - * @param subject caller - * @param criteria the criteria - * @return list of agents - */ - PageList findAgentsByCriteria(Subject subject, AgentCriteria criteria); -} \ No newline at end of file +} diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerRemote.java new file mode 100644 index 00000000000..ca03af76138 --- /dev/null +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerRemote.java @@ -0,0 +1,38 @@ +package org.rhq.enterprise.server.core; + +import javax.ejb.Remote; + +import org.rhq.core.domain.auth.Subject; +import org.rhq.core.domain.criteria.AgentCriteria; +import org.rhq.core.domain.resource.Agent; +import org.rhq.core.domain.util.PageList; + +/** + * Remote agent management. + */ +@Remote +public interface AgentManagerRemote { + + /** + * Deletes an existing agent by subject, if there is no platform resource for this agent. + * This method is primarily for deleting agents that may have incompletely registered. + * + * Subject needs MANAGE_SETTINGS permissions. + * + * @param subject caller + * @param agent agent object. + */ + void deleteAgent(Subject subject, Agent agent); + + /** + * Fetches the agents based on provided criteria. + * + * Subject needs MANAGE_SETTINGS and MANAGE_INVENTORY permissions. + * + * @param subject caller + * @param criteria the criteria + * @return list of agents + */ + PageList findAgentsByCriteria(Subject subject, AgentCriteria criteria); + +} diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java index 5104ad4ef12..a1cead2d78a 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java @@ -805,9 +805,11 @@ private ResourceUpgradeResponse upgradeResource(Resource resource, ResourceUpgra String resourceKey = upgradeRequest.getNewResourceKey(); String name = upgradeRequest.getNewName(); String description = upgradeRequest.getNewDescription(); + String version = upgradeRequest.getNewVersion(); + boolean isUpgradeAll = allowGenericPropertiesUpgrade || upgradeRequest.isForceGenericPropertyUpgrade(); StringBuilder logMessage = new StringBuilder("Resource [").append(resource.toString()).append( - "] upgraded its "); + "] upgraded ["); if (needsUpgrade(resource.getResourceKey(), resourceKey)) { resource.setResourceKey(resourceKey); @@ -815,18 +817,24 @@ private ResourceUpgradeResponse upgradeResource(Resource resource, ResourceUpgra ret.setUpgradedResourceKey(resource.getResourceKey()); } - if (allowGenericPropertiesUpgrade && needsUpgrade(resource.getName(), name)) { + if (isUpgradeAll && needsUpgrade(resource.getName(), name)) { resource.setName(name); logMessage.append("name, "); ret.setUpgradedResourceName(resource.getName()); } - if (allowGenericPropertiesUpgrade && needsUpgrade(resource.getDescription(), description)) { + if (isUpgradeAll && needsUpgrade(resource.getDescription(), description)) { resource.setDescription(description); logMessage.append("description, "); ret.setUpgradedResourceDescription(resource.getDescription()); } + if (needsUpgrade(resource.getVersion(), version)) { + resource.setVersion(version); + logMessage.append("version, "); + ret.setUpgradedResourceVersion(resource.getVersion()); + } + // If provided, assume the new plugin config should replace the old plugin config in its entirety. // Use a deep copy without ids as the updgardeRequest config may contain entity config props. // Note: we explicitly do not call configurationManager.updatePluginConfiguration() because the @@ -848,8 +856,8 @@ private ResourceUpgradeResponse upgradeResource(Resource resource, ResourceUpgra entityManager.remove(error); } - logMessage.replace(logMessage.length() - 1, logMessage.length(), "to become [").append(resource.toString()) - .append("]"); + logMessage.replace(logMessage.length() - 1, logMessage.length(), "] to become [") + .append(resource.toString()).append("]"); LOG.info(logMessage.toString()); } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityManagerBean.java index 08a7445d3a1..d1bc2cd7cb4 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityManagerBean.java @@ -714,12 +714,9 @@ public boolean mergeAvailabilityReport(AvailabilityReport report) { if (reportSize == 0) { log.error("Agent [" + agentName + "] sent an empty availability report. This is a bug, please report it"); return true; // even though this report is bogus, do not ask for an immediate full report to avoid unusual infinite recursion due to this error condition - } - if (log.isDebugEnabled()) { - if (reportSize > 1) { - log.debug("Agent [" + agentName + "]: processing availability report of size: " + reportSize); - } + } else if (log.isDebugEnabled()) { + log.debug("Agent [" + agentName + "]: processing availability report of size: " + reportSize); } // translate data into Availability objects for downstream processing @@ -730,44 +727,41 @@ public boolean mergeAvailabilityReport(AvailabilityReport report) { } Integer agentToUpdate = agentManager.getAgentIdByName(agentName); - - // if this report is from an agent update the lastAvailReport time - if (!report.isServerSideReport() && agentToUpdate != null) { - availabilityManager.updateLastAvailabilityReportInNewTransaction(agentToUpdate.intValue()); - } - MergeInfo mergeInfo = new MergeInfo(report); - // if this report is from an agent, and is a changes-only report, and the agent appears backfilled, - // then we need to skip this report so as not to waste our time. Then, immediately request and process - // a full report because, obviously, the agent is no longer down but the server thinks - // it still is down - we need to know the availabilities for all the resources on that agent - if (!report.isServerSideReport() && report.isChangesOnlyReport() - && agentManager.isAgentBackfilled(agentToUpdate.intValue())) { + // For agent reports (not a server-side report) + if (!report.isServerSideReport() && agentToUpdate != null) { + // if this is a changes-only report, and the agent appears backfilled, then immediately request and process + // a full report because, obviously, the agent is no longer down but the server thinks it still is down - + // we need to know the availabilities for all the resources on that agent + if (report.isChangesOnlyReport() && agentManager.isAgentBackfilled(agentToUpdate.intValue())) { + mergeInfo.setAskForFullReport(true); + } - mergeInfo.setAskForFullReport(true); + // update the lastAvailReport time and unset the backfill flag if it is set. + availabilityManager.updateLastAvailabilityReportInNewTransaction(agentToUpdate.intValue()); - } else { - // process the report in batches to avoid an overly long transaction and to potentially increase the - // speed in which an avail change becomes visible. + } - while (!availabilities.isEmpty()) { - int size = availabilities.size(); - int end = (MERGE_BATCH_SIZE < size) ? MERGE_BATCH_SIZE : size; + // process the report in batches to avoid an overly long transaction and to potentially increase the + // speed in which an avail change becomes visible. - List availBatch = availabilities.subList(0, end); - availabilityManager.mergeAvailabilitiesInNewTransaction(availBatch, mergeInfo); + while (!availabilities.isEmpty()) { + int size = availabilities.size(); + int end = (MERGE_BATCH_SIZE < size) ? MERGE_BATCH_SIZE : size; - // Advance our progress and possibly help GC. This will remove the processed avails from the backing list - availBatch.clear(); - } + List availBatch = availabilities.subList(0, end); + availabilityManager.mergeAvailabilitiesInNewTransaction(availBatch, mergeInfo); - MeasurementMonitor.getMBean().incrementAvailabilityReports(report.isChangesOnlyReport()); - MeasurementMonitor.getMBean().incrementAvailabilitiesInserted(mergeInfo.getNumInserted()); - MeasurementMonitor.getMBean().incrementAvailabilityInsertTime(watch.getElapsed()); - watch.reset(); + // Advance our progress and possibly help GC. This will remove the processed avails from the backing list + availBatch.clear(); } + MeasurementMonitor.getMBean().incrementAvailabilityReports(report.isChangesOnlyReport()); + MeasurementMonitor.getMBean().incrementAvailabilitiesInserted(mergeInfo.getNumInserted()); + MeasurementMonitor.getMBean().incrementAvailabilityInsertTime(watch.getElapsed()); + watch.reset(); + if (!report.isServerSideReport()) { if (agentToUpdate != null) { // don't bother asking for a full report if the one we are currently processing is already full diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityManagerLocal.java index 805cc361fd5..1228c168cdf 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityManagerLocal.java @@ -180,7 +180,9 @@ List findAvailabilitiesForAutoGroup(Subject subject, int pare /** * Executing this method will update the given agent's lastAvailabilityReport time - * in a new transaction + * in a new transaction. + *

+ * SIDE-EFFECT: will unset the backfill flag if currently set on the agent. * * @param agentId the id of the agent */ diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerLocal.java index 74318aa41c2..a89f9a86ea7 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerLocal.java @@ -139,8 +139,6 @@ public List> findDataForContext(Sub */ Set findLiveData(Subject subject, int resourceId, int[] definitionIds, Long timeout); - MeasurementAggregate getAggregate(Subject subject, int groupId, int definitionId, long startTime, long endTime); - void updateAlertConditionCache(String callingMethod, MeasurementData[] data); } \ No newline at end of file diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerRemote.java index d458cc76d26..3a302345956 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerRemote.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerRemote.java @@ -164,4 +164,22 @@ List> findDataForCompatibleGroup(Su */ List> findDataForResource(Subject subject, int resourceId, int[] definitionIds, long beginTime, long endTime, int numPoints); + + /** + * Get the aggregate values of the numerical values for a given group and metric + * definition. + * + * @param subject the user requesting the aggregate + * @param groupId the id of the {@link ResourceGroup} for which this aggregate is being requested + * @param definitionId the id of the {@link MeasurementDefinition} for the metric + * + * @param startTime in millis + * @param endTime in millis + * + * @return MeasurementAggregate aggregate data + * + * @throws MeasurementException if aggregate cannot be found + */ + MeasurementAggregate getAggregate(Subject subject, int groupId, int definitionId, long startTime, long endTime); + } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginsBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginsBean.java index 24faa726fd2..7588d2fe135 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginsBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginsBean.java @@ -47,14 +47,12 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - import org.rhq.core.clientapi.agent.metadata.ConfigurationMetadataParser; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.authz.Permission; import org.rhq.core.domain.cloud.Server; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; -import org.rhq.core.domain.plugin.Plugin; import org.rhq.core.domain.plugin.PluginDeploymentType; import org.rhq.core.domain.plugin.PluginKey; import org.rhq.core.domain.plugin.PluginStatusType; @@ -83,7 +81,7 @@ */ @Stateless @javax.annotation.Resource(name = "RHQ_DS", mappedName = RHQConstants.DATASOURCE_JNDI_NAME) -public class ServerPluginsBean implements ServerPluginsLocal { +public class ServerPluginsBean implements ServerPluginsLocal, ServerPluginsRemote { private final Log log = LogFactory.getLog(ServerPluginsBean.class); @PersistenceContext(unitName = RHQConstants.PERSISTENCE_UNIT_NAME) @@ -748,4 +746,11 @@ private List getPluginKeysFromIds(List pluginIds) { List keys = q.getResultList(); return keys; } + + @Override + @RequiredPermission(Permission.MANAGE_SETTINGS) + public List getServerPlugins(Subject subject) { + return getServerPlugins(); + } + } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginsLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginsLocal.java index cd4f93a6439..b913f2429a0 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginsLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginsLocal.java @@ -31,12 +31,10 @@ import javax.persistence.NoResultException; import org.rhq.core.domain.auth.Subject; -import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; import org.rhq.core.domain.plugin.PluginKey; import org.rhq.core.domain.plugin.PluginStatusType; import org.rhq.core.domain.plugin.ServerPlugin; -import org.rhq.enterprise.server.plugin.pc.ControlResults; import org.rhq.enterprise.server.plugin.pc.ServerPluginType; import org.rhq.enterprise.server.xmlschema.ControlDefinition; import org.rhq.enterprise.server.xmlschema.generated.serverplugin.ServerPluginDescriptorType; @@ -50,14 +48,7 @@ * @author John Mazzitelli */ @Local -public interface ServerPluginsLocal { - /** - * Recycles the master plugin container, essentially shutting down all server plugins - * and then restarting them. - * - * @param subject the user asking to restart the master plugin container - */ - void restartMasterPluginContainer(Subject subject); +public interface ServerPluginsLocal extends ServerPluginsRemote { /** * Returns a list of all the installed server plugins in the database @@ -153,36 +144,6 @@ public interface ServerPluginsLocal { */ List getServerPluginKeysByEnabled(boolean enabled); - /** - * Enables the plugins and restarts them. - * - * @param subject user making the request - * @param pluginIds the plugins to be enabled - * @return the list of keys of the plugins that were enabled - * @throws Exception if failed to disable a plugin - */ - List enableServerPlugins(Subject subject, List pluginIds) throws Exception; - - /** - * Disables the plugins and unschedules their jobs. - * - * @param subject user making the request - * @param pluginIds the plugins to be disabled - * @return the list of keys of the plugins that were disabled - * @throws Exception if failed to disable a plugin - */ - List disableServerPlugins(Subject subject, List pluginIds) throws Exception; - - /** - * Removes the plugins from the system and unschedules their jobs. - * - * @param subject user making the request - * @param pluginIds the plugins to be undeployed - * @return the list of keys of plugins that were undeployed - * @throws Exception if failed to undeploy a plugin - */ - List deleteServerPlugins(Subject subject, List pluginIds) throws Exception; - /** * Turns on or off the enabled flag in the database but does NOT restart the server plugin. * This has "requires new" semantics, so the results are committed immediately upon return. @@ -292,23 +253,6 @@ public interface ServerPluginsLocal { */ List getServerPluginControlDefinitions(PluginKey pluginKey) throws Exception; - /** - * Invokes a control operation on a given plugin and returns the results. This method blocks until - * the plugin component completes the invocation. - * - * @param subject user making the request, must have the proper permissions - * @param pluginKey identifies the plugin whose control operation is to be invoked - * @param controlName identifies the name of the control operation to invoke - * @param params parameters to pass to the control operation; may be null - * @return the results of the invocation - * - * @throws if failed to obtain the plugin component and invoke the control. This usually means an - * abnormal error occurred - if the control operation merely failed to do what it needed to do, - * the error will be reported in the returned results, not as a thrown exception. - */ - ControlResults invokeServerPluginControl(Subject subject, PluginKey pluginKey, String controlName, - Configuration params) throws Exception; - /** * Return all the server plugins that match a certain type string. * This type is defined in the XML schema of the plugin descriptor. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginsRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginsRemote.java new file mode 100644 index 00000000000..70ed0e5e99b --- /dev/null +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginsRemote.java @@ -0,0 +1,82 @@ +package org.rhq.enterprise.server.plugin; + +import java.util.List; + +import javax.ejb.Remote; + +import org.rhq.core.domain.auth.Subject; +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.plugin.PluginKey; +import org.rhq.core.domain.plugin.ServerPlugin; +import org.rhq.enterprise.server.plugin.pc.ControlResults; + +/** + * Remote management interface for server plugins. + */ +@Remote +public interface ServerPluginsRemote { + + /** + * Recycles the master plugin container, essentially shutting down all server plugins + * and then restarting them. + * + * @param subject the user asking to restart the master plugin container + */ + void restartMasterPluginContainer(Subject subject); + + /** + * Returns a list of all the installed server plugins in the database, minus + * the content object. + * + * @return all installed server plugins found in the DB + */ + List getServerPlugins(Subject subject); + + /** + * Enables the plugins and restarts them. + * + * @param subject user making the request + * @param pluginIds the plugins to be enabled + * @return the list of keys of the plugins that were enabled + * @throws Exception if failed to disable a plugin + */ + List enableServerPlugins(Subject subject, List pluginIds) throws Exception; + + /** + * Disables the plugins and unschedules their jobs. + * + * @param subject user making the request + * @param pluginIds the plugins to be disabled + * @return the list of keys of the plugins that were disabled + * @throws Exception if failed to disable a plugin + */ + List disableServerPlugins(Subject subject, List pluginIds) throws Exception; + + /** + * Removes the plugins from the system and unschedules their jobs. + * + * @param subject user making the request + * @param pluginIds the plugins to be undeployed + * @return the list of keys of plugins that were undeployed + * @throws Exception if failed to undeploy a plugin + */ + List deleteServerPlugins(Subject subject, List pluginIds) throws Exception; + + /** + * Invokes a control operation on a given plugin and returns the results. This method blocks until + * the plugin component completes the invocation. + * + * @param subject user making the request, must have the proper permissions + * @param pluginKey identifies the plugin whose control operation is to be invoked + * @param controlName identifies the name of the control operation to invoke + * @param params parameters to pass to the control operation; may be null + * @return the results of the invocation + * + * @throws if failed to obtain the plugin component and invoke the control. This usually means an + * abnormal error occurred - if the control operation merely failed to do what it needed to do, + * the error will be reported in the returned results, not as a thrown exception. + */ + ControlResults invokeServerPluginControl(Subject subject, PluginKey pluginKey, String controlName, + Configuration params) throws Exception; + +} diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java index 1681f5c5cfa..65250555970 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java @@ -2499,15 +2499,17 @@ public Resource getResource(Subject subject, int resourceId) { @Override @TransactionAttribute(TransactionAttributeType.NEVER) public ResourceAvailability getLiveResourceAvailability(Subject subject, int resourceId) { + Resource res = getResourceById(subject, resourceId); - //platforms are never unknown, just up or down, so we need to default the availability to a different value - //depending on the resource's category - ResourceAvailability results = new ResourceAvailability(res, + + // platforms are never unknown, just up or down, so we need to default the availability to a different value + // depending on the resource's category + ResourceAvailability result = new ResourceAvailability(res, res.getResourceType().getCategory() == ResourceCategory.PLATFORM ? AvailabilityType.DOWN : AvailabilityType.UNKNOWN); try { - // first, quickly see if we can even ping the agent, if not, don't bother trying to get the resource avail + // validate the resource and agent, protect against REST dummy agent Agent agent = agentManager.getAgentByResourceId(subjectManager.getOverlord(), resourceId); if (agent == null) { if (log.isDebugEnabled()) { @@ -2516,7 +2518,6 @@ public ResourceAvailability getLiveResourceAvailability(Subject subject, int res new IllegalStateException("No agent is associated with the resource with id [" + resourceId + "]"); } else if (agent.getName().startsWith(ResourceHandlerBean.DUMMY_AGENT_NAME_PREFIX) && agent.getAgentToken().startsWith(ResourceHandlerBean.DUMMY_AGENT_TOKEN_PREFIX)) { - // dummy agent created from REST return getResourceById(subject, resourceId).getCurrentAvailability(); } AgentClient client = agentManager.getAgentClient(agent); @@ -2526,6 +2527,7 @@ public ResourceAvailability getLiveResourceAvailability(Subject subject, int res AvailabilityReport report = null; + // first, quickly see if we can even ping the agent, if not, don't bother trying to get the resource avail boolean agentPing = client.pingService(5000L); if (agentPing) { // we can't serialize the resource due to the hibernate proxies (agent can't deserialize hibernate objs) @@ -2533,30 +2535,30 @@ public ResourceAvailability getLiveResourceAvailability(Subject subject, int res Resource bareResource = new Resource(res.getResourceKey(), res.getName(), res.getResourceType()); bareResource.setId(res.getId()); bareResource.setUuid(res.getUuid()); + // root the avail check at the desired resource. Ask for a full report to guarantee that we + // get back the agent-side avail for the resource and keep the server in sync. This also means we'll + // get the descendants as well. report = client.getDiscoveryAgentService().getCurrentAvailability(bareResource, false); } - if (report == null) { - report = new AvailabilityReport(client.getAgent().getName()); - Availability fakeAvail = new Availability(res, - res.getResourceType().getCategory() == ResourceCategory.PLATFORM ? AvailabilityType.DOWN - : AvailabilityType.UNKNOWN); - fakeAvail.setStartTime(System.currentTimeMillis()); - report.addAvailability(fakeAvail); - } + if (report != null) { + // although the data came from the agent this should be processed like a server-side report + // because it was requested and initiated by the server (bz 1094540). The availabilities will + // still be merged but certain backfill logic will remain unscathed. + report.setServerSideReport(true); - // The report is most likely empty as it's unlikely the avail has changed. Don't merge it and return - AvailabilityType foundAvail = report.forResource(res.getId()); - if (foundAvail != null) { - availabilityManager.mergeAvailabilityReport(report); - } else { - foundAvail = res.getCurrentAvailability() == null ? AvailabilityType.UNKNOWN : res - .getCurrentAvailability().getAvailabilityType(); - } + AvailabilityType foundAvail = report.forResource(res.getId()); + if (foundAvail != null) { + availabilityManager.mergeAvailabilityReport(report); + } else { + foundAvail = res.getCurrentAvailability() == null ? AvailabilityType.UNKNOWN : res + .getCurrentAvailability().getAvailabilityType(); + } - // make sure we don't somehow leak/persist a MISSING avail - foundAvail = (AvailabilityType.MISSING == foundAvail) ? AvailabilityType.DOWN : foundAvail; - results.setAvailabilityType(foundAvail); + // make sure we don't somehow leak/persist a MISSING avail + foundAvail = (AvailabilityType.MISSING == foundAvail) ? AvailabilityType.DOWN : foundAvail; + result.setAvailabilityType(foundAvail); + } } catch (Exception e) { if (log.isDebugEnabled()) { @@ -2564,7 +2566,7 @@ public ResourceAvailability getLiveResourceAvailability(Subject subject, int res } } - return results; + return result; } // lineage is a getXXX (not findXXX) because it logically returns a single object, but modeled as a list here diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBean.java index 52b9b70aa1d..56ec39092cd 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBean.java @@ -798,4 +798,5 @@ public List getCannedGroupExpressions() { } return list; } + } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerLocal.java index 2b649344c07..00b138fc60b 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerLocal.java @@ -60,12 +60,6 @@ public interface PluginManagerLocal extends PluginManagerRemote { List getPluginStats(List pluginIds); - void enablePlugins(Subject subject, List pluginIds) throws Exception; - - void disablePlugins(Subject subject, List pluginIds) throws Exception; - - void deletePlugins(Subject subject, List pluginIds) throws Exception; - /** * Not to be called outside of the PluginManagerBean implementation. Used for transaction demarcation. */ @@ -90,6 +84,9 @@ public interface PluginManagerLocal extends PluginManagerRemote { */ void purgePlugins(List plugins); + /** + * Sets if a plugin is enabled or not. + */ void setPluginEnabledFlag(Subject subject, int pluginId, boolean enabled) throws Exception; /** @@ -119,7 +116,7 @@ boolean registerPluginTypes(String newPluginName, PluginDescriptor pluginDescrip /** * Returns the directory where plugins can be dropped for inclusion into the system. - * + * * @return directory where the plugin dropbox is located */ File getPluginDropboxDirectory(); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerRemote.java index cdb60f48902..5c75dcb4520 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerRemote.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerRemote.java @@ -34,6 +34,7 @@ * @author Lukas Krejci * @since 4.11 */ + @Remote public interface PluginManagerRemote { @@ -118,10 +119,19 @@ public interface PluginManagerRemote { */ List deployUsingContentHandle(Subject subject, String pluginJarName, String handle) throws Exception; + /** + * Returns a list of plugins by criteria. + */ PageList findPluginsByCriteria(Subject subject, PluginCriteria criteria); + /** + * Enables plugins by ID. + */ void enablePlugins(Subject subject, List pluginIds) throws Exception; + /** + * Disables plugins by ID. + */ void disablePlugins(Subject subject, List pluginIds) throws Exception; /** @@ -134,4 +144,5 @@ public interface PluginManagerRemote { * @throws Exception if an error occurs */ void deletePlugins(Subject subject, List pluginIds) throws Exception; + } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceTypeHandlerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceTypeHandlerBean.java index e73efbd04da..d2fd830aec4 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceTypeHandlerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceTypeHandlerBean.java @@ -115,9 +115,15 @@ public Response getTypes(@ApiParam("Limit results to param in the resource type if (name!=null) { criteria.addFilterName(name); } + if (pluginName!=null) { criteria.addFilterPluginName(pluginName); } + + if (page != null) { + criteria.setPaging(page, pageSize); + } + PageList pageList = typeManager.findResourceTypesByCriteria(caller,criteria); List rtrList = new ArrayList(pageList.size()); for (ResourceType type : pageList) { diff --git a/modules/plugins/jboss-as-7/intentional-api-changes-since-4.11.0.xml b/modules/plugins/jboss-as-7/intentional-api-changes-since-4.11.0.xml index 096e45e583e..bb71f3a2f02 100644 --- a/modules/plugins/jboss-as-7/intentional-api-changes-since-4.11.0.xml +++ b/modules/plugins/jboss-as-7/intentional-api-changes-since-4.11.0.xml @@ -18,4 +18,9 @@ java.lang.String buildDefaultResourceName(org.rhq.modules.plugins.jbossas7.helper.HostPort, org.rhq.modules.plugins.jbossas7.helper.HostPort, org.rhq.modules.plugins.jbossas7.JBossProductType) Functionality enhancements due to [BZ 1080552], old method is still present but deprecated. + + org/rhq/modules/plugins/jbossas7/QueryCacheDiscovery + 8001 + See [BZ 1033130], this resource component class was never used. + diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractVersionedSubsystemDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractVersionedSubsystemDiscovery.java new file mode 100644 index 00000000000..d14373d5811 --- /dev/null +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractVersionedSubsystemDiscovery.java @@ -0,0 +1,74 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2014 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +package org.rhq.modules.plugins.jbossas7; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.apache.commons.logging.LogFactory; + +/* + * @author Jay Shaughnessy + */ +abstract public class AbstractVersionedSubsystemDiscovery extends SubsystemDiscovery { + + /* The matched format is name-VERSION.ext. Version must minimally be in major.minor format. Simpler versions, + * like a single digit, are too possibly part of the actual name. myapp-1.war and myapp-2.war could easily be + * different apps (albeit poorly named). But myapp-1.0.war and myapp-2.0.war are pretty clearly versions of + * the same app. The goal was to handle maven-style versioning. + */ + static private final String PATTERN_DEFAULT = "^(.*?)-([0-9]+\\.[0-9].*)(\\..*)$"; + static private final String PATTERN_DISABLE = "disable"; + static private final String PATTERN_PROP = "rhq.as7.VersionedSubsystemDiscovery.pattern"; + + static protected final Matcher MATCHER; + static protected final String SUBDEPLOYMENT_TYPE = "Subdeployment"; + static protected boolean DISABLED = false; + + static { + Matcher m = null; + try { + String override = System.getProperty(PATTERN_PROP); + if (null != override) { + if (override.toLowerCase().startsWith(PATTERN_DISABLE)) { + DISABLED = true; + + } else { + Pattern p = Pattern.compile(override); + m = p.matcher(""); + if (m.groupCount() != 3) { + String msg = "Pattern supplied by system property [" + PATTERN_PROP + + "] is invalid. Expected [3] matching groups but found [" + m.groupCount() + + "]. Will use default pattern [" + PATTERN_DEFAULT + "]."; + m = null; + LogFactory.getLog(AbstractVersionedSubsystemDiscovery.class).error(msg); + } + } + } + } catch (Exception e) { + String msg = "Pattern supplied by system property [" + PATTERN_PROP + + "] is invalid. Will use default pattern [" + PATTERN_DEFAULT + "]."; + m = null; + LogFactory.getLog(AbstractVersionedSubsystemDiscovery.class).error(msg, e); + } + + MATCHER = (null != m) ? m : Pattern.compile(PATTERN_DEFAULT).matcher(""); + } +} diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HibernatePersistenceUnitComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HibernatePersistenceUnitComponent.java new file mode 100644 index 00000000000..ca54be00bcc --- /dev/null +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HibernatePersistenceUnitComponent.java @@ -0,0 +1,162 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2014 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +package org.rhq.modules.plugins.jbossas7; + +import java.util.List; +import java.util.Map; + +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.PropertyList; +import org.rhq.core.domain.configuration.PropertyMap; +import org.rhq.core.domain.configuration.PropertySimple; +import org.rhq.core.pluginapi.operation.OperationResult; +import org.rhq.modules.plugins.jbossas7.json.Address; +import org.rhq.modules.plugins.jbossas7.json.CompositeOperation; +import org.rhq.modules.plugins.jbossas7.json.ReadChildrenNames; +import org.rhq.modules.plugins.jbossas7.json.ReadResource; +import org.rhq.modules.plugins.jbossas7.json.Result; + +/** + * @author Thomas Segismont + */ +public class HibernatePersistenceUnitComponent extends BaseComponent { + private static final String[] QUERY_CACHE_ATTRIBUTE_NAMES = new String[] { // + "query-name", // + "query-execution-count", // + "query-execution-row-count", // + "query-execution-min-time", // + "query-execution-max-time", // + "query-execution-average-time", // + "query-cache-hit-count", // + "query-cache-miss-count", // + "query-cache-put-count" // + }; + private static final int BATCH_SIZE = 10; + private static final int MANAGEMENT_QUERY_TIMEOUT = 60; + + @Override + public OperationResult invokeOperation(String name, Configuration parameters) throws Exception { + if ("viewQueries".equals(name)) { + return invokeViewQueriesOperation(parameters); + } + return super.invokeOperation(name, parameters); + } + + private OperationResult invokeViewQueriesOperation(Configuration parameters) throws InterruptedException { + OperationResult operationResult = new OperationResult(); + + int batchSize; + PropertySimple batchSizeProp = parameters.getSimple("batchSize"); + if (batchSizeProp == null || batchSizeProp.getStringValue() == null) { + batchSize = BATCH_SIZE; + } else { + try { + batchSize = Integer.parseInt(batchSizeProp.getStringValue()); + if (batchSize < 1) { + operationResult.setErrorMessage("batchSize property is less than 1"); + return operationResult; + } + } catch (NumberFormatException e) { + operationResult.setErrorMessage("batchSize property is not an integer"); + return operationResult; + } + } + + int timeoutSec; + PropertySimple managementQueryTimeoutProp = parameters.getSimple("managementQueryTimeout"); + if (managementQueryTimeoutProp == null || managementQueryTimeoutProp.getStringValue() == null) { + timeoutSec = MANAGEMENT_QUERY_TIMEOUT; + } else { + try { + timeoutSec = Integer.parseInt(managementQueryTimeoutProp.getStringValue()); + if (timeoutSec < 1) { + operationResult.setErrorMessage("managementQueryTimeout property is less than 1"); + return operationResult; + } + } catch (NumberFormatException e) { + operationResult.setErrorMessage("managementQueryTimeout property is not an integer"); + return operationResult; + } + } + + PropertyList queriesPropertyList = new PropertyList("queries"); + operationResult.getComplexResults().put(queriesPropertyList); + + ReadChildrenNames readQueryCacheChildrenNames = new ReadChildrenNames(getAddress(), "query-cache"); + Result readQueryCacheChildrenNamesResult = getASConnection().execute(readQueryCacheChildrenNames, timeoutSec); + if (!readQueryCacheChildrenNamesResult.isSuccess()) { + operationResult.setErrorMessage("Could not read query-cache children names: " + + readQueryCacheChildrenNamesResult.getFailureDescription()); + return operationResult; + } + @SuppressWarnings("unchecked") + List childrenNames = (List) readQueryCacheChildrenNamesResult.getResult(); + + // Process children in batches to avoid sending too many queries if the PU has many query-cache nodes + while (!childrenNames.isEmpty()) { + if (context.getComponentInvocationContext().isInterrupted()) { + // Operation canceled or timed out + throw new InterruptedException(); + } + + List childrenNamesSubList = childrenNames.subList(0, Math.min(batchSize, childrenNames.size())); + + // Create batch operation to read N query-cache nodes + CompositeOperation batchOperation = new CompositeOperation(); + for (String childrenName : childrenNamesSubList) { + Address address = new Address(getAddress()); + address.add("query-cache", childrenName); + ReadResource readQueryCacheResource = new ReadResource(address); + readQueryCacheResource.includeRuntime(true); + batchOperation.addStep(readQueryCacheResource); + } + + // Execute batch + Result batchResult = getASConnection().execute(batchOperation, timeoutSec); + if (!batchResult.isSuccess()) { + operationResult.setErrorMessage("Could not read query-cache attributes: " + + batchResult.getFailureDescription()); + return operationResult; + } + + // Iterate over batch results + @SuppressWarnings("unchecked") + Map mapResult = (Map) batchResult.getResult(); + for (Map stepResult : mapResult.values()) { + PropertyMap queryPropertyMap = new PropertyMap("query"); + @SuppressWarnings("unchecked") + Map queryCacheAttributes = (Map) stepResult.get("result"); + for (String queryCacheAttributeName : QUERY_CACHE_ATTRIBUTE_NAMES) { + addAttributeToPropertyMap(queryCacheAttributeName, queryPropertyMap, queryCacheAttributes); + } + queriesPropertyList.add(queryPropertyMap); + } + + childrenNamesSubList.clear(); + } + + return operationResult; + } + + private void addAttributeToPropertyMap(String attributeName, PropertyMap propertyMap, + Map queryCacheAttributes) { + propertyMap.put(new PropertySimple(attributeName, queryCacheAttributes.get(attributeName))); + } +} diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/QueryCacheDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/QueryCacheDiscovery.java deleted file mode 100644 index 48a972f9fff..00000000000 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/QueryCacheDiscovery.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2013 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - */ - -package org.rhq.modules.plugins.jbossas7; - -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import org.rhq.core.domain.configuration.Configuration; -import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails; -import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException; -import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent; -import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; -import org.rhq.core.util.MessageDigestGenerator; -import org.rhq.modules.plugins.jbossas7.json.Address; -import org.rhq.modules.plugins.jbossas7.json.ReadChildrenNames; -import org.rhq.modules.plugins.jbossas7.json.Result; - -/** - * @author Thomas Segismont - */ -public class QueryCacheDiscovery implements ResourceDiscoveryComponent> { - private static final String QUERY_CACHE_TYPE_NAME = "query-cache"; - private static final String RESOURCE_NAME_PREFIX = "Query Cache "; - - @Override - public Set discoverResources(ResourceDiscoveryContext> context) - throws InvalidPluginConfigurationException { - - BaseComponent parentComponent = context.getParentResourceComponent(); - String parentComponentPath = parentComponent.getPath(); - Address parentAddress = new Address(parentComponentPath); - - Result readChildrenNamesResult = parentComponent.getASConnection().execute( - new ReadChildrenNames(parentAddress, QUERY_CACHE_TYPE_NAME)); - - if (readChildrenNamesResult.isSuccess()) { - Set details = new HashSet(); - List childrenNames = (List) readChildrenNamesResult.getResult(); - for (String childName : childrenNames) { - Configuration pluginConfiguration = context.getDefaultPluginConfiguration(); - pluginConfiguration.setSimpleValue("path", parentComponentPath + "," + QUERY_CACHE_TYPE_NAME + "=" - + childName); - String resourceKey = MessageDigestGenerator.getDigestString(childName); - details.add( // - new DiscoveredResourceDetails( // - context.getResourceType(), // DataType - resourceKey, // Key - RESOURCE_NAME_PREFIX + resourceKey, // Name - null, // Version - context.getResourceType().getDescription(), // subsystem.description - pluginConfiguration, null)); - } - return details; - } - return Collections.emptySet(); - } -} diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/SubsystemDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/SubsystemDiscovery.java index 8b68f46137c..76b7f019df4 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/SubsystemDiscovery.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/SubsystemDiscovery.java @@ -208,7 +208,7 @@ public Set discoverResources(ResourceDiscoveryContext * @param confPath The subsystem that got fed into discovery. Directly return is not subsystem=infinispan * @return True if this subsystem should be skipped. */ - private boolean shouldSkipEntryWrtIspn(ResourceDiscoveryContext> context, String confPath) { + protected boolean shouldSkipEntryWrtIspn(ResourceDiscoveryContext> context, String confPath) { // If this is not subsystem=infinispan, we should not skip it at all if (!"subsystem=infinispan".equals(confPath)) @@ -238,4 +238,4 @@ private boolean shouldSkipEntryWrtIspn(ResourceDiscoveryContext return true; } -} +} \ No newline at end of file diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/VersionedRuntimeDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/VersionedRuntimeDiscovery.java new file mode 100644 index 00000000000..e54b2599031 --- /dev/null +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/VersionedRuntimeDiscovery.java @@ -0,0 +1,215 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2014 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +package org.rhq.modules.plugins.jbossas7; + +import java.util.Set; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.resource.ResourceUpgradeReport; +import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails; +import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; +import org.rhq.core.pluginapi.upgrade.ResourceUpgradeContext; +import org.rhq.core.pluginapi.upgrade.ResourceUpgradeFacet; + +/** + * Discover subsystems. We need to distinguish two cases denoted by the path + * plugin config: + *

    + *
  • Path is a single 'word': here the value denotes a key in the resource path + * of AS7, that identifies a child type see e.g. the Connectors below the JBossWeb + * service in the plugin descriptor. There can be multiple resources of the given + * type. In addition it is possible that a path entry in configuration shares multiple + * types that are separated by the pipe symbol.
    • + *
  • Path is a key-value pair (e.g. subsystem=web ). This denotes a singleton + * subsystem with a fixes path within AS7 (perhaps below another resource in the + * tree.
    • + *
+ * + * Similar to {@link VersionedSubsystemDiscovery} but the logic is slightly different for the Runtime + * resources under a Deployment or Subdeployment. + * + * @see VersionedSubsystemDiscovery + * + * @author Jay Shaughnessy + */ +public class VersionedRuntimeDiscovery extends AbstractVersionedSubsystemDiscovery implements ResourceUpgradeFacet { + + private final Log log = LogFactory.getLog(this.getClass()); + + public Set discoverResources(ResourceDiscoveryContext> context) + throws Exception { + + // Perform the standard discovery. This can return resources with versions in the name, + // key and path. + Set details = super.discoverResources(context); + + if (DISABLED) { + return details; + } + + // Now, post-process the discovery as needed. We need to strip the versions from the + // resource name and the resource key. We want to leave them in the path plugin config + // property, that value reflects the actual DMR used to query EAP. + // Note that the version string is always set to the parent's version for these + // resources which are logically part of the umbrella deployment. + + Configuration config = context.getDefaultPluginConfiguration(); + String configPath = config.getSimpleValue("path", ""); + boolean isType = (configPath == null || configPath.isEmpty() || configPath.contains("=")); + + for (DiscoveredResourceDetails detail : details) { + BaseComponent parentComponent = context.getParentResourceComponent(); + String parentPath = (null != parentComponent.getPath()) ? parentComponent.getPath() : ""; + detail.setResourceVersion((parentPath.isEmpty()) ? null : context.getParentResourceContext().getVersion()); + + if (isType) { + detail.setResourceKey((parentPath.isEmpty()) ? configPath : (parentComponent.key + "," + configPath)); + continue; + } + + // Note that in addition to the comma-separated segments of the DMR address, certain runtime + // resources (e.g. "Hibernate Persistence Unit") have a forwardSlash-separated segments of + // their own. + + StringBuilder sb = new StringBuilder(); + String slash = ""; + for (String segment : detail.getResourceName().split("/")) { + MATCHER.reset(segment); + if (MATCHER.matches()) { + sb.append(slash); + sb.append(MATCHER.group(1) + MATCHER.group(3)); + } else { + sb.append(slash); + sb.append(segment); + } + slash = "/"; + } + detail.setResourceName(sb.toString()); + + sb = new StringBuilder(); + String comma = ""; + for (String outerSegment : detail.getResourceKey().split(",")) { + sb.append(comma); + comma = ","; + slash = ""; + for (String segment : outerSegment.split("/")) { + sb.append(slash); + slash = "/"; + MATCHER.reset(segment); + if (MATCHER.matches()) { + sb.append(MATCHER.group(1) + MATCHER.group(3)); + } else { + sb.append(segment); + } + } + } + detail.setResourceKey(sb.toString()); + } + + return details; + } + + // The Matching logic here is the same as above, but instead of setting the discovery details we + // set new values in the upgrade report for name, version and key. + @Override + public ResourceUpgradeReport upgrade(ResourceUpgradeContext inventoriedResource) { + ResourceUpgradeReport result = null; + + if (DISABLED) { + return result; + } + + // Note that in addition to the comma-separated segments of the DMR address, certain runtime + // resources (e.g. "Hibernate Persistence Unit") have a forwardSlash-separated segments of + // their own. + + StringBuilder sb = new StringBuilder(); + String slash = ""; + boolean upgradeName = false; + for (String segment : inventoriedResource.getName().split("/")) { + MATCHER.reset(segment); + if (MATCHER.matches()) { + upgradeName = true; + sb.append(slash); + sb.append(MATCHER.group(1) + MATCHER.group(3)); + } else { + sb.append(slash); + sb.append(segment); + } + slash = "/"; + } + + if (upgradeName) { + if (null == result) { + result = new ResourceUpgradeReport(); + } + result.setForceGenericPropertyUpgrade(true); // It is critical the name get upgraded + result.setNewName(sb.toString()); + } + + // Note that the version string is always set to the parent's version for these + // resources which are logically part of the umbrella deployment. + String parentVersion = inventoriedResource.getParentResourceContext().getVersion(); + String currentVersion = inventoriedResource.getVersion(); + if ((currentVersion != parentVersion) + && ((null == currentVersion && null != parentVersion) || !currentVersion.equals(parentVersion))) { + if (null == result) { + result = new ResourceUpgradeReport(); + } + result.setForceGenericPropertyUpgrade(true); // It is critical the version get upgraded + result.setNewVersion(parentVersion); + } + + sb = new StringBuilder(); + String comma = ""; + boolean upgradeKey = false; + for (String outerSegment : inventoriedResource.getResourceKey().split(",")) { + sb.append(comma); + comma = ","; + slash = ""; + for (String segment : outerSegment.split("/")) { + sb.append(slash); + slash = "/"; + MATCHER.reset(segment); + if (MATCHER.matches()) { + upgradeKey = true; + sb.append(MATCHER.group(1) + MATCHER.group(3)); + } else { + sb.append(segment); + } + } + } + if (upgradeKey) { + if (null == result) { + result = new ResourceUpgradeReport(); + } + result.setNewResourceKey(sb.toString()); + } + + if (null != result && log.isDebugEnabled()) { + log.debug("Requesting upgrade: " + result); + } + + return result; + } +} diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/VersionedSubsystemDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/VersionedSubsystemDiscovery.java new file mode 100644 index 00000000000..ded95091a80 --- /dev/null +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/VersionedSubsystemDiscovery.java @@ -0,0 +1,181 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2014 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +package org.rhq.modules.plugins.jbossas7; + +import java.util.Set; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import org.rhq.core.domain.resource.ResourceUpgradeReport; +import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails; +import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; +import org.rhq.core.pluginapi.upgrade.ResourceUpgradeContext; +import org.rhq.core.pluginapi.upgrade.ResourceUpgradeFacet; + +/** + * Discover subsystems. We need to distinguish two cases denoted by the path + * plugin config: + *
    + *
  • Path is a single 'word': here the value denotes a key in the resource path + * of AS7, that identifies a child type see e.g. the Connectors below the JBossWeb + * service in the plugin descriptor. There can be multiple resources of the given + * type. In addition it is possible that a path entry in configuration shares multiple + * types that are separated by the pipe symbol.
    • + *
  • Path is a key-value pair (e.g. subsystem=web ). This denotes a singleton + * subsystem with a fixes path within AS7 (perhaps below another resource in the + * tree.
    • + *
+ * + * This subclass adds logic for discovering different versions of the same logical resource, + * by stripping version info out of the path, removing it from the resourceName and setting it + * as the resourceVersion. + *

+ * The default version matching pattern is designed to match maven-like version stamping: + * name-version.ext being the basic format. The version must minimally contain + * major.minor values. See Maven documentation for more information. The default + * pattern is "^(.*?)-([0-9]+\\.[0-9].*)(\\..*)$". The same pattern is applied to + * all Deployment and Subdeployment artifacts. + *

+ * To override the default pattern the following environment variable can be defined: + * rhq.as7.VersionedSubsystemDiscovery.pattern=theDesiredRegexPattern. The regex + * *must* capture three groups as does the default. Group1=name, Group2=version, Group3=extension. + *

+ * To disable versioned discovery and maintain version strings in the deployment names, set + * rhq.as7.VersionedSubsystemDiscovery.pattern=disable + * + * @author Jay Shaughnessy + */ +public class VersionedSubsystemDiscovery extends AbstractVersionedSubsystemDiscovery implements ResourceUpgradeFacet { + + private final Log log = LogFactory.getLog(this.getClass()); + + public Set discoverResources(ResourceDiscoveryContext> context) + throws Exception { + + // Perform the standard discovery. This can return resources with versions in the name, + // key and path. + Set details = super.discoverResources(context); + + if (DISABLED) { + return details; + } + + // Now, post-process the discovery as needed. We need to strip the versions from the + // resource name and the resource key. We want to leave them in the path plugin config + // property, that value reflects the actual DMR used to query EAP. + // The stripped versions are then used to set the resource version string. + + for (DiscoveredResourceDetails detail : details) { + MATCHER.reset(detail.getResourceName()); + if (MATCHER.matches()) { + // reset the resource name with the stripped value + detail.setResourceName(MATCHER.group(1) + MATCHER.group(3)); + + // The version string for a subdeployment must incorporate the parent deployment's version + // so that we detect an overall version change if the parent is re-deployed. Without this + // the Subdeployment will not be properly updated if its version remains unchanged in the + // updated Deployment. + if (SUBDEPLOYMENT_TYPE.equals(context.getResourceType().getName())) { + String parentResourceVersion = context.getParentResourceContext().getVersion(); + parentResourceVersion = (null == parentResourceVersion) ? "" : (parentResourceVersion + "/"); + detail.setResourceVersion(parentResourceVersion + MATCHER.group(2)); + } else { + detail.setResourceVersion(MATCHER.group(2)); + } + } + + StringBuilder sb = new StringBuilder(); + String comma = ""; + for (String segment : detail.getResourceKey().split(",")) { + sb.append(comma); + comma = ","; + MATCHER.reset(segment); + if (MATCHER.matches()) { + sb.append(MATCHER.group(1) + MATCHER.group(3)); + } else { + sb.append(segment); + } + } + detail.setResourceKey(sb.toString()); + } + + return details; + } + + // The Matching logic here is the same as above, but instead of setting the discovery details we + // set new values in the upgrade report for name, version and key. + @Override + public ResourceUpgradeReport upgrade(ResourceUpgradeContext inventoriedResource) { + ResourceUpgradeReport result = null; + + if (DISABLED) { + return result; + } + + MATCHER.reset(inventoriedResource.getName()); + if (MATCHER.matches()) { + result = new ResourceUpgradeReport(); + result.setForceGenericPropertyUpgrade(true); // It is critical the name and version get upgraded + + // reset the resource name with the stripped value + result.setNewName(MATCHER.group(1) + MATCHER.group(3)); + + // The version string for a subdeployment must incorporate the parent deployment's version + // so that we detect an overall version change if the parent is re-deployed. Without this + // the Subdeployment will not be properly updated if its version remains unchanged in the + // updated Deployment. + if (SUBDEPLOYMENT_TYPE.equals(inventoriedResource.getResourceType().getName())) { + String parentResourceVersion = inventoriedResource.getParentResourceContext().getVersion(); + parentResourceVersion = (null == parentResourceVersion) ? "" : (parentResourceVersion + "/"); + result.setNewVersion(parentResourceVersion + MATCHER.group(2)); + } else { + result.setNewVersion(MATCHER.group(2)); + } + } + + StringBuilder sb = new StringBuilder(); + String comma = ""; + boolean upgradeKey = false; + for (String segment : inventoriedResource.getResourceKey().split(",")) { + sb.append(comma); + comma = ","; + MATCHER.reset(segment); + if (MATCHER.matches()) { + upgradeKey = true; + sb.append(MATCHER.group(1) + MATCHER.group(3)); + } else { + sb.append(segment); + } + } + if (upgradeKey) { + if (null == result) { + result = new ResourceUpgradeReport(); + } + result.setNewResourceKey(sb.toString()); + } + + if (null != result && log.isDebugEnabled()) { + log.debug("Requesting upgrade: " + result); + } + + return result; + } +} diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/WebRuntimeDiscoveryComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/WebRuntimeDiscoveryComponent.java index 31af277e0ff..8292e89f789 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/WebRuntimeDiscoveryComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/WebRuntimeDiscoveryComponent.java @@ -41,7 +41,7 @@ /** * @author Thomas Segismont */ -public class WebRuntimeDiscoveryComponent extends SubsystemDiscovery { +public class WebRuntimeDiscoveryComponent extends VersionedRuntimeDiscovery { private static final Log LOG = LogFactory.getLog(WebRuntimeDiscoveryComponent.class); private static final String CONTEXT_ROOT_ATTRIBUTE = "context-root"; diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml index 8433dc83765..9c624ec17d5 100644 --- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml @@ -1981,7 +1981,7 @@ @@ -9042,7 +9042,7 @@ @@ -9104,7 +9104,7 @@ @@ -9170,7 +9170,7 @@ @@ -9186,7 +9186,7 @@ @@ -9307,7 +9307,7 @@ @@ -9422,7 +9422,7 @@ @@ -9438,7 +9438,7 @@ @@ -9703,7 +9703,7 @@ @@ -9901,7 +9901,7 @@ @@ -10022,7 +10022,7 @@ @@ -10038,7 +10038,7 @@ @@ -10084,7 +10084,7 @@ @@ -10125,7 +10125,7 @@ @@ -10171,7 +10171,7 @@ @@ -10197,7 +10197,7 @@ @@ -10221,7 +10221,7 @@ @@ -10237,7 +10237,7 @@ @@ -10266,7 +10266,7 @@ @@ -10281,8 +10281,8 @@ @@ -10308,6 +10308,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -10343,7 +10383,7 @@ @@ -10357,29 +10397,9 @@ - - - - - - - - - - - - - - - - - - - - @@ -10396,7 +10416,7 @@ @@ -13594,4 +13614,64 @@ + + Versioned Deployments (Since RHQ 4.12) + + This plugin supports Versioned Deployments. A Deployment (EAR, WAR, etc) can be a managed server deployment or + standalone deployment. This includes Versioned Subdeployments (WAR, EJB JAR inside an EAR, etc). A Versioned + Deployment is one that incorporates a version into the artifact name. For example, testapp-1.0.war. By default + the plugin will strip the version from the artifact and create a resource named "testapp.war" with version "1.0". + The benefit to this approach is that when upgrading to testapp-2.0.war, for example, the logical "testapp.war" + resource remains in inventory and is reset to version "2.0". In this way all historical data is maintained, and the + resource does not fall into a permanent "DOWN" state. Without versioned deployments, after the upgrade there would + exist in inventory two resources: a permanently DOWN testapp-1.0.war resource as well as a new testapp-2.0.war + resource. + +

+ The version matching is designed to match "Maven-style" versions (see http://mojo.codehaus.org/versions-maven-plugin/version-rules.html). + The version stamp is delimited by a dash, and must minimally include a Major.Minor version. This avoids confusion + with distinct but poorly named Deployments like app-1.war and app-2.war, or app1.war and app2.war. In both of those + cases the version matcher would not match and all of the apps would be different resources. + +

+ The default pattern is the following regular expression:

^(.*?)-([0-9]+\\.[0-9].*)(\\..*)$
+ +

+ There is a system property that can be set to alter the default behavior of the plugin. Note that for the property + to have any effect it must be applied to every applicable RHQ Agent prior to its startup. To disable versioned + Deployments and allow for version stamps to remain in the Deployment names set: + 

rhq.as7.VersionedSubsystemDiscovery.pattern=disable
+ To override the default pattern (not recommended) set: + 
rhq.as7.VersionedSubsystemDiscovery.pattern=YourPatternHere
+ Note that the custom regex pattern *must* capture three groups as does the default. Group1=name, Group2=version, + Group3=extension. The single pattern is applied to all Deployments. + +

Upgrade Behavior

+ Earlier versions of RHQ may have Deployment resources in inventory that contain version stamps in their names. This + plugin implements the ResourceUpgradeFacet, which will convert the existing resources on the first Agent startup + with the new updated plugin. To avoid this the above system property must be set in advance. Behavior can always + be changed. If necessary update the system property as needed and, when desired, uninventory any + old resources that are no longer needed after the change. + +
Multiple Versions of the Same Resource in Inventory
+ The new feature is designed for the use case where a single version of a given resource is in inventory under a + given parent. When upgraded the logical resource is maintained and its version is updated. For installations where + multiple versions already exist the resource upgrade may generate failures. For example, if under some server I + have both app-1.0.war and app-2.0.war deployed, both will try to upgrade to the same logical resource: app.war. To + avoid issues it is recommended to either, 1) disable this feature prior to upgrade or 2) uninventory resources leaving + only a single version of the resource. + +

MISSING Resource Support (Since RHQ 4.12)

+ This plugin supports the MISSING Resource Policy feature introduced in RHQ 4.12. Deployments and Domain Deployments + can be configured to be automatically uninventoried or ignored if they can no longer be found in the underlying + appication server. + +
Interaction with Versioned Deployment Support
+ If utilizing versioned deployments as described above, it is recommended to leave the MISSING Policy as DOWN (the + default). Otherwise, while updating versions it is possible during the update window to have the resource removed + or ignored. + ]]> + + diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/WebRuntimeDiscoveryComponentTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/WebRuntimeDiscoveryComponentTest.java index e9f647623d6..1110b9d1934 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/WebRuntimeDiscoveryComponentTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/WebRuntimeDiscoveryComponentTest.java @@ -39,6 +39,7 @@ import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails; +import org.rhq.core.pluginapi.inventory.ResourceContext; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; import org.rhq.core.pluginapi.util.ResponseTimeConfiguration; import org.rhq.modules.plugins.jbossas7.helper.ServerPluginConfiguration; @@ -63,6 +64,9 @@ public class WebRuntimeDiscoveryComponentTest { @Mock private ResourceDiscoveryContext discoveryContext; + @Mock + private ResourceContext parentResourceContext; + @Mock private BaseComponent parentResourceComponent; @@ -83,6 +87,7 @@ public void setup() throws Exception { discoveryComponent = new WebRuntimeDiscoveryComponent(); MockitoAnnotations.initMocks(this); when(discoveryContext.getParentResourceComponent()).thenReturn(parentResourceComponent); + when(discoveryContext.getParentResourceContext()).thenReturn(parentResourceContext); when(parentResourceComponent.getASConnection()).thenReturn(asConnection); when(discoveryContext.getDefaultPluginConfiguration()).thenReturn(createDefaultPluginConfig()); when(asConnection.execute(any(ReadResource.class))).thenReturn(createReadResourceResult()); diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/DeploymentRuntimeResourcesTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/DeploymentRuntimeResourcesTest.java index 734cf4b2b5e..2cfc65f016e 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/DeploymentRuntimeResourcesTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/DeploymentRuntimeResourcesTest.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2013 Red Hat, Inc. + * Copyright (C) 2005-2014 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -24,15 +24,18 @@ import static org.rhq.modules.plugins.jbossas7.itest.standalone.DeploymentTest.getMissingMeasurements; import static org.rhq.modules.plugins.jbossas7.itest.standalone.DeploymentTest.getTestDeploymentPackageDetails; import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertNull; +import static org.testng.Assert.assertTrue; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.util.HashSet; +import java.util.List; import java.util.Set; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -44,6 +47,9 @@ import org.rhq.core.clientapi.agent.inventory.CreateResourceResponse; import org.rhq.core.clientapi.agent.inventory.DeleteResourceRequest; import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.Property; +import org.rhq.core.domain.configuration.PropertyList; +import org.rhq.core.domain.configuration.PropertyMap; import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.content.PackageDetailsKey; import org.rhq.core.domain.content.transfer.ResourcePackageDetails; @@ -56,6 +62,8 @@ import org.rhq.core.pc.inventory.ResourceContainer; import org.rhq.core.pc.util.FacetLockType; import org.rhq.core.pluginapi.measurement.MeasurementFacet; +import org.rhq.core.pluginapi.operation.OperationFacet; +import org.rhq.core.pluginapi.operation.OperationResult; import org.rhq.modules.plugins.jbossas7.itest.AbstractJBossAS7PluginTest; import org.rhq.test.arquillian.MockingServerServices; import org.rhq.test.arquillian.RunDiscovery; @@ -67,7 +75,6 @@ */ @Test(groups = { "integration", "pc", "standalone" }, singleThreaded = true) public class DeploymentRuntimeResourcesTest extends AbstractJBossAS7PluginTest { - private static final Log LOG = LogFactory.getLog(DeploymentRuntimeResourcesTest.class); private enum RuntimeServiceType { DATASOURCES_RUNTIME("Datasources Runtime"), // @@ -98,9 +105,9 @@ public String getServiceTypeName() { } } - private Resource standaloneServer; private Resource deployment; + @Override protected void injectMocks(MockingServerServices serverServices) { Mockito.when( serverServices.getContentServerService().downloadPackageBitsGivenResource(Mockito.anyInt(), @@ -138,9 +145,7 @@ private long copyStreamAndReturnCount(OutputStream out) throws IOException { try { int data; while ((data = in.read()) != -1) { - if (out != null) { - out.write(data); - } + out.write(data); cnt++; } } finally { @@ -154,8 +159,8 @@ private long copyStreamAndReturnCount(OutputStream out) throws IOException { @RunDiscovery public void testDeploy() throws Exception { Resource platform = validatePlatform(); - standaloneServer = waitForResourceByTypeAndKey(platform, platform, StandaloneServerComponentTest.RESOURCE_TYPE, - StandaloneServerComponentTest.RESOURCE_KEY); + Resource standaloneServer = waitForResourceByTypeAndKey(platform, platform, + StandaloneServerComponentTest.RESOURCE_TYPE, StandaloneServerComponentTest.RESOURCE_KEY); //assertFalse(standaloneResources == null || standaloneResources.size() != 1, // "Exactly 1 AS7 standalone server resource should be present."); @@ -198,7 +203,7 @@ public void testRuntimeResources() throws Exception { private void ensureAllRuntimeServicesAreFound() throws InterruptedException { long start = System.currentTimeMillis(); - boolean foundAllRuntimeServices = false; + boolean foundAllRuntimeServices; do { boolean runtimeServiceMissing = false; for (RuntimeServiceType runtimeServiceType : RuntimeServiceType.values()) { @@ -255,7 +260,6 @@ private MeasurementFacet getMeasurementFacet(Resource resource) { return resourceContainer.createResourceComponentProxy(MeasurementFacet.class, FacetLockType.READ, SECONDS.toMillis(5), false, false, false); } catch (PluginContainerException e) { - return null; } } @@ -274,6 +278,33 @@ private Set getChildResourcesOfType(final Resource parentResource, fin return foundResources; } + @Test(priority = 13) + public void testHibernatePersistenceUnitViewQueriesOperation() throws Exception { + Set resources = getChildResourcesOfType(getDeploymentResource(), + RuntimeServiceType.HIBERNATE_PERSISTENCE_UNIT.getServiceTypeName()); + for (Resource resource : resources) { + OperationFacet operationFacet = getOperationFacet(resource); + Configuration parameters = new Configuration(); + parameters.setSimpleValue("batchSize", "50"); + parameters.setSimpleValue("managementQueryTimeout", "180"); + OperationResult operationResult = operationFacet.invokeOperation("viewQueries", parameters); + String errorMessage = operationResult.getErrorMessage(); + assertNull(errorMessage, errorMessage); + Configuration complexResults = operationResult.getComplexResults(); + assertNotNull(complexResults, "ComplexResults is null"); + PropertyList queriesPropList = complexResults.getList("queries"); + assertNotNull(queriesPropList, "queriesPropList is null"); + List queriesList = queriesPropList.getList(); + assertFalse(queriesList.isEmpty(), "queriesPropList is empty"); + for (Property queryProperty : queriesList) { + assertTrue(queryProperty instanceof PropertyMap, "Not a PropertyMap: " + queryProperty); + PropertyMap queryPropertyMap = (PropertyMap) queryProperty; + assertTrue(queryPropertyMap.getMap().containsKey("query-name"), + "Map does not contain query-name attribute: " + queryPropertyMap.getMap()); + } + } + } + @Test(priority = 99) public void testUndeploy() throws Exception { Resource deploymentResource = getDeploymentResource(); @@ -286,4 +317,14 @@ private Resource getDeploymentResource() { return deployment; } + private OperationFacet getOperationFacet(Resource resource) { + ResourceContainer resourceContainer = pluginContainer.getInventoryManager().getResourceContainer(resource); + try { + return resourceContainer.createResourceComponentProxy(OperationFacet.class, FacetLockType.WRITE, + SECONDS.toMillis(5), false, false, false); + } catch (PluginContainerException e) { + return null; + } + } + } diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/DeploymentTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/DeploymentTest.java index 07666398ef8..2d8700b24b8 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/DeploymentTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/DeploymentTest.java @@ -135,7 +135,7 @@ public void testDeploy() throws Exception { request.setPluginConfiguration(null); request.setPluginName(PLUGIN_NAME); request.setResourceConfiguration(deploymentConfig); - request.setResourceName(packageDetails.getName()); + request.setResourceName(TestDeployments.DEPLOYMENT_1.getResourceKey()); request.setResourceTypeName("Deployment"); CreateResourceResponse response = pluginContainer.getResourceFactoryManager().executeCreateResourceImmediately( @@ -145,7 +145,8 @@ public void testDeploy() throws Exception { + response.getErrorMessage(); Resource deployment = waitForResourceByTypeAndKey(platform, serverResource, new ResourceType("Deployment", - PLUGIN_NAME, ResourceCategory.SERVICE, null), "deployment=" + packageDetails.getName()); + PLUGIN_NAME, ResourceCategory.SERVICE, null), + "deployment=" + TestDeployments.DEPLOYMENT_1.getResourceKey()); // these tests may depend on the deployment children to be in inventory, make sure they are waitForAsyncDiscoveryToStabilize(deployment, 5000L, 10); } @@ -156,7 +157,8 @@ public void testPackageDetectedForArchivedDeployment() throws Exception { Resource deployment = deploymentResources.iterator().next(); - assert TestDeployments.DEPLOYMENT_1.getDeploymentName().equals(deployment.getName()) : "The deployment doesn't seem to have the expected name"; + // the resource key and resource name are the same, and should be the filename stripped of version. + assert TestDeployments.DEPLOYMENT_1.getResourceKey().equals(deployment.getName()) : "The deployment doesn't seem to have the expected name"; ContentDiscoveryReport report = pluginContainer.getContentManager().executeResourcePackageDiscoveryImmediately( deployment.getId(), "file"); @@ -229,9 +231,9 @@ public void testWebRuntimeMetricsHaveNonNullValues() throws Exception { measurementFacet.getValues(report, measurementScheduleRequests); assertEquals(report.getCallTimeData().size(), 0, "No calltime data was requested"); assertTrue( - report.getNumericData().size() + report.getTraitData().size() == measurementScheduleRequests.size(), - "Some requested measurements are missing: " - + getMissingMeasurements(measurementScheduleRequests, report.getNumericData(), report.getTraitData())); + report.getNumericData().size() + report.getTraitData().size() == measurementScheduleRequests.size(), + "Some requested measurements are missing: " + + getMissingMeasurements(measurementScheduleRequests, report.getNumericData(), report.getTraitData())); } @Test(priority = 16) @@ -327,7 +329,7 @@ static ResourcePackageDetails getTestDeploymentPackageDetails(TestDeployments de } static Set getMissingMeasurements(Set measurementScheduleRequests, - Set numericData, Set traitData) { + Set numericData, Set traitData) { Set missingMeasurements = new HashSet(); for (MeasurementScheduleRequest measurementScheduleRequest : measurementScheduleRequests) { missingMeasurements.add(measurementScheduleRequest.getName()); @@ -343,17 +345,17 @@ static Set getMissingMeasurements(Set measur static Set getMeasurementScheduleRequests(Resource webRuntimeResource) { Set measurementDefinitions = getMeasurementDefinitions( - webRuntimeResource.getResourceType(), new MeasurementDefinitionFilter() { - private final Set acceptableDataTypes = EnumSet.of(DataType.MEASUREMENT, DataType.TRAIT); + webRuntimeResource.getResourceType(), new MeasurementDefinitionFilter() { + private final Set acceptableDataTypes = EnumSet.of(DataType.MEASUREMENT, DataType.TRAIT); - public boolean accept(MeasurementDefinition measurementDefinition) { - return acceptableDataTypes.contains(measurementDefinition.getDataType()); - } - }); + public boolean accept(MeasurementDefinition measurementDefinition) { + return acceptableDataTypes.contains(measurementDefinition.getDataType()); + } + }); Set measurementScheduleRequests = new HashSet(); for (MeasurementDefinition measurementDefinition : measurementDefinitions) { measurementScheduleRequests.add(new MeasurementScheduleRequest(-1, measurementDefinition.getName(), -1, - true, measurementDefinition.getDataType(), measurementDefinition.getRawNumericType())); + true, measurementDefinition.getDataType(), measurementDefinition.getRawNumericType())); } return measurementScheduleRequests; } diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/TestDeployments.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/TestDeployments.java index ef265c8a92e..2e75ee5da72 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/TestDeployments.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/TestDeployments.java @@ -10,16 +10,22 @@ * @author Thomas Segismont */ enum TestDeployments { - DEPLOYMENT_1("test-simple.war"), // + DEPLOYMENT_1("test-simple-1.0.war", "test-simple.war"), // DEPLOYMENT_2("test-simple-2.war"), // JAVAEE6_TEST_APP("javaee6-test-app.war"); private String deploymentName; + private String resourceKey; // different if version is stripped private String resourcePath; private byte[] hash; TestDeployments(String warName) { + this(warName, warName); + } + + TestDeployments(String warName, String resourceKey) { this.deploymentName = warName; + this.resourceKey = resourceKey; this.resourcePath = "itest/" + warName; InputStream resourceAsStream = DeploymentTest.class.getClassLoader().getResourceAsStream(resourcePath); try { @@ -35,6 +41,10 @@ public String getDeploymentName() { return deploymentName; } + public String getResourceKey() { + return resourceKey; + } + public String getResourcePath() { return resourcePath; } diff --git a/modules/plugins/jboss-as-7/src/test/resources/itest/test-simple-1.0.war b/modules/plugins/jboss-as-7/src/test/resources/itest/test-simple-1.0.war new file mode 100644 index 00000000000..bd427b199f6 Binary files /dev/null and b/modules/plugins/jboss-as-7/src/test/resources/itest/test-simple-1.0.war differ diff --git a/modules/plugins/jboss-as/src/test/java/org/rhq/plugins/jbossas/test/JBossASPluginTest.java b/modules/plugins/jboss-as/src/test/java/org/rhq/plugins/jbossas/test/JBossASPluginTest.java index cc428f39298..73232e17413 100644 --- a/modules/plugins/jboss-as/src/test/java/org/rhq/plugins/jbossas/test/JBossASPluginTest.java +++ b/modules/plugins/jboss-as/src/test/java/org/rhq/plugins/jbossas/test/JBossASPluginTest.java @@ -1,25 +1,25 @@ - /* - * Jopr Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License and the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ +/* + * Jopr Management Platform + * Copyright (C) 2005-2008 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ package org.rhq.plugins.jbossas.test; import java.io.File; @@ -71,7 +71,8 @@ public void start() { PluginContainer.getInstance().setConfiguration(pcConfig); PluginContainer.getInstance().initialize(); System.out.println("Plugin container started with the following plugins:"); - Set pluginNames = PluginContainer.getInstance().getPluginManager().getMetadataManager().getPluginNames(); + Set pluginNames = PluginContainer.getInstance().getPluginManager().getMetadataManager() + .getPluginNames(); for (String pluginName : pluginNames) { System.out.println("\t* " + pluginName); } @@ -321,11 +322,14 @@ public void completeConfigurationUpdate(ConfigurationUpdateResponse response) { lastResult = response; } - public void persistUpdatedResourceConfiguration(int resourceId, - Configuration resourceConfiguration) - { - // TODO Auto-generated method stub + public void persistUpdatedResourceConfiguration(int resourceId, Configuration resourceConfiguration) { + // TODO Auto-generated method stub + } - } + @Override + public Configuration persistUpdatedPluginConfiguration(int resourceId, Configuration pluginConfiguration) { + // TODO Auto-generated method stub + return null; + } } } \ No newline at end of file diff --git a/modules/plugins/sudoers/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/sudoers/src/main/resources/META-INF/rhq-plugin.xml index 8260e798daa..6b1d1816ff6 100644 --- a/modules/plugins/sudoers/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/sudoers/src/main/resources/META-INF/rhq-plugin.xml @@ -12,7 +12,7 @@ diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/helper/TomcatConfig.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/helper/TomcatConfig.java index dbcfb4cdc55..d61592db7eb 100644 --- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/helper/TomcatConfig.java +++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/helper/TomcatConfig.java @@ -143,11 +143,6 @@ public void startElement(String uri, String localName, String qName, Attributes } } - String scheme = attributes.getValue("scheme"); - if ("https".equals(scheme)) { - return; - } - String className = attributes.getValue("className"); if (className != null) { if (className.endsWith("WarpConnector") //e.g. 4.0.x @@ -176,4 +171,4 @@ public static void main(String[] args) throws Exception { System.out.println("Port=" + cfg.getPort() + " [" + args[i] + "]"); } } -} \ No newline at end of file +}