Skip to content

Commit 85e7424

Browse files
lolocohenlolocohen
committed
preparing version 6.1.4
1 parent 7642a84 commit 85e7424

14 files changed

+422
-431
lines changed

‎JPPF/bin/build.number

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
#Tue, 08 Oct 2019 07:06:51 +0200
2-
build.number=2381
1+
#Sat, 21 Dec 2019 05:22:11 +0100
2+
build.number=2404

‎JPPF/bin/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#------------------------------------------------------------------------------#
1818

1919
# release number for this build
20-
version.number = 6.1.3
20+
version.number = 6.1.4
2121

2222
# root install directory for the IzPack installer generator
2323
#izpack.home = /home/lcohen/tools/IzPack

‎JPPF/docs/manual/JPPF-User-Guide.odt

27 Bytes
Binary file not shown.

‎JPPF/docs/manual/JPPF-User-Guide.pdf

0 Bytes
Binary file not shown.

‎admin-web/bin/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#------------------------------------------------------------------------------#
1818

1919
# release number for this build
20-
version.number = 6.1.3
20+
version.number = 6.1.4
2121

2222
# root install directory for the IzPack installer generator
2323
#izpack.home = /home/lcohen/tools/IzPack

‎demo/config/jppf-client.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ jppf.drivers = driver1
2626
#jppf.drivers = driver1 driver2
2727

2828
driver1.jppf.server.host = 192.168.1.24
29-
#driver1.jppf.server.host = 192.168.1.16
3029
driver1.jppf.server.port = 11111
3130
#driver1.jppf.server.port = 11443
3231
driver1.jppf.priority = 20

‎demo/config/jppf-driver.properties

Lines changed: 366 additions & 365 deletions
Large diffs are not rendered by default.

‎demo/config/jppf-gui.properties

Lines changed: 14 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ jppf.ssl.configuration.file = config/ssl2/ssl-client.properties
4747
#jppf.ssl.configuration.source = mypackage.MyConfigSource
4848

4949
driver1.jppf.server.host = 192.168.1.24
50-
#driver1.jppf.server.host = 192.168.1.16
5150
driver1.jppf.server.port = 11111
5251
#driver1.jppf.management.port = 11191
5352
#driver1.jppf.management.port = -1
@@ -62,6 +61,20 @@ driver2.jppf.server.port = 11112
6261

6362
jppf.client.max.init.time = 1000
6463

64+
#------------------------------------------------------------------------------#
65+
# Administration and monitoring UI: configuration of the UI refresh intervals #
66+
#------------------------------------------------------------------------------#
67+
68+
jppf.admin.refresh.interval.stats = 1000
69+
jppf.admin.refresh.interval.topology = 1000
70+
jppf.admin.refresh.interval.health = 1000
71+
72+
jppf.gui.publish.period = 40
73+
jppf.gui.publish.mode = immediate_notifications
74+
#jppf.gui.publish.mode = deferred_notifications
75+
#jppf.gui.publish.mode = polling
76+
77+
6578
#------------------------------------------------------------------------------#
6679
# Automatic recovery: number of seconds before the first reconnection attempt. #
6780
# default value is 1; uncomment to specify a different value #
@@ -101,50 +114,6 @@ jppf.discovery.exclude.ipv6 = -
101114
#jppf.object.serialization.class = org.jppf.serialization.kryo.KryoSerialization
102115
#!include file jppf-common.properties
103116

104-
#------------------------------------------------------------------------------#
105-
# Administration and monitoring UI: configuration of the UI refresh intervals #
106-
#------------------------------------------------------------------------------#
107-
108-
# refresh interval for the statistcs panel in ms
109-
# this is the interval between 2 succesive stats requests to a driver
110-
jppf.admin.refresh.interval.stats = 1000
111-
112-
# refresh interval for the topology panels: tree view and graph views in ms
113-
# this is the interval between 2 successive runs of the task that refreshes
114-
# the topology via JMX requests
115-
jppf.admin.refresh.interval.topology = 1000
116-
117-
# refresh interval for the JVM health panel in ms
118-
# this is the interval between 2 successive runs of the task that refreshes
119-
#the JVM health via JMX requests
120-
jppf.admin.refresh.interval.health = 1000
121-
122-
# UI refresh interval for the job data panel in ms. Its meaning depends on the
123-
# publish mode specified with property "jppf.gui.publish.mode" (see below):
124-
# - in "immediate_notifications" mode, this is not used
125-
# - in "deferred_notifications" mode, this is the interval between 2 publications
126-
# of updates as job monitoring events
127-
# - in "polling" mode this is the interval between 2 polls of each driver
128-
#jppf.gui.publish.period = 75
129-
jppf.gui.publish.period = 3000
130-
131-
# UI refresh mode for the job data panel. The possible values are:
132-
# - polling: means that the job data is polled at regular intervals and the updates
133-
# to the view are computed as the differences with the previous poll. This mode
134-
# generates less network traffic than the notifications mode, but some updates,
135-
# possibly entire jobs, may be missed
136-
# - deferred_notifications: updates are received as jmx notifications and published at
137-
# regular intervals, possibly aggregated during the interval. This mode provides
138-
# a more accuate view of the jobs life cycle, at the cost of increased network traffic.
139-
# - immediate_notifications: updates are received as jmx notifications and published
140-
# immediately as job monitoring events which are pushed to the UI. In this mode,
141-
# all notifications are pushed as events and no aggreagtion occurs, thus no event is
142-
# missed. However, this may cause memory issues if events are not processed fast enough.
143-
# The default value is immediate_notifications
144-
jppf.gui.publish.mode = immediate_notifications
145-
#jppf.gui.publish.mode = deferred_notifications
146-
#jppf.gui.publish.mode = polling
147-
148117
#------------------------------------------------------------------------------#
149118
# Administration and monitoring UI: configuration of pluggable views #
150119
#------------------------------------------------------------------------------#

‎demo/config/log4j-driver.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,13 @@ log4j.logger.org.jppf.management.JMXConnectionThread=INFO
8282
#log4j.logger.org.jppf.server.job.management.DriverJobManagement=DEBUG
8383
#log4j.logger.org.jppf.server.management=DEBUG
8484
log4j.logger.org.jppf.nio=INFO
85+
log4j.logger.org.jppf.nio.NioMessageReader=DEBUG
8586
#log4j.logger.org.jppf.nio.NioObject=INFO
8687
#log4j.logger.org.jppf.nio.NioServer=DEBUG
8788
#log4j.logger.org.jppf.nio.StateTransitionTask=DEBUG
8889
#log4j.logger.org.jppf.nio.StateTransitionManager=DEBUG
8990
#log4j.logger.org.jppf.server.nio.acceptor=DEBUG
90-
log4j.logger.org.jppf.server.nio.classloader=DEBUG
91+
#log4j.logger.org.jppf.server.nio.classloader=DEBUG
9192
#log4j.logger.org.jppf.server.nio.classloader.ClassNioServer=DEBUG
9293
#log4j.logger.org.jppf.server.nio.classloader.client=DEBUG
9394
#log4j.logger.org.jppf.server.nio.classloader.client.ClientClassNioServer=DEBUG

‎demo/config/log4j-gui.properties

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ log4j.rootLogger=INFO, JPPF
4141
#log4j.logger.org.jppf.client.monitoring=DEBUG
4242
#log4j.logger.org.jppf.client.monitoring.jobs=DEBUG
4343
#log4j.logger.org.jppf.client.monitoring.jobs.JobMonitor=DEBUG
44-
#log4j.logger.org.jppf.client.monitoring.jobs.JobNotificationsHandler=TRACE
44+
#log4j.logger.org.jppf.client.monitoring.jobs.ImmediateJobNotificationsHandler=DEBUG
4545
#log4j.logger.org.jppf.client.monitoring.topology=DEBUG
4646
#log4j.logger.org.jppf.client.monitoring.topology.TopologyManager=DEBUG
4747
#log4j.logger.org.jppf.client.monitoring.topology.JVMHealthRefreshHandler=TRACE
@@ -56,7 +56,7 @@ log4j.logger.org.jppf.comm.discovery=INFO
5656
#log4j.logger.org.jppf.management.JPPFJMXServer=DEBUG
5757
#log4j.logger.org.jppf.scripting=DEBUG
5858
#log4j.logger.org.jppf.scripting.ScriptRunnerImpl=DEBUG
59-
log4j.logger.org.jppf.ui=DEBUG
59+
#log4j.logger.org.jppf.ui=DEBUG
6060
#log4j.logger.org.jppf.ui.monitoring=DEBUG
6161
#log4j.logger.org.jppf.ui.monitoring.charts=DEBUG
6262
#log4j.logger.org.jppf.ui.monitoring.charts.BarSeries3DChartHandler=DEBUG
@@ -69,6 +69,7 @@ log4j.logger.org.jppf.ui.monitoring.charts.config=INFO
6969
#log4j.logger.org.jppf.ui.monitoring.data.ClientHandler=DEBUG
7070
#log4j.logger.org.jppf.ui.monitoring.data.NodeHandler=DEBUG
7171
#log4j.logger.org.jppf.ui.monitoring.diagnostics=DEBUG
72+
#log4j.logger.org.jppf.ui.monitoring.diagnostics.JVMHealthPanel=DEBUG
7273
#log4j.logger.org.jppf.ui.monitoring.job=DEBUG
7374
#log4j.logger.org.jppf.ui.monitoring.job.JobDataPanelManager=DEBUG
7475
#log4j.logger.org.jppf.ui.monitoring.job.JobNotificationListener=TRACE
@@ -93,9 +94,12 @@ log4j.logger.org.jppf.ui.options.event=INFO
9394
#log4j.logger.org.jppf.ui.plugin=DEBUG
9495
log4j.logger.org.jppf.utils=INFO
9596
log4j.logger.org.jppf.utils.SoftReferenceValuesMap=TRACE
97+
#log4j.logger.org.jppf.ui.treetable.AbstractJPPFTreeTableModel=TRACE
9698
#log4j.logger.org.jppf.ui.treetable.JTreeTable=DEBUG
9799
#log4j.logger.org.jppf.ui.treetable.TreeTableModelAdapter=DEBUG
98100
#log4j.logger.org.jppf.ui.monitoring.job.JobData=DEBUG
101+
#log4j.logger.org.jppf.ui.utils.JobsUtils=DEBUG
99102
#log4j.logger.org.jppf.utils.LocalizationUtils=DEBUG
100103
#log4j.logger.org.jppf.utils.configuration=TRACE
101104
#log4j.logger.org.jppf.utils.configuration.ScriptHandler=DEBUG
105+
#log4j.logger.org.jppf.utils.concurrent.DebuggableThread=DEBUG

‎demo/config/log4j-node1.properties

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@
2222
#log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
2323
#log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
2424

25+
#log4j.throwableRenderer=org.apache.log4j.EnhancedThrowableRenderer
26+
2527
### direct messages to file jppf-node1.log ###
2628
log4j.appender.JPPF=org.apache.log4j.FileAppender
2729
log4j.appender.JPPF.File=jppf-node1.log
2830
log4j.appender.JPPF.Append=false
31+
#log4j.appender.JPPF.layout=org.apache.log4j.EnhancedPatternLayout
2932
log4j.appender.JPPF.layout=org.apache.log4j.PatternLayout
30-
#log4j.appender.JPPF.layout.ConversionPattern=%d{ABSOLUTE} [%-5p][%c.%M(%L)]: %m\n
31-
#log4j.appender.JPPF.layout.ConversionPattern=%d [%-5p][%c.%M(%L)]: %m\n
32-
#log4j.appender.JPPF.layout.ConversionPattern=%d [%-5p][%-20.20t][%c.%M(%L)]: %m\n
33-
log4j.appender.JPPF.layout.ConversionPattern=%d [%-5p][%-20.20t][%c.%M(%L)]: %m%n
33+
log4j.appender.JPPF.layout.ConversionPattern=%d [%-5p][%-20.20t][%c.%M(%L)] %m%n
3434

3535
### direct messages to the JMX Logger ###
3636
log4j.appender.JMX=org.jppf.logging.log4j.JmxAppender
@@ -42,7 +42,7 @@ log4j.appender.JMX.layout.ConversionPattern=%d [%-5p][%c.%M(%L)]: %m\n
4242
log4j.rootLogger=INFO, JPPF
4343
#log4j.rootLogger=DEBUG, JPPF
4444

45-
log4j.logger.org.jppf.classloader=DEBUG
45+
#log4j.logger.org.jppf.classloader=DEBUG
4646
#log4j.logger.org.jppf.classloader.ClassLoaderRequestHandler=DEBUG
4747
#log4j.logger.org.jppf.classloader.JPPFClassLoader=DEBUG
4848
log4j.logger.org.jppf.comm.discovery=INFO
@@ -70,7 +70,7 @@ log4j.logger.org.jppf.jmxremote.nio.JMXNioServer=INFO
7070
log4j.logger.org.jppf.nio.PlainNioObject=INFO
7171
#log4j.logger.org.jppf.nio.SelectorSynchronizerLock=TRACE
7272
#log4j.logger.org.jppf.nio.StateTransitionTask=DEBUG
73-
log4j.logger.org.jppf.node=DEBUG
73+
#log4j.logger.org.jppf.node=DEBUG
7474
#log4j.logger.org.jppf.node.idle=DEBUG
7575
#log4j.logger.org.jppf.node.NodeRunner=DEBUG
7676
#log4j.logger.org.jppf.node.connection=DEBUG
@@ -85,7 +85,7 @@ log4j.logger.org.jppf.node=DEBUG
8585
#log4j.logger.org.jppf.process=DEBUG
8686
#log4j.logger.org.jppf.scheduling=DEBUG
8787
#log4j.logger.org.jppf.serialization=DEBUG
88-
log4j.logger.org.jppf.server.node=DEBUG
88+
#log4j.logger.org.jppf.server.node=DEBUG
8989
#log4j.logger.org.jppf.server.node.AbstractNodeIO=DEBUG
9090
#log4j.logger.org.jppf.server.node.JPPFContainer=DEBUG
9191
#log4j.logger.org.jppf.server.node.JPPFNode=DEBUG
@@ -111,3 +111,5 @@ log4j.logger.atomikos=WARN
111111

112112
#log4j.logger.org.jppf.node.idle=DEBUG
113113
#log4j.logger.org.jppf.example.idlesystem=DEBUG
114+
115+
log4j.logger.org.apache.commons.configuration2=TRACE

‎demo/config/node1.properties

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@ jppf.processing.threads = 8
8888
# # definition for server 2 |\
8989
# false, localhost, 11112, -1
9090

91+
jppf.node.tasks.jmx.notifications.enabled = true
92+
9193
#------------------------------------------------------------------------------#
9294
# Other JVM options added to the java command line when the node is started as #
9395
# a subprocess. Multiple options are separated by spaces. #
@@ -99,8 +101,21 @@ bin.dir = ${BridgeTo.NET.dir}/jni4net
99101
jar.dir = ${BridgeTo.NET.dir}/jni4net
100102
interceptor.options -cp ../samples-pack/NetworkInterceptor/NetworkInterceptor.jar -Djppf.user.name=jppf1
101103

104+
deleted = $s{ var file = new java.io.File("jcl-diag-node.log"); file.exists() ? file.delete() : false; }$
105+
jppf.node.sys.props = -Djava.util.logging.config.file=config/logging-node1.properties -Duser.language=en
106+
102107
# to use with offline = true
103-
jppf.jvm.options = -server -Xmx128m -XX:+HeapDumpOnOutOfMemoryError -Djava.util.logging.config.file=config/logging-node1.properties -Duser.language=en
108+
jppf.jvm.options = -server -Xmx128m -XX:+HeapDumpOnOutOfMemoryError ${jppf.node.sys.props}
109+
110+
dbk.cp = \
111+
-cp ../x-client-test/lib/commons-configuration2-2.2.jar
112+
113+
# -cp ../x-client-test/lib/commons-logging-1.1.1.jar
114+
# -cp ../x-client-test/lib/commons-lang3-3.4.jar \
115+
# -cp ../x-client-test/lib/commons-beanutils-1.9.4.jar \
116+
# -cp ../x-client-test/lib/commons-text-1.8.jar
117+
118+
104119
#jppf.jvm.options = -server -Xmx128m -Djava.util.logging.config.file=config/logging-node1.properties ${kryo.cp} \
105120
# "-Djava.library.path=${bin.dir};${env.PATH}" \
106121
# -cp ${jar.dir}/jni4net.j-0.8.8.0.jar;${BridgeTo.NET.dir}/classes;${jar.dir}/jppf.api.jar;${jar.dir}/jppf.example.tasks.jar;${jar.dir}/jppf.dotnet.api.generated.jar \
@@ -178,7 +193,7 @@ jppf.node.provisioning.master = true
178193
jppf.node.provisioning.slave.path.prefix = slave_nodes/node_1_
179194
jppf.node.provisioning.slave.config.path = config/slave
180195
jppf.node.provisioning.slave.jvm.options = -Dlog4j.configuration=config/log4j-slave.properties
181-
jppf.node.provisioning.startup.slaves = 0
196+
jppf.node.provisioning.startup.slaves = 9
182197
#jppf.node.provisioning.startup.overrides.file = ${jppf.node.provisioning.slave.config.path}/node-config-overrides.properties
183198
#jppf.node.provisioning.slave.start.delay.increment = 250
184199

‎demo/config/samples/deadlock.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ hour = 3600000
99
#display = $s{ java.lang.System.out.println("second = ${second}, minute = ${minute}, hour = ${hour}"); }$
1010
#display = $s{ java.lang.System.out.printf("second = %,d, minute = %,d, hour = %,d%n", ${Long}.valueOf(${second}), ${Long}.valueOf(${minute}), ${Long}.valueOf(${hour})); }$
1111

12-
deadlock.concurrencyLimit = 10
12+
deadlock.concurrencyLimit = 40
1313
deadlock.clientConnections = 1
14-
deadlock.streamDuration = $s{ 5 * ${minute} }$
14+
#deadlock.streamDuration = $s{ 5 * ${minute} }$
1515
deadlock.nbJobs = 1000
1616
deadlock.tasksPerJob = 1000
1717
deadlock.taskDuration = 2
@@ -31,7 +31,7 @@ deadlock.triggerNodeDeadlockAfter = -1
3131

3232
# javascript script invoked upon creation of each job
3333
#deadlock.script.created = job.getSLA().setAllowMultipleDispatchesToSameChannel(false).setMaxDispatchSize(100);
34-
deadlock.script.created = job.getSLA().setAllowMultipleDispatchesToSameChannel(false);
34+
deadlock.script.created = job.getSLA().setAllowMultipleDispatchesToSameChannel(true);
3535

3636
# javascript script invoked upon completion of each job
3737
#deadlock.script.completed =

‎jca-client/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#------------------------------------------------------------------------------#
1818

1919
# release number for this build
20-
version.number = 6.1.3
20+
version.number = 6.1.4
2121

2222
# root install directory for the IzPack installer generator
2323
#izpack.home = /home/lcohen/tools/IzPack

0 commit comments

Comments
 (0)