[rhq] modules/enterprise
by Jay Shaughnessy
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleGroupsStep.java | 17 ++++------
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/group/BundleGroupSelector.java | 4 ++
2 files changed, 11 insertions(+), 10 deletions(-)
New commits:
commit 3a2356d895e97a831ff9c8da9b0c9ad44dee5dc4
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Aug 26 10:50:43 2013 -0400
- Fix subtle bug in non-initial version groups selector setup where we
potentially queried the selector for assigned records prior to oninit()
being called and actually setting up the initial selection.
- Fix usability issue when assigning intial bundle groups. if the only
option is to leave unassigned, keep the selector disabled and the
"unassigned" radio button on.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleGroupsStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleGroupsStep.java
index f19153d..a1c5c36 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleGroupsStep.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleGroupsStep.java
@@ -93,7 +93,7 @@ public class BundleGroupsStep extends AbstractWizardStep {
radioForm.setNumCols(1);
radioForm.setColWidths(350);
- RadioGroupItem radioGroupItem = new RadioGroupItem("RadioOptions");
+ final RadioGroupItem radioGroupItem = new RadioGroupItem("RadioOptions");
radioGroupItem.setTitleOrientation(TitleOrientation.TOP);
radioGroupItem.setTitle(MSG.view_bundle_createWizard_groupsStep_radioTitle());
radioGroupItem.setRequired(true);
@@ -103,18 +103,15 @@ public class BundleGroupsStep extends AbstractWizardStep {
valueMap.put("unassigned", MSG.view_bundle_createWizard_groupsStep_leaveUnassigned());
valueMap.put("assign", MSG.view_bundle_createWizard_groupsStep_assign());
radioGroupItem.setValueMap(valueMap);
- radioGroupItem.setValue("assign");
+ radioGroupItem.setValue(map.isEmpty() ? "unassigned" : "assign");
radioGroupItem.addChangedHandler(new ChangedHandler() {
public void onChanged(ChangedEvent event) {
- if ("unassigned".equals(event.getValue())) {
- selector.disable();
- return;
+ if (map.isEmpty()) {
+ radioGroupItem.setValue("unassigned");
} else {
- if (!map.isEmpty()) {
- selector.enable();
- }
+ selector.setDisabled("unassigned".equals(event.getValue()));
}
canvas.markForRedraw();
@@ -126,7 +123,7 @@ public class BundleGroupsStep extends AbstractWizardStep {
canvas.addMember(radioForm);
selector = getSelector(map, false);
- selector.enable();
+ selector.setDisabled(map.isEmpty());
canvas.addMember(selector);
} else if (!map.isEmpty()) {
@@ -164,7 +161,7 @@ public class BundleGroupsStep extends AbstractWizardStep {
final Map<BundleGroup, Boolean> map = composite.getBundleGroupMap();
selector = getSelector(map, true);
- if (0 == selector.getSelectedRecords().length) {
+ if (!selector.hasInitialSelection()) {
selector.destroy();
DynamicForm form = new DynamicForm();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/group/BundleGroupSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/group/BundleGroupSelector.java
index 4c5e219..b2003a3 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/group/BundleGroupSelector.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/group/BundleGroupSelector.java
@@ -98,4 +98,8 @@ public class BundleGroupSelector extends AbstractSelector<BundleGroup, BundleGro
return result;
}
}
+
+ public boolean hasInitialSelection() {
+ return null != initialSelection && initialSelection.length > 0;
+ }
}
10 years, 9 months
[rhq] Branch 'bug/988881' - modules/core
by lkrejci
modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java | 9 +++++++++
1 file changed, 9 insertions(+)
New commits:
commit b72461c76f2b7d951e72c001b6dfde68bc31afdb
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Mon Aug 26 16:54:43 2013 +0200
Added a note to AvailablityExecutor.lock field.
I think it should be removed because it creates a false sense of
thread-safety of avail collection.
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java
index b318c04..c28975e 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java
@@ -83,7 +83,16 @@ public class AvailabilityExecutor implements Runnable, Callable<AvailabilityRepo
protected final InventoryManager inventoryManager;
private AtomicBoolean sendChangesOnlyReport;
+
+ // NOTE: this is probably useless. The concurrency of the availability checks is mainly guarded by the size of the
+ // availabilityThreadPoolExecutor in InventoryManager. While this lock object would prevent multiple avail checks
+ // from running concurrently even if the size of the above executor was more than 1 (which it isn't), the problem
+ // we'd then face would be that we use multiple instances of AvailabilityExecutor in InventoryManager:
+ // availabilityExecutor field but also local instances in executeAvailabilityScanImmediately() and
+ // getCurrentAvailability(). This means that the only thing preventing from the multiple availability checks
+ // happening concurrently is the size of the thread pool and this object serves little purpose in that regard.
private final Object lock = new Object();
+
private int scanHistorySize = 1;
private LinkedList<Scan> scanHistory = new LinkedList<Scan>();
10 years, 9 months
[rhq] modules/core
by Jiri Kremser
modules/core/plugin-container/src/main/java/org/rhq/core/pc/util/DiscoveryComponentProxyFactory.java | 11 ++++++++++
1 file changed, 11 insertions(+)
New commits:
commit 614c84652bb5dde7cf00068825584dc479737cdf
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Mon Aug 26 16:32:53 2013 +0200
Adding a way to disable the blacklising of resource types during the discovery. This can be handy when debugging the discovery process.
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/util/DiscoveryComponentProxyFactory.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/util/DiscoveryComponentProxyFactory.java
index ac465a6..43b5203 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/util/DiscoveryComponentProxyFactory.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/util/DiscoveryComponentProxyFactory.java
@@ -66,6 +66,15 @@ public class DiscoveryComponentProxyFactory {
private static final String DAEMON_THREAD_POOL_NAME = "ResourceDiscoveryComponent.invoker.daemon";
private ExecutorService daemonThreadPool = null;
private final Set<ResourceType> blacklist = new HashSet<ResourceType>();
+ private static boolean blacklistDisable;
+ static {
+ try {
+ blacklistDisable = Boolean.valueOf(System.getProperty("rhq.agent.blacklist.disable", "false"));
+ } catch (Throwable t) {
+ blacklistDisable = false;
+ } // always catch here, always let the class load, use a default if the sysprop is invalid
+ }
+
/**
* Same as {@link #getDiscoveryComponentProxy(org.rhq.core.domain.resource.ResourceType, org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent, long, org.rhq.core.pc.inventory.ResourceContainer)} except
@@ -152,12 +161,14 @@ public class DiscoveryComponentProxyFactory {
}
public boolean isResourceTypeBlacklisted(ResourceType type) {
+ if (blacklistDisable) return false;
synchronized (this.blacklist) {
return this.blacklist.contains(type);
}
}
public void addResourceTypeToBlacklist(ResourceType type) {
+ if (blacklistDisable) return;
synchronized (this.blacklist) {
this.blacklist.add(type);
}
10 years, 9 months
[rhq] Changes to 'bug/988881'
by lkrejci
New branch 'bug/988881' available with the following commits:
commit 97828c5de4db18796d070ede5f914b53ca942199
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Mon Aug 26 14:42:57 2013 +0200
[BZ 988881] - GUI correctly disables avail refresh timer when leaving page
The tree refresh now works slightly better, too.
Some refactoring to call things better names and get rid of the
"overriden method called in superclass constructor" anti-pattern present
in the resource and group detail views.
commit 272e988114a60332b2292efcb764003224505258
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Mon Aug 26 14:42:45 2013 +0200
[BZ 988881] - The agent side is now always in sync with the server
Even getting the live availability is handled properly on the agent side
and the results are correctly recorded in the inventory.
10 years, 9 months
[rhq] etc/zipLengthCheck
by Heiko W. Rupp
etc/zipLengthCheck/check.sh | 9 ++
etc/zipLengthCheck/src/main/java/org/rhq/devUtil/zipCheck/ZipCheck.java | 34 ++++++++++
2 files changed, 43 insertions(+)
New commits:
commit c0c77ccae0468b9e2707b43640b07c9dec02dbd1
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Mon Aug 26 11:20:47 2013 +0200
Remove imports for apache logging, add a start script
diff --git a/etc/zipLengthCheck/check.sh b/etc/zipLengthCheck/check.sh
new file mode 100644
index 0000000..a927bc4
--- /dev/null
+++ b/etc/zipLengthCheck/check.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ ! -d target ]
+then
+ mkdir target
+fi
+
+javac -sourcepath src/main/java -d target src/main/java/org/rhq/devUtil/zipCheck/*
+java -cp target org.rhq.devUtil.zipCheck.ZipCheck $*
\ No newline at end of file
diff --git a/etc/zipLengthCheck/src/main/java/org/rhq/devUtil/zipCheck/ZipCheck.java b/etc/zipLengthCheck/src/main/java/org/rhq/devUtil/zipCheck/ZipCheck.java
new file mode 100644
index 0000000..2573bc2
--- /dev/null
+++ b/etc/zipLengthCheck/src/main/java/org/rhq/devUtil/zipCheck/ZipCheck.java
@@ -0,0 +1,34 @@
+package org.rhq.devUtil.zipCheck;
+
+import java.util.Enumeration;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+
+/**
+ * Util to check path lengths inside zip files, as especially windows has issues with long paths
+ * @author Heiko W. Rupp
+ */
+public class ZipCheck {
+
+ private static final int WARN_LENGTH = 245;
+
+ public static void main(String[] args) throws Exception {
+
+ if (args.length<1) {
+ System.err.println("Usage: ZipCheck <file.zip>");
+ System.exit(1);
+ }
+
+ ZipFile file = new ZipFile(args[0]);
+ Enumeration<? extends ZipEntry> entries = file.entries();
+ while (entries.hasMoreElements()) {
+ ZipEntry entry = entries.nextElement();
+ String name = entry.getName();
+ if (name.length()> WARN_LENGTH) {
+ System.err.printf("Long path: %4d : %s\n", name.length(), name);
+ }
+ }
+ file.close();
+ }
+}
10 years, 9 months
[rhq] modules/enterprise
by lkrejci
modules/enterprise/scripting/javascript/pom.xml | 2 ++
modules/enterprise/scripting/python/pom.xml | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 8fd1c205a2ebe88edb96754f2a599ac29b37ee62
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Mon Aug 26 11:10:09 2013 +0200
Make sure we don't get incomplete scripting support jars.
diff --git a/modules/enterprise/scripting/javascript/pom.xml b/modules/enterprise/scripting/javascript/pom.xml
index d313323..adfd66e 100644
--- a/modules/enterprise/scripting/javascript/pom.xml
+++ b/modules/enterprise/scripting/javascript/pom.xml
@@ -43,6 +43,8 @@
<goal>jarjar</goal>
</goals>
<configuration>
+ <!-- important, so that re-packaging happens even if previously done, i.e. during mvn install on an already built module -->
+ <overwrite>true</overwrite>
<includes>
<include>org.mozilla:rhino</include>
</includes>
diff --git a/modules/enterprise/scripting/python/pom.xml b/modules/enterprise/scripting/python/pom.xml
index ddf8541..d0fa818 100644
--- a/modules/enterprise/scripting/python/pom.xml
+++ b/modules/enterprise/scripting/python/pom.xml
@@ -42,6 +42,8 @@
<goal>jarjar</goal>
</goals>
<configuration>
+ <!-- important, so that re-packaging happens even if previously done, i.e. during mvn install on an already built module -->
+ <overwrite>true</overwrite>
<includes>
<include>org.python:jython-standalone</include>
</includes>
@@ -54,7 +56,6 @@
</execution>
</executions>
</plugin>
-
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
10 years, 9 months
[rhq] modules/enterprise
by John Sanda
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java | 109 ++++++----
1 file changed, 68 insertions(+), 41 deletions(-)
New commits:
commit d42837646a5288c096c0ac9f7a522aadec7d25de
Author: John Sanda <jsanda(a)redhat.com>
Date: Sun Aug 25 23:04:48 2013 -0400
adding missing exception handling for (un)deployments
There is exception handling in place for when operations complete. The
exception handle will ensure a specific error message is loged and that error
fields are set to make known that the (un)deployment failed. That exception
handling was missing in a couple placing. The first place is when the
(un)deployment is advanced in response to a cql driver event notification.
The second place is when the (un)deployment is retried.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java
index 63b1309..4093034 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java
@@ -186,33 +186,47 @@ public class StorageNodeOperationsHandlerBean implements StorageNodeOperationsHa
@Override
public void performAddNodeMaintenanceIfNecessary(InetAddress storageNodeAddress) {
- StorageNode storageNode = entityManager.createNamedQuery(StorageNode.QUERY_FIND_BY_ADDRESS,
- StorageNode.class).setParameter("address", storageNodeAddress.getHostAddress()).getSingleResult();
-
- if (storageNode.getOperationMode() == StorageNode.OperationMode.BOOTSTRAP) {
- // TODO need to add support for HA deployments
- // If multiple RHQ servers are running, they will all receive the event
- // notification that the node is up and will all wind up calling this method.
- storageNode = storageNodeOperationsHandler.setMode(storageNode, StorageNode.OperationMode.ADD_MAINTENANCE);
- performAddNodeMaintenance(subjectManager.getOverlord(), storageNode);
- } else {
- log.info(storageNode + " has already been bootstrapped. Skipping add node maintenance.");
+ try {
+ StorageNode storageNode = entityManager.createNamedQuery(StorageNode.QUERY_FIND_BY_ADDRESS,
+ StorageNode.class).setParameter("address", storageNodeAddress.getHostAddress()).getSingleResult();
+
+ if (storageNode.getOperationMode() == StorageNode.OperationMode.BOOTSTRAP) {
+ // TODO need to add support for HA deployments
+ // If multiple RHQ servers are running, they will all receive the event
+ // notification that the node is up and will all wind up calling this method.
+ storageNode = storageNodeOperationsHandler.setMode(storageNode, StorageNode.OperationMode.ADD_MAINTENANCE);
+ performAddNodeMaintenance(subjectManager.getOverlord(), storageNode);
+ } else {
+ log.info(storageNode + " has already been bootstrapped. Skipping add node maintenance.");
+ }
+ } catch (Exception e) {
+ String msg = "Aborting storage node deployment due to unexpected error while performing add node " +
+ "maintenance.";
+ log.error(msg, e);
+ storageNodeOperationsHandler.logError(StorageNode.OperationMode.ADD_MAINTENANCE, msg, e);
}
}
@Override
public void performAddNodeMaintenance(Subject subject, StorageNode storageNode) {
- List<StorageNode> clusterNodes = entityManager.createNamedQuery(StorageNode.QUERY_FIND_ALL_BY_MODE,
- StorageNode.class).setParameter("operationMode", StorageNode.OperationMode.NORMAL)
- .getResultList();
- for (StorageNode node : clusterNodes) {
- node.setMaintenancePending(true);
+ try {
+ List<StorageNode> clusterNodes = entityManager.createNamedQuery(StorageNode.QUERY_FIND_ALL_BY_MODE,
+ StorageNode.class).setParameter("operationMode", StorageNode.OperationMode.NORMAL)
+ .getResultList();
+ for (StorageNode node : clusterNodes) {
+ node.setMaintenancePending(true);
+ }
+ storageNode.setMaintenancePending(true);
+ clusterNodes.add(storageNode);
+ boolean runRepair = updateSchemaIfNecessary(clusterNodes.size() - 1, clusterNodes.size());
+ performAddNodeMaintenance(subject, storageNode, runRepair, createPropertyListOfAddresses(SEEDS_LIST,
+ clusterNodes));
+ } catch (Exception e) {
+ String msg = "Aborting storage node deployment due to unexpected error while performing add node " +
+ "maintenance.";
+ log.error(msg, e);
+ storageNodeOperationsHandler.logError(StorageNode.OperationMode.ADD_MAINTENANCE, msg, e);
}
- storageNode.setMaintenancePending(true);
- clusterNodes.add(storageNode);
- boolean runRepair = updateSchemaIfNecessary(clusterNodes.size() - 1, clusterNodes.size());
- performAddNodeMaintenance(subject, storageNode, runRepair, createPropertyListOfAddresses(SEEDS_LIST,
- clusterNodes));
}
private void performAddNodeMaintenance(Subject subject, StorageNode storageNode, boolean runRepair,
@@ -230,32 +244,45 @@ public class StorageNodeOperationsHandlerBean implements StorageNodeOperationsHa
@Override
public void performRemoveNodeMaintenanceIfNecessary(InetAddress storageNodeAddress) {
- StorageNode storageNode = entityManager.createNamedQuery(StorageNode.QUERY_FIND_BY_ADDRESS,
- StorageNode.class).setParameter("address", storageNodeAddress.getHostAddress()).getSingleResult();
-
- if (storageNode.getOperationMode() == StorageNode.OperationMode.DECOMMISSION) {
- // TODO need to add support for HA deployments
- // If multiple RHQ servers are running, they will all receive the event
- // notification that the node is up and will all wind up calling this method.
- storageNode = storageNodeOperationsHandler.setMode(storageNode,
- StorageNode.OperationMode.REMOVE_MAINTENANCE);
- performRemoveNodeMaintenance(subjectManager.getOverlord(), storageNode);
- } else {
- log.info("Remove node maintenance has already been run for " + storageNode);
+ try {
+ StorageNode storageNode = entityManager.createNamedQuery(StorageNode.QUERY_FIND_BY_ADDRESS,
+ StorageNode.class).setParameter("address", storageNodeAddress.getHostAddress()).getSingleResult();
+
+ if (storageNode.getOperationMode() == StorageNode.OperationMode.DECOMMISSION) {
+ // TODO need to add support for HA deployments
+ // If multiple RHQ servers are running, they will all receive the event
+ // notification that the node is up and will all wind up calling this method.
+ storageNode = storageNodeOperationsHandler.setMode(storageNode,
+ StorageNode.OperationMode.REMOVE_MAINTENANCE);
+ performRemoveNodeMaintenance(subjectManager.getOverlord(), storageNode);
+ } else {
+ log.info("Remove node maintenance has already been run for " + storageNode);
+ }
+ } catch (Exception e) {
+ String msg = "Aborting undeployment due to unexpected error while performing remove node maintenance for " +
+ storageNodeAddress.getHostAddress();
+ log.error(msg, e);
+ storageNodeOperationsHandler.logError(StorageNode.OperationMode.REMOVE_MAINTENANCE, msg, e);
}
}
@Override
public void performRemoveNodeMaintenance(Subject subject, StorageNode storageNode) {
- List<StorageNode> clusterNodes = entityManager.createNamedQuery(StorageNode.QUERY_FIND_ALL_BY_MODE,
- StorageNode.class).setParameter("operationMode", StorageNode.OperationMode.NORMAL)
- .getResultList();
- for (StorageNode node : clusterNodes) {
- node.setMaintenancePending(true);
+ try {
+ List<StorageNode> clusterNodes = entityManager.createNamedQuery(StorageNode.QUERY_FIND_ALL_BY_MODE,
+ StorageNode.class).setParameter("operationMode", StorageNode.OperationMode.NORMAL)
+ .getResultList();
+ for (StorageNode node : clusterNodes) {
+ node.setMaintenancePending(true);
+ }
+ boolean runRepair = storageNode.isMaintenancePending();
+ performRemoveNodeMaintenance(subject, clusterNodes.get(0), runRepair,
+ createPropertyListOfAddresses(SEEDS_LIST, clusterNodes));
+ } catch (Exception e) {
+ String msg = "Aborting undeployment due to unexpected error while performing remove node maintenance.";
+ log.error(msg, e);
+ storageNodeOperationsHandler.logError(StorageNode.OperationMode.REMOVE_MAINTENANCE, msg, e);
}
- boolean runRepair = storageNode.isMaintenancePending();
- performRemoveNodeMaintenance(subject, clusterNodes.get(0), runRepair,
- createPropertyListOfAddresses(SEEDS_LIST, clusterNodes));
}
private void performRemoveNodeMaintenance(Subject subject, StorageNode storageNode, boolean runRepair,
10 years, 9 months
[rhq] 3 commits - modules/common modules/enterprise modules/plugins
by Heiko W. Rupp
modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java | 2 ++
modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml | 6 +++---
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
New commits:
commit c72a6387fa4b79da75d53d27aef535ced9f1ef17
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Sat Aug 24 19:36:40 2013 +0200
BZ 973299 - fix a typo.
diff --git a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
index 82ff294..2c8bcbe 100644
--- a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
+++ b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
@@ -283,13 +283,13 @@
</resources>
</module>
]]></echo>
-
+
<echo>Updating JGroups module component for EAP to ${jgroups.patch.version}</echo>
<!-- Remove the unpatched version -->
<delete file="${jboss.home}/modules/system/layers/base/org/jgroups/main/jgroups-${jgroups.initial.version}.jar" />
<delete file="${jboss.home}/modules/system/layers/base/org/jgroups/main/jgroups-${jgroups.initial.version}.jar.index" />
<!-- Update the module metadata to the patched version -->
- <replace file="${jboss.home}/modules/system/layers/base/org/jgroups/main/module.xml"
+ <replace file="${jboss.home}/modules/system/layers/base/org/jgroups/main/module.xml"
token="jgroups-${jgroups.initial.version}.jar" value="jgroups-${jgroups.patch.version}.jar"/>
<!-- Copy in patched version -->
<copy file="${settings.localRepository}/org/jgroups/jgroups/${jgroups.patch.version}/jgroups-${jgroups.patch.version}.jar"
@@ -461,7 +461,7 @@ rhq.server.quartz.driverDelegateClass=${rhq.server.quartz.driverDelegateClass}
#############################################################################
# Server Settings
# ---------------
-# These are miscallenous settings that the server will use to customize itself
+# These are miscellaneous settings that the server will use to customize itself
# to the environment in which it is running. These are settings you usually
# want to change or at least be aware of.
#############################################################################
commit 1f3165b51d29b72c71d88e5bc6d4f69caedf629b
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Sat Aug 24 17:39:42 2013 +0200
BZ 991202 Also log JBAS014792 only at debug level
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java
index 662d6ef..1524816 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java
@@ -322,7 +322,7 @@ public class ASConnection {
}
if (responseBody.contains("JBAS014807") || responseBody.contains("JBAS010850")
- || responseBody.contains("JBAS014793")) {
+ || responseBody.contains("JBAS014792") || responseBody.contains("JBAS014793")) {
// management resource not found or not readable or no known child-type
if (LOG.isDebugEnabled()) {
LOG.debug("Requested management resource not found: " + operation.getAddress().getPath());
commit d5baeca89902b35a8fadf49f163dc70e7e102084
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Sat Aug 24 17:36:55 2013 +0200
If the JMX-port is a string with quotes around, strip them.
diff --git a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java
index bc98a20..6b5c6cf 100644
--- a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java
+++ b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java
@@ -750,6 +750,8 @@ public class StorageInstaller {
throw new RuntimeException("Cannot determine JMX port");
}
+ jmxPort = jmxPort.replaceAll("\"","");
+
return Integer.parseInt(jmxPort);
} catch (IOException e) {
log.error("Failed to parse JMX port. There was an unexpected IO error", e);
10 years, 9 months
[rhq] Changes to 'mtho11/ietooltips2'
by mike thompson
New branch 'mtho11/ietooltips2' available with the following commits:
commit 8c869ea90dcc850cf7fc3ad13e9275fdd74889a1
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Fri Aug 23 16:01:25 2013 -0700
Graph Tooltip creation to be more compatible with IE.
10 years, 9 months
[rhq] modules/enterprise
by John Sanda
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java | 2 ++
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 0fb322f323db0d7025e2324bfd79f91888f1064e
Author: John Sanda <jsanda(a)redhat.com>
Date: Fri Aug 23 18:47:21 2013 -0400
fixing a couple of (un)deployment bugs
Adding a couple missing break statement in switch blocks in the deploy/undeploy
methods in StorageNodeManagerBean. Also fixing a minor issue in
StorageNodeOperationsHandlerBean where the storage node needed to be merged
back into the persistence context so an update wasn't lost. I discovered this
when I noticed that repair wasn't getting run when it should of been during
undeployments.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java
index 663ee1e..58f753a 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java
@@ -266,6 +266,7 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN
case ADD_MAINTENANCE:
reset();
storageNodeOperationsHandler.performAddNodeMaintenance(subject, storageNode);
+ break;
default:
// TODO what do we do with/about maintenance mode?
@@ -299,6 +300,7 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN
case REMOVE_MAINTENANCE:
reset();
storageNodeOperationsHandler.performRemoveNodeMaintenance(subject, storageNode);
+ break;
case UNANNOUNCE:
reset();
storageNodeOperationsHandler.unannounceStorageNode(subject, storageNode);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java
index 96c22b8..63b1309 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java
@@ -168,7 +168,7 @@ public class StorageNodeOperationsHandlerBean implements StorageNodeOperationsHa
// This is a bit of a hack since the maintenancePending flag is really intended to
// queue up storage nodes during cluster maintenance operations.
storageNode.setMaintenancePending(runRepair);
-
+ storageNode = entityManager.merge(storageNode);
scheduleOperation(subject, storageNode, new Configuration(), "decommission");
}
10 years, 9 months
