Issue 5673: (SLTS) Fix wrong GC config (pravega#5674)

Changed SLTS GC time unit from seconds to milliseconds. Also changed the level of some log messages to reduce noise. Signed-off-by: Sachin Joshi <sachin.joshi@emc.com>
co-jo · Feb 16, 2021 · 6f20300 · 6f20300
1 parent 737ac17
commit 6f20300
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/...src/main/java/io/pravega/segmentstore/storage/chunklayer/ChunkedSegmentStorageConfig.java b/...src/main/java/io/pravega/segmentstore/storage/chunklayer/ChunkedSegmentStorageConfig.java
@@ -41,8 +41,8 @@ public class ChunkedSegmentStorageConfig {
     public static final Property<Integer> GARBAGE_COLLECTION_DELAY = Property.named("garbage.collection.delay.seconds", 60);
     public static final Property<Integer> GARBAGE_COLLECTION_MAX_CONCURRENCY = Property.named("garbage.collection.concurrency.max", 10);
     public static final Property<Integer> GARBAGE_COLLECTION_MAX_QUEUE_SIZE = Property.named("garbage.collection.queue.size.max", 16 * 1024);
-    public static final Property<Integer> GARBAGE_COLLECTION_SLEEP = Property.named("garbage.collection.sleep.seconds", 60);
-    public static final Property<Integer> GARBAGE_COLLECTION_MAX_ATTEMPS = Property.named("garbage.collection.attempts.max", 3);
+    public static final Property<Integer> GARBAGE_COLLECTION_SLEEP = Property.named("garbage.collection.sleep.millis", 10);
+    public static final Property<Integer> GARBAGE_COLLECTION_MAX_ATTEMPTS = Property.named("garbage.collection.attempts.max", 3);
 
 
     /**
@@ -63,7 +63,7 @@ public class ChunkedSegmentStorageConfig {
             .garbageCollectionDelay(Duration.ofSeconds(60))
             .garbageCollectionMaxConcurrency(10)
             .garbageCollectionMaxQueueSize(16 * 1024)
-            .garbageCollectionSleep(Duration.ofSeconds(60))
+            .garbageCollectionSleep(Duration.ofMillis(10))
             .garbageCollectionMaxAttempts(3)
             .build();
 
@@ -191,8 +191,8 @@ public class ChunkedSegmentStorageConfig {
         this.garbageCollectionDelay = Duration.ofSeconds(properties.getInt(GARBAGE_COLLECTION_DELAY));
         this.garbageCollectionMaxConcurrency = properties.getInt(GARBAGE_COLLECTION_MAX_CONCURRENCY);
         this.garbageCollectionMaxQueueSize = properties.getInt(GARBAGE_COLLECTION_MAX_QUEUE_SIZE);
-        this.garbageCollectionSleep = Duration.ofSeconds(properties.getInt(GARBAGE_COLLECTION_SLEEP));
-        this.garbageCollectionMaxAttempts = properties.getInt(GARBAGE_COLLECTION_MAX_ATTEMPS);
+        this.garbageCollectionSleep = Duration.ofMillis(properties.getInt(GARBAGE_COLLECTION_SLEEP));
+        this.garbageCollectionMaxAttempts = properties.getInt(GARBAGE_COLLECTION_MAX_ATTEMPTS);
     }
 
     /**

diff --git a/...re/storage/src/main/java/io/pravega/segmentstore/storage/chunklayer/GarbageCollector.java b/...re/storage/src/main/java/io/pravega/segmentstore/storage/chunklayer/GarbageCollector.java
@@ -168,15 +168,11 @@ protected CompletableFuture<Void> doRun() {
         loopFuture = Futures.loop(
                 this::canRun,
                 () -> delaySupplier.get()
-                        .thenRunAsync(() -> {
-                            log.info("{}: Iteration {} started.", traceObjectId, iterationId.get());
-                        }, executor)
                         .thenComposeAsync(v -> deleteGarbage(true, config.getGarbageCollectionMaxConcurrency()), executor)
                         .handleAsync((v, ex) -> {
                             if (null != ex) {
                                 log.error("{}: Error during doRun.", traceObjectId, ex);
                             }
-                            log.info("{}: Iteration {} ended.", traceObjectId, iterationId.getAndIncrement());
                             return null;
                         }, executor),
                 executor);
@@ -240,7 +236,7 @@ void addToGarbage(String chunkToDelete, long startTime, int attempts) {
      * @return CompletableFuture which is completed when garbage is deleted.
      */
     CompletableFuture<Boolean> deleteGarbage(boolean isBackground, int maxItems) {
-        log.debug("{}: deleteGarbage - started.", traceObjectId);
+        log.debug("{}: Iteration {} started.", traceObjectId, iterationId.get());
         // Sleep if suspended.
         if (suspended.get() && isBackground) {
             log.info("{}: deleteGarbage - suspended - sleeping for {}.", traceObjectId, config.getGarbageCollectionDelay());
@@ -351,7 +347,7 @@ CompletableFuture<Boolean> deleteGarbage(boolean isBackground, int maxItems) {
         }
         return Futures.allOf(futures)
                 .thenApplyAsync( v -> {
-                    log.debug("{}: deleteGarbage - finished.", traceObjectId);
+                    log.debug("{}: Iteration {} ended.", traceObjectId, iterationId.getAndIncrement());
                     return true;
                 }, executor);
     }

diff --git a/...est/java/io/pravega/segmentstore/storage/chunklayer/ChunkedSegmentStorageConfigTests.java b/...est/java/io/pravega/segmentstore/storage/chunklayer/ChunkedSegmentStorageConfigTests.java
@@ -37,7 +37,7 @@ public void testProvidedValues() {
         props.setProperty(ChunkedSegmentStorageConfig.GARBAGE_COLLECTION_MAX_QUEUE_SIZE.getFullName(ChunkedSegmentStorageConfig.COMPONENT_CODE), "10");
         props.setProperty(ChunkedSegmentStorageConfig.GARBAGE_COLLECTION_MAX_CONCURRENCY.getFullName(ChunkedSegmentStorageConfig.COMPONENT_CODE), "11");
         props.setProperty(ChunkedSegmentStorageConfig.GARBAGE_COLLECTION_SLEEP.getFullName(ChunkedSegmentStorageConfig.COMPONENT_CODE), "12");
-        props.setProperty(ChunkedSegmentStorageConfig.GARBAGE_COLLECTION_MAX_ATTEMPS.getFullName(ChunkedSegmentStorageConfig.COMPONENT_CODE), "13");
+        props.setProperty(ChunkedSegmentStorageConfig.GARBAGE_COLLECTION_MAX_ATTEMPTS.getFullName(ChunkedSegmentStorageConfig.COMPONENT_CODE), "13");
 
         TypedProperties typedProperties = new TypedProperties(props, "storage");
         ChunkedSegmentStorageConfig config = new ChunkedSegmentStorageConfig(typedProperties);
@@ -55,7 +55,7 @@ public void testProvidedValues() {
         Assert.assertEquals(config.getGarbageCollectionDelay().toSeconds(), 9);
         Assert.assertEquals(config.getGarbageCollectionMaxQueueSize(), 10);
         Assert.assertEquals(config.getGarbageCollectionMaxConcurrency(), 11);
-        Assert.assertEquals(config.getGarbageCollectionSleep().toSeconds(), 12);
+        Assert.assertEquals(config.getGarbageCollectionSleep().toMillis(), 12);
         Assert.assertEquals(config.getGarbageCollectionMaxAttempts(), 13);
     }