Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Params comparison instrumentation #76

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Params comparison instrumentation #76

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2f7381f
ThrottleQueueTaskDispatcher.java : fix whitespace
jimklimov Jun 28, 2019
49eec23
ThrottleQueueTaskDispatcher.java isAnotherBuildWithSameParametersRunn…
jimklimov Jun 28, 2019
4c6e43e
ThrottleQueueTaskDispatcher.java isAnotherBuildWithSameParametersRunn…
jimklimov Jun 28, 2019
c4b2f2e
ThrottleQueueTaskDispatcher.java doFilter() : log warnings in sanity …
jimklimov Jun 28, 2019
96c4f75
ThrottleQueueTaskDispatcher.java isAnotherBuildWithSameParametersRunn…
jimklimov Jun 28, 2019
5f1af23
ThrottleQueueTaskDispatcher.java : rename doFilterParams() params int…
jimklimov Feb 10, 2020
3cadb3a
ThrottleQueueTaskDispatcher.java : enhance debug logging comprehensib…
jimklimov Jul 18, 2019
63af186
ThrottleQueueTaskDispatcher.java : shift logging priorities for less …
jimklimov Jul 19, 2019
38bcff3
Merge remote-tracking branch 'upstream/master' into params-compare-in…
jimklimov Feb 10, 2020
fcb6fac
Merge branch 'master' into params-compare-instrumentation
jimklimov Sep 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 38 additions & 5 deletions src/main/java/hudson/plugins/throttleconcurrents/ThrottleQueueTaskDispatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,12 @@ private boolean isAnotherBuildWithSameParametersRunningOnNode(Node node, Queue.I
List<ParameterValue> itemParams = getParametersFromQueueItem(item);

if (paramsToCompare.size() > 0) {
LOGGER.log(Level.FINER, "filter itemParams " + itemParams +
" (from queue) to only pick up to " + paramsToCompare.size() +
": " + paramsToCompare + " (from throttle config)");
itemParams = doFilterParams(paramsToCompare, itemParams);
LOGGER.log(Level.FINE, "filtering got " + itemParams.size() +
" itemParams : " + itemParams );
}

// Look at all executors of specified node => computer,
Expand All @@ -339,7 +344,18 @@ private boolean isAnotherBuildWithSameParametersRunningOnNode(Node node, Queue.I
if (currentExecutable != null &&
parentTask.getOwnerTask().getName().equals(item.task.getName())) {
List<ParameterValue> executingUnitParams = getParametersFromWorkUnit(exec.getCurrentWorkUnit());

LOGGER.log(Level.FINER, "filter executingUnitParams" +
" on " + computer.getDisplayName() + "#" + exec.getNumber() +
" in build (" + exec.getCurrentWorkUnit() + ") from original " +
executingUnitParams + " to only pick up to " +
paramsToCompare.size() + ": " + paramsToCompare);
executingUnitParams = doFilterParams(paramsToCompare, executingUnitParams);
LOGGER.log(Level.FINE, "filtering got " + executingUnitParams.size() +
" executingUnitParams : " + executingUnitParams +
" on " + computer.getDisplayName() + "#" + exec.getNumber() +
" in build (" + exec.getCurrentWorkUnit() + ")");
// if nothing filtered away, we'll compare all params, not a subset

// An already executing work unit (of the same name) can have more
// parameters than the queued item, e.g. due to env injection or by
Expand All @@ -355,7 +371,9 @@ private boolean isAnotherBuildWithSameParametersRunningOnNode(Node node, Queue.I
if (executingUnitParams.containsAll(itemParams)) {
LOGGER.log(Level.FINE, "build (" + exec.getCurrentWorkUnit() +
") with identical parameters (" +
executingUnitParams + ") is already running.");
executingUnitParams + ") as the ones in queued item (" +
itemParams + ") is already running " +
"on node '" + node.getDisplayName() + "'.");
return true;
}
}
Expand All @@ -367,22 +385,37 @@ private boolean isAnotherBuildWithSameParametersRunningOnNode(Node node, Queue.I

/**
* Filter job parameters to only include parameters used for throttling
* @param params - a list of Strings with parameter names to compare
* @param paramsToCompare - a list of Strings with parameter names to compare
* @param OriginalParams - a list of ParameterValue descendants whose name fields should match
* @return a list of ParameterValue descendants whose name fields did match, entries copied from OriginalParams
*/
private List<ParameterValue> doFilterParams(List<String> params, List<ParameterValue> OriginalParams) {
if (params.isEmpty()) {
private List<ParameterValue> doFilterParams(List<String> paramsToCompare, List<ParameterValue> OriginalParams) {
if (paramsToCompare.isEmpty()) {
LOGGER.log(Level.FINEST, "paramsToCompare.isEmpty() => return OriginalParams");
return OriginalParams;
}

List<ParameterValue> newParams = new ArrayList<>();
LOGGER.log(Level.FINEST, "filtering by paramsToCompare = " + paramsToCompare);

for (ParameterValue p : OriginalParams) {
if (params.contains(p.getName())) {
LOGGER.log(Level.FINEST, "checking if original " +
p.getName() + " is on our list of paramsToCompare?.." );
if (paramsToCompare.contains(p.getName())) {
LOGGER.log(Level.FINEST, "we have a hit in OriginalParams: " + p);
newParams.add(p);
}
}
if (newParams.size() == 0 ) {
LOGGER.log(Level.WARNING, "Error selecting params," +
" got no hits of " + paramsToCompare + " in " + OriginalParams +
" : is the job configuration valid?");
} else if (newParams.size() < paramsToCompare.size() ) {
LOGGER.log(Level.WARNING, "Error selecting params," +
" not all of " + paramsToCompare + " were present in " + OriginalParams +
" : is the job configuration valid?");
}

return newParams;
}

Expand Down