Commit Graph
32590 Commits
Author SHA1 Message Date
Stephen Connolly 1edb51cb91 [JENKINS-28844] Noting merge of #1766 2015-07-16 13:15:31 +01:00
Daniel Beck 23d800cf8a Merge pull request #1617 from KostyaSha/cronFix
Don't run trigger for disabled/copied projects
2015-07-16 12:40:46 +01:00
Stephen Connolly 9cd1929cfc Merge pull request #1766 from jenkinsci/jenkins-28844
[FIXED JENKINS-28844] The curious case of the Channel memory cycles
2015-07-16 08:41:24 +01:00
Michael Prankl 3a527b24fc Added log4j to banned dependencies via maven-enforcer-plugin. 2015-07-14 19:02:58 +02:00
Stephen Connolly aac20468ff [FIXED JENKINS-28844] The curious case of the Channel memory cycles
Pick up the remoting 2.52 release
2015-07-14 15:22:15 +01:00
Oliver Gondža 9a853b9d10 Merge pull request #1763 from olivergondza/JENKINS-29286
[FIXED JENKINS-29286] Use byte size to sort disk space monitor columns
2015-07-14 10:11:27 +02:00
Oliver Gondža 316b32e07b Noting #1763 and #1764 2015-07-14 10:08:59 +02:00
Oliver Gondža c7c408bf88 Merge pull request #1764 from olivergondza/JENKINS-29376
[FIXED JENKINS-29376] Rename help texts as well
2015-07-14 10:06:23 +02:00
Oliver Gondža 1c1d5a95d9 [FIXED JENKINS-29376] Rename help texts as well
Amends eec43983a3.
2015-07-13 10:34:57 +02:00
Michael Prankl 41ca5b8a36 Use log4j-bridge of slf4j, exclude log4j. 2015-07-13 10:30:34 +02:00
Oliver Gondža fabec0eef0 [FIXED JENKINS-29286] Use byte size to sort disk space monitor columns 2015-07-13 09:07:30 +02:00
Kohsuke Kawaguchi 30b6c8dfc8 updated changelog for release 2015-07-12 18:36:38 -07:00
Kohsuke Kawaguchi e4ff328728 [maven-release-plugin] prepare for next development iteration 2015-07-12 18:30:38 -07:00
Kohsuke Kawaguchi fe9756673f [maven-release-plugin] prepare release jenkins-1.620 jenkins-1.620 2015-07-12 18:30:37 -07:00
Oliver Gondža ae2163ac88 Noting #1761 2015-07-10 16:13:40 +02:00
Oliver Gondža 4f22d5bf42 Merge pull request #1761 from olivergondza/JENKINS-29300
[FIXED JENKINS-29300] Display system info even when slave is temporarily offline
2015-07-10 16:12:37 +02:00
Tom Fennelly 82d265d144 Merge pull request #1759 from tfennelly/isMultipart
Added a simple isMultipart utility to MultipartFormDataParser
2015-07-10 08:38:19 +01:00
Oliver Gondža 8af198e9c8 Merge pull request #1760 from olivergondza/fix-interactiveBreak
Fix url presented by JenkinsRule#interactiveBreak
2015-07-09 18:38:32 +02:00
Oliver Gondža 48b909dbf0 [FIXED JENKINS-29300] Display system info even when slave is temporarily offline 2015-07-09 16:24:17 +02:00
Oliver Gondža f32e9673af Fix url presented by JenkinsRule#interactiveBreak 2015-07-09 16:14:50 +02:00
tfennelly b103e59238 Making @jtnord happy
ridiculous stuff
2015-07-08 15:08:09 +01:00
tfennelly 49e0d64f57 More @jtnord w*f 2015-07-08 14:58:49 +01:00
tfennelly 76841f9d7e Javadoc etc for @jtnord 2015-07-08 14:03:28 +01:00
tfennelly d703b10fd6 Added a simple isMultipart utility to MultipartFormDataParser 2015-07-08 13:16:11 +01:00
Kanstantsin Shautsou 1bea95f7a2 Clarify doc because of unknown race conditions 2015-07-07 18:48:13 +03:00
Kanstantsin Shautsou 3c471f1fd2 Dont start onLoad and after submit for disabled 2015-07-07 18:48:12 +03:00
Kanstantsin Shautsou df4bb2de2d Don't run disabled/copied projects 2015-07-07 18:44:11 +03:00
Kamran Mackey 0016f85a50 Merge pull request #1750 from ikedam/feature/JENKINS-29064_DropdownDescriptorSelectorOptional
[JENKINS-29064] dropdownDescriptorSelector should accept descriptors without configurations.
2015-07-07 09:25:53 -06:00
Oliver Gondža 3005532a94 Avoid Long#compare for now jenkins-1.609.2-rc1 2015-07-07 13:45:56 +02:00
Oliver Gondža 260b0947cd Avoid diamonds for now 2015-07-07 13:33:31 +02:00
Stephen Connolly 8596004024 [JENKINS-28926] Adding test case
- I was forgetting the call to `rebuildDependencyGraph()` which was why the test didn't work for me

(cherry picked from commit c44c088442)
2015-07-07 13:22:45 +02:00
Stephen Connolly 4f4a64a522 [FIXED JENKINS-28926] Block while upstream/downstream building cycles never complete
- One could argue that without this change the system is functioning correctly and that previous behaviour
  was a bug. On the other hand, people have come to rely on the previous behaviour.
- The issue really centeres around state changes in the blocked tasks. Since blocking on upstream/downstream
  relies on checking the building projects and the queued (excluding blocked) tasks we need any change in
  the blocked task list to be visible immediately (i.e. update the snapshot)
- I was able to reliably reproduce this behaviour with a convoluted set of manually configured projects
  but turning this into a test case has not proved quite as easy. Manual testing confirms that the issue is
  fixed for my manual test case
- I have also added a sorting of the blocked list when probing for tasks to unblock. This should prioritise
  tasks as intended by the QueueSorter

(cherry picked from commit de87736795)
2015-07-07 13:22:02 +02:00
Daniel Beck c3dcaeb8d5 [FIX JENKINS-14899] Don't use truncating LargeText for /consoleText
(cherry picked from commit 20bd4e3049)
2015-07-07 13:14:38 +02:00
liorha 0fcb58813b Contine the JENKINS-27289 ticket: update the getResources as well
(cherry picked from commit 40e75129f4)
2015-07-07 13:09:09 +02:00
Stephen Connolly 119fcbbf98 [FIXED JENKINS-28840] Deadlock between Queue.maintain and Executor.interrupt
More fun here:

- All this originates from Executor extending Thread.
- There is funky logic in the lock handling code of the JVM that makes assumptions
  about how it might proceed with the lock when the thread holding the lock has its
  interrupt flag set.
- Really it would be better if Executor did not extend Thread as that way we wouldn't
  have to deal with some of that complexity. But OTOH we are where we are and backwards
  compatibility may make such a change not possible without a lot of breakage.
- Fixing the issue at hand, firstly requires that interrupting a Computer happens with the
  Queue lock held (to speed up tests we have Jenkins.cleanup get the lock for all Computers)
  That prevents the Queue maintain thread from getting caught
- Secondly, when removing an executor from a computer we process the removal while
  holding the Queue lock, but we move the removal itself to a separate thread if we cannot
  get the Queue lock in order to avoid deadlock.
- Also add helper methods to wrap tasks to be performed while holding the lock
  and a helper method for Runnables that exposes the tryLock functionality

(cherry picked from commit 6f343dc7c2)
2015-07-07 13:01:11 +02:00
Stephen Connolly c24c323691 [FIXED JENKINS-28690] Deadlock in hudson.model.Executor
- Rather fun one here. The Lock code relies on assuming that Thread.interrupted() is clear on entry
- If it then sees Thread.interrupted() set, it will interrupt the current thread in order to set the
  flag again.
- Executor is a thread that does funky things with an overridden interrupt method
- Executor.abortResult() is used to track a build be interrupted or aborted in some other way
- As a result the abortResult can cause a deadlockif there is a genuine interruption
- This fix clears the interrupt flag in abortResult() and uses the write lock in order to ensure:
    - The same lock as used in interrupt() is helf
    - The interrupt flag is clear
- Clearing the interrupt flag should be safe as the only time it is called is immediately after
  an interruption and the resulting exception is caught and rethrown/logged anyway

(cherry picked from commit ddb0a472ad)
2015-07-07 11:22:37 +02:00
Daniel Beck 23528253f0 Add new plugin labels to clean up Plugin Manager 2015-07-07 08:38:30 +02:00
Kohsuke Kawaguchi 38fc3e53e2 updated changelog for release 2015-07-05 21:25:29 -07:00
Kohsuke Kawaguchi bacaee02d7 [maven-release-plugin] prepare for next development iteration 2015-07-05 21:19:49 -07:00
Kohsuke Kawaguchi 564a16df77 [maven-release-plugin] prepare release jenkins-1.619 jenkins-1.619 2015-07-05 21:19:48 -07:00
Daniel Beck 94ff948981 Merge pull request #1717 from recena/master
[JENKINS-28550] Unwanted effect rendering the pages
2015-07-05 21:31:14 +01:00
Daniel Beck 5410740d95 Noting #1684 2015-07-05 16:52:59 +02:00
Daniel Beck 9a047acd4b Merge pull request #1684 from DanielWeber/JENKINS-9104
[JENKINS-9104] Add extension point that allows extensions to veto killing...
2015-07-05 15:52:10 +01:00
Daniel Beck 3c785d5af0 Noting #1754 2015-07-05 16:42:08 +02:00
Daniel Beck 038edc1be0 Merge pull request #1754 from daniel-beck/JENKINS-27694
[FIX JENKINS-27694] Update dynamically loaded plugins' Downloadables
2015-07-05 15:40:29 +01:00
Jesse Glick 01bf18b83f Merge pull request #1753 from jglick/Job.properties
Typo. This list is of JobProperty, not UserProperty.
2015-07-04 12:08:09 -04:00
Harald Albers da0d3027ae Merge pull request #1755 from dalbertom/gardening
LoadStatistics: fix spacing issue in message bundle
2015-07-03 18:01:47 +02:00
Stephen Connolly 09fd8aa791 Merge pull request #1756 from carlossg/patch-1
Add @since annotation to ExtensionListListener
2015-07-03 16:55:25 +01:00
Carlos Sanchez 86c26cd17e Add @since annotation to ExtensionListListener 2015-07-03 16:38:13 +02:00
David Alberto 2c6dd5e627 LoadStatistics: fix spacing issue in message bundle
pretty minor, but some words were joined together when rendering the
message in the load statistics page.
2015-07-03 09:33:40 -04:00