Merge branch 'main' into improvement-enable-disable

justinmclean · web-flow · commit ff627fa2b3a8 · 2025-02-27T10:52:51.000+08:00
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,16 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "gradle"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "npm"
+    directory: "/web/web"
+    schedule:
+      interval: "weekly"
diff --git a/core/src/main/java/org/apache/gravitino/Configs.java b/core/src/main/java/org/apache/gravitino/Configs.java
@@ -310,4 +310,12 @@ private Configs() {}
           .version(ConfigConstants.VERSION_0_7_0)
           .stringConf()
           .createWithDefault(SimpleFormatterV2.class.getName());
+
+  public static final ConfigEntry<List<String>> VISIBLE_CONFIGS =
+      new ConfigBuilder("gravitino.server.visibleConfigs")
+          .doc("List of configs that are visible in the config servlet")
+          .version(ConfigConstants.VERSION_0_9_0)
+          .stringConf()
+          .toSequence()
+          .createWithDefault(Collections.emptyList());
 }
diff --git a/core/src/main/java/org/apache/gravitino/config/ConfigConstants.java b/core/src/main/java/org/apache/gravitino/config/ConfigConstants.java
@@ -70,4 +70,7 @@ private ConfigConstants() {}
 
   /** The version number for the 0.8.0 release. */
   public static final String VERSION_0_8_0 = "0.8.0";
+
+  /** The version number for the 0.9.0 release. */
+  public static final String VERSION_0_9_0 = "0.9.0";
 }
diff --git a/core/src/main/java/org/apache/gravitino/lock/LockManager.java b/core/src/main/java/org/apache/gravitino/lock/LockManager.java
@@ -112,9 +112,9 @@ private void startDeadLockChecker() {
 
     deadLockChecker.scheduleAtFixedRate(
         () -> {
-          LOG.info("Start to check the dead lock...");
+          LOG.debug("Start to check the dead lock...");
           checkDeadLock(treeLockRootNode);
-          LOG.info("Finish to check the dead lock...");
+          LOG.debug("Finish to check the dead lock...");
         },
         0,
         60,
@@ -161,12 +161,12 @@ private void startNodeCleaner() {
     lockCleaner.scheduleAtFixedRate(
         () -> {
           long nodeCount = totalNodeCount.get();
-          LOG.info("Total tree lock node count: {}", nodeCount);
+          LOG.debug("Total tree lock node count: {}", nodeCount);
           // If the total node count is greater than the maxTreeNodeInMemory * 0.5, we will do the
           // clear up in case of the memory explosion.
           if (nodeCount > maxTreeNodeInMemory * 0.5) {
             StopWatch watch = StopWatch.createStarted();
-            LOG.trace("Start to clean up the stale tree lock nodes...");
+            LOG.info("Start to clean up the stale tree lock nodes...");
             treeLockRootNode
                 .getAllChildren()
                 .forEach(child -> evictStaleNodes(child, treeLockRootNode));
diff --git a/core/src/main/java/org/apache/gravitino/storage/relational/RelationalGarbageCollector.java b/core/src/main/java/org/apache/gravitino/storage/relational/RelationalGarbageCollector.java
@@ -71,14 +71,14 @@ public void start() {
   @VisibleForTesting
   public void collectAndClean() {
     long threadId = Thread.currentThread().getId();
-    LOG.info("Thread {} start to collect garbage...", threadId);
+    LOG.debug("Thread {} start to collect garbage...", threadId);
 
     try {
-      LOG.info("Start to collect and delete legacy data by thread {}", threadId);
+      LOG.debug("Start to collect and delete legacy data by thread {}", threadId);
       long legacyTimeline = System.currentTimeMillis() - storeDeleteAfterTimeMillis;
       for (Entity.EntityType entityType : Entity.EntityType.values()) {
         long deletedCount = Long.MAX_VALUE;
-        LOG.info(
+        LOG.debug(
             "Try to physically delete {} legacy data that has been marked deleted before {}",
             entityType,
             legacyTimeline);
@@ -94,7 +94,7 @@ public void collectAndClean() {
       LOG.info("Start to collect and delete old version data by thread {}", threadId);
       for (Entity.EntityType entityType : Entity.EntityType.values()) {
         long deletedCount = Long.MAX_VALUE;
-        LOG.info(
+        LOG.debug(
             "Try to softly delete {} old version data that has been over retention count {}",
             entityType,
             versionRetentionCount);
@@ -109,7 +109,7 @@ public void collectAndClean() {
     } catch (Exception e) {
       LOG.error("Thread {} failed to collect and clean garbage.", threadId, e);
     } finally {
-      LOG.info("Thread {} finish to collect garbage.", threadId);
+      LOG.debug("Thread {} finish to collect garbage.", threadId);
     }
   }
 
diff --git a/docs/gravitino-server-config.md b/docs/gravitino-server-config.md
@@ -37,6 +37,7 @@ The `gravitino.conf` file lists the configuration items in the following table.
 | `gravitino.server.shutdown.timeout`                  | Time in milliseconds to gracefully shut down of the Gravitino webserver.                                                                                                              | `3000`                                                                       | No       | 0.2.0            |
 | `gravitino.server.webserver.customFilters`           | Comma-separated list of filter class names to apply to the API.                                                                                                                       | (none)                                                                       | No       | 0.4.0            |
 | `gravitino.server.rest.extensionPackages`            | Comma-separated list of REST API packages to expand                                                                                                                                   | (none)                                                                       | No       | 0.6.0-incubating |
+| `gravitino.server.visibleConfigs`                    | List of configs that are visible in the config servlet                                                                                                                                | (none)                                                                       | No       | 0.9.0-incubating |
 
 The filter in the customFilters should be a standard javax servlet filter.
 You can also specify filter parameters by setting configuration entries of the form `gravitino.server.webserver.<class name of filter>.param.<param name>=<value>`.
diff --git a/server/src/main/java/org/apache/gravitino/server/web/ConfigServlet.java b/server/src/main/java/org/apache/gravitino/server/web/ConfigServlet.java
@@ -22,6 +22,7 @@
 import com.google.common.collect.Maps;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.util.List;
 import java.util.Map;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
@@ -58,6 +59,15 @@ public ConfigServlet(ServerConfig serverConfig) {
         configs.put(key.getKey(), serverConfig.get(key));
       }
     }
+
+    List<String> visibleConfigs = serverConfig.get(Configs.VISIBLE_CONFIGS);
+
+    for (String config : visibleConfigs) {
+      String configValue = serverConfig.getRawString(config);
+      if (configValue != null) {
+        configs.put(config, configValue);
+      }
+    }
   }
 
   @Override
diff --git a/server/src/test/java/org/apache/gravitino/server/web/TestConfigServlet.java b/server/src/test/java/org/apache/gravitino/server/web/TestConfigServlet.java
@@ -22,8 +22,13 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import com.google.common.collect.Lists;
 import java.io.PrintWriter;
 import javax.servlet.http.HttpServletResponse;
+import org.apache.gravitino.Configs;
+import org.apache.gravitino.config.ConfigBuilder;
+import org.apache.gravitino.config.ConfigConstants;
+import org.apache.gravitino.config.ConfigEntry;
 import org.apache.gravitino.server.ServerConfig;
 import org.junit.jupiter.api.Test;
 
@@ -43,4 +48,29 @@ public void testConfigServlet() throws Exception {
             "{\"gravitino.authorization.enable\":false,\"gravitino.authenticators\":[\"simple\"]}");
     configServlet.destroy();
   }
+
+  @Test
+  public void testConfigServletWithVisibleConfigs() throws Exception {
+    ServerConfig serverConfig = new ServerConfig();
+
+    ConfigEntry<String> customConfig =
+        new ConfigBuilder("gravitino.extended.custom.config")
+            .doc("Gravitino custom config")
+            .version(ConfigConstants.VERSION_0_9_0)
+            .stringConf()
+            .createWithDefault("default");
+
+    serverConfig.set(customConfig, "test");
+    serverConfig.set(Configs.VISIBLE_CONFIGS, Lists.newArrayList(customConfig.getKey()));
+    ConfigServlet configServlet = new ConfigServlet(serverConfig);
+    configServlet.init();
+    HttpServletResponse res = mock(HttpServletResponse.class);
+    PrintWriter writer = mock(PrintWriter.class);
+    when(res.getWriter()).thenReturn(writer);
+    configServlet.doGet(null, res);
+    verify(writer)
+        .write(
+            "{\"gravitino.extended.custom.config\":\"test\",\"gravitino.authorization.enable\":false,\"gravitino.authenticators\":[\"simple\"]}");
+    configServlet.destroy();
+  }
 }
diff --git a/web/integration-test/src/test/java/org/apache/gravitino/integration/test/web/ui/MetalakePageTest.java b/web/integration-test/src/test/java/org/apache/gravitino/integration/test/web/ui/MetalakePageTest.java
@@ -104,7 +104,7 @@ public void testCreateMultipleMetalakes() throws InterruptedException {
 
     for (int i = 0; i < twoPagesCount; i++) {
       try {
-        Thread.sleep(ACTION_SLEEP_MILLIS);
+        Thread.sleep(ACTION_SLEEP * 1000);
       } catch (Exception e) {
         LOG.error(e.getMessage(), e);
       }
diff --git a/web/integration-test/src/test/java/org/apache/gravitino/integration/test/web/ui/pages/CatalogsPage.java b/web/integration-test/src/test/java/org/apache/gravitino/integration/test/web/ui/pages/CatalogsPage.java
diff --git a/web/integration-test/src/test/java/org/apache/gravitino/integration/test/web/ui/pages/MetalakePage.java b/web/integration-test/src/test/java/org/apache/gravitino/integration/test/web/ui/pages/MetalakePage.java
diff --git a/web/integration-test/src/test/java/org/apache/gravitino/integration/test/web/ui/utils/BaseWebIT.java b/web/integration-test/src/test/java/org/apache/gravitino/integration/test/web/ui/utils/BaseWebIT.java

Original file line number	Diff line number	Diff line change
`@@ -70,4 +70,7 @@ private ConfigConstants() {}`
`70`	`70`
`71`	`71`	`/** The version number for the 0.8.0 release. */`
`72`	`72`	`public static final String VERSION_0_8_0 = "0.8.0";`
	`73`	`+`
	`74`	`+ /** The version number for the 0.9.0 release. */`
	`75`	`+ public static final String VERSION_0_9_0 = "0.9.0";`
`73`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ public void testCreateMultipleMetalakes() throws InterruptedException {`
`104`	`104`
`105`	`105`	`for (int i = 0; i < twoPagesCount; i++) {`
`106`	`106`	`try {`
`107`		`- Thread.sleep(ACTION_SLEEP_MILLIS);`
	`107`	`+ Thread.sleep(ACTION_SLEEP * 1000);`
`108`	`108`	`} catch (Exception e) {`
`109`	`109`	`LOG.error(e.getMessage(), e);`
`110`	`110`	`}`