From 478c68990268f8f7434f988e71c0a23e5e0d26c6 Mon Sep 17 00:00:00 2001 From: alandavis Date: Mon, 1 Aug 2022 08:39:59 +0100 Subject: [PATCH] Reset probe in testing --- .../transformer/probes/ProbeTestTransform.java | 2 +- .../transform/base/probes/ProbeTransform.java | 11 ++++++++--- .../transform/base/TransformControllerTest.java | 3 +++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/probes/ProbeTestTransform.java b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/probes/ProbeTestTransform.java index 0834a00a..ab8ac9bf 100644 --- a/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/probes/ProbeTestTransform.java +++ b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/probes/ProbeTestTransform.java @@ -249,7 +249,7 @@ public abstract class ProbeTestTransform { throw new TransformException(TOO_MANY_REQUESTS, getMessagePrefix(isLiveProbe) + "Transformer requested to die. A transform took " + - "longer than " + (maxTransformTime * 1000) + " seconds"); + "longer than " + (maxTransformTime / 1000) + " seconds"); } if (maxTransformCount > 0 && transformCount.get() > maxTransformCount) diff --git a/engines/base/src/main/java/org/alfresco/transform/base/probes/ProbeTransform.java b/engines/base/src/main/java/org/alfresco/transform/base/probes/ProbeTransform.java index f823fcc3..d24a3b68 100644 --- a/engines/base/src/main/java/org/alfresco/transform/base/probes/ProbeTransform.java +++ b/engines/base/src/main/java/org/alfresco/transform/base/probes/ProbeTransform.java @@ -242,7 +242,7 @@ public class ProbeTransform { throw new TransformException(TOO_MANY_REQUESTS, getMessagePrefix(isLiveProbe) + "Transformer requested to die. A transform took " + - "longer than " + (maxTransformTime * 1000) + " seconds"); + "longer than " + (maxTransformTime / 1000) + " seconds"); } if (maxTransformCount > 0 && transformCount.get() > maxTransformCount) @@ -302,8 +302,7 @@ public class ProbeTransform true)) || transCount > AVERAGE_OVER_TRANSFORMS) { nextTransformTime = System.currentTimeMillis() + livenessTransformPeriod; - logger.trace("{} - {}ms+{}%={}ms", message, normalTime, livenessPercent, - maxTime); + logger.trace("{} - {}ms+{}%={}ms", message, normalTime, livenessPercent, maxTime); } } else if (!isLiveProbe && !readySent.getAndSet(true)) @@ -356,4 +355,10 @@ public class ProbeTransform { return normalTime; } + + public void resetForTesting() + { + die.set(false); + transformCount.set(0); + } } diff --git a/engines/base/src/test/java/org/alfresco/transform/base/TransformControllerTest.java b/engines/base/src/test/java/org/alfresco/transform/base/TransformControllerTest.java index c3a09a68..4a63a1a1 100644 --- a/engines/base/src/test/java/org/alfresco/transform/base/TransformControllerTest.java +++ b/engines/base/src/test/java/org/alfresco/transform/base/TransformControllerTest.java @@ -129,6 +129,7 @@ public class TransformControllerTest public File tempDir; @MockBean protected AlfrescoSharedFileStoreClient fakeSfsClient; + @BeforeEach public void fakeSfsClient() { @@ -229,6 +230,7 @@ public class TransformControllerTest @Test public void testReadyEndpointReturnsSuccessful() throws Exception { + transformController.probeTransform.resetForTesting(); mockMvc.perform(MockMvcRequestBuilders.get(ENDPOINT_READY)) .andExpect(status().isOk()) .andExpect(content().string(containsString("Success - "))); @@ -237,6 +239,7 @@ public class TransformControllerTest @Test public void testLiveEndpointReturnsSuccessful() throws Exception { + transformController.probeTransform.resetForTesting(); mockMvc.perform(MockMvcRequestBuilders.get(ENDPOINT_LIVE)) .andExpect(status().isOk()) .andExpect(content().string(containsString("Success - ")));