Merge branch 'master' into int-test-improvement

csviri · csviri · commit ed34aa5b996a · 2020-04-26T20:11:41.000+02:00
diff --git a/.github/main.workflow b/.github/main.workflow
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,27 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Java CI with Maven
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: [8, 11]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK
+        uses: actions/setup-java@v1
+        with:
+          java-version: ${{ matrix.java }}
+      - name: Build with Maven
+        run: mvn -B package -P no-integration-tests --file pom.xml
diff --git a/README.md b/README.md
@@ -1,5 +1,6 @@
 # java-operator-sdk
 [![Build Status](https://travis-ci.org/ContainerSolutions/java-operator-sdk.svg?branch=master)](https://travis-ci.org/ContainerSolutions/java-operator-sdk)
+![Java CI with Maven](https://github.com/ContainerSolutions/java-operator-sdk/workflows/Java%20CI%20with%20Maven/badge.svg)
 
 SDK for building Kubernetes Operators in Java. Inspired by [operator-sdk](https://github.com/operator-framework/operator-sdk).
 In this first iteration we aim to provide a framework which handles the reconciliation loop by dispatching events to
@@ -13,7 +14,7 @@ Feature we would like to implement and invite the community to help us implement
 
 * ~~Spring Boot sample~~
 * Class generation from CRD to POJO
-* Quarkus support
+* GraalVM / Quarkus support
 
 ## Additional Features
 
diff --git a/operator-framework/pom.xml b/operator-framework/pom.xml
@@ -31,10 +31,6 @@
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.fabric8</groupId>
             <artifactId>openshift-client</artifactId>
diff --git a/operator-framework/src/main/java/com/github/containersolutions/operator/processing/EventScheduler.java b/operator-framework/src/main/java/com/github/containersolutions/operator/processing/EventScheduler.java
@@ -2,7 +2,6 @@
 
 
 import com.github.containersolutions.operator.processing.retry.Retry;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import io.fabric8.kubernetes.client.CustomResource;
 import io.fabric8.kubernetes.client.KubernetesClientException;
 import io.fabric8.kubernetes.client.Watcher;
@@ -11,7 +10,6 @@
 
 import java.util.Optional;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.ReentrantLock;
 
@@ -48,11 +46,7 @@ public class EventScheduler implements Watcher<CustomResource> {
     public EventScheduler(EventDispatcher eventDispatcher, Retry retry) {
         this.eventDispatcher = eventDispatcher;
         this.retry = retry;
-        ThreadFactory threadFactory = new ThreadFactoryBuilder()
-                .setNameFormat("event-consumer-%d")
-                .setDaemon(false)
-                .build();
-        executor = new ScheduledThreadPoolExecutor(1, threadFactory);
+        executor = new ScheduledThreadPoolExecutor(1);
         executor.setRemoveOnCancelPolicy(true);
     }
 
@@ -61,14 +55,13 @@ public void eventReceived(Watcher.Action action, CustomResource resource) {
         log.debug("Event received for action: {}, {}: {}", action.toString().toLowerCase(), resource.getClass().getSimpleName(),
                 resource.getMetadata().getName());
         CustomResourceEvent event = new CustomResourceEvent(action, resource, retry);
-        scheduleEvent(event);
+        scheduleEventFromApi(event);
     }
 
-    void scheduleEvent(CustomResourceEvent event) {
-        log.trace("Current queue size {}", executor.getQueue().size());
-        log.debug("Scheduling event: {}", event);
+    void scheduleEventFromApi(CustomResourceEvent event) {
         try {
             lock.lock();
+            log.debug("Scheduling event from Api: {}", event);
             if (event.getResource().getMetadata().getDeletionTimestamp() != null && event.getAction() == Action.DELETED) {
                 // Note that we always use finalizers, we want to process delete event just in corner case,
                 // when we are not able to add finalizer (lets say because of optimistic locking error, and the resource was deleted instantly).
@@ -89,30 +82,39 @@ void scheduleEvent(CustomResourceEvent event) {
                 eventStore.addOrReplaceEventAsNotScheduled(event);
                 return;
             }
+            scheduleEventForExecution(event);
+            log.trace("Scheduling event from API finished: {}", event);
+        } finally {
+            lock.unlock();
+        }
+    }
 
+    private void scheduleEventForExecution(CustomResourceEvent event) {
+        try {
+            lock.lock();
+            log.trace("Current queue size {}", executor.getQueue().size());
+            log.debug("Scheduling event for execution: {}", event);
             Optional<Long> nextBackOff = event.nextBackOff();
             if (!nextBackOff.isPresent()) {
                 log.warn("Event max retry limit reached. Will be discarded. {}", event);
                 return;
             }
-            log.debug("Creating scheduled task for event: {}", event);
             eventStore.addEventUnderProcessing(event);
             executor.schedule(new EventConsumer(event, eventDispatcher, this),
                     nextBackOff.get(), TimeUnit.MILLISECONDS);
+            log.trace("Scheduled task for event: {}", event);
         } finally {
-            log.debug("Scheduling event finished: {}", event);
             lock.unlock();
         }
     }
 
     void eventProcessingFinishedSuccessfully(CustomResourceEvent event) {
         try {
             lock.lock();
-            log.debug("Event processing successful for event: {}", event);
             eventStore.removeEventUnderProcessing(event.resourceUid());
             if (eventStore.containsNotScheduledEvent(event.resourceUid())) {
-                log.debug("Scheduling recent event for processing processing: {}", event);
-                scheduleEvent(eventStore.removeEventNotScheduled(event.resourceUid()));
+                log.debug("Scheduling recent event for processing: {}", event);
+                scheduleNotYetScheduledEventForExecution(event.resourceUid());
             }
         } finally {
             lock.unlock();
@@ -124,19 +126,22 @@ void eventProcessingFailed(CustomResourceEvent event) {
             lock.lock();
             eventStore.removeEventUnderProcessing(event.resourceUid());
             if (eventStore.containsNotScheduledEvent(event.resourceUid())) {
-                CustomResourceEvent notScheduledEvent = eventStore.removeEventNotScheduled(event.resourceUid());
-                log.debug("Event processing failed. Scheduling the most recent event. Failed event: {}," +
-                        " Most recent event: {}", event, notScheduledEvent);
-                scheduleEvent(notScheduledEvent);
+                log.debug("Event processing failed. Scheduling the most recent event. Failed event: {}", event);
+                scheduleNotYetScheduledEventForExecution(event.resourceUid());
             } else {
                 log.debug("Event processing failed. Attempting to re-schedule the event: {}", event);
-                scheduleEvent(event);
+                scheduleEventForExecution(event);
             }
         } finally {
             lock.unlock();
         }
     }
 
+    private void scheduleNotYetScheduledEventForExecution(String uuid) {
+        CustomResourceEvent notScheduledEvent = eventStore.removeEventNotScheduled(uuid);
+        scheduleEventForExecution(notScheduledEvent);
+    }
+
     @Override
     public void onClose(KubernetesClientException e) {
         log.error("Error: ", e);
diff --git a/pom.xml b/pom.xml
@@ -41,11 +41,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>com.google.guava</groupId>
-                <artifactId>guava</artifactId>
-                <version>28.1-jre</version>
-            </dependency>
             <dependency>
                 <groupId>io.fabric8</groupId>
                 <artifactId>openshift-client</artifactId>
@@ -104,14 +99,31 @@
     </build>
 
     <profiles>
+        <profile>
+            <id>no-integration-tests</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <version>2.22.2</version>
+                        <configuration>
+                            <excludes>
+                                <exclude>**/*IT.java</exclude>
+                            </excludes>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
         <profile>
             <id>release</id>
             <build>
                 <plugins>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
-                        <!--<version>2.19.1</version> -->
+                        <version>2.22.2</version>
                         <configuration>
                             <excludes>
                                 <exclude>**/*IT.java</exclude>
diff --git a/samples/basic/spring-boot/pom.xml b/samples/basic/spring-boot/pom.xml
@@ -55,6 +55,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.2.6.RELEASE</version>
             </plugin>
         </plugins>
     </build>
