You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2016/03/04 19:23:51 UTC
svn commit: r1733630 -
/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccSchedulerClasses.java
Author: degenaro
Date: Fri Mar 4 18:23:50 2016
New Revision: 1733630
URL: http://svn.apache.org/viewvc?rev=1733630&view=rev
Log:
UIMA-4815 DUCC Web Server (WS) System Machines page re-imagined
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccSchedulerClasses.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccSchedulerClasses.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccSchedulerClasses.java?rev=1733630&r1=1733629&r2=1733630&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccSchedulerClasses.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccSchedulerClasses.java Fri Mar 4 18:23:50 2016
@@ -24,9 +24,13 @@ import java.util.Map;
import java.util.Properties;
import org.apache.uima.ducc.common.NodeConfiguration;
+import org.apache.uima.ducc.common.utils.id.DuccId;
public class DuccSchedulerClasses {
+ private static DuccLogger logger = DuccLoggerComponents.getWsLogger(DuccSchedulerClasses.class.getName());
+ private static DuccId jobid = null;
+
public static final String FAIR_SHARE = "FAIR_SHARE";
public static final String FIXED_SHARE = "FIXED_SHARE";
public static final String RESERVE = "RESERVE";
@@ -35,7 +39,6 @@ public class DuccSchedulerClasses {
private static DuccSchedulerClasses instance = null;
private long lastModified = 0;
- private DuccLogger logger = null;
private NodeConfiguration nodeConfiguration = null;
private String fileName = null;
@@ -107,6 +110,32 @@ public class DuccSchedulerClasses {
return retVal;
}
+ /**
+ * Get nodepool for specified node
+ */
+ public String getNodepool(String node) {
+ String location = "getNodepool";
+ String retVal = "";
+ String nodepool = null;
+ try {
+ if(node != null) {
+ NodeConfiguration nc = readConfiguration();
+ nodepool = nc.getFirstNodepool();
+ if(nodepool != null) {
+ retVal = nodepool;
+ }
+ nodepool = nc.getNodePoolNameForNode(node);
+ if(nodepool != null) {
+ retVal = nodepool;
+ }
+ }
+ }
+ catch(Exception e) {
+ logger.error(location, jobid, e);
+ }
+ return retVal;
+ }
+
public String getDefaultClassName()
throws Exception
{