Author: mattmann
Date: Mon Aug 31 02:33:55 2015
New Revision: 1700186
URL: http://svn.apache.org/r1700186
Log:
Fix for OODT-247: Resource Manager client should allow users to see what jobs
are currently in the queue contributed by Gabe Resneck and mattmann.
Added:
oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/cli/action/GetQueuedJobsCliAction.java
Modified:
oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManager.java
Added:
oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/cli/action/GetQueuedJobsCliAction.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/cli/action/GetQueuedJobsCliAction.java?rev=1700186&view=auto
==============================================================================
---
oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/cli/action/GetQueuedJobsCliAction.java
(added)
+++
oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/cli/action/GetQueuedJobsCliAction.java
Mon Aug 31 02:33:55 2015
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.oodt.cas.resource.cli.action;
+
+//JDK imports
+import java.util.List;
+
+//OODT imports
+import org.apache.oodt.cas.cli.exception.CmdLineActionException;
+import org.apache.oodt.cas.resource.structs.Job;
+import static
org.apache.oodt.cas.resource.system.XmlRpcResourceManagerClient.getReadableJobStatus;
+
+/**
+ * A {@link CmdLineAction} which returns Jobs that are currently queued.
+ *
+ */
+public class GetQueuedJobsCliAction extends ResourceCliAction {
+
+ @Override
+ public void execute(ActionMessagePrinter printer)
+ throws CmdLineActionException {
+ try {
+ List<Job> queuedJobs = getClient().getQueuedJobs();
+ if (queuedJobs != null && queuedJobs.size() > 0){
+ printer.println("Jobs: ");
+ for(Job job: queuedJobs){
+ printer.println("Job: [id=" + job.getId() + ", status="
+ + getReadableJobStatus(job.getStatus()) + ",name="
+ + job.getName() + ",queue=" + job.getQueueName()
+ + ",load=" + job.getLoadValue() + ",inputClass="
+ + job.getJobInputClassName() + ",instClass="
+ + job.getJobInstanceClassName() + "]");
+ }
+ printer.println();
+ }
+ } catch (Exception e) {
+ throw new CmdLineActionException("Failed to get queued jobs : "
+ + e.getMessage(), e);
+ }
+ }
+}
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=1700186&r1=1700185&r2=1700186&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
Mon Aug 31 02:33:55 2015
@@ -31,6 +31,7 @@ import org.apache.oodt.cas.resource.stru
import org.apache.oodt.cas.resource.structs.exceptions.QueueManagerException;
import org.apache.oodt.cas.resource.structs.exceptions.SchedulerException;
import org.apache.oodt.cas.resource.util.GenericResourceManagerObjectFactory;
+import org.apache.oodt.cas.resource.util.ResourceNodeComparator;
import org.apache.oodt.cas.resource.util.XmlRpcStructFactory;
//APACHE imports
@@ -353,6 +354,38 @@ public class XmlRpcResourceManager {
return XmlRpcStructFactory.getXmlRpcJobList(jobs);
}
+ public String getNodeReport() throws MonitorException{
+ String report = new String();
+
+ try{
+
+ // get a sorted list of nodes
+ List nodes = scheduler.getMonitor().getNodes();
+ Collections.sort(nodes, new ResourceNodeComparator());
+
+ // formulate the report string
+ for(Iterator i = nodes.iterator(); i.hasNext(); ){
+ ResourceNode node = (ResourceNode)i.next();
+ String nodeId = node.getNodeId();
+ report += nodeId;
+ report += " (" + getNodeLoad(nodeId) + "/" +
node.getCapacity() + ")";
+ List<String> nodeQueues = getQueuesWithNode(nodeId);
+ if(nodeQueues != null && nodeQueues.size() > 0){
+ report += " -- " + nodeQueues.get(0);
+ for(int j = 1; j < nodeQueues.size(); j++){
+ report += ", " + nodeQueues.get(j);
+ }
+ }
+ report += "\n";
+ }
+
+ }catch(Exception e){
+ throw new MonitorException(e.getMessage(), e);
+ }
+
+ return report;
+ }
+
public static void main(String[] args) throws Exception {
int portNum = -1;
String usage = "XmlRpcResourceManager --portNum <port number for xml
rpc service>\n";
