You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ma...@apache.org on 2012/03/16 05:04:15 UTC
svn commit: r1301325 - in /oodt/trunk: CHANGES.txt
resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManager.java
Author: mattmann
Date: Fri Mar 16 04:04:15 2012
New Revision: 1301325
URL: http://svn.apache.org/viewvc?rev=1301325&view=rev
Log:
- fix for OODT-249 When a node is removed from the Resource Management system, it should be removed from all of its queues as well contributed by Gabe Resneck
Modified:
oodt/trunk/CHANGES.txt
oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManager.java
Modified: oodt/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/oodt/trunk/CHANGES.txt?rev=1301325&r1=1301324&r2=1301325&view=diff
==============================================================================
--- oodt/trunk/CHANGES.txt (original)
+++ oodt/trunk/CHANGES.txt Fri Mar 16 04:04:15 2012
@@ -4,6 +4,9 @@ Apache OODT Change Log
Release 0.4: Current Development
--------------------------------------------
+* OODT-249 When a node is removed from the Resource Management
+ system, it should be removed from all of its queues as well (gabe via mattmann)
+
* OODT-376 Addition of Cas-Browser Balance module (gabe)
* OODT-411 Port CAS-PGE's PcsMetadataKeys to PgeTaskMetKeys (bfoster)
Modified: oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManager.java
URL: http://svn.apache.org/viewvc/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManager.java?rev=1301325&r1=1301324&r2=1301325&view=diff
==============================================================================
--- oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManager.java (original)
+++ oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManager.java Fri Mar 16 04:04:15 2012
@@ -292,7 +292,15 @@ public class XmlRpcResourceManager {
}
public boolean removeNode(String nodeId) throws MonitorException {
- this.scheduler.getMonitor().removeNodeById(nodeId);
+ try{
+ for(String queueName: this.getQueuesWithNode(nodeId)){
+ this.removeNodeFromQueue(nodeId, queueName);
+ }
+ this.scheduler.getMonitor().removeNodeById(nodeId);
+ }catch(Exception e){
+ throw new MonitorException(e.getMessage(), e);
+ }
+
return true;
}