jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject [jmeter] branch master updated: Bug 64936 - Increase generate_report_ui.generation_timeout to 5 minutes to handle large performance test
Date Tue, 24 Nov 2020 19:42:44 GMT
This is an automated email from the ASF dual-hosted git repository.

pmouawad pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git


The following commit(s) were added to refs/heads/master by this push:
     new aacf090  Bug 64936 - Increase generate_report_ui.generation_timeout to 5 minutes
to handle large performance test
aacf090 is described below

commit aacf090a64699532c2eac695b306af46f89bf517
Author: pmouawad <p.mouawad@ubik-ingenierie.com>
AuthorDate: Tue Nov 24 20:41:30 2020 +0100

    Bug 64936 - Increase generate_report_ui.generation_timeout to 5 minutes to handle large
performance test
---
 bin/jmeter.properties                                                   | 2 +-
 .../src/main/java/org/apache/jmeter/gui/action/HtmlReportGenerator.java | 2 +-
 xdocs/changes.xml                                                       | 1 +
 xdocs/usermanual/properties_reference.xml                               | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/bin/jmeter.properties b/bin/jmeter.properties
index 4388b39..7683c28 100644
--- a/bin/jmeter.properties
+++ b/bin/jmeter.properties
@@ -1325,7 +1325,7 @@ jmeter.reportgenerator.apdex_satisfied_threshold=500
 jmeter.reportgenerator.apdex_tolerated_threshold=1500
 
 # Timeout in milliseconds for Report generation when using Tools > Generate HTML report
-#generate_report_ui.generation_timeout=120000
+#generate_report_ui.generation_timeout=300000
 #---------------------------------------------------------------------------
 # Naming Policy configuration
 #---------------------------------------------------------------------------
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/HtmlReportGenerator.java
b/src/core/src/main/java/org/apache/jmeter/gui/action/HtmlReportGenerator.java
index 2b3b5af..87803da 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/HtmlReportGenerator.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/HtmlReportGenerator.java
@@ -40,7 +40,7 @@ public class HtmlReportGenerator {
     public static final String CANNOT_CREATE_DIRECTORY = "generate_report_ui.cannot_create_directory";
 
     private static final Logger LOGGER = LoggerFactory.getLogger(HtmlReportGenerator.class);
-    private static final long COMMAND_TIMEOUT = JMeterUtils.getPropDefault("generate_report_ui.generation_timeout",
120_000L);
+    private static final long COMMAND_TIMEOUT = JMeterUtils.getPropDefault("generate_report_ui.generation_timeout",
300_000L);
 
     private String csvFilePath;
     private String userPropertiesFilePath;
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index b8828b4..a454b3b 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -115,6 +115,7 @@ applications when JMeter is starting up.</p>
 <h3>Report / Dashboard</h3>
 <ul>
   <li><bug>64824</bug>Dashboard/HTML Report: Rename <code>KO</code>
to <code>FAIL</code></li>
+  <li><bug>64936</bug>Increase generate_report_ui.generation_timeout to
5 minutes to handle large performance test</li>
 </ul>
 
 <h3>General</h3>
diff --git a/xdocs/usermanual/properties_reference.xml b/xdocs/usermanual/properties_reference.xml
index a11ba55..d90f0c3 100644
--- a/xdocs/usermanual/properties_reference.xml
+++ b/xdocs/usermanual/properties_reference.xml
@@ -1779,7 +1779,7 @@ JMETER-SERVER</source>
 </property>
 <property name="generate_report_ui.generation_timeout">
     Timeout in milliseconds for Report generation when using Tools &gt; Generate HTML
report.<br/>
-    Defaults to: 120000
+    Defaults to: 300000
 </property>
 </properties>
 </section>


Mime
View raw message