modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java | 5 + modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java | 13 ++ modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java | 46 ---------- modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Result.java | 13 ++ modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/NamingTest.java | 2 5 files changed, 34 insertions(+), 45 deletions(-)
New commits: commit d2f5eff25a2d69d7a9664a676a5c6236f6ff85bc Author: Heiko W. Rupp hwr@redhat.com Date: Tue May 29 14:16:10 2012 +0200
Fix typo
diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/NamingTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/NamingTest.java index 79d5e27..4bc7056 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/NamingTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/NamingTest.java @@ -37,7 +37,7 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull;
/** - * Test stuff around socket bindings. + * Test stuff around naming subsystem * This could actually also run for domain mode * @author Heiko W. Rupp */
commit 918a99c026a1325954fa61fbaaefcbede41098bb Author: Heiko W. Rupp hwr@redhat.com Date: Tue May 29 14:15:50 2012 +0200
BZ 782598 Fix bug in pseudo-metric collection and remove formerly needed enable/disable wrapper
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java index aff50e2..a4efae1 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java @@ -127,44 +127,6 @@ public class DatasourceComponent extends BaseComponent<BaseComponent<?>> impleme return resourceReport; }
- void addAdditionalToOp(Operation op, Configuration parameters, String parameterName, boolean optional) { - String value = parameters.getSimpleValue(parameterName, null); - if (value == null) { - if (!optional) { - throw new IllegalArgumentException("Required parameter [" + parameterName + "] for operation [" - + op.getName() + "] is not defined."); - } - } else { - op.addAdditionalProperty(parameterName, value); - } - } - - void addRequiredToOp(Operation op, Configuration parameters, String property) { - addAdditionalToOp(op, parameters, property, false); - } - - void addOptionalToOp(Operation op, Configuration parameters, String property) { - addAdditionalToOp(op, parameters, property, true); - } - - @Override - public void updateResourceConfiguration(ConfigurationUpdateReport report) { - - Operation op = new Operation("disable", getAddress()); - Result res = getASConnection().execute(op); - if (!res.isSuccess()) { - report.setErrorMessage("Was not able to disable the datasource for config changes: " - + res.getFailureDescription()); - return; - } - - super.updateResourceConfiguration(report); - - op = new Operation("enable", getAddress()); - res = getASConnection().execute(op); - - } - @Override public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> requests) throws Exception {
@@ -217,14 +179,14 @@ public class DatasourceComponent extends BaseComponent<BaseComponent<?>> impleme Result res = getASConnection().execute(op);
if (res.isSuccess()) { - String tmp = (String) res.getResult(); + Integer tmp = (Integer) res.getResult(); if (tmp == null) { // server if (request.getName().equals("max-pool-size")) - tmp = "20"; // The default value + tmp = 20; // The default value else if (request.getName().equals("min-pool-size")) - tmp = "0"; // The default value + tmp = 0; // The default value else - tmp ="-1"; // Fallback for unknown requests + tmp =-1; // Fallback for unknown requests } Double val = Double.valueOf(tmp); MeasurementDataNumeric data = new MeasurementDataNumeric(request, val);
commit 74bef966894fb0fd3b77ef88b2359af8308c01c8 Author: Heiko W. Rupp hwr@redhat.com Date: Tue May 29 14:15:35 2012 +0200
BZ 826008 Deliver both signal reload/restart to the server.
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java index 30fe82b..60a5151 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java @@ -284,6 +284,11 @@ public class BaseComponent<T extends ResourceComponent<?>> implements AS7Compone PropertySimple oobMessage = new PropertySimple("__OOB","The server needs a reload for the latest changes to come effective."); configuration.put(oobMessage); } + if (res.isRestartRequired()) { + PropertySimple oobMessage = new PropertySimple("__OOB", + "The server needs a restart for the latest changes to come effective."); + configuration.put(oobMessage); + } return configuration; }
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java index a2e6cc1..d6d7329 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java @@ -109,9 +109,18 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet { } else { report.setStatus(ConfigurationUpdateStatus.SUCCESS); - // TODO how to signal "need reload" + // signal "need reload" + if (result.isReloadRequired()) { + PropertySimple oobMessage = new PropertySimple("__OOB", + "The server needs a reload for the latest changes to come effective."); + conf.put(oobMessage); + } + if (result.isRestartRequired()) { + PropertySimple oobMessage = new PropertySimple("__OOB", + "The server needs a restart for the latest changes to come effective."); + conf.put(oobMessage); + } } - }
protected CompositeOperation updateGenerateOperationFromProperties(Configuration conf, Address address) { diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Result.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Result.java index 2c34641..3fbdb90 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Result.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Result.java @@ -88,6 +88,19 @@ public class Result { return false; }
+ @JsonIgnore + public boolean isRestartRequired() { + if (responseHeaders == null) + return false; + if (responseHeaders instanceof Map) { + Map<String, Object> map = (Map<String, Object>) responseHeaders; + if (map.containsKey("process-state") && map.get("process-state").equals("restart-required")) { + return true; + } + } + return false; + } + public boolean isSuccess() { return success; }
rhq-commits@lists.fedorahosted.org