updated

Author: achang52

docs/layouts/shortcodes/generated/history_server_configuration.html

@@ -8,6 +8,12 @@
         </tr>
     </thead>
     <tbody>
+        <tr>
+            <td><h5>historyserver.archive.cached-retained-jobs</h5></td>
+            <td style="word-wrap: break-word;">(none)</td>
+            <td>Integer</td>
+            <td>The maximum number of n latest jobs to retain in the local directory defined by `historyserver.web.tmpdir`. If this configuration is provided, the remote and local storage of job archives will be decoupled.If set to `0` or less than `-1` HistoryServer will throw an <code class="highlighter-rouge">IllegalConfigurationException</code>. </td>
+        </tr>
         <tr>
             <td><h5>historyserver.archive.clean-expired-jobs</h5></td>
             <td style="word-wrap: break-word;">false</td>
@@ -26,6 +32,12 @@
             <td>Duration</td>
             <td>Interval for refreshing the archived job directories.</td>
         </tr>
+        <tr>
+            <td><h5>historyserver.archive.num-cached-most-recently-viewed-jobs</h5></td>
+            <td style="word-wrap: break-word;">1</td>
+            <td>Integer</td>
+            <td>The maximum number of jobs to retain in the local cache defined by `historyserver.web.tmpdir` which stores the job archives that are fetched from the remote storage. This limit is distinct from the number of most recent jobs which will in the cache.The total cache size is a combination of the number of remote cache jobs and the number of remote fetch cached jobs and retained cache jobs.If set to less than `0` HistoryServer will throw an <code class="highlighter-rouge">IllegalConfigurationException</code>. </td>
+        </tr>
         <tr>
             <td><h5>historyserver.archive.retained-jobs</h5></td>
             <td style="word-wrap: break-word;">-1</td>

flink-core/src/main/java/org/apache/flink/configuration/HistoryServerOptions.java

@@ -136,7 +136,8 @@ public class HistoryServerOptions {
                                             String.format(
                                                     "The maximum number of n latest jobs to retain in the local directory defined by `%s`. ",
                                                     HISTORY_SERVER_WEB_DIR.key()))
-                                    .text("If this configuration is provided, the remote and local storage of job archives will be decoupled.")
+                                    .text(
+                                            "If this configuration is provided, the remote and local storage of job archives will be decoupled.")
                                     .text(
                                             "If set to `0` or less than `-1` HistoryServer will throw an %s. ",
                                             code("IllegalConfigurationException"))

flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/history/HistoryServerArchiveFetcher.java

@@ -139,6 +139,7 @@ protected boolean removeEldestEntry(Map.Entry<String, String> eldest) {
     private final int generalCachedJobSize;
 
     private final boolean remoteFetchEnabled;
+
     /** Cache of all available jobs identified by their id and refresh directory. */
     private final Map<Path, Set<String>> cachedArchivesPerRefreshDirectory;
 

flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/history/HistoryServerArchiveFetcherTest.java

@@ -43,8 +43,7 @@
 public class HistoryServerArchiveFetcherTest {
 
     @Test
-    void testMostRecentlyViewedCacheEvictedWhenFull(@TempDir Path tmpDir)
-            throws IOException {
+    void testMostRecentlyViewedCacheEvictedWhenFull(@TempDir Path tmpDir) throws IOException {
         final Path webDir = Files.createDirectory(tmpDir.resolve("webDir"));
         final Path tempDir = Files.createDirectory(tmpDir.resolve("tmpDir"));
         final org.apache.flink.core.fs.Path tempDirFs =

flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/history/HistoryServerTest.java

@@ -286,8 +286,7 @@ private void startHistoryServerWithCacheSizeLimit(int maxCacheSize)
         Configuration historyServerConfig =
                 createTestConfiguration(
                         HistoryServerOptions.HISTORY_SERVER_CLEANUP_EXPIRED_JOBS.defaultValue());
-        historyServerConfig.set(
-                HistoryServerOptions.HISTORY_SERVER_CACHED_JOBS, maxCacheSize);
+        historyServerConfig.set(HistoryServerOptions.HISTORY_SERVER_CACHED_JOBS, maxCacheSize);
         new HistoryServer(historyServerConfig).start();
     }
 
@@ -297,8 +296,7 @@ private void startHistoryServerWithRemoteFetchCacheSizeLimit(
         Configuration historyServerConfig =
                 createTestConfiguration(
                         HistoryServerOptions.HISTORY_SERVER_CLEANUP_EXPIRED_JOBS.defaultValue());
-        historyServerConfig.set(
-                HistoryServerOptions.HISTORY_SERVER_CACHED_JOBS, 3);
+        historyServerConfig.set(HistoryServerOptions.HISTORY_SERVER_CACHED_JOBS, 3);
         historyServerConfig.set(
                 HistoryServerOptions.HISTORY_SERVER_NUM_CACHED_MOST_RECENTLY_VIEWED_JOBS,
                 numCachedMostRecentlyViewedJobs);
@@ -434,13 +432,8 @@ private static Stream<Arguments> remoteAndLocalCacheSource() {
                         2,
                         HistoryServerOptions.HISTORY_SERVER_RETAINED_JOBS.defaultValue(),
                         2),
-                Arguments.arguments(
-                        true, -1, 2, 2),
-                Arguments.arguments(
-                        false,
-                        -1,
-                        2,
-                        2));
+                Arguments.arguments(true, -1, 2, 2),
+                Arguments.arguments(false, -1, 2, 2));
     }
 
     @ParameterizedTest