Merge pull request #1204 from oracle/owls-74082

OWLS-74082 Configurable introspector job activeDeadlineSeconds using new tuning parameter

Author: rjeberhard

operator/src/main/java/oracle/kubernetes/operator/TuningParameters.java

@@ -201,20 +201,23 @@ public static class PodTuning {
     public final int livenessProbeInitialDelaySeconds;
     public final int livenessProbeTimeoutSeconds;
     public final int livenessProbePeriodSeconds;
+    public final long introspectorJobActiveDeadlineSeconds;
 
     public PodTuning(
         int readinessProbeInitialDelaySeconds,
         int readinessProbeTimeoutSeconds,
         int readinessProbePeriodSeconds,
         int livenessProbeInitialDelaySeconds,
         int livenessProbeTimeoutSeconds,
-        int livenessProbePeriodSeconds) {
+        int livenessProbePeriodSeconds,
+        long introspectorJobActiveDeadlineSeconds) {
       this.readinessProbeInitialDelaySeconds = readinessProbeInitialDelaySeconds;
       this.readinessProbeTimeoutSeconds = readinessProbeTimeoutSeconds;
       this.readinessProbePeriodSeconds = readinessProbePeriodSeconds;
       this.livenessProbeInitialDelaySeconds = livenessProbeInitialDelaySeconds;
       this.livenessProbeTimeoutSeconds = livenessProbeTimeoutSeconds;
       this.livenessProbePeriodSeconds = livenessProbePeriodSeconds;
+      this.introspectorJobActiveDeadlineSeconds = introspectorJobActiveDeadlineSeconds;
     }
 
     @Override

operator/src/main/java/oracle/kubernetes/operator/TuningParametersImpl.java

@@ -77,7 +77,8 @@ private void update() {
             (int) readTuningParameter("readinessProbePeriodSeconds", 5),
             (int) readTuningParameter("livenessProbeInitialDelaySeconds", 30),
             (int) readTuningParameter("livenessProbeTimeoutSeconds", 5),
-            (int) readTuningParameter("livenessProbePeriodSeconds", 45));
+            (int) readTuningParameter("livenessProbePeriodSeconds", 45),
+            readTuningParameter("introspectorJobActiveDeadlineSeconds", 120));
 
     lock.writeLock().lock();
     try {

operator/src/main/java/oracle/kubernetes/operator/helpers/JobStepContext.java

@@ -31,7 +31,6 @@
 import oracle.kubernetes.weblogic.domain.model.Domain;
 
 public abstract class JobStepContext extends StepContextBase {
-  static final long DEFAULT_ACTIVE_DEADLINE_SECONDS = 120L;
   static final long DEFAULT_ACTIVE_DEADLINE_INCREMENT_SECONDS = 60L;
   private static final LoggingFacade LOGGER = LoggingFactory.getLogger("Operator", "Operator");
   private static final String WEBLOGIC_OPERATOR_SCRIPTS_INTROSPECT_DOMAIN_SH =
@@ -158,8 +157,8 @@ V1ObjectMeta createMetadata() {
           .putLabelsItem(LabelConstants.CREATEDBYOPERATOR_LABEL, "true");
   }
 
-  private long getActiveDeadlineSeconds() {
-    return DEFAULT_ACTIVE_DEADLINE_SECONDS
+  private long getActiveDeadlineSeconds(TuningParameters.PodTuning podTuning) {
+    return podTuning.introspectorJobActiveDeadlineSeconds
           + (DEFAULT_ACTIVE_DEADLINE_INCREMENT_SECONDS * info.getRetryCount());
   }
 
@@ -168,11 +167,11 @@ V1JobSpec createJobSpec(TuningParameters tuningParameters) {
           "Creating job "
                 + getJobName()
                 + " with activeDeadlineSeconds = "
-                + getActiveDeadlineSeconds());
+                + getActiveDeadlineSeconds(tuningParameters.getPodTuning()));
 
     return new V1JobSpec()
           .backoffLimit(0)
-          .activeDeadlineSeconds(getActiveDeadlineSeconds())
+          .activeDeadlineSeconds(getActiveDeadlineSeconds(tuningParameters.getPodTuning()))
           .template(createPodTemplateSpec(tuningParameters));
   }
 
@@ -196,7 +195,7 @@ private V1ObjectMeta createPodTemplateMetadata() {
   private V1PodSpec createPodSpec(TuningParameters tuningParameters) {
     V1PodSpec podSpec =
           new V1PodSpec()
-                .activeDeadlineSeconds(getActiveDeadlineSeconds())
+                .activeDeadlineSeconds(getActiveDeadlineSeconds(tuningParameters.getPodTuning()))
                 .restartPolicy("Never")
                 .addContainersItem(createContainer(tuningParameters))
                 .addVolumesItem(new V1Volume().name(SECRETS_VOLUME).secret(getSecretsVolume()))

operator/src/test/java/oracle/kubernetes/operator/helpers/DomainIntrospectorJobTest.java

@@ -87,6 +87,7 @@ public void setUp() throws Exception {
         TestUtils.silenceOperatorLogger()
             .collectLogMessages(logRecords, getMessageKeys())
             .withLogLevel(Level.INFO));
+    mementos.add(TuningParametersStub.install());
     mementos.add(testSupport.install());
     testSupport.addDomainPresenceInfo(domainPresenceInfo);
   }

operator/src/test/java/oracle/kubernetes/operator/helpers/JobHelperTest.java

@@ -4,8 +4,10 @@
 
 package oracle.kubernetes.operator.helpers;
 
+import com.meterware.simplestub.Memento;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -33,6 +35,8 @@
 import oracle.kubernetes.weblogic.domain.model.DomainSpec;
 import org.hamcrest.Matcher;
 import org.hamcrest.junit.MatcherAssert;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
 import static org.hamcrest.CoreMatchers.equalTo;
@@ -49,11 +53,22 @@ public class JobHelperTest {
   private static final String END_VALUE_1 = "find uid1 at /u01/oracle/user_projects/domains";
   private Method getDomainSpec;
   private final DomainPresenceInfo domainPresenceInfo = createDomainPresenceInfo();
+  protected List<Memento> mementos = new ArrayList<>();
 
   private static Matcher<Iterable<? super V1EnvVar>> hasEnvVar(String name, String value) {
     return hasItem(new V1EnvVar().name(name).value(value));
   }
 
+  @Before
+  public void setup() throws Exception {
+    mementos.add(TuningParametersStub.install());
+  }
+
+  @After
+  public void tearDown() throws Exception {
+    for (Memento memento : mementos) memento.revert();
+  }
+
   @Test
   public void creatingServers_true_whenClusterReplicas_gt_0() {
     configureCluster(domainPresenceInfo, "cluster1").withReplicas(1);
@@ -256,9 +271,9 @@ public void verify_introspectorPodSpec_activeDeadlineSeconds_initial_values() {
 
     MatcherAssert.assertThat(
         jobSpec.getTemplate().getSpec().getActiveDeadlineSeconds(),
-        is(JobStepContext.DEFAULT_ACTIVE_DEADLINE_SECONDS));
+        is(TuningParametersStub.INTROSPECTOR_JOB_ACTIVE_DEADLINE_SECONDS));
     MatcherAssert.assertThat(
-        jobSpec.getActiveDeadlineSeconds(), is(JobStepContext.DEFAULT_ACTIVE_DEADLINE_SECONDS));
+        jobSpec.getActiveDeadlineSeconds(), is(TuningParametersStub.INTROSPECTOR_JOB_ACTIVE_DEADLINE_SECONDS));
   }
 
   @Test
@@ -268,7 +283,7 @@ public void verify_introspectorPodSpec_activeDeadlineSeconds_retry_values() {
     V1JobSpec jobSpec = createJobSpec();
 
     long expectedActiveDeadlineSeconds =
-        JobStepContext.DEFAULT_ACTIVE_DEADLINE_SECONDS
+        TuningParametersStub.INTROSPECTOR_JOB_ACTIVE_DEADLINE_SECONDS
             + (failureCount * JobStepContext.DEFAULT_ACTIVE_DEADLINE_INCREMENT_SECONDS);
     MatcherAssert.assertThat(
         jobSpec.getTemplate().getSpec().getActiveDeadlineSeconds(),

operator/src/test/java/oracle/kubernetes/operator/helpers/TuningParametersStub.java

@@ -21,6 +21,7 @@ public abstract class TuningParametersStub implements TuningParameters {
   static final int LIVENESS_INITIAL_DELAY = 4;
   static final int LIVENESS_PERIOD = 6;
   static final int LIVENESS_TIMEOUT = 5;
+  static final long INTROSPECTOR_JOB_ACTIVE_DEADLINE_SECONDS = 180L;
   static Map<String, String> namedParameters;
 
   public static Memento install() throws NoSuchFieldException {
@@ -37,7 +38,8 @@ public PodTuning getPodTuning() {
         READINESS_PERIOD,
         LIVENESS_INITIAL_DELAY,
         LIVENESS_TIMEOUT,
-        LIVENESS_PERIOD);
+        LIVENESS_PERIOD,
+        INTROSPECTOR_JOB_ACTIVE_DEADLINE_SECONDS);
   }
 
   @Override