Skip to content

[#8933] fix(CI): Fix the lance rest start issue #8934

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yuqi1129 merged 3 commits into from
Oct 28, 2025
Merged

[#8933] fix(CI): Fix the lance rest start issue #8934

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
78e61b2
Fix the lance rest start issue
jerryshao Oct 28, 2025
2d4fe80
Fix the lance rest start issue
jerryshao Oct 28, 2025
744ff34
Fix the lance rest start issue
jerryshao Oct 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions catalogs/catalog-lakehouse-iceberg/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,8 @@ tasks.test {
exclude("**/integration/test/**")
} else {
dependsOn(tasks.jar)
dependsOn(":iceberg:iceberg-rest-server:jar")
dependsOn(":lance:lance-rest-server:jar")
}
}

Expand Down
2 changes: 1 addition & 1 deletion ...org/apache/gravitino/catalog/lakehouse/iceberg/integration/test/CatalogIcebergBaseIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ public abstract class CatalogIcebergBaseIT extends BaseIT {

@BeforeAll
public void startup() throws Exception {
ignoreIcebergRestService = false;
super.ignoreAuxRestService = false;
super.startIntegrationTest();
containerSuite.startHiveContainer();
initIcebergCatalogProperties();
Expand Down
2 changes: 1 addition & 1 deletion ...he/gravitino/catalog/lakehouse/iceberg/integration/test/CatalogIcebergKerberosHiveIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ public void startIntegrationTest() {
// Config kerberos configuration for Gravitino server
addKerberosConfig();

ignoreIcebergRestService = false;
super.ignoreAuxRestService = false;
// Start Gravitino server
super.startIntegrationTest();
} catch (Exception e) {
Expand Down
2 changes: 1 addition & 1 deletion conf/gravitino.conf.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ gravitino.authorization.serviceAdmins = anonymous

# THE CONFIGURATION FOR AUXILIARY SERVICE
# Auxiliary service names, separate by ',', currently support iceberg-rest and lance-rest
gravitino.auxService.names = iceberg-rest
gravitino.auxService.names = iceberg-rest,lance-rest
# Iceberg REST service classpath
gravitino.iceberg-rest.classpath = iceberg-rest-server/libs, iceberg-rest-server/conf
# Iceberg REST service host
Expand Down
2 changes: 1 addition & 1 deletion ...flink/src/test/java/org/apache/gravitino/flink/connector/integration/test/FlinkEnvIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ protected String flinkByPass(String key) {
protected abstract String getProvider();

private void initIcebergRestServiceEnv() {
ignoreIcebergRestService = false;
super.ignoreAuxRestService = false;
Map<String, String> icebergRestServiceConfigs = new HashMap<>();
icebergRestServiceConfigs.put(
"gravitino."
Expand Down
25 changes: 21 additions & 4 deletions ...ration-test-common/src/test/java/org/apache/gravitino/integration/test/MiniGravitino.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public MiniGravitino(MiniGravitinoContext context) throws IOException {
mockConfDir.mkdirs();
}

private void removeIcebergRestConfiguration(Properties properties) {
private void removeAuxRestConfiguration(Properties properties) {
// Disable Iceberg REST service
properties.remove(
AuxiliaryServiceManager.GRAVITINO_AUX_SERVICE_PREFIX
Expand All @@ -103,9 +103,9 @@ public void start() throws Exception {
serverConfig.loadPropertiesFromFile(
new File(ITUtils.joinPath(mockConfDir.getAbsolutePath(), "gravitino.conf")));

// Remove Iceberg rest service.
if (context.ignoreIcebergRestService) {
removeIcebergRestConfiguration(properties);
// Disable auxiliary rest service.
if (context.ignoreAuxRestService) {
removeAuxRestConfiguration(properties);
ITUtils.overwriteConfigFile(
ITUtils.joinPath(mockConfDir.getAbsolutePath(), "gravitino.conf"), properties);
}
Expand Down Expand Up @@ -230,6 +230,22 @@ Map<String, String> getIcebergRestServiceConfigs() throws IOException {
return customConfigs;
}

private Map<String, String> getLanceRestServiceConfigs() throws IOException {
Map<String, String> customConfigs = new HashMap<>();

String lanceJarPath = Paths.get("lance", "lance-rest-server", "build", "libs").toString();
String lanceConfigPath =
Paths.get("lance", "lance-rest-server", "src", "main", "resources").toString();
customConfigs.put(
"gravitino.lance-rest." + AuxiliaryServiceManager.AUX_SERVICE_CLASSPATH,
String.join(",", lanceJarPath, lanceConfigPath));

customConfigs.put(
"gravitino.lance-rest." + JettyServerConfig.WEBSERVER_HTTP_PORT.getKey(),
String.valueOf(RESTUtils.findAvailablePort(4000, 5000)));
return customConfigs;
}

// Customize the config file
private void customizeConfigFile(String configTempFileName, String configFileName)
throws IOException {
Expand All @@ -239,6 +255,7 @@ private void customizeConfigFile(String configTempFileName, String configFileNam
String.valueOf(RESTUtils.findAvailablePort(2000, 3000)));

configMap.putAll(getIcebergRestServiceConfigs());
configMap.putAll(getLanceRestServiceConfigs());
configMap.putAll(context.customConfig);

ITUtils.rewriteConfigFile(configTempFileName, configFileName, configMap);
Expand Down
6 changes: 3 additions & 3 deletions ...test-common/src/test/java/org/apache/gravitino/integration/test/MiniGravitinoContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@

public class MiniGravitinoContext {
Map<String, String> customConfig;
final boolean ignoreIcebergRestService;
final boolean ignoreAuxRestService;

public MiniGravitinoContext(Map<String, String> customConfig, boolean ignoreIcebergRestService) {
public MiniGravitinoContext(Map<String, String> customConfig, boolean ignoreAuxRestService) {
this.customConfig = customConfig;
this.ignoreIcebergRestService = ignoreIcebergRestService;
this.ignoreAuxRestService = ignoreAuxRestService;
}
}
5 changes: 2 additions & 3 deletions integration-test-common/src/test/java/org/apache/gravitino/integration/test/util/BaseIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public class BaseIT {

protected Map<String, String> customConfigs = new HashMap<>();

protected boolean ignoreIcebergRestService = true;
protected boolean ignoreAuxRestService = true;

public String DOWNLOAD_MYSQL_JDBC_DRIVER_URL =
"https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.26/mysql-connector-java-8.0.26.jar";
Expand Down Expand Up @@ -330,8 +330,7 @@ public void startIntegrationTest() throws Exception {
serverConfig = new ServerConfig();
customConfigs.put(ENTITY_RELATIONAL_JDBC_BACKEND_PATH.getKey(), file.getAbsolutePath());
if (testMode != null && testMode.equals(ITUtils.EMBEDDED_TEST_MODE)) {
MiniGravitinoContext context =
new MiniGravitinoContext(customConfigs, ignoreIcebergRestService);
MiniGravitinoContext context = new MiniGravitinoContext(customConfigs, ignoreAuxRestService);
miniGravitino = new MiniGravitino(context);
miniGravitino.start();
serverConfig = miniGravitino.getServerConfig();
Expand Down
2 changes: 1 addition & 1 deletion ...ommon/src/test/java/org/apache/gravitino/spark/connector/integration/test/SparkEnvIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ private void initHiveEnv() {
protected void initCatalogEnv() throws Exception {}

private void initIcebergRestServiceEnv() {
ignoreIcebergRestService = false;
super.ignoreAuxRestService = false;
Map<String, String> icebergRestServiceConfigs = new HashMap<>();
icebergRestServiceConfigs.put(
"gravitino."
Expand Down
1 change: 1 addition & 0 deletions spark-connector/v3.3/spark/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ tasks.test {
dependsOn(":catalogs:catalog-lakehouse-iceberg:jar")
dependsOn(":catalogs:catalog-hive:jar")
dependsOn(":iceberg:iceberg-rest-server:jar")
dependsOn(":lance:lance-rest-server:jar")
dependsOn(":catalogs:catalog-lakehouse-paimon:jar")
dependsOn(":catalogs:catalog-jdbc-mysql:jar")
dependsOn(":catalogs:catalog-jdbc-postgresql:jar")
Expand Down
1 change: 1 addition & 0 deletions spark-connector/v3.4/spark/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ tasks.test {
dependsOn(":catalogs:catalog-lakehouse-iceberg:jar")
dependsOn(":catalogs:catalog-hive:jar")
dependsOn(":iceberg:iceberg-rest-server:jar")
dependsOn(":lance:lance-rest-server:jar")
dependsOn(":catalogs:catalog-lakehouse-paimon:jar")
dependsOn(":catalogs:catalog-jdbc-mysql:jar")
dependsOn(":catalogs:catalog-jdbc-postgresql:jar")
Expand Down
1 change: 1 addition & 0 deletions spark-connector/v3.5/spark/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ tasks.test {
dependsOn(":catalogs:catalog-lakehouse-iceberg:jar")
dependsOn(":catalogs:catalog-hive:jar")
dependsOn(":iceberg:iceberg-rest-server:jar")
dependsOn(":lance:lance-rest-server:jar")
dependsOn(":catalogs:catalog-lakehouse-paimon:jar")
dependsOn(":catalogs:catalog-jdbc-mysql:jar")
dependsOn(":catalogs:catalog-jdbc-postgresql:jar")
Expand Down