diff --git a/src/META-INF/explorviz.live_trace_processing.default.properties b/src/META-INF/explorviz.live_trace_processing.default.properties index cc678a48acfefcb525f1d233bf44d4e0c650f73f..1f87cf8b9f3347ccc3f0f739e41585f66305144d 100644 --- a/src/META-INF/explorviz.live_trace_processing.default.properties +++ b/src/META-INF/explorviz.live_trace_processing.default.properties @@ -1,6 +1,4 @@ -explorviz.live_trace_processing.worker_enabled=true - -explorviz.live_trace_processing.reader_listening_port=10133 +######################## Common ######################## explorviz.live_trace_processing.writer_target_ip=127.0.0.1 explorviz.live_trace_processing.writer_target_port=10133 @@ -9,7 +7,27 @@ explorviz.live_trace_processing.writer_load_balancing_enabled=false explorviz.live_trace_processing.writer_load_balancing_ip=10.50.0.2 explorviz.live_trace_processing.writer_load_balancing_port=9999 explorviz.live_trace_processing.writer_load_balancing_wait_time=20000 -explorviz.live_trace_processing.writer_load_balancing_scaling_group=analysis-worker-2 +explorviz.live_trace_processing.writer_load_balancing_scaling_group=analysis-worker + +explorviz.live_trace_processing.sending_buffer_size=65536 + +######################## Monitoring ######################## + +explorviz.live_trace_processing.host_name= +explorviz.live_trace_processing.application_name= + +explorviz.live_trace_processing.debug=false + +explorviz.live_trace_processing.monitoring_enabled=true +explorviz.live_trace_processing.system_monitoring_enabled=true + +explorviz.live_trace_processing.monitoring_controller_disruptor_size=32 + +######################## Analysis ######################## + +explorviz.live_trace_processing.worker_enabled=true + +explorviz.live_trace_processing.reader_listening_port=10133 explorviz.live_trace_processing.tcp_reader_output_buffer_size=8192 explorviz.live_trace_processing.tcp_reader_disruptor_size=32 @@ -21,5 +39,3 @@ explorviz.live_trace_processing.trace_reconstruction_buffer_initial_size=1024 explorviz.live_trace_processing.trace_summarization_output_buffer_size=64 explorviz.live_trace_processing.trace_summarization_disruptor_size=16 - -explorviz.live_trace_processing.sending_buffer_size=65536 \ No newline at end of file diff --git a/src/explorviz/live_trace_processing/main/FilterConfiguration.java b/src/explorviz/live_trace_processing/main/FilterConfiguration.java index d9312897646ae35536d7096db4163c230d77532d..98a3cde56d7083b60c01d50865124d08dface3c6 100644 --- a/src/explorviz/live_trace_processing/main/FilterConfiguration.java +++ b/src/explorviz/live_trace_processing/main/FilterConfiguration.java @@ -23,7 +23,7 @@ public class FilterConfiguration { final ITraceReconstruction traceReconstruction = new TraceReconstructionFilter( TimeUnit.SECONDS.toNanos(4), traceReduction); - new TCPReader(configuration.getIntProperty(ConfigurationFactory.READER_LISTENING_PORT), - traceReconstruction).read(); + new TCPReader(configuration.getIntProperty(ConfigurationFactory.READER_LISTENING_PORT, + 10133), traceReconstruction).read(); } } diff --git a/src/explorviz/live_trace_processing/main/WorkerStarter.java b/src/explorviz/live_trace_processing/main/WorkerStarter.java index 5d191fc9b88cd8c12c65327e7378a5ecc01dc7b4..c9e6fbed54f52cc6dd892f16b34edab957062384 100644 --- a/src/explorviz/live_trace_processing/main/WorkerStarter.java +++ b/src/explorviz/live_trace_processing/main/WorkerStarter.java @@ -21,7 +21,7 @@ public class WorkerStarter { if (isWorker) { final TCPConnector connector = new TCPConnector( configuration.getStringProperty(ConfigurationFactory.WRITER_TARGET_IP), - configuration.getIntProperty(ConfigurationFactory.WRITER_TARGET_PORT), + configuration.getIntProperty(ConfigurationFactory.WRITER_TARGET_PORT, 10133), configuration); configureLoadBalancerIfEnabled(configuration, connector); @@ -39,8 +39,9 @@ public class WorkerStarter { if (loadBalancerEnabled) { new LoadBalancer( configuration.getStringProperty(ConfigurationFactory.LOAD_BALANCER_IP), - configuration.getIntProperty(ConfigurationFactory.LOAD_BALANCER_PORT), - configuration.getIntProperty(ConfigurationFactory.LOAD_BALANCER_WAIT_TIME), + configuration.getIntProperty(ConfigurationFactory.LOAD_BALANCER_PORT, 9999), + configuration.getIntProperty(ConfigurationFactory.LOAD_BALANCER_WAIT_TIME, + 20000), configuration .getStringProperty(ConfigurationFactory.LOAD_BALANCER_SCALING_GROUP), tcpConnector);