-
Notifications
You must be signed in to change notification settings - Fork 274
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.
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
Do not use synchronised checks during event processing #363
Open
Jimilian
wants to merge
2
commits into
jenkinsci:master
Choose a base branch
from
Jimilian:remove_contention_on_event_processing
base: master
Could not load branches
Branch not found: {{ refName }}
Could not load tags
Nothing to show
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -206,7 +206,11 @@ public synchronized void allBuildsCompleted(GerritTriggeredEvent event, GerritCa | |
* @param event the Gerrit Event which is being checked. | ||
* @param p the Gerrit project being checked. | ||
* @return true if so. | ||
* | ||
* @deprecated Use {@link #isTriggered(Job, GerritTriggeredEvent)} and | ||
* {@link #isBuilding(Job, GerritTriggeredEvent)}} instead | ||
*/ | ||
@Deprecated | ||
public synchronized boolean isProjectTriggeredAndIncomplete(Job p, GerritTriggeredEvent event) { | ||
if (!memory.isTriggered(event, p)) { | ||
return false; | ||
|
@@ -328,18 +332,13 @@ protected void cleanUpGerritCauses(GerritCause firstFound, Run build) { | |
* @param project the project that will be built. | ||
* @param event the event that caused the build to be scheduled. | ||
*/ | ||
public synchronized void onTriggered(Job project, GerritTriggeredEvent event) { | ||
public void onTriggered(Job project, GerritTriggeredEvent event) { | ||
//TODO stop builds for earlier patch-sets on same change. | ||
memory.triggered(event, project); | ||
if (event instanceof GerritEventLifecycle) { | ||
((GerritEventLifecycle)event).fireProjectTriggered(project); | ||
} | ||
//Logging | ||
String name = null; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why did you remove this? |
||
if (project != null) { | ||
name = project.getName(); | ||
} | ||
logger.info("Project [{}] triggered by Gerrit: [{}]", name, event); | ||
logger.info("Project [{}] triggered by Gerrit: [{}]", project.getName(), event); | ||
} | ||
|
||
/** | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a change that might have outside repercussions. The lifecycle listeners might have assumptions about owning the monitor when called (which is normal behavior in most listener cases that I've seen)
But I think I can live with that risk if this change is really needed.