[JENKINS-66258] Retrieve non transient actions to prevent deadlock

jenkinsci · Dec 2, 2024 · a10e30d · a10e30d
1 parent 9c7e1f8
commit a10e30d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/main/java/jenkins/plugins/logstash/persistence/BuildData.java b/src/main/java/jenkins/plugins/logstash/persistence/BuildData.java
@@ -276,7 +276,10 @@ public void updateResult()
         Result result = build.getResult();
         this.result = result == null ? null : result.toString();
       }
-      Action testResultAction = build.getAction(AbstractTestResultAction.class);
+      @SuppressWarnings("deprecation") // We don't need transient actions
+      Action testResultAction = build.getActions().stream()
+          .filter(action -> action instanceof AbstractTestResultAction).findFirst()
+          .orElse(null);
       if (testResults == null && testResultAction != null) {
         testResults = new TestData(testResultAction);
       }

diff --git a/src/test/java/jenkins/plugins/logstash/LogstashWriterTest.java b/src/test/java/jenkins/plugins/logstash/LogstashWriterTest.java
@@ -116,7 +116,7 @@ public void before() throws Exception {
     when(mockBuild.getBuildVariables()).thenReturn(Collections.emptyMap());
     when(mockBuild.getSensitiveBuildVariables()).thenReturn(Collections.emptySet());
     when(mockBuild.getEnvironments()).thenReturn(null);
-    when(mockBuild.getAction(AbstractTestResultAction.class)).thenReturn(mockTestResultAction);
+    when(mockBuild.getActions()).thenReturn(Collections.singletonList(mockTestResultAction));
     when(mockBuild.getLog(3)).thenReturn(Arrays.asList("line 1", "line 2", "line 3", "Log truncated..."));
     when(mockBuild.getEnvironment(null)).thenReturn(new EnvVars());
     when(mockBuild.getExecutor()).thenReturn(mockExecutor);
@@ -167,7 +167,7 @@ public void constructorSuccess() throws Exception {
     verify(mockBuild).getFullDisplayName();
     verify(mockBuild).getDescription();
     verify(mockBuild).getUrl();
-    verify(mockBuild).getAction(AbstractTestResultAction.class);
+    verify(mockBuild).getActions();
     verify(mockBuild).getExecutor();
     verify(mockBuild, times(2)).getNumber();
     verify(mockBuild).getTimestamp();

diff --git a/src/test/java/jenkins/plugins/logstash/persistence/BuildDataTest.java b/src/test/java/jenkins/plugins/logstash/persistence/BuildDataTest.java
@@ -89,7 +89,7 @@ public void before() throws Exception {
     when(mockBuild.getBuildVariables()).thenReturn(Collections.emptyMap());
     when(mockBuild.getSensitiveBuildVariables()).thenReturn(Collections.emptySet());
     when(mockBuild.getEnvironments()).thenReturn(null);
-    when(mockBuild.getAction(AbstractTestResultAction.class)).thenReturn(mockTestResultAction);
+    when(mockBuild.getActions()).thenReturn(Collections.singletonList(mockTestResultAction));
     when(mockBuild.getEnvironment(mockListener)).thenReturn(new EnvVars());
     when(mockBuild.getRootBuild()).thenReturn(mockRootBuild);
 
@@ -138,7 +138,7 @@ private void verifyMocks() throws Exception
     verify(mockBuild).getDescription();
     verify(mockBuild).getStartTimeInMillis();
     verify(mockBuild).getUrl();
-    verify(mockBuild).getAction(AbstractTestResultAction.class);
+    verify(mockBuild).getActions();
     verify(mockBuild).getExecutor();
     verify(mockBuild).getNumber();
     verify(mockBuild).getTimestamp();
@@ -264,7 +264,7 @@ public void constructorSuccessTestFailures() throws Exception {
 
   @Test
   public void constructorSuccessNoTests() throws Exception {
-    when(mockBuild.getAction(AbstractTestResultAction.class)).thenReturn(null);
+    when(mockBuild.getActions()).thenReturn(Collections.emptyList());
 
     // Unit under test
     BuildData buildData = new BuildData(mockBuild, mockDate, mockListener);