Hms standalone rest server with spring boot #6327
+618
−213
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.iceberg.rest.standalone; | ||
|
|
||
| import org.apache.hadoop.conf.Configuration; | ||
| import org.apache.hadoop.hive.metastore.HiveMetaStoreClient; | ||
| import org.apache.hadoop.hive.metastore.conf.MetastoreConf; | ||
| import org.apache.hadoop.hive.metastore.conf.MetastoreConf.ConfVars; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
| import org.springframework.boot.actuate.health.Health; | ||
| import org.springframework.boot.actuate.health.HealthIndicator; | ||
| import org.springframework.stereotype.Component; | ||
|
|
||
| /** | ||
| * Custom health indicator for HMS connectivity. | ||
| * Verifies that HMS is reachable via Thrift, not just that configuration is present. | ||
| * Used by Kubernetes readiness probes to determine if the server is ready to accept traffic. | ||
| */ | ||
| @Component | ||
| public class HMSReadinessHealthIndicator implements HealthIndicator { | ||
|
Member
There was a problem hiding this comment. should we move it under the |
||
| private static final Logger LOG = LoggerFactory.getLogger(HMSReadinessHealthIndicator.class); | ||
|
|
||
| private final Configuration conf; | ||
|
|
||
| public HMSReadinessHealthIndicator(Configuration conf) { | ||
| this.conf = conf; | ||
| } | ||
|
|
||
| @Override | ||
| public Health health() { | ||
| String hmsThriftUris = MetastoreConf.getVar(conf, ConfVars.THRIFT_URIS); | ||
| if (hmsThriftUris == null || hmsThriftUris.isEmpty()) { | ||
| return Health.down() | ||
| .withDetail("reason", "HMS Thrift URIs not configured") | ||
| .build(); | ||
| } | ||
|
|
||
| try (HiveMetaStoreClient client = new HiveMetaStoreClient(conf)) { | ||
| // Lightweight call to verify HMS is reachable | ||
| client.getAllDatabases(); | ||
| return Health.up() | ||
| .withDetail("hmsThriftUris", hmsThriftUris) | ||
| .withDetail("warehouse", MetastoreConf.getVar(conf, ConfVars.WAREHOUSE)) | ||
| .build(); | ||
| } catch (Exception e) { | ||
| LOG.warn("HMS connectivity check failed: {}", e.getMessage()); | ||
| return Health.down() | ||
| .withDetail("hmsThriftUris", hmsThriftUris) | ||
| .withDetail("error", e.getMessage()) | ||
| .build(); | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.iceberg.rest.standalone; | ||
|
|
||
| import javax.servlet.http.HttpServlet; | ||
|
|
||
| import org.apache.hadoop.conf.Configuration; | ||
| import org.apache.hadoop.hive.metastore.conf.MetastoreConf; | ||
| import org.apache.hadoop.hive.metastore.conf.MetastoreConf.ConfVars; | ||
| import org.apache.iceberg.rest.HMSCatalogFactory; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
| import org.springframework.boot.web.servlet.ServletRegistrationBean; | ||
| import org.springframework.context.annotation.Bean; | ||
|
|
||
| /** | ||
| * Spring configuration for the Iceberg REST Catalog servlet. | ||
| * Extracted to separate concerns from the main application bootstrap. | ||
| */ | ||
| @org.springframework.context.annotation.Configuration | ||
| public class IcebergCatalogConfiguration { | ||
| private static final Logger LOG = LoggerFactory.getLogger(IcebergCatalogConfiguration.class); | ||
|
|
||
| private final Configuration conf; | ||
|
|
||
| public IcebergCatalogConfiguration(Configuration conf) { | ||
| this.conf = conf; | ||
| } | ||
|
|
||
| @Bean | ||
| public ServletRegistrationBean<HttpServlet> restCatalogServlet() { | ||
| // Determine servlet path and port | ||
| String servletPath = MetastoreConf.getVar(conf, ConfVars.ICEBERG_CATALOG_SERVLET_PATH); | ||
| if (servletPath == null || servletPath.isEmpty()) { | ||
| servletPath = "iceberg"; | ||
| MetastoreConf.setVar(conf, ConfVars.ICEBERG_CATALOG_SERVLET_PATH, servletPath); | ||
| } | ||
|
|
||
| int port = MetastoreConf.getIntVar(conf, ConfVars.CATALOG_SERVLET_PORT); | ||
| if (port == 0) { | ||
| port = 8080; | ||
| MetastoreConf.setLongVar(conf, ConfVars.CATALOG_SERVLET_PORT, port); | ||
| } | ||
|
|
||
| LOG.info("Creating REST Catalog servlet at /{}", servletPath); | ||
|
|
||
| // Create servlet from Iceberg factory | ||
| org.apache.hadoop.hive.metastore.ServletServerBuilder.Descriptor descriptor = | ||
| HMSCatalogFactory.createServlet(conf); | ||
| if (descriptor == null || descriptor.getServlet() == null) { | ||
| throw new IllegalStateException("Failed to create Iceberg REST Catalog servlet"); | ||
| } | ||
|
|
||
| ServletRegistrationBean<HttpServlet> registration = | ||
| new ServletRegistrationBean<>(descriptor.getServlet(), "/" + servletPath + "/*"); | ||
| registration.setName("IcebergRESTCatalog"); | ||
| registration.setLoadOnStartup(1); | ||
|
|
||
| return registration; | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
em, i am not sure about this
cc @zabetak, @abstractdog should we whitelist spring dependencies in Nexus? I originally thought that if a dependency is missing from the local repository, we always fetch it from Central."
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess it should work without defining this repository, spring artifacts are present in central:
https://mvnrepository.com/artifact/org.springframework.boot
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, the repo definition here is strange don't think we need it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, I added that to check if the build passes with this definitions, not for production.
It wasn't able to find spring boot dependencies through the wonder repo.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@abstractdog no it didn't work, you can see that previous build failed saying these dependencies were missing in wonder.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I know it sounds silly, but the same happens when I add a new tez staging artifact repo, it magically fails to fetch all artifacts for 2-3 times, and then it succeeds: I still think you should remove this, and we can check wonder artifactory logs what exactly happened when it tried to connect to the remote maven central (if it tried at all :D )
I'll check if I can provide easy access to you to the artifactory logs (e.g. kubeconfig)