This is an automated email from the ASF dual-hosted git repository. fschumacher pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit 1a1984ae3f7ad0abc3745d85d61c811092f429aa Author: Felix Schumacher <[email protected]> AuthorDate: Tue Jun 9 16:21:41 2020 +0200 Try to use neutral words Name the remote systems that do the work "worker nodes" and the one the controlls all the stuff "controller node". --- xdocs/changes_history.xml | 6 +- xdocs/images/screenshots/distributed-names.svg | 590 ++++++++++----------- .../jmeter_distributed_testing_step_by_step.xml | 18 +- 3 files changed, 306 insertions(+), 308 deletions(-) diff --git a/xdocs/changes_history.xml b/xdocs/changes_history.xml index 2c725fd..bfb8d9f 100644 --- a/xdocs/changes_history.xml +++ b/xdocs/changes_history.xml @@ -814,7 +814,7 @@ to view the last release notes of version 5.1.1. <li><bug>63490</bug>At end of scheduler duration lots of Samplers gets executed at the same time</li> <li><pr>480</pr><pr>482</pr>Fix a few typos in comments and log messages. Based on patch by Anass Benomar (anassbenomar at gmail.com)</li> <li><bug>63751</bug>Correct a typo in Chinese translations. Reported by Jinliang Wang (wjl31802 at 126.com)</li> - <li><bug>63723</bug>Distributed testing: JMeter master ends distributed test though some threads still are active</li> + <li><bug>63723</bug>Distributed testing: JMeter controller node ends distributed test though some threads still are active</li> <li><bug>63614</bug>Distributed testing: Unable to generate Dashboard report at end of load test</li> <li><bug>63862</bug> Search Dialog / Search in View Results Tree: Uncaught exception if regex is checked and regex is invalid</li> <li><bug>63793</bug>Fix unsecure XML Parsing</li> @@ -1405,7 +1405,7 @@ containing a fix to this issue, we decided to remove it. If you still needed, yo <li><bug>62743</bug>Client auth must be enabled on distributed testing</li> <li><bug>62767</bug>NPE when searching under certain conditions. Contributed by Ubik Load Pack (support at ubikloadpack.com)</li> <li><bug>62790</bug><code>ArrayIndexOutOfBoundsException</code> when calling replace without selecting the first match</li> - <li><bug>62795</bug>JMeter master sometimes ends distributed test even though some of the slaves have not finished</li> + <li><bug>62795</bug>JMeter controller node sometimes ends distributed test even though some of the worker nodes have not finished</li> <li><bug>62336</bug><pr>396</pr>Some shortcuts are not working correctly on windows. Contributed by Michael Pavlov (michael.paulau at gmail.com)</li> <li><bug>62889</bug>Format JSON Arrays when displayed with JSON Path Tester.</li> <li><bug>62900</bug>ObjectProperty#getStringValue() can throw NullPointerException</li> @@ -2565,7 +2565,7 @@ ensure you update your implementation to be able to compute latency, see <bugzil <li><bug>57958</bug>Fix transaction sample not generated if thread stops/restarts. Implemented by Artem Fedorov (artem at blazemeter.com) and contributed by BlazeMeter Ltd.</li> <li><bug>61050</bug>Handle uninitialized RessourceBundle more gracefully, when calling <code>JMeterUtils#getResString</code>.</li> <li><bug>61100</bug>Invalid GC Log Filename on Windows</li> - <li><bug>57962</bug>Allow to use variables ( from User Defined Variables only ) in all listeners in slave mode</li> + <li><bug>57962</bug>Allow to use variables (from User Defined Variables only) in all listeners in worker node mode</li> <li><bug>61270</bug>Fixed width fonts too small in text areas to read under HiDPI (user manual bug)</li> <li><bug>61292</bug>Make processing of samples in reporter more robust.</li> <li><bug>61359</bug>When cutting an element from Tree, Test plan is not marked as dirty</li> diff --git a/xdocs/images/screenshots/distributed-names.svg b/xdocs/images/screenshots/distributed-names.svg index a435aaa..6451cbb 100644 --- a/xdocs/images/screenshots/distributed-names.svg +++ b/xdocs/images/screenshots/distributed-names.svg @@ -14,7 +14,7 @@ viewBox="0 0 1068.3858 639.62056" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)" sodipodi:docname="distributed-names.svg"> <defs id="defs4"> @@ -118,8 +118,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.55974683" - inkscape:cx="517.60117" - inkscape:cy="415.43228" + inkscape:cx="460.43247" + inkscape:cy="402.92662" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -134,10 +134,10 @@ fit-margin-left="10" fit-margin-right="10" fit-margin-bottom="10" - inkscape:window-width="1366" - inkscape:window-height="719" + inkscape:window-width="1920" + inkscape:window-height="1010" inkscape:window-x="0" - inkscape:window-y="27" + inkscape:window-y="33" inkscape:window-maximized="1" /> <metadata id="metadata7"> @@ -147,7 +147,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"; /> - <dc:title></dc:title> + <dc:title /> </cc:Work> </rdf:RDF> </metadata> @@ -156,323 +156,321 @@ inkscape:groupmode="layer" id="layer1" transform="translate(65.2309,-67.072506)"> + <path + style="fill:none;fill-rule:evenodd;stroke:#888888;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:6, 6;stroke-dashoffset:0;stroke-opacity:1" + d="M 291.28177,105.50558 V 668.25997" + id="path4239" + inkscape:connector-curvature="0" /> + <path + style="fill:none;fill-rule:evenodd;stroke:#888888;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:6, 6;stroke-dashoffset:0;stroke-opacity:1" + d="M 648.50747,668.25997 V 105.50558" + id="path4243" + inkscape:connector-curvature="0" /> <g - id="g7067"> - <path - inkscape:connector-curvature="0" - id="path4239" - d="m 291.28177,105.50558 0,562.75439" - style="fill:none;fill-rule:evenodd;stroke:#888888;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:6, 6;stroke-dashoffset:0;stroke-opacity:1" /> - <path - inkscape:connector-curvature="0" - id="path4243" - d="m 648.50747,668.25997 0,-562.75439" - style="fill:none;fill-rule:evenodd;stroke:#888888;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:6, 6;stroke-dashoffset:0;stroke-opacity:1" /> + id="g4215" + transform="matrix(0.71029464,0,0,0.71029464,52.794034,182.22272)"> + <rect + ry="16.422403" + y="175.65852" + x="61.899826" + height="199.59537" + width="111.16703" + id="rect4136" + style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <g - transform="matrix(0.71029464,0,0,0.71029464,52.794034,182.22272)" - id="g4215"> - <rect - style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect4136" - width="111.16703" - height="199.59537" - x="61.899826" - y="175.65852" - ry="16.422403" /> + id="g4170"> <g - id="g4170"> - <g - transform="translate(-1.8948978,0)" - id="g4161"> - <path - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 84.638539,294.40514 69.479401,0" - id="path4138" - inkscape:connector-curvature="0" /> - <path - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 84.638538,311.4591 69.479402,0" - id="path4138-3" - inkscape:connector-curvature="0" /> - <path - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 84.638538,328.5132 69.479402,0" - id="path4138-6" - inkscape:connector-curvature="0" /> - </g> - <rect - ry="1.2632638" - y="200.92377" - x="130.27411" - height="17.685665" - width="18.948927" - id="rect4168" - style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + id="g4161" + transform="translate(-1.8948978)"> + <path + inkscape:connector-curvature="0" + id="path4138" + d="M 84.638539,294.40514 H 154.11794" + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + inkscape:connector-curvature="0" + id="path4138-3" + d="M 84.638538,311.4591 H 154.11794" + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + inkscape:connector-curvature="0" + id="path4138-6" + d="M 84.638538,328.5132 H 154.11794" + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> </g> - </g> - <g - transform="matrix(0.66913565,0,0,0.66913565,512.1878,225.7809)" - id="g4229"> <rect style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect4177" - width="150.32816" - height="90.954849" - x="373.92548" - y="183.2381" - ry="16.4224" /> + id="rect4168" + width="18.948927" + height="17.685665" + x="130.27411" + y="200.92377" + ry="1.2632638" /> + </g> + </g> + <g + id="g4229" + transform="matrix(0.66913565,0,0,0.66913565,512.1878,225.7809)"> + <rect + ry="16.4224" + y="183.2381" + x="373.92548" + height="90.954849" + width="150.32816" + id="rect4177" + style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <rect + ry="8.8428326" + y="289.14188" + x="374.5571" + height="17.685665" + width="149.0649" + id="rect4179" + style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <g + transform="translate(9.9479538)" + id="g4224"> + <path + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 393.66418,207.24007 h 90.95484" + id="path4181" + inkscape:connector-curvature="0" /> + <path + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:5.43139029;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 393.66418,221.74845 h 74.53244" + id="path4181-7" + inkscape:connector-curvature="0" /> <rect style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect4179" - width="149.0649" - height="17.685665" - x="374.5571" - y="289.14188" - ry="8.8428326" /> + id="rect4213" + width="2.7432709" + height="4.9764233" + x="396.66418" + y="233.76857" + ry="0.47837442" /> + </g> + </g> + <rect + style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect4237" + width="991.51965" + height="562.75439" + x="-26.797829" + y="105.50558" + ry="21.34848" /> + <g + id="g4215-3" + transform="matrix(0.71029464,0,0,0.71029464,388.1153,70.131827)"> + <rect + ry="16.422403" + y="175.65852" + x="61.899826" + height="199.59537" + width="111.16703" + id="rect4136-5" + style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <g + id="g4170-6"> <g - id="g4224" - transform="translate(9.9479538,0)"> + id="g4161-2" + transform="translate(-1.8948978)"> + <path + inkscape:connector-curvature="0" + id="path4138-9" + d="M 84.638539,294.40514 H 154.11794" + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> <path inkscape:connector-curvature="0" - id="path4181" - d="m 393.66418,207.24007 90.95484,0" + id="path4138-3-1" + d="M 84.638538,311.4591 H 154.11794" style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> <path inkscape:connector-curvature="0" - id="path4181-7" - d="m 393.66418,221.74845 74.53244,0" - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:5.43139029;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> - <rect - ry="0.47837442" - y="233.76857" - x="396.66418" - height="4.9764233" - width="2.7432709" - id="rect4213" - style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + id="path4138-6-2" + d="M 84.638538,328.5132 H 154.11794" + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> </g> + <rect + style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect4168-7" + width="18.948927" + height="17.685665" + x="130.27411" + y="200.92377" + ry="1.2632638" /> </g> + </g> + <g + id="g4215-3-0" + transform="matrix(0.71029464,0,0,0.71029464,388.1153,338.61578)"> <rect - ry="21.34848" - y="105.50558" - x="-26.797829" - height="562.75439" - width="991.51965" - id="rect4237" + ry="16.422403" + y="175.65852" + x="61.899826" + height="199.59537" + width="111.16703" + id="rect4136-5-9" style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <g - transform="matrix(0.71029464,0,0,0.71029464,388.1153,70.131827)" - id="g4215-3"> - <rect - style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect4136-5" - width="111.16703" - height="199.59537" - x="61.899826" - y="175.65852" - ry="16.422403" /> + id="g4170-6-3"> <g - id="g4170-6"> - <g - transform="translate(-1.8948978,0)" - id="g4161-2"> - <path - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 84.638539,294.40514 69.479401,0" - id="path4138-9" - inkscape:connector-curvature="0" /> - <path - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 84.638538,311.4591 69.479402,0" - id="path4138-3-1" - inkscape:connector-curvature="0" /> - <path - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 84.638538,328.5132 69.479402,0" - id="path4138-6-2" - inkscape:connector-curvature="0" /> - </g> - <rect - ry="1.2632638" - y="200.92377" - x="130.27411" - height="17.685665" - width="18.948927" - id="rect4168-7" - style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + id="g4161-2-6" + transform="translate(-1.8948978)"> + <path + inkscape:connector-curvature="0" + id="path4138-9-0" + d="M 84.638539,294.40514 H 154.11794" + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + inkscape:connector-curvature="0" + id="path4138-3-1-6" + d="M 84.638538,311.4591 H 154.11794" + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + inkscape:connector-curvature="0" + id="path4138-6-2-2" + d="M 84.638538,328.5132 H 154.11794" + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> </g> - </g> - <g - transform="matrix(0.71029464,0,0,0.71029464,388.1153,338.61578)" - id="g4215-3-0"> <rect style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect4136-5-9" - width="111.16703" - height="199.59537" - x="61.899826" - y="175.65852" - ry="16.422403" /> - <g - id="g4170-6-3"> - <g - transform="translate(-1.8948978,0)" - id="g4161-2-6"> - <path - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 84.638539,294.40514 69.479401,0" - id="path4138-9-0" - inkscape:connector-curvature="0" /> - <path - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 84.638538,311.4591 69.479402,0" - id="path4138-3-1-6" - inkscape:connector-curvature="0" /> - <path - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 84.638538,328.5132 69.479402,0" - id="path4138-6-2-2" - inkscape:connector-curvature="0" /> - </g> - <rect - ry="1.2632638" - y="200.92377" - x="130.27411" - height="17.685665" - width="18.948927" - id="rect4168-7-6" - style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> + id="rect4168-7-6" + width="18.948927" + height="17.685665" + x="130.27411" + y="200.92377" + ry="1.2632638" /> </g> - <text - sodipodi:linespacing="125%" - id="text4317" - y="154.73605" + </g> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="66.101311" + y="154.73605" + id="text4317"><tspan + style="font-size:48px;line-height:1.25" + sodipodi:role="line" + id="tspan4319" x="66.101311" - style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:48px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - xml:space="preserve"><tspan - y="154.73605" - x="66.101311" - id="tspan4319" - sodipodi:role="line">Target</tspan></text> - <text - sodipodi:linespacing="125%" - id="text4321" - y="159.77512" - x="401.96744" - style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:48px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - xml:space="preserve"><tspan - y="159.77512" - x="401.96744" - id="tspan4323" - sodipodi:role="line">Slaves</tspan></text> - <text - sodipodi:linespacing="125%" - id="text4325" - y="159.50558" - x="739.99097" - style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:48px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - xml:space="preserve"><tspan - y="159.50558" - x="739.99097" - id="tspan4327" - sodipodi:role="line">Master</tspan></text> - <rect - ry="5.3595657" - y="406.66925" - x="466.20352" - height="10.719131" - width="10.719131" - id="rect4337" - style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - <rect - ry="5.3595657" - y="383.44449" - x="466.20352" - height="10.719131" - width="10.719131" - id="rect4337-1" - style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - <rect - ry="5.3595657" - y="429.89404" - x="466.20352" - height="10.719131" - width="10.719131" - id="rect4337-8" - style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - <text - sodipodi:linespacing="125%" - id="text4365" - y="364.55127" + y="154.73605">Target</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="308.21744" + y="159.77512" + id="text4321"><tspan + style="font-size:48px;line-height:1.25" + sodipodi:role="line" + id="tspan4323" + x="308.21744" + y="159.77512">Worker Nodes</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="683.74097" + y="159.50558" + id="text4325"><tspan + style="font-size:48px;line-height:1.25" + sodipodi:role="line" + id="tspan4327" + x="683.74097" + y="159.50558">Controller</tspan><tspan + style="font-size:48px;line-height:1.25" + sodipodi:role="line" + x="683.74097" + y="219.50558" + id="tspan1022">Node</tspan></text> + <rect + style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect4337" + width="10.719131" + height="10.719131" + x="466.20352" + y="406.66925" + ry="5.3595657" /> + <rect + style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect4337-1" + width="10.719131" + height="10.719131" + x="466.20352" + y="383.44449" + ry="5.3595657" /> + <rect + style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect4337-8" + width="10.719131" + height="10.719131" + x="466.20352" + y="429.89404" + ry="5.3595657" /> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="398.17441" + y="364.55127" + id="text4365"><tspan + sodipodi:role="line" + id="tspan4367" x="398.17441" - style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:48px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - xml:space="preserve"><tspan - style="font-size:25px" - y="364.55127" - x="398.17441" - id="tspan4367" - sodipodi:role="line">192.168.0.10</tspan></text> - <text - sodipodi:linespacing="125%" - id="text4365-7" - y="630.63611" + y="364.55127" + style="font-size:25px;line-height:1.25">192.168.0.10</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="397.93637" + y="630.63611" + id="text4365-7"><tspan + sodipodi:role="line" + id="tspan4367-9" x="397.93637" - style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:48px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - xml:space="preserve"><tspan - style="font-size:25px" - y="630.63611" - x="397.93637" - id="tspan4367-9" - sodipodi:role="line">192.168.0.15</tspan></text> - <text - sodipodi:linespacing="125%" - id="text4365-2" - y="464.48956" + y="630.63611" + style="font-size:25px;line-height:1.25">192.168.0.15</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="741.26532" + y="464.48956" + id="text4365-2"><tspan + sodipodi:role="line" + id="tspan4367-0" x="741.26532" - style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:48px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - xml:space="preserve"><tspan - style="font-size:25px" - y="464.48956" - x="741.26532" - id="tspan4367-0" - sodipodi:role="line">192.168.0.2</tspan></text> - <text - sodipodi:linespacing="125%" - id="text4365-23" - y="485.92783" + y="464.48956" + style="font-size:25px;line-height:1.25">192.168.0.2</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="25.591187" + y="485.92783" + id="text4365-23"><tspan + sodipodi:role="line" + id="tspan4367-7" x="25.591187" - style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:48px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - xml:space="preserve"><tspan - style="font-size:25px" - y="485.92783" - x="25.591187" - id="tspan4367-7" - sodipodi:role="line">www.example.com</tspan></text> - <path - sodipodi:nodetypes="cc" - inkscape:connector-curvature="0" - id="path4418" - d="M 412.68656,264.50602 189.37133,357.40517" - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker4770)" /> - <path - sodipodi:nodetypes="cc" - inkscape:connector-curvature="0" - id="path4420" - d="M 410.90005,541.41693 189.37132,400.2817" - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Mend)" /> - <path - sodipodi:nodetypes="cc" - inkscape:connector-curvature="0" - id="path4418-2" - d="M 744.08639,371.21054 531.49028,253.3001" - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker4770-5)" /> - <path - sodipodi:nodetypes="cc" - inkscape:connector-curvature="0" - id="path4418-9" - d="M 744.08639,396.17872 527.91724,542.67353" - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker4770-2)" /> - </g> + y="485.92783" + style="font-size:25px;line-height:1.25">www.example.com</tspan></text> + <path + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker4770)" + d="M 412.68656,264.50602 189.37133,357.40517" + id="path4418" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + <path + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Mend)" + d="M 410.90005,541.41693 189.37132,400.2817" + id="path4420" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + <path + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker4770-5)" + d="M 744.08639,371.21054 531.49028,253.3001" + id="path4418-2" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + <path + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker4770-2)" + d="M 744.08639,396.17872 527.91724,542.67353" + id="path4418-9" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> </g> </svg> diff --git a/xdocs/usermanual/jmeter_distributed_testing_step_by_step.xml b/xdocs/usermanual/jmeter_distributed_testing_step_by_step.xml index 068262a..3bbc193 100644 --- a/xdocs/usermanual/jmeter_distributed_testing_step_by_step.xml +++ b/xdocs/usermanual/jmeter_distributed_testing_step_by_step.xml @@ -48,12 +48,12 @@ This short tutorial explains how to use multiple systems to perform stress testi <p> Once you've made sure the systems are ready, it's time to setup remote testing. The tutorial assumes you already -have JMeter installed on all the systems. The way JMeter works is one master controller initiates the test on multiple slave systems. +have JMeter installed on all the systems. The way JMeter works is one controller node initiates the test on multiple worker nodes. </p> <note>In this tutorial we use GUI Mode just for demonstration. In real life you should use CLI mode (NON GUI) to start your load test</note> -<figure width="610" height="462" image="distributed-jmeter.svg">One master controls multiple slaves</figure> +<figure width="610" height="462" image="distributed-jmeter.svg">One controller node with multiple worker nodes</figure> <subsection name="§-num;.1 Terminology" anchor="terminology"> @@ -62,8 +62,8 @@ Before we dive into the step-by-step instructions, it's a good idea to define th </p> <dl> - <dt>Master</dt><dd>the system running JMeter GUI, which controls the test</dd> - <dt>Slave</dt><dd>the system running <code>jmeter-server</code>, which takes commands from + <dt>Controller Node</dt><dd>the system running JMeter GUI, which controls the test</dd> + <dt>Worker Node</dt><dd>the system running <code>jmeter-server</code>, which takes commands from the GUI and send requests to the target system(s)</dd> <dt>Target</dt><dd>the webserver we plan to stress test</dd> </dl> @@ -75,10 +75,10 @@ Before we dive into the step-by-step instructions, it's a good idea to define th <subsection name="§-num;.2 Step-by-Step" anchor="step-by-step"> <ol> - <li>On the slave systems, go to <code>jmeter/bin</code> directory and execute + <li>On the worker nodes, go to <code>jmeter/bin</code> directory and execute <code>jmeter-server.bat</code> (<code>jmeter-server</code> on unix). </li> - <li>On master system acting as the console, open windows explorer and go to + <li>On controller node acting as the console, open windows explorer and go to <code>jmeter/bin</code> directory</li> <li>Open <code>jmeter.properties</code> in a text editor</li> <li>Edit the line <code>remote_hosts=127.0.0.1</code></li> @@ -98,7 +98,7 @@ Before we dive into the step-by-step instructions, it's a good idea to define th <p> At this point, you are ready to start load testing. If you want to double check -the slave systems are working, open <code>jmeter.log</code> in your editor. You should see the following in the log. +the worker nodes are working, open <code>jmeter.log</code> in your editor. You should see the following in the log. </p> <source> @@ -122,7 +122,7 @@ initiate the test: a single system and all systems. <li>Select the IP address</li> </ol> -<figure width="490" height="196" image="example-remote-start.png">Start a single slave</figure> +<figure width="490" height="196" image="example-remote-start.png">Start a single worker node</figure> </subsection> @@ -133,7 +133,7 @@ initiate the test: a single system and all systems. <li>Select Remote Start all or use <keycombo><keysym>Ctrl</keysym><keysym>Shift</keysym><keysym>R</keysym></keycombo></li> </ol> -<figure width="410" height="155" image="example-remote-start-all.png">Start all slaves</figure> +<figure width="410" height="155" image="example-remote-start-all.png">Start all worker nodes</figure> </subsection>
