OAK-11453 : changed variable name for setting full gc max revision age

Author: Rishabh Kumar

oak-run/src/main/java/org/apache/jackrabbit/oak/run/RevisionsCommand.java

@@ -121,7 +121,7 @@ private static class RevisionsOptions extends Utils.NodeStoreOptions {
         final OptionSpec<Long> olderThan;
         final OptionSpec<Double> delay;
         final OptionSpec<Double> fullGcDelayFactor;
-        final OptionSpec<Long> fullGcMaxAgeInSecs;
+        final OptionSpec<Long> fullGcMaxAge;
         final OptionSpec<?> continuous;
         final OptionSpec<?> fullGCOnly;
         final OptionSpec<Boolean> resetFullGC;
@@ -191,10 +191,10 @@ private static class RevisionsOptions extends Utils.NodeStoreOptions {
             fullGcProgressSize = parser.accepts("fullGcProgressSize", "The number of documents to check for " +
                             "garbage in each Full GC cycle")
                     .withRequiredArg().ofType(Integer.class).defaultsTo(10000);
-            fullGcMaxAgeInSecs = parser.accepts("fullGcMaxAgeInSecs", "The maximum age of the document in seconds " +
+            fullGcMaxAge = parser.accepts("fullGcMaxAge", "The maximum age of the document in seconds " +
                             "to be considered for Full GC i.e. Version Garbage Collector (Full GC) logic will only consider those " +
-                            "nodes for Full GC which are not accessed recently (currentTime - lastModifiedTime > fullGcMaxAgeInSecs)")
-                    .withOptionalArg().ofType(Long.class).defaultsTo(86400L);
+                            "nodes for Full GC which are not accessed recently (currentTime - lastModifiedTime > fullGcMaxAge)")
+                    .withOptionalArg().ofType(Long.class).defaultsTo(TimeUnit.DAYS.toMillis(1));
         }
 
         public RevisionsOptions parse(String[] args) {
@@ -238,8 +238,8 @@ int getFullGcProgressSize() {
             return fullGcProgressSize.value(options);
         }
 
-        long getFullGcMaxAgeInSecs() {
-            return fullGcMaxAgeInSecs.value(options);
+        long getFullGcMaxAge() {
+            return fullGcMaxAge.value(options);
         }
 
         double getFullGcDelayFactor() {
@@ -357,7 +357,7 @@ private VersionGarbageCollector bootstrapVGC(RevisionsOptions options, Closer cl
         builder.setFullGCDelayFactor(options.getFullGcDelayFactor());
         builder.setFullGCBatchSize(options.getFullGcBatchSize());
         builder.setFullGCProgressSize(options.getFullGcProgressSize());
-        builder.setFullGcMaxAgeMillis(SECONDS.toMillis(options.getFullGcMaxAgeInSecs()));
+        builder.setFullGcMaxAgeMillis(SECONDS.toMillis(options.getFullGcMaxAge()));
 
         // create a VersionGCSupport while builder is read-write
         VersionGCSupport gcSupport = builder.createVersionGCSupport();
@@ -389,7 +389,7 @@ private VersionGarbageCollector bootstrapVGC(RevisionsOptions options, Closer cl
         System.out.println("FullGcDelayFactory is : " + options.getFullGcDelayFactor());
         System.out.println("FullGcBatchSize is : " + options.getFullGcBatchSize());
         System.out.println("FullGcProgressSize is : " + options.getFullGcProgressSize());
-        System.out.println("FullGcMaxAgeInSecs is : " + options.getFullGcMaxAgeInSecs());
+        System.out.println("FullGcMaxAgeInSecs is : " + options.getFullGcMaxAge());
         System.out.println("FullGcMaxAgeMillis is : " + builder.getFullGcMaxAgeMillis());
         VersionGarbageCollector gc = createVersionGC(builder.build(), gcSupport, options.isDryRun(), builder);
 

oak-run/src/test/java/org/apache/jackrabbit/oak/plugins/document/RevisionsCommandTest.java

@@ -209,7 +209,7 @@ public void fullGC() {
     public void fullGCWithMaxAgeInSecs() {
         ns.dispose();
 
-        String output = captureSystemOut(new RevisionsCmd("fullGC", "--fullGcMaxAgeInSecs", "10000", "--entireRepo"));
+        String output = captureSystemOut(new RevisionsCmd("fullGC", "--fullGcMaxAge", "10000", "--entireRepo"));
         assertTrue(output.contains("FullGcMaxAgeInSecs is : 10000"));
         assertTrue(output.contains("FullGcMaxAgeMillis is : 10000000"));
         assertTrue(output.contains("starting gc collect"));