Merge remote-tracking branch 'origin/develop' into domain-introspector

Author: rjeberhard

integration-tests/README.md

@@ -268,6 +268,12 @@ mvn -Dit.test="ITOperator#test6CreateConfiguredDomainInTest2NS" -DfailIfNoTests=
 
 mvn -Dit.test="ITOperator#test6CreateConfiguredDomainInTest2NS+test7CreateDomainPVReclaimPolicyRecycle" -DfailIfNoTests=false integration-test -P java-integration-tests
 
+# How to run cleanup script
+
+cleanup script deletes the k8s artifacts, local test tmp directory, delete all helm charts and the potentially remote domain pv directories.
+cd weblogic-kubernetes-operator
+src/integration-tests/bash/cleanup.sh
+
 # Logging/Archiving
 
 Java utils logging is used, writes all the messages to console and java_test_suite.out in $RESULT_ROOT/acceptance_test_tmp directory.

integration-tests/src/test/java/oracle/kubernetes/operator/ITOperator.java

@@ -94,6 +94,9 @@ public void test1CreateFirstOperatorAndDomain() throws Exception {
     logTestBegin("test1CreateFirstOperatorAndDomain");
     testCreateOperatorManagingDefaultAndTest1NS();
     domain1 = testAllUseCasesForADomain(operator1, domain1YamlFile);
+    domain1.testWlsLivenessProbe();
+    domain1.destroy();
+
     logger.info("SUCCESS - test1CreateFirstOperatorAndDomain");
   }
 
@@ -128,6 +131,7 @@ public void test3CreateDomainInTest1NS() throws Exception {
     // create domain3
     Domain domain3 = testDomainCreation(domain3YamlFile);
     testWLDFScaling(operator1, domain3);
+    domain3.destroy();
     logger.info("SUCCESS - test3CreateDomainInTest1NS");
   }
 
@@ -157,6 +161,8 @@ public void test5CreateConfiguredDomainInTest2NS() throws Exception {
     }
     if (domain1 == null) {
       domain1 = TestUtils.createDomain(domain1YamlFile);
+    } else {
+      domain1.create();
     }
     logger.info("Checking if operator2 is running, if not creating");
     if (operator2 == null) {
@@ -179,6 +185,8 @@ public void test5CreateConfiguredDomainInTest2NS() throws Exception {
 
     logger.info("Verify no impact on domain4");
     domain4.verifyDomainCreated();
+    domain4.destroy();
+    domain1.destroy();
     logger.info("SUCCESS - test5CreateConfiguredDomainInTest2NS");
   }
 
@@ -194,7 +202,8 @@ public void test6CreateDomainWithStartPolicyAdminOnly() throws Exception {
     }
     logger.info("Creating Domain domain5 & verifing the domain creation");
     // create domain5
-    TestUtils.createDomain(domain5YamlFile);
+    Domain domain5 = TestUtils.createDomain(domain5YamlFile);
+    domain5.destroy();
     logger.info("SUCCESS - test6CreateDomainWithStartPolicyAdminOnly");
   }
 
@@ -216,25 +225,6 @@ public void test7CreateDomainPVReclaimPolicyRecycle() throws Exception {
     logger.info("SUCCESS - test7CreateDomainPVReclaimPolicyRecycle");
   }
 
-  @Test
-  public void test8WlsLivenessProbe() throws Exception {
-
-    logTestBegin("test8WlsLivenessProbe");
-    logger.info("Checking if operator1 is running, if not creating");
-    if (operator1 == null) {
-      operator1 = TestUtils.createOperator(op1YamlFile);
-    }
-    if (domain1 == null) {
-      domain1 = TestUtils.createDomain(domain1YamlFile);
-    }
-    // test managed server1 pod auto restart
-    String domain = domain1.getDomainUid();
-    String namespace = domain1.getDomainMap().get("namespace").toString();
-    String serverName = domain1.getDomainMap().get("managedServerNameBase").toString() + "1";
-    TestUtils.testWlsLivenessProbe(domain, serverName, namespace);
-    logger.info("SUCCESS - test8WlsLivenessProbe");
-  }
-
   @Test
   public void test9CreateDomainOnExistingDir() throws Exception {
     Assume.assumeFalse(
@@ -246,10 +236,10 @@ public void test9CreateDomainOnExistingDir() throws Exception {
     }
     if (domain1 == null) {
       domain1 = TestUtils.createDomain(domain1YamlFile);
+      // create domain on existing dir
+      domain1.destroy();
     }
     logger.info("domain1 " + domain1);
-    // create domain on existing dir
-    domain1.destroy();
     domain1.createDomainOnExistingDirectory();
     logger.info("SUCCESS - test9CreateDomainOnExistingDir");
   }
@@ -267,6 +257,7 @@ public void testACreateDomainApacheLB() throws Exception {
     // create domain7
     Domain domain7 = TestUtils.createDomain(domain7YamlFile);
     domain7.verifyAdminConsoleViaLB();
+    domain7.destroy();
     logger.info("SUCCESS - testACreateDomainApacheLB");
   }
 
@@ -281,7 +272,8 @@ public void testBCreateDomainWithDefaultValuesInSampleInputs() throws Exception
     }
 
     // create domain8
-    testAllUseCasesForADomain(operator1, domain8YamlFile);
+    Domain domain8 = testAllUseCasesForADomain(operator1, domain8YamlFile);
+    domain8.destroy();
     logger.info("SUCCESS - testBCreateDomainWithDefaultValuesInSampleInputs");
   }
 

integration-tests/src/test/java/oracle/kubernetes/operator/utils/Domain.java

@@ -510,6 +510,13 @@ public String getDomainUid() {
     return domainUid;
   }
 
+  public void testWlsLivenessProbe() throws Exception {
+
+    // test managed server1 pod auto restart
+    String serverName = managedServerNameBase + "1";
+    TestUtils.testWlsLivenessProbe(domainUid, serverName, domainNS);
+  }
+
   private int getAdminSericeLBNodePort() throws Exception {
 
     String adminServerLBNodePortService = domainUid + "-apache-webtier";

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

@@ -29,10 +29,10 @@
 abstract class Watcher<T> {
   static final String HAS_NEXT_EXCEPTION_MESSAGE = "IO Exception during hasNext method.";
   private static final LoggingFacade LOGGER = LoggingFactory.getLogger("Operator", "Operator");
-  private static final String IGNORED_RESOURCE_VERSION = "0";
+  private static final long IGNORED_RESOURCE_VERSION = 0;
 
   private final AtomicBoolean isDraining = new AtomicBoolean(false);
-  private String resourceVersion;
+  private Long resourceVersion;
   private AtomicBoolean stopping;
   private WatchListener<T> listener;
   private Thread thread = null;
@@ -45,7 +45,8 @@ abstract class Watcher<T> {
    * @param stopping an atomic boolean to watch to determine when to stop the watcher
    */
   Watcher(String resourceVersion, AtomicBoolean stopping) {
-    this.resourceVersion = resourceVersion;
+    this.resourceVersion =
+        !isNullOrEmptyString(resourceVersion) ? Long.parseLong(resourceVersion) : 0;
     this.stopping = stopping;
   }
 
@@ -110,7 +111,8 @@ protected boolean isStopping() {
   }
 
   private void watchForEvents() {
-    try (WatchI<T> watch = initiateWatch(new WatchBuilder().withResourceVersion(resourceVersion))) {
+    try (WatchI<T> watch =
+        initiateWatch(new WatchBuilder().withResourceVersion(resourceVersion.toString()))) {
       while (watch.hasNext()) {
         Watch.Response<T> item = watch.next();
 
@@ -139,9 +141,11 @@ private boolean isError(Watch.Response<T> item) {
   }
 
   private void handleRegularUpdate(Watch.Response<T> item) {
-    LOGGER.fine(MessageKeys.WATCH_EVENT, item.type, item.object);
-    trackResourceVersion(item.type, item.object);
-    if (listener != null) listener.receivedResponse(item);
+    if (isFresh(item.type, item.object)) {
+      LOGGER.fine(MessageKeys.WATCH_EVENT, item.type, item.object);
+      trackResourceVersion(item.type, item.object);
+      if (listener != null) listener.receivedResponse(item);
+    }
   }
 
   private void handleErrorResponse(Watch.Response<T> item) {
@@ -152,7 +156,8 @@ private void handleErrorResponse(Watch.Response<T> item) {
       if (index1 > 0) {
         int index2 = message.indexOf(')', index1 + 1);
         if (index2 > 0) {
-          resourceVersion = message.substring(index1 + 1, index2);
+          String val = message.substring(index1 + 1, index2);
+          resourceVersion = !isNullOrEmptyString(val) ? Long.parseLong(val) : 0;
         }
       }
     }
@@ -170,27 +175,34 @@ private void trackResourceVersion(String type, Object object) {
     updateResourceVersion(getNewResourceVersion(type, object));
   }
 
-  private String getNewResourceVersion(String type, Object object) {
-    if (type.equalsIgnoreCase("DELETED"))
-      return Integer.toString(1 + Integer.parseInt(resourceVersion));
+  private long getNewResourceVersion(String type, Object object) {
+    if (type.equalsIgnoreCase("DELETED")) return 1 + resourceVersion;
     else return getResourceVersionFromMetadata(object);
   }
 
-  private String getResourceVersionFromMetadata(Object object) {
+  private long getResourceVersionFromMetadata(Object object) {
     try {
       Method getMetadata = object.getClass().getDeclaredMethod("getMetadata");
       V1ObjectMeta metadata = (V1ObjectMeta) getMetadata.invoke(object);
-      return metadata.getResourceVersion();
+      String val = metadata.getResourceVersion();
+      return !isNullOrEmptyString(val) ? Long.parseLong(val) : 0;
     } catch (Exception e) {
       LOGGER.warning(MessageKeys.EXCEPTION, e);
       return IGNORED_RESOURCE_VERSION;
     }
   }
 
-  private void updateResourceVersion(String newResourceVersion) {
-    if (isNullOrEmptyString(resourceVersion)) resourceVersion = newResourceVersion;
-    else if (newResourceVersion.compareTo(resourceVersion) > 0)
-      resourceVersion = newResourceVersion;
+  private boolean isFresh(String type, Object object) {
+    if (resourceVersion == 0) return true;
+    long newResourceVersion = getResourceVersionFromMetadata(object);
+    return type.equalsIgnoreCase("DELETED")
+        ? newResourceVersion >= resourceVersion
+        : newResourceVersion > resourceVersion;
+  }
+
+  private void updateResourceVersion(long newResourceVersion) {
+    if (resourceVersion == 0) resourceVersion = newResourceVersion;
+    else if (newResourceVersion > resourceVersion) resourceVersion = newResourceVersion;
   }
 
   private static boolean isNullOrEmptyString(String s) {

operator/src/test/java/oracle/kubernetes/operator/WatcherTestBase.java

@@ -5,7 +5,6 @@
 package oracle.kubernetes.operator;
 
 import static java.net.HttpURLConnection.HTTP_GONE;
-import static oracle.kubernetes.operator.builders.EventMatcher.addEvent;
 import static oracle.kubernetes.operator.builders.EventMatcher.modifyEvent;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
@@ -107,12 +106,13 @@ private Watch.Response createHttpGoneErrorResponse(int nextResourceVersion) {
   @SuppressWarnings({"unchecked", "rawtypes"})
   @Test
   public void receivedEvents_areSentToListeners() {
-    Object object = createObjectWithMetaData();
-    StubWatchFactory.addCallResponses(createAddResponse(object), createModifyResponse(object));
+    Object object1 = createObjectWithMetaData();
+    Object object2 = createObjectWithMetaData();
+    StubWatchFactory.addCallResponses(createAddResponse(object1), createModifyResponse(object2));
 
     createAndRunWatcher(NAMESPACE, stopping, INITIAL_RESOURCE_VERSION);
 
-    assertThat(callBacks, contains(addEvent(object), modifyEvent(object)));
+    assertThat(callBacks, contains(modifyEvent(object2)));
   }
 
   @SuppressWarnings({"rawtypes", "unchecked"})
@@ -121,15 +121,14 @@ public void afterFirstSetOfEvents_nextRequestSendsLastResourceVersion() {
     Object object1 = createObjectWithMetaData();
     Object object2 = createObjectWithMetaData();
     Watch.Response[] firstSet = {createAddResponse(object1), createModifyResponse(object2)};
-    int resourceAfterFirstSet = resourceVersion - 1;
     StubWatchFactory.addCallResponses(firstSet);
     scheduleAddResponse(createObjectWithMetaData());
 
     createAndRunWatcher(NAMESPACE, stopping, INITIAL_RESOURCE_VERSION);
 
     assertThat(
         StubWatchFactory.getRequestParameters().get(1),
-        hasEntry("resourceVersion", Integer.toString(resourceAfterFirstSet)));
+        hasEntry("resourceVersion", String.valueOf(resourceVersion - 2)));
   }
 
   @SuppressWarnings({"unchecked", "rawtypes"})

wercker.yml

@@ -181,7 +181,7 @@ integration-test-java:
     goals: clean verify
     version: 3.5.2
     profiles: java-integration-tests
-
+    
   after-steps:
   - script:
     name: cleanup and store