fix 193 in 2.x train (#195)

* fix 193 in 2.12 train

* add a warning log for not running tasks

* wip

* Use hybrid combination of Redis and fixed rate scheduler to avoid job multiplications.

* test fixes

* 25% buffer

* doc updated.

* 2.13.1 release

---------

Co-authored-by: Sonu Kumar <sonu@git>

CHANGELOG.md

@@ -1,11 +1,18 @@
 # [Rqueue] New and Notable Changes
 
+
+### [2.13.1] - 24-June-2023
+### Fixes
+This will fix a severe bug happening due to task multiplications. This is causing more Redis resource usage Please check #[193]
+
+
 ### [2.13.0] - 25-Dec-2022
 ### Fixes
 * Important fix for parallel message deletion or delete the message from message listener
 * No threads are available, improvement on message poller
 * Use System Zone ID for UI bottom screen
 
+
 ### [2.12.0] - 14-Dec-2022
 ### Fixes
 * Upgraded Pebble version for CVE
@@ -328,3 +335,4 @@ Fixes:
 [2.13.0]: https://repo1.maven.org/maven2/com/github/sonus21/rqueue-core/2.13.0-RELEASE
 
 [122]: https://github.com/sonus21/rqueue/issues/122
+[193]: https://github.com/sonus21/rqueue/issues/193

build.gradle

@@ -31,10 +31,10 @@ ext {
     springDataVersion = System.getenv("SPRING_DATA_VERSION")
     microMeterVersion = System.getenv("MICROMETER_VERSION")
 
-//    springBootVersion = '2.0.6.RELEASE'
-//    springVersion = '5.0.10.RELEASE'
-//    springDataVersion = '2.0.6.RELEASE'
-//    microMeterVersion = '1.1.0'
+    springBootVersion = '2.0.6.RELEASE'
+    springVersion = '5.0.10.RELEASE'
+    springDataVersion = '2.0.6.RELEASE'
+    microMeterVersion = '1.1.0'
 
     // logging dependencies
     lombokVersion = '1.18.10'
@@ -74,7 +74,7 @@ ext {
 
 subprojects {
     group = 'com.github.sonus21'
-    version = '2.13.0-RELEASE'
+    version = '2.13.1-RELEASE'
 
     dependencies {
         // https://mvnrepository.com/artifact/org.springframework/spring-messaging

rqueue-core/src/main/java/com/github/sonus21/rqueue/config/RqueueSchedulerConfig.java

@@ -16,6 +16,7 @@
 
 package com.github.sonus21.rqueue.config;
 
+import com.github.sonus21.rqueue.utils.Constants;
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.beans.factory.annotation.Value;
@@ -68,8 +69,26 @@ public class RqueueSchedulerConfig {
   @Value("${rqueue.scheduler.scheduled.message.time.interval:2000}")
   private long scheduledMessageTimeIntervalInMilli;
 
+  // How long the application should wait for task termination
+  @Value("${rqueue.scheduler.termination.wait.time:200}")
+  private long terminationWaitTime;
 
   // Maximum delay for message mover task due to failure
   @Value("${rqueue.scheduler.max.message.mover.delay:60000}")
   private long maxMessageMoverDelay;
+
+  // Minimum amount of time between two consecutive message move calls
+  @Value("${rqueue.scheduler.min.message.mover.delay:100}")
+  private long minMessageMoverDelay;
+
+  // Maximum number of messages that should be copied from scheduled to normal queue
+  @Value("${rqueue.scheduler.max.message.count:100}")
+  private long maxMessageCount;
+
+  public long minMessageMoveDelay() {
+    if (minMessageMoverDelay <= 0) {
+      return Constants.MIN_SCHEDULE_INTERVAL;
+    }
+    return minMessageMoverDelay;
+  }
 }