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");
}
Show replies by date