Skip to content

Commit b7ba6c1

Browse files
committed
Disable by default "remembering" and querying Dynamatrix.knownClones (seems they have a way to store stats into parent after all)
1 parent ab669fc commit b7ba6c1

File tree

2 files changed

+25
-25
lines changed

2 files changed

+25
-25
lines changed

src/org/nut/dynamatrix/Dynamatrix.groovy

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ class Dynamatrix implements Cloneable {
131131
* @see #setWorstResult(String, String)
132132
* @see #resultFromString
133133
*/
134-
public Result getWorstResult(Boolean recurse = true) {
134+
public Result getWorstResult(Boolean recurse = false) {
135135
Result r = this.@dmWorstResult
136136
if (recurse && this.knownClones.size() > 0) {
137137
this.knownClones.each {
@@ -325,7 +325,7 @@ class Dynamatrix implements Cloneable {
325325
* @see #setLogKey
326326
*/
327327
@NonCPS
328-
synchronized public String getLogKey(String s, Boolean recurse = true) {
328+
synchronized public String getLogKey(String s, Boolean recurse = false) {
329329
Map<String, String> mapTrackStageLogkeys = this.getTrackStageLogkeys(recurse)
330330
if (mapTrackStageLogkeys.containsKey(s)) {
331331
return mapTrackStageLogkeys[s]
@@ -352,7 +352,7 @@ class Dynamatrix implements Cloneable {
352352
* @return
353353
*/
354354
@NonCPS
355-
synchronized public Map<Result, Set<String>> reportStageResults(Boolean recurse = true) {
355+
synchronized public Map<Result, Set<String>> reportStageResults(Boolean recurse = false) {
356356
Map<Result, Set<String>> mapres = [:]
357357
this.getTrackStageResults(recurse).each { String sn, Result r ->
358358
// this.trackStageResults.each { String sn, Result r ->
@@ -433,20 +433,20 @@ class Dynamatrix implements Cloneable {
433433

434434
/** Reporting the accounted values:
435435
* We started the stage (maybe more than once) */
436-
public Integer countStagesStarted(Boolean recurse = true) {
436+
public Integer countStagesStarted(Boolean recurse = false) {
437437
Map<String, Integer> mapCountStages = this.getCountStages(recurse)
438438
return intNullZero(mapCountStages?.STARTED) + intNullZero(mapCountStages?.RESTARTED)
439439
}
440440

441441
/** Reporting the accounted values:
442442
* We restarted the stage */
443-
public Integer countStagesRestarted(Boolean recurse = true) {
443+
public Integer countStagesRestarted(Boolean recurse = false) {
444444
return intNullZero(this.getCountStages(recurse)?.RESTARTED)
445445
}
446446

447447
/** Reporting the accounted values:
448448
* We know we finished the stage, successfully or with "fex" exception caught */
449-
public Integer countStagesCompleted(Boolean recurse = true) {
449+
public Integer countStagesCompleted(Boolean recurse = false) {
450450
return intNullZero(this.getCountStages(recurse)?.COMPLETED)
451451
}
452452

@@ -455,32 +455,32 @@ class Dynamatrix implements Cloneable {
455455
* (due to {@link #mustAbort}, after getting a node
456456
* to execute our logic on)
457457
*/
458-
public Integer countStagesAbortedSafe(Boolean recurse = true) {
458+
public Integer countStagesAbortedSafe(Boolean recurse = false) {
459459
return intNullZero(this.getCountStages(recurse)?.ABORTED_SAFE)
460460
}
461461

462462
/** Reporting the accounted values: Standard Jenkins build results */
463-
public Integer countStagesFinishedOK(Boolean recurse = true) {
463+
public Integer countStagesFinishedOK(Boolean recurse = false) {
464464
return intNullZero(this.getCountStages(recurse)?.SUCCESS)
465465
}
466466

467467
/** Reporting the accounted values: Standard Jenkins build results */
468-
public Integer countStagesFinishedFailure(Boolean recurse = true) {
468+
public Integer countStagesFinishedFailure(Boolean recurse = false) {
469469
return intNullZero(this.getCountStages(recurse)?.FAILURE)
470470
}
471471

472472
/** Reporting the accounted values: Standard Jenkins build results */
473-
public Integer countStagesFinishedFailureAllowed(Boolean recurse = true) {
473+
public Integer countStagesFinishedFailureAllowed(Boolean recurse = false) {
474474
return intNullZero(this.getCountStages(recurse)?.UNSTABLE)
475475
}
476476

477477
/** Reporting the accounted values: Standard Jenkins build results */
478-
public Integer countStagesAborted(Boolean recurse = true) {
478+
public Integer countStagesAborted(Boolean recurse = false) {
479479
return intNullZero(this.getCountStages(recurse)?.ABORTED)
480480
}
481481

482482
/** Reporting the accounted values: Standard Jenkins build results */
483-
public Integer countStagesAbortedNotBuilt(Boolean recurse = true) {
483+
public Integer countStagesAbortedNotBuilt(Boolean recurse = false) {
484484
return intNullZero(this.getCountStages(recurse)?.NOT_BUILT)
485485
}
486486

@@ -536,7 +536,7 @@ class Dynamatrix implements Cloneable {
536536
// Must be CPS - calls pipeline script steps; this
537537
// precludes use of at least synchronized{} blocks
538538
synchronized
539-
Boolean updateProgressBadge(Boolean removeOnly = false, Boolean recurse = true) {
539+
Boolean updateProgressBadge(Boolean removeOnly = false, Boolean recurse = false) {
540540
if (!this.script)
541541
return null
542542

@@ -653,7 +653,7 @@ class Dynamatrix implements Cloneable {
653653
return ret
654654
}
655655

656-
public Dynamatrix clone(String dynamatrixComment, Boolean rememberMe = true) throws CloneNotSupportedException {
656+
public Dynamatrix clone(String dynamatrixComment, Boolean rememberMe = false) throws CloneNotSupportedException {
657657
Dynamatrix ret = (Dynamatrix) super.clone()
658658
ret.dynamatrixComment = dynamatrixComment
659659
ret.knownClones = []
@@ -697,7 +697,7 @@ class Dynamatrix implements Cloneable {
697697
* Report amounts of stages which have certain verdicts,
698698
* zero or not, in layman wording.
699699
*/
700-
public String toStringStageCount(Boolean recurse = true) {
700+
public String toStringStageCount(Boolean recurse = false) {
701701
return "countStagesStarted:${countStagesStarted(recurse)} " +
702702
"(of which countStagesRestarted:${countStagesRestarted(recurse)}) " +
703703
"countStagesCompleted:${countStagesCompleted(recurse)} " +
@@ -713,7 +713,7 @@ class Dynamatrix implements Cloneable {
713713
* Report amounts of stages which have certain verdicts,
714714
* greater than zero, in layman wording.
715715
*/
716-
public String toStringStageCountNonZero(Boolean recurse = true) {
716+
public String toStringStageCountNonZero(Boolean recurse = false) {
717717
String s = ""
718718
Integer i
719719

@@ -752,7 +752,7 @@ class Dynamatrix implements Cloneable {
752752
* greater than zero, in debug-friendly wording (using
753753
* key names from {@link #countStages} map).
754754
*/
755-
public String toStringStageCountDumpNonZero(Boolean recurse = true) {
755+
public String toStringStageCountDumpNonZero(Boolean recurse = false) {
756756
Map<String, Integer> m = [:]
757757
this.getCountStages(recurse).each {String k, Integer v ->
758758
if (v > 0) m[k] = v
@@ -766,7 +766,7 @@ class Dynamatrix implements Cloneable {
766766
* made from this {@link Dynamatrix} object.
767767
*/
768768
@NonCPS
769-
synchronized public Map<String, Integer> getCountStages(Boolean recurse = true) {
769+
synchronized public Map<String, Integer> getCountStages(Boolean recurse = false) {
770770
// Avoid java.lang.CloneNotSupportedException: java.util.concurrent.ConcurrentHashMap
771771
// Groovy and Java should support it, but...
772772
Map<String, Integer> mapres = new ConcurrentHashMap<String, Integer>()
@@ -794,7 +794,7 @@ class Dynamatrix implements Cloneable {
794794
* made from this {@link Dynamatrix} object.
795795
*/
796796
@NonCPS
797-
synchronized public Map<String, String> getTrackStageLogkeys(Boolean recurse = true) {
797+
synchronized public Map<String, String> getTrackStageLogkeys(Boolean recurse = false) {
798798
// Avoid java.lang.CloneNotSupportedException: java.util.concurrent.ConcurrentHashMap
799799
// Groovy and Java should support it, but...
800800
Map<String, String> mapres = new ConcurrentHashMap<String, String>()
@@ -822,7 +822,7 @@ class Dynamatrix implements Cloneable {
822822
* made from this {@link Dynamatrix} object.
823823
*/
824824
@NonCPS
825-
synchronized public Map<String, Result> getTrackStageResults(Boolean recurse = true) {
825+
synchronized public Map<String, Result> getTrackStageResults(Boolean recurse = false) {
826826
// Avoid java.lang.CloneNotSupportedException: java.util.concurrent.ConcurrentHashMap
827827
// Groovy and Java should support it, but...
828828
Map<String, Result> mapres = new ConcurrentHashMap<String, Result>()
@@ -845,7 +845,7 @@ class Dynamatrix implements Cloneable {
845845
}
846846

847847
/** Returns stringification of current {@link #countStages} map contents. */
848-
public String toStringStageCountDump(Boolean recurse = true) {
848+
public String toStringStageCountDump(Boolean recurse = false) {
849849
if (recurse) {
850850
return this.getCountStages(recurse).toString()
851851
} else {
@@ -1973,12 +1973,12 @@ def parallelStages = prepareDynamatrix(
19731973

19741974
/** @see #generateBuild(Map, boolean, boolean, Closure) */
19751975
def generateBuild(Map dynacfgOrig = [:], Closure bodyOrig = null) {
1976-
return generateBuild(dynacfgOrig, false, true, bodyOrig)
1976+
return generateBuild(dynacfgOrig, false, false, bodyOrig)
19771977
}
19781978

19791979
/** @see #generateBuild(Map, boolean, boolean, Closure) */
19801980
def generateBuild(Map dynacfgOrig = [:], boolean returnSet, Closure bodyOrig = null) {
1981-
return generateBuild(dynacfgOrig, returnSet, true, bodyOrig)
1981+
return generateBuild(dynacfgOrig, returnSet, false, bodyOrig)
19821982
}
19831983

19841984
/**

vars/prepareDynamatrix.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,11 @@ prepareDynamatrix([
7979
* Or a Set, if called from inside a pipeline stage (CPS code).
8080
*/
8181
def call(Map dynacfgOrig = [:], Closure body = null) {
82-
return call(dynacfgOrig, false, true, body)
82+
return call(dynacfgOrig, false, false, body)
8383
}
8484

8585
def call(Map dynacfgOrig = [:], boolean returnSet, Closure body = null) {
86-
return call(dynacfgOrig, returnSet, true, body)
86+
return call(dynacfgOrig, returnSet, false, body)
8787
}
8888

8989
def call(Map dynacfgOrig = [:], boolean returnSet, Boolean rememberClones, Closure body = null) {

0 commit comments

Comments
 (0)