svn propchange: r1703911 - svn:log
Author: degenaro Revision: 1703911 Modified property: svn:log Modified: svn:log at Fri Sep 18 19:37:48 2015 -- --- svn:log (original) +++ svn:log Fri Sep 18 19:37:48 2015 @@ -1 +1,3 @@ -UIMA-4569 JD share reservation test code temporary disable +UIMA-4532 JD share reservation test code temporary disable + +See also UIMA 4569.
svn commit: r1703911 - /uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/test/java/org/apache/uima/ducc/orchestrator/jd/scheduler/test/TestSuite.java
Author: degenaro
Date: Fri Sep 18 19:16:32 2015
New Revision: 1703911
URL: http://svn.apache.org/viewvc?rev=1703911=rev
Log:
UIMA-4569 JD share reservation test code temporary disable
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/test/java/org/apache/uima/ducc/orchestrator/jd/scheduler/test/TestSuite.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/test/java/org/apache/uima/ducc/orchestrator/jd/scheduler/test/TestSuite.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/test/java/org/apache/uima/ducc/orchestrator/jd/scheduler/test/TestSuite.java?rev=1703911=1703910=1703911=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/test/java/org/apache/uima/ducc/orchestrator/jd/scheduler/test/TestSuite.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/test/java/org/apache/uima/ducc/orchestrator/jd/scheduler/test/TestSuite.java
Fri Sep 18 19:16:32 2015
@@ -55,6 +55,18 @@ public class TestSuite {
private static DuccLogger logger = null;
@Before
+ public void testBefore() {
+ }
+
+ @After
+ public void testAfter() {
+ }
+
+ @Test
+ public void test() {
+ }
+
+ //@Before
public void before() {
ducc_home();
ducc_logger();
@@ -104,7 +116,7 @@ public class TestSuite {
System.setProperty(key, value);
}
- @After
+ //@After
public void after() {
}
@@ -157,7 +169,7 @@ public class TestSuite {
}
}
- @Test
+ //@Test
public void testJdReservation() {
try {
IDuccWorkReservation dwr = new DuccWorkReservation();
@@ -179,7 +191,7 @@ public class TestSuite {
}
}
- @Test
+ //@Test
public void testJdSchedulerStatic() {
try {
JdHostProperties jdHostProperties = new
JdHostProperties();
@@ -234,7 +246,7 @@ public class TestSuite {
}
}
- @Test
+ //@Test
public void testJdSchedulerDynamic() {
try {
DuccId jobId = new DuccId(999);
svn commit: r1703913 - /uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccData.java
Author: challngr
Date: Fri Sep 18 19:18:51 2015
New Revision: 1703913
URL: http://svn.apache.org/viewvc?rev=1703913=rev
Log:
UIMA-4569 Fix wording when something can't be recovered from history.
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccData.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccData.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccData.java?rev=1703913=1703912=1703913=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccData.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccData.java
Fri Sep 18 19:18:51 2015
@@ -119,7 +119,7 @@ public class DuccData {
map.put(duccId, history);
}
} catch ( Exception e ) {
-logger.warn(methodName, duccId, "Cannot recover",
duccWork.getDuccType(), "from database");
+logger.warn(methodName, duccId, "Cannot recover",
duccWork.getDuccType(), "from history.");
}
}
}
svn commit: r1703877 - /uima/sandbox/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbHandle.java
Author: challngr
Date: Fri Sep 18 14:54:52 2015
New Revision: 1703877
URL: http://svn.apache.org/viewvc?rev=1703877=rev
Log:
UIMA-4577 Set logger so things get logged in higher level components correctly.
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbHandle.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbHandle.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbHandle.java?rev=1703877=1703876=1703877=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbHandle.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbHandle.java
Fri Sep 18 14:54:52 2015
@@ -7,6 +7,7 @@ import java.util.Map;
import java.util.Properties;
import java.util.Set;
+import org.apache.uima.ducc.common.main.DuccService;
import org.apache.uima.ducc.common.utils.DuccLogger;
import org.apache.uima.ducc.common.utils.DuccProperties;
import org.apache.uima.ducc.database.DbConstants.DbCategory;
@@ -24,7 +25,8 @@ import com.tinkerpop.blueprints.impls.or
public class DbHandle
{
-private DuccLogger logger = DuccLogger.getLogger(DbHandle.class, "DB");
// get the component logger
+//private DuccLogger logger = DuccLogger.getLogger(DbHandle.class, "DB");
// get the component logger
+private DuccLogger logger =
DuccService.getDuccLogger(DbHandle.class.getName());
DbManager manager;
public OrientBaseGraph graphDb;
svn commit: r1703896 - in /uima/sandbox/uima-ducc/trunk: src/main/admin/ uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/
Author: challngr
Date: Fri Sep 18 16:05:20 2015
New Revision: 1703896
URL: http://svn.apache.org/viewvc?rev=1703896=rev
Log:
UIMA-4569 Adjust viz for memory-only reported by OR.
Modified:
uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/Markup.java
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/NodeViz.java
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/VisualizedHost.java
Modified: uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py?rev=1703896=1703895=1703896=diff
==
--- uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py Fri Sep 18
16:05:20 2015
@@ -215,9 +215,9 @@ class DuccUtil(DuccBase):
return False
resp = conn.getresponse()
-#print 'response code', resp.status, resp.reason
+print 'response code', resp.status, resp.reason
data = resp.read()
-#print 'Data:', data
+print 'Data:', data
if ( resp.status == 200 ):
# it will be simple json that Python will see as lists and maps so
we can just eval it
@@ -293,7 +293,7 @@ class DuccUtil(DuccBase):
classpath = self.DUCC_HOME + '/lib/uima-ducc/*:' + classpath
dburl = self.ducc_properties.get('ducc.state.database.url')
-cmd = ' '.join([self.java(),
'-DDUCC_HOME=/home/challngr/ducc_runtime_db', '-cp', classpath, main, dburl])
+cmd = ' '.join([self.java(), '-DDUCC_HOME=' + self.DUCC_HOME, '-cp',
classpath, main, dburl])
print cmd
self.spawn(cmd)
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/Markup.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/Markup.java?rev=1703896=1703895=1703896=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/Markup.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/Markup.java
Fri Sep 18 16:05:20 2015
@@ -215,8 +215,7 @@ public class Markup
break;
case Undefined:
out.append("");
-out.append(j.qshares);
-out.append(" unused shares (");
+out.append("mem avail (");
out.append((j.qshares * j.quantum));
out.append("GB) on ");
out.append(h.name);
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/NodeViz.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/NodeViz.java?rev=1703896=1703895=1703896=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/NodeViz.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/NodeViz.java
Fri Sep 18 16:05:20 2015
@@ -146,15 +146,8 @@ public class NodeViz
NodeConfiguration nc = new NodeConfiguration(class_definitions, null,
user_registry, logger);// UIMA-4142 make the config global
try {
nc.readConfiguration();
- } catch (FileNotFoundException e1) {
- // TODO Auto-generated catch block
- e1.printStackTrace();
- } catch (IOException e1) {
- // TODO Auto-generated catch block
- e1.printStackTrace();
- } catch (IllegalConfigurationException e1) {
- // TODO Auto-generated catch block
- e1.printStackTrace();
+ } catch (Exception e ) {
+logger.error(methodName, null, "Cannot read node configuration.
Some information may not be quite right.");
}
// first step, generate the viz from the OR map which seems to have
everything we need
@@ -202,7 +195,7 @@ public class NodeViz
// but punt and try not to crash.
logger.warn(methodName, null, "Cannot find scheduling class or
quantum for " + sclass + ". Using default quantum of " + default_quantum);
}
-int qshares = jobmem / quantum;
+int
