Skip to content
Permalink
Browse files

issue JPPF-608 fixed small regression

  • Loading branch information
lolocohen committed Nov 2, 2019
1 parent 8b43ecf commit 3a88324110db2288f9fa7167d98148989db59737
@@ -25,9 +25,9 @@
jppf.drivers = driver1
#jppf.drivers = driver1 driver2

#driver1.jppf.server.host = 192.168.1.24
driver1.jppf.server.host = 192.168.1.12
driver1.jppf.server.port = 31111
driver1.jppf.server.host = 192.168.1.24
#driver1.jppf.server.host = 192.168.1.12
driver1.jppf.server.port = 11111
#driver1.jppf.server.port = 11443
#driver1.jppf.priority = 20
driver1.jppf.pool.size = 1
@@ -119,7 +119,7 @@ jppf.admin.refresh.interval.topology = 1000
# refresh interval for the JVM health panel in ms
# this is the interval between 2 successive runs of the task that refreshes
#the JVM health via JMX requests
jppf.admin.refresh.interval.health = 5000
jppf.admin.refresh.interval.health = 1000

# UI refresh interval for the job data panel in ms. Its meaning depends on the
# publish mode specified with property "jppf.gui.publish.mode" (see below):
@@ -12,12 +12,12 @@ hour = 3600000
deadlock.concurrencyLimit = 20
deadlock.clientConnections = 1
#deadlock.streamDuration = $s{ 120 * ${minute} }$
deadlock.nbJobs = 10
deadlock.nbJobs = 1000
deadlock.tasksPerJob = 1000
deadlock.taskDuration = 5
deadlock.taskDuration = 1
deadlock.useCPU = false
# < 0 means no provisioning
deadlock.slaveNodes = 9
deadlock.slaveNodes = -1
deadlock.waitTime = 15000
deadlock.simulateNodeCrashes = false
# < 0 means null byte[]
@@ -33,9 +33,9 @@
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry path=&quot;3&quot; projectName=&quot;node&quot; type=&quot;1&quot;/&gt;&#13;&#10;"/>
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry path=&quot;3&quot; projectName=&quot;jmxremote-nio&quot; type=&quot;1&quot;/&gt;&#13;&#10;"/>
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/JPPF/lib/log4j/log4j-1.2.15.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/JPPF/lib/LZ4/lz4-1.3.0.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/JPPF/lib/slf4j/slf4j-api-1.7.25.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/JPPF/lib/slf4j/slf4j-log4j12-1.7.25.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/JPPF/lib/LZ4/lz4-java-1.6.0.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="sample.test.deadlock.DeadlockRunner"/>
@@ -162,17 +162,17 @@ public NodeForwarding(final JPPFDriver driver) {

@Override
public ResultsMap<String, Void> gc(final NodeSelector selector) throws Exception {
return forwardInvoke(selector, DiagnosticsMBean.MBEAN_NAME_NODE, "threadDump");
return forwardInvoke(selector, DiagnosticsMBean.MBEAN_NAME_NODE, "gc");
}

@Override
public ResultsMap<String, String> heapDump(final NodeSelector selector) throws Exception {
return forwardInvoke(selector, DiagnosticsMBean.MBEAN_NAME_NODE, "gc");
return forwardInvoke(selector, DiagnosticsMBean.MBEAN_NAME_NODE, "heapDump");
}

@Override
public ResultsMap<String, ThreadDump> threadDump(final NodeSelector selector) throws Exception {
return forwardInvoke(selector, DiagnosticsMBean.MBEAN_NAME_NODE, "heapDump");
return forwardInvoke(selector, DiagnosticsMBean.MBEAN_NAME_NODE, "threadDump");
}

@Override

0 comments on commit 3a88324

Please sign in to comment.
You can’t perform that action at this time.