jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1820239 - in /jmeter/trunk: src/core/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java xdocs/changes.xml
Date Thu, 04 Jan 2018 23:16:22 GMT
Author: pmouawad
Date: Thu Jan  4 23:16:21 2018
New Revision: 1820239

URL: http://svn.apache.org/viewvc?rev=1820239&view=rev
Log:
Bug 61962 - Latency Vs Request graph does not exceed 1000 RPS
Contributed by UbikLoadPack
Bugzilla Id: 61962

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java?rev=1820239&r1=1820238&r2=1820239&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java
Thu Jan  4 23:16:21 2018
@@ -278,7 +278,7 @@ public abstract class AbstractVersusRequ
             for (int i = 0; i < channelsCount; i++) {
                 try {
                     File tmpFile = File.createTempFile(parent.getName(), "-"
-                            + String.valueOf(i), workDir);
+                            + i, workDir);
                     tmpFile.deleteOnExit();
                     fileInfos.add(new FileInfo(tmpFile, getConsumedMetadata(i)));
                 } catch (IOException ex) {
@@ -335,14 +335,15 @@ public abstract class AbstractVersusRequ
                     while (reader.hasNext()) {
                         Sample sample = reader.readSample();
                         // Ask parent to consume the altered sample
-                        Long requestsPerGranularity = counts.get(getTimeInterval(sample)).longValue()
-                                % parent.getGranularity();
+                        Long requestsPerGranularity = counts.get(getTimeInterval(sample));
                         Long requestsPerSecond = requestsPerGranularity * 1000 / parent.getGranularity();
                         parent.consumeBase(
                                 createIndexedSample(sample, i, requestsPerSecond), i);
                     }
                 } finally {
-                    file.delete();
+                    if(!file.delete()) {
+                        log.warn("Could not delete intermediate file {}", file.getAbsolutePath());
+                    }
                 }
             }
 

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1820239&r1=1820238&r2=1820239&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Thu Jan  4 23:16:21 2018
@@ -271,6 +271,7 @@ Summary
     <li><bug>61925</bug>CsvSampleReader does not increment row in nextSample().
Contributed by Graham Russell (graham at ham1.co.uk)</li>
     <li><bug>61956</bug>Report Generation : <code>-f</code>
of <code>-forceDeleteResultFile</code> option does not work. Contributed by Ubik
Load Pack (support at ubikloadpack.com)</li>
     <li><bug>61899</bug>Report Generation : When <code>jmeter.save.saveservice.print_field_names</code>
is false and <code>sample_variables</code> are set report generation fails. Contributed
by Ubik Load Pack (support at ubikloadpack.com)</li>
+    <li><bug>61962</bug>Latency Vs Request graph does not exceed 1000 RPS.
Contributed by Ubik Load Pack (support at ubikloadpack.com)</li>
 </ul>
 
 <h3>General</h3>



Mime
View raw message