Author: degenaro
Date: Wed Mar 27 18:21:32 2013
New Revision: 1461766
URL: http://svn.apache.org/r1461766
Log:
UIMA-2775 WS should use ducc.rm.share.quantum for share size
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccMachinesData.java
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebProperties.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccMachinesData.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccMachinesData.java?rev=1461766&r1=1461765&r2=1461766&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccMachinesData.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccMachinesData.java
Wed Mar 27 18:21:32 2013
@@ -126,15 +126,11 @@ public class DuccMachinesData {
catch(Throwable t) {
logger.warn(location, jobid, t);
}
- Properties properties = DuccWebProperties.get();
- String key_share_size = "ducc.rm.default.memory";
- if(properties.containsKey(key_share_size)) {
- try {
- shareSize =
Integer.parseInt(properties.getProperty(key_share_size).trim());
- }
- catch(Throwable t) {
- logger.warn(location, jobid, t);
- }
+ try {
+ shareSize =
Integer.parseInt(DuccWebProperties.getProperty(DuccWebProperties.key_ducc_rm_share_quantum,
DuccWebProperties.val_ducc_rm_share_quantum));
+ }
+ catch(Throwable t) {
+ logger.warn(location, jobid, t);
}
try {
InetAddress ia = InetAddress.getLocalHost();
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java?rev=1461766&r1=1461765&r2=1461766&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
Wed Mar 27 18:21:32 2013
@@ -2340,15 +2340,11 @@ public class DuccHandler extends DuccAbs
StringBuffer sb = new StringBuffer();
sb.append("<select id=\"instance_memory_size\">");
int shareSize = DuccConstants.defaultShareSize;
- Properties properties = DuccWebProperties.get();
- String key_share_size = "ducc.rm.default.memory";
- if(properties.containsKey(key_share_size)) {
- try {
- shareSize =
Integer.parseInt(properties.getProperty(key_share_size).trim());
- }
- catch(Throwable t) {
- duccLogger.error(methodName, null, t);
- }
+ try {
+ shareSize =
Integer.parseInt(DuccWebProperties.getProperty(DuccWebProperties.key_ducc_rm_share_quantum,
DuccWebProperties.val_ducc_rm_share_quantum));
+ }
+ catch(Throwable t) {
+ duccLogger.warn(methodName, jobid, t);
}
for(int i=0; i<DuccConstants.memorySizes.length; i++) {
int memorySize = DuccConstants.memorySizes[i]*shareSize;
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebProperties.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebProperties.java?rev=1461766&r1=1461765&r2=1461766&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebProperties.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebProperties.java
Wed Mar 27 18:21:32 2013
@@ -28,7 +28,8 @@ import org.apache.uima.ducc.common.utils
public class DuccWebProperties {
- static Properties properties = new Properties();
+ /*
+ public static Properties properties = new Properties();
public static String key_MaxRecordsJobs = "MaxRecordsJobs";
public static String key_MaxRecordsReservations =
"MaxRecordsReservations";
@@ -41,18 +42,22 @@ public class DuccWebProperties {
public static Properties instance() {
return (Properties)properties.clone();
}
+ */
+
+ public static String key_ducc_rm_share_quantum =
"ducc.rm.share.quantum";
+ public static String val_ducc_rm_share_quantum = "15";
private static String dir_home = Utils.findDuccHome();
private static String dir_resources = "resources";
private static String ducc_properties_filename =
dir_home+File.separator+dir_resources+File.separator+"ducc.properties";
public static Properties get() {
- Properties properties = new Properties();
+ Properties currentProperties = new Properties();
try {
File file = new File(ducc_properties_filename);
FileInputStream fis;
fis = new FileInputStream(file);
- properties.load(fis);
+ currentProperties.load(fis);
fis.close();
}
catch (FileNotFoundException e) {
@@ -61,6 +66,17 @@ public class DuccWebProperties {
catch (IOException e) {
e.printStackTrace();
}
- return properties;
+ return currentProperties;
+ }
+
+ public static String getProperty(String key, String defaultValue) {
+ String value = defaultValue;
+ Properties currentProperties = get();
+ if(currentProperties != null) {
+ if(currentProperties.containsKey(key)) {
+ value =
currentProperties.getProperty(key).trim();
+ }
+ }
+ return value;
}
}
