[#2290] TrackingEventProcessor does not wait for his worker threads to shut down

messaging/src/main/java/org/axonframework/eventhandling/TrackingEventProcessor.java

@@ -350,8 +350,9 @@ private void releaseToken(Segment segment) {
         try {
             transactionManager.executeInTransaction(() -> tokenStore.releaseClaim(getName(), segment.getSegmentId()));
             logger.info("Released claim");
-        } catch (Exception e) {
-            logger.info("Release claim failed", e);
+        } catch (Exception e) { 
+            logger.info("Release claim failed");
+            logger.debug("Release claim failed", e);
             // Ignore exception
         }
     }
@@ -696,6 +697,12 @@ private CompletableFuture<Void> awaitTermination() {
                                     if (workerThread.isAlive()) {
                                         workerThread.interrupt();
                                         workerThread.join(workerTerminationTimeout);
+                                        if (workerThread.isAlive( )) {
+                                        	logger.warn(
+                                        			"Forced shutdown of TrackingProcessor Worker '{}' was not successful. Consider increasing workerTerminationTimeout.",
+                                        			worker.getKey()
+                                        	);
+                                        }
                                     }
                                 } catch (InterruptedException e) {
                                     logger.info(

messaging/src/main/java/org/axonframework/eventhandling/TrackingEventProcessorConfiguration.java

@@ -186,14 +186,32 @@ public TrackingEventProcessorConfiguration andEventTrackerStatusChangeListener(
     }
 
     /**
-     * Sets the shutdown timeout to terminate active workers. Defaults to 5000ms.
+     * Sets the shutdown timeout to terminate active workers. This is used for both the graceful termination and the 
+     * potential forced termination of active workers. It is thus possible that it is used twice during the shutdown 
+     * phase. Defaults to 5000ms.
      *
-     * @param workerTerminationTimeout the timeout for workers to terminate on a shutdown
+     * @param workerTerminationTimeout the timeout for workers to terminate on a shutdown in milliseconds
      * @return {@code this} for method chaining
+     * 
+     * @deprecated Use {@link #andWorkerTerminationTimeout(long, TimeUnit)} instead.
      */
-    public TrackingEventProcessorConfiguration andWorkerTerminationTimeout(long workerTerminationTimeout) {
+    @Deprecated
+    public TrackingEventProcessorConfiguration andWorkerTerminationTimeout(long workerTerminationTimeoutInMilliseconds) {
+    	return andWorkerTerminationTimeout(workerTerminationTimeoutInMilliseconds, TimeUnit.MILLISECONDS);
+    }
+
+    /**
+     * Sets the shutdown timeout to terminate active workers. This is used for both the graceful termination and the 
+     * potential forced termination of active workers. It is thus possible that it is used twice during the shutdown 
+     * phase. Defaults to 5000ms.
+     *
+     * @param workerTerminationTimeout the timeout for workers to terminate on a shutdown.
+     * @param timeUnit           The unit of time
+     * @return {@code this} for method chaining
+     */
+    public TrackingEventProcessorConfiguration andWorkerTerminationTimeout(long workerTerminationTimeout, TimeUnit timeUnit) {
         assertStrictPositive(workerTerminationTimeout, "The worker termination timeout should be strictly positive");
-        this.workerTerminationTimeout = workerTerminationTimeout;
+        this.workerTerminationTimeout = timeUnit.toMillis(workerTerminationTimeout);
         return this;
     }