Branch: refs/heads/master
Home: https://github.com/jenkinsci/jenkins
Commit: 44048365d7efb5e640c22d6c427a4d3013b84c97
https://github.com/jenkinsci/jenkins/commit/44048365d7efb5e640c22d6c427a4d3013b84c97
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2020-05-07 (Thu, 07 May 2020)
Changed paths:
M core/src/main/java/hudson/slaves/SlaveComputer.java
Log Message:
-----------
[JENKINS-62181] Deadlock during log formatting
Commit: 22f0692bec725ac5823a56904a8a6ca7edb4a258
https://github.com/jenkinsci/jenkins/commit/22f0692bec725ac5823a56904a8a6ca7edb4a258
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2020-05-15 (Fri, 15 May 2020)
Changed paths:
M bom/pom.xml
M core/pom.xml
M core/src/main/java/hudson/Functions.java
M core/src/main/java/hudson/model/ItemGroupMixIn.java
M core/src/main/java/hudson/model/PasswordParameterDefinition.java
M core/src/main/java/hudson/model/PasswordParameterValue.java
M core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java
M core/src/main/java/hudson/util/Protector.java
M core/src/main/java/hudson/util/Scrambler.java
M core/src/main/java/hudson/util/Secret.java
M core/src/main/java/jenkins/model/Configuration.java
M core/src/main/java/jenkins/telemetry/impl/UserLanguages.java
M core/src/main/java/jenkins/telemetry/impl/java11/MissingClassEvents.java
M
core/src/main/java/jenkins/telemetry/impl/java11/MissingClassTelemetry.java
M core/src/main/resources/hudson/PluginManager/_table.js
M core/src/main/resources/hudson/PluginManager/advanced.jelly
M core/src/main/resources/hudson/PluginManager/installed.jelly
M core/src/main/resources/hudson/ProxyConfiguration/config.groovy
M core/src/main/resources/hudson/model/Job/configure.jelly
M
core/src/main/resources/hudson/model/PasswordParameterDefinition/config.jelly
M core/src/main/resources/hudson/model/PasswordParameterValue/value.jelly
A
core/src/main/resources/hudson/model/PasswordParameterValue/value.properties
M
core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index.groovy
M core/src/main/resources/jenkins/tools/GlobalToolConfiguration/index.groovy
M core/src/main/resources/lib/form/expandableTextbox.jelly
M core/src/main/resources/lib/form/repeatable.jelly
M core/src/main/resources/lib/form/slave-mode.jelly
M core/src/test/java/hudson/EnvVarsTest.java
M core/src/test/java/hudson/FunctionsTest.java
M core/src/test/java/hudson/LauncherTest.java
M core/src/test/java/hudson/PluginManagerTest.java
M core/src/test/java/hudson/PluginWrapperTest.java
M core/src/test/java/hudson/UtilTest.java
M core/src/test/java/hudson/XmlFileTest.java
M core/src/test/java/hudson/logging/LogRecorderTest.java
M core/src/test/java/hudson/model/ActionableTest.java
M core/src/test/java/hudson/model/AutoCompleteSeederTest.java
M core/src/test/java/hudson/model/DisplayNameListenerTest.java
M core/src/test/java/hudson/model/FingerprintCleanupThreadTest.java
M core/src/test/java/hudson/model/FingerprintTest.java
M core/src/test/java/hudson/model/JobTest.java
M core/src/test/java/hudson/model/LoadStatisticsTest.java
M core/src/test/java/hudson/model/RunParameterValueTest.java
M core/src/test/java/hudson/model/RunTest.java
M core/src/test/java/hudson/model/UpdateCenterTest.java
M core/src/test/java/hudson/model/UserTest.java
M core/src/test/java/hudson/model/listeners/SCMListenerTest.java
M core/src/test/java/hudson/model/queue/AbstractQueueTaskTest.java
M core/src/test/java/hudson/os/WindowsUtilTest.java
M core/src/test/java/hudson/scheduler/CronTabEventualityTest.java
M core/src/test/java/hudson/scheduler/CronTabTest.java
M core/src/test/java/hudson/slaves/ComputerLauncherTest.java
M core/src/test/java/hudson/slaves/DelegatingComputerLauncherTest.java
M core/src/test/java/hudson/util/ConsistentHashTest.java
M core/src/test/java/hudson/util/CopyOnWriteMapTest.java
M core/src/test/java/hudson/util/DescribableListTest.java
M core/src/test/java/hudson/util/DirScannerTest.java
M core/src/test/java/hudson/util/FormValidationTest.java
M core/src/test/java/hudson/util/IsOverriddenTest.java
M core/src/test/java/hudson/util/IteratorsTest.java
M core/src/test/java/hudson/util/ProcessTreeTest.java
M core/src/test/java/hudson/util/RobustReflectionConverterTest.java
M core/src/test/java/hudson/util/SecretRewriterTest.java
M core/src/test/java/hudson/util/SecretTest.java
M core/src/test/java/hudson/util/TextFileTest.java
M core/src/test/java/hudson/util/XStream2EncodingTest.java
M core/src/test/java/hudson/util/XStream2Test.java
M core/src/test/java/hudson/util/io/TarArchiverTest.java
M core/src/test/java/jenkins/model/IdStrategyTest.java
M core/src/test/java/jenkins/model/JenkinsLocationConfigurationTest.java
M core/src/test/java/jenkins/model/RunIdMigratorTest.java
M core/src/test/java/jenkins/model/lazy/AbstractLazyLoadRunMapTest.java
M core/src/test/java/jenkins/model/lazy/SortedIntListTest.java
M core/src/test/java/jenkins/security/CryptoConfidentialKeyTest.java
M core/src/test/java/jenkins/security/HMACConfidentialKeyTest.java
M core/src/test/java/jenkins/security/HexStringConfidentialKeyTest.java
M core/src/test/java/jenkins/security/RSAConfidentialKeyTest.java
M core/src/test/java/jenkins/slaves/RemotingVersionInfoTest.java
M core/src/test/java/jenkins/util/AtmostOneTaskExecutorTest.java
M core/src/test/java/jenkins/util/TimeDurationTest.java
M core/src/test/java/jenkins/util/TreeStringBuilderTest.java
M core/src/test/java/jenkins/util/VirtualFileTest.java
M core/src/test/java/jenkins/util/io/FileLockerRule.java
M core/src/test/java/jenkins/util/java/JavaUtilsTest.java
M core/src/test/java/jenkins/util/xstream/XStreamDOMTest.java
M core/src/test/java/jenkins/xml/XMLUtilsTest.java
M pom.xml
M test/src/test/java/hudson/AboutJenkinsTest.java
M test/src/test/java/hudson/ExtensionFinderTest.java
M test/src/test/java/hudson/FilePathTest.java
M test/src/test/java/hudson/LauncherTest.java
M test/src/test/java/hudson/PluginManagerCheckUpdateCenterTest.java
M test/src/test/java/hudson/PluginManagerTest.java
M test/src/test/java/hudson/TcpSlaveAgentListenerTest.java
M test/src/test/java/hudson/XMLFileTest.java
M test/src/test/java/hudson/bugs/JnlpAccessWithSecuredHudsonTest.java
M test/src/test/java/hudson/cli/BuildCommandTest.java
M test/src/test/java/hudson/cli/CLIActionTest.java
M test/src/test/java/hudson/cli/CLIEnvVarTest.java
M test/src/test/java/hudson/cli/CLITest.java
M test/src/test/java/hudson/cli/ComputerStateTest.java
M test/src/test/java/hudson/cli/CopyJobCommandTest.java
M test/src/test/java/hudson/cli/CreateJobCommandTest.java
M test/src/test/java/hudson/cli/DisablePluginCommandTest.java
M test/src/test/java/hudson/cli/EnableJobCommandTest.java
M test/src/test/java/hudson/cli/EnablePluginCommandTest.java
M test/src/test/java/hudson/cli/GetJobCommandTest.java
M test/src/test/java/hudson/cli/GroovyshCommandTest.java
M test/src/test/java/hudson/cli/HelpCommandTest.java
M test/src/test/java/hudson/cli/InstallPluginCommandTest.java
M test/src/test/java/hudson/cli/ListPluginsCommandTest.java
M test/src/test/java/hudson/console/AnnotatedLargeTextTest.java
M test/src/test/java/hudson/console/ConsoleAnnotatorTest.java
M test/src/test/java/hudson/console/HyperlinkNoteTest.java
M test/src/test/java/hudson/core/PluginManagerOverrideTest.java
M test/src/test/java/hudson/diagnosis/OldDataMonitorTest.java
M test/src/test/java/hudson/init/impl/GroovyInitScriptTest.java
M test/src/test/java/hudson/jobs/CreateItemTest.java
M test/src/test/java/hudson/logging/LogRecorderManagerTest.java
M test/src/test/java/hudson/model/AbstractBuildTest.java
M test/src/test/java/hudson/model/AbstractItem2Test.java
M test/src/test/java/hudson/model/AbstractItemSecurityTest.java
M test/src/test/java/hudson/model/AbstractItemTest.java
M test/src/test/java/hudson/model/AbstractProjectSEC1781Test.java
M test/src/test/java/hudson/model/AbstractProjectTest.java
M test/src/test/java/hudson/model/AperiodicWorkTest.java
M test/src/test/java/hudson/model/ApiSEC1704Test.java
M test/src/test/java/hudson/model/ApiTest.java
M test/src/test/java/hudson/model/AsynchPeopleTest.java
M test/src/test/java/hudson/model/BuildAuthorizationTokenTest.java
M test/src/test/java/hudson/model/BuildExecutionTest.java
M test/src/test/java/hudson/model/CauseTest.java
M test/src/test/java/hudson/model/ComputerSetTest.java
M test/src/test/java/hudson/model/ComputerTest.java
M test/src/test/java/hudson/model/DescriptorTest.java
M test/src/test/java/hudson/model/DescriptorVisibilityFilterTest.java
M test/src/test/java/hudson/model/DirectlyModifiableViewTest.java
M test/src/test/java/hudson/model/DirectoryBrowserSupportTest.java
M test/src/test/java/hudson/model/DownloadService2Test.java
M test/src/test/java/hudson/model/EnvironmentContributorTest.java
M test/src/test/java/hudson/model/ExecutorTest.java
M test/src/test/java/hudson/model/FileParameterValueTest.java
M test/src/test/java/hudson/model/FingerprintTest.java
M test/src/test/java/hudson/model/FreeStyleProjectTest.java
M test/src/test/java/hudson/model/HudsonTest.java
M test/src/test/java/hudson/model/ItemGroupMixInTest.java
M test/src/test/java/hudson/model/ItemsTest.java
M test/src/test/java/hudson/model/JobPropertyTest.java
M test/src/test/java/hudson/model/JobTest.java
M test/src/test/java/hudson/model/LabelLoadStatisticsQueueLengthTest.java
M test/src/test/java/hudson/model/ListViewTest.java
M test/src/test/java/hudson/model/MyViewTest.java
M test/src/test/java/hudson/model/MyViewsPropertyTest.java
M test/src/test/java/hudson/model/NodeTest.java
M test/src/test/java/hudson/model/ParametersAction2Test.java
M test/src/test/java/hudson/model/ParametersDefinitionPropertyTest.java
M test/src/test/java/hudson/model/ParametersTest.java
M test/src/test/java/hudson/model/PeriodicWorkTest.java
M test/src/test/java/hudson/model/ProjectTest.java
M test/src/test/java/hudson/model/QueueSEC1537Test.java
M test/src/test/java/hudson/model/QueueTest.java
M test/src/test/java/hudson/model/RSSTest.java
M test/src/test/java/hudson/model/RunActionTest.java
M test/src/test/java/hudson/model/RunMapTest.java
M test/src/test/java/hudson/model/RunParameterDefinitionTest.java
M test/src/test/java/hudson/model/RunTest.java
M test/src/test/java/hudson/model/SlaveTest.java
M test/src/test/java/hudson/model/UpdateCenter2Test.java
M test/src/test/java/hudson/model/UpdateCenterCustomTest.java
M test/src/test/java/hudson/model/UpdateCenterTest.java
M test/src/test/java/hudson/model/UpdateSiteTest.java
M test/src/test/java/hudson/model/UsageStatisticsTest.java
M test/src/test/java/hudson/model/UserIdMigratorTest.java
M test/src/test/java/hudson/model/UserPropertyTest.java
M test/src/test/java/hudson/model/UserRestartTest.java
M test/src/test/java/hudson/model/UserTest.java
M test/src/test/java/hudson/model/ViewDescriptorTest.java
M test/src/test/java/hudson/model/ViewJobTest.java
M test/src/test/java/hudson/model/ViewTest.java
M test/src/test/java/hudson/model/WorkspaceCleanupThreadTest.java
M test/src/test/java/hudson/model/labels/LabelExpressionTest.java
M test/src/test/java/hudson/model/listeners/ItemListenerTest.java
M
test/src/test/java/hudson/model/queue/BuildKeepsRunningWhenFaultySubTasksTest.java
M test/src/test/java/hudson/model/queue/QueueTaskDispatcherTest.java
M test/src/test/java/hudson/scm/AbstractScmTagActionTest.java
M test/src/test/java/hudson/security/ACLTest.java
M test/src/test/java/hudson/security/AccessDeniedException2Test.java
M test/src/test/java/hudson/security/ExtendedReadPermissionTest.java
M test/src/test/java/hudson/security/HudsonPrivateSecurityRealmTest.java
M test/src/test/java/hudson/security/PermissionGroupTest.java
M test/src/test/java/hudson/security/SecurityRealmTest.java
M test/src/test/java/hudson/security/TokenBasedRememberMeServices2Test.java
M test/src/test/java/hudson/security/csrf/CrumbExclusionTest.java
M test/src/test/java/hudson/security/csrf/DefaultCrumbIssuerSEC1491Test.java
M test/src/test/java/hudson/security/csrf/DefaultCrumbIssuerSEC1704Test.java
M test/src/test/java/hudson/security/csrf/DefaultCrumbIssuerSEC626Test.java
M test/src/test/java/hudson/security/csrf/DefaultCrumbIssuerTest.java
M test/src/test/java/hudson/slaves/CloudTest.java
M test/src/test/java/hudson/slaves/JNLPLauncherTest.java
M test/src/test/java/hudson/slaves/NodeCanTakeTaskTest.java
M test/src/test/java/hudson/slaves/NodeProvisionerTest.java
M test/src/test/java/hudson/tasks/ArtifactArchiverTest.java
M test/src/test/java/hudson/tasks/BuildTriggerTest.java
M test/src/test/java/hudson/tasks/FingerprinterTest.java
M test/src/test/java/hudson/tasks/LogRotatorTest.java
M test/src/test/java/hudson/tasks/MavenTest.java
M test/src/test/java/hudson/tools/InstallerTranslatorTest.java
M test/src/test/java/hudson/tools/ZipExtractionInstallerTest.java
M test/src/test/java/hudson/triggers/TriggerStartTest.java
M test/src/test/java/hudson/util/AlternativeUiTextProviderTest.java
M test/src/test/java/hudson/util/BootFailureTest.java
M test/src/test/java/hudson/util/HudsonIsLoadingTest.java
M test/src/test/java/hudson/util/HudsonIsRestartingTest.java
M test/src/test/java/hudson/util/LogTaskListenerTest.java
M test/src/test/java/hudson/util/ProcessTreeKillerTest.java
M test/src/test/java/hudson/util/RobustReflectionConverterTest.java
M test/src/test/java/hudson/util/SecretCompatTest.java
M test/src/test/java/hudson/views/GlobalDefaultViewConfigurationTest.java
M test/src/test/java/jenkins/ExtensionFilterTest.java
M test/src/test/java/jenkins/agents/WebSocketAgentsTest.java
M test/src/test/java/jenkins/bugs/Jenkins19124Test.java
M test/src/test/java/jenkins/install/InstallStateTest.java
M test/src/test/java/jenkins/install/LoadDetachedPluginsTest.java
M test/src/test/java/jenkins/install/SetupWizardTest.java
M test/src/test/java/jenkins/install/UpgradeWizardTest.java
M test/src/test/java/jenkins/model/BuildDiscarderPropertyTest.java
M test/src/test/java/jenkins/model/GlobalSCMRetryCountConfigurationTest.java
M
test/src/test/java/jenkins/model/JenkinsBuildsAndWorkspacesDirectoriesTest.java
M
test/src/test/java/jenkins/model/JenkinsSystemReadAndManagePermissionTest.java
M test/src/test/java/jenkins/model/JenkinsSystemReadPermissionTest.java
M test/src/test/java/jenkins/model/NodesTest.java
M test/src/test/java/jenkins/model/PeepholePermalinkTest.java
M test/src/test/java/jenkins/model/StartupTest.java
M test/src/test/java/jenkins/model/TransientActionFactoryTest.java
M test/src/test/java/jenkins/model/UnlabeledLoadStatisticsTest.java
M test/src/test/java/jenkins/model/identity/IdentityRootActionTest.java
M test/src/test/java/jenkins/model/lazy/LazyBuildMixInTest.java
M test/src/test/java/jenkins/scm/SCMCheckoutStrategyTest.java
M test/src/test/java/jenkins/security/ApiTokenPropertyTest.java
M
test/src/test/java/jenkins/security/BasicHeaderApiTokenAuthenticatorTest.java
M test/src/test/java/jenkins/security/BasicHeaderProcessorTest.java
M test/src/test/java/jenkins/security/ClassFilterImplTest.java
M test/src/test/java/jenkins/security/FilePathSecureTest.java
M
test/src/test/java/jenkins/security/RedactSecretJsonInErrorMessageSanitizerHtmlTest.java
M test/src/test/java/jenkins/security/ResourceDomainTest.java
M test/src/test/java/jenkins/security/Security218Test.java
M test/src/test/java/jenkins/security/Security637Test.java
M test/src/test/java/jenkins/security/UserDetailsCacheTest.java
M test/src/test/java/jenkins/security/apitoken/ApiTokenStatsRestartTest.java
M test/src/test/java/jenkins/security/apitoken/ApiTokenStatsTest.java
M
test/src/test/java/jenkins/security/apitoken/LegacyApiTokenAdministrativeMonitorTest.java
M test/src/test/java/jenkins/security/s2m/AdminFilePathFilterTest.java
M test/src/test/java/jenkins/security/s2m/DefaultFilePathFilterTest.java
M test/src/test/java/jenkins/security/seed/UserSeedChangeListenerTest.java
M test/src/test/java/jenkins/security/seed/UserSeedPropertyTest.java
M
test/src/test/java/jenkins/security/stapler/CustomRoutingDecisionProviderTest.java
M test/src/test/java/jenkins/security/stapler/DynamicTest.java
M test/src/test/java/jenkins/security/stapler/Security400Test.java
M test/src/test/java/jenkins/security/stapler/Security867Test.java
M test/src/test/java/jenkins/security/stapler/StaplerAbstractTest.java
M
test/src/test/java/jenkins/security/stapler/StaticRoutingDecisionProvider2Test.java
M test/src/test/java/jenkins/slaves/OldRemotingAgentTest.java
M test/src/test/java/jenkins/slaves/RemotingVersionInfoTest.java
M test/src/test/java/jenkins/tasks/SimpleBuildWrapperTest.java
M test/src/test/java/jenkins/telemetry/TelemetryTest.java
M
test/src/test/java/jenkins/telemetry/impl/java11/MissingClassTelemetryFasterTest.java
M test/src/test/java/jenkins/triggers/ReverseBuildTriggerTest.java
M test/src/test/java/jenkins/util/FullDuplexHttpServiceTest.java
M test/src/test/java/jenkins/util/JenkinsJVMRealTest.java
M test/src/test/java/jenkins/util/SystemPropertiesTest.java
M test/src/test/java/jenkins/widgets/BuildListTableTest.java
M test/src/test/java/lib/form/ApplyButtonTest.java
M test/src/test/java/lib/form/NameRefTest.java
M test/src/test/java/lib/form/PasswordTest.java
M test/src/test/java/lib/form/TextAreaTest.java
M test/src/test/java/lib/form/ValidateButtonSEC1327Test.java
A test/src/test/resources/lib/form/PasswordTest/ActionImpl/index.jelly
A
test/src/test/resources/lib/form/PasswordTest/PasswordHolderBuildStep/config.jelly
A
test/src/test/resources/lib/form/PasswordTest/PasswordHolderConfiguration/config.jelly
A
test/src/test/resources/lib/form/PasswordTest/StringlyTypedSecretsBuilder/config.jelly
Log Message:
-----------
Merge branch 'master' of github.com:jenkinsci/jenkins into
deadlock-JENKINS-62181
Commit: a01810e7d5096eadeeb061a94107f8f219296d69
https://github.com/jenkinsci/jenkins/commit/a01810e7d5096eadeeb061a94107f8f219296d69
Author: Jesse Glick <jgl...@cloudbees.com>
Date: 2020-05-15 (Fri, 15 May 2020)
Changed paths:
M core/src/main/java/hudson/slaves/SlaveComputer.java
Log Message:
-----------
Keep a ThreadLocal for the SimpleFormatter
Commit: c2bd4fa006e2013cb1a94508f457d34cbc8125e8
https://github.com/jenkinsci/jenkins/commit/c2bd4fa006e2013cb1a94508f457d34cbc8125e8
Author: Mark Waite <mark.earl.wa...@gmail.com>
Date: 2020-05-19 (Tue, 19 May 2020)
Changed paths:
M core/src/main/java/hudson/slaves/SlaveComputer.java
Log Message:
-----------
Merge pull request #4714 from jglick/deadlock-JENKINS-62181
[JENKINS-62181] Deadlock during log formatting
Compare:
https://github.com/jenkinsci/jenkins/compare/598d78b8b570...c2bd4fa006e2
--
You received this message because you are subscribed to the Google Groups
"Jenkins Commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to jenkinsci-commits+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/jenkinsci-commits/jenkinsci/jenkins/push/refs/heads/master/598d78-c2bd4f%40github.com.
