Skip to content

HIVE-29391: Enable Independent Scaling of HMS REST Catalog from HMS #6270

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

Draft
difin wants to merge 2 commits into
base: master
Choose a base branch
from
+3,150 −644
Draft

HIVE-29391: Enable Independent Scaling of HMS REST Catalog from HMS #6270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d02fe25
HIVE-29391: Enable Independent Scaling of HMS REST Catalog from HMS
Dec 31, 2025
fc55364
Removed duplicated classes.
Jan 14, 2026
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
698 changes: 698 additions & 0 deletions itests/qtest-iceberg/src/test/java/org/apache/hadoop/hive/cli/TestRESTCatalogHA.java
View file
Open in desktop

Large diffs are not rendered by default.

403 changes: 403 additions & 0 deletions .../qtest-iceberg/src/test/java/org/apache/hadoop/hive/cli/TestRESTCatalogModeSelection.java
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions llap-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,11 @@
<artifactId>hadoop-yarn-registry</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-standalone-metastore-common</artifactId>
<version>${project.version}</version>
</dependency>
<!-- test inter-project -->
<dependency>
<groupId>org.mockito</groupId>
Expand Down
660 changes: 26 additions & 634 deletions llap-client/src/java/org/apache/hadoop/hive/registry/impl/ZkRegistryBase.java
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions standalone-metastore/metastore-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,16 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-registry</artifactId>
<version>${hadoop.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-api</artifactId>
<version>${hadoop.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-storage-api</artifactId>
Expand Down
25 changes: 22 additions & 3 deletions ...ore/metastore-common/src/main/java/org/apache/hadoop/hive/common/ZooKeeperHiveHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,11 +228,30 @@ public static ZooKeeperHiveHelper.ZooKeeperHiveHelperBuilder builder() {
public ZooKeeperHiveHelper(ZooKeeperHiveHelperBuilder builder) {
// Get the ensemble server addresses in the format host1:port1, host2:port2, ... . Append
// the configured port to hostname if the hostname doesn't contain a port.
String[] hosts = builder.getQuorum().split(",");
String quorumInput = builder.getQuorum();
if (quorumInput == null || quorumInput.trim().isEmpty()) {
throw new IllegalArgumentException("ZooKeeper quorum cannot be null or empty");
}
// Clean up any protocol prefixes (thrift://, //, etc.)
quorumInput = quorumInput.trim();
if (quorumInput.startsWith("//")) {
quorumInput = quorumInput.substring(2);
}
int protocolIndex = quorumInput.indexOf("://");
if (protocolIndex >= 0) {
quorumInput = quorumInput.substring(protocolIndex + 3);
}

String[] hosts = quorumInput.split(",");
StringBuilder quorumServers = new StringBuilder();
for (int i = 0; i < hosts.length; i++) {
quorumServers.append(hosts[i].trim());
if (!hosts[i].contains(":")) {
String host = hosts[i].trim();
// Clean up any remaining protocol artifacts
if (host.startsWith("//")) {
host = host.substring(2);
}
quorumServers.append(host);
if (!host.contains(":")) {
quorumServers.append(":");
quorumServers.append(builder.getClientPort());
}
Expand Down
17 changes: 17 additions & 0 deletions ...e/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1942,6 +1942,23 @@ public enum ConfVars {
"hive.metastore.iceberg.catalog.cache.expiry", -1,
"HMS Iceberg Catalog cache expiry."
),
REST_CATALOG_HA_ENABLED("metastore.rest.catalog.ha.enabled",
"hive.metastore.rest.catalog.ha.enabled", false,
"Whether REST Catalog supports High Availability with ZooKeeper service discovery."
),
REST_CATALOG_HA_REGISTRY_NAMESPACE("metastore.rest.catalog.ha.registry.namespace",
"hive.metastore.rest.catalog.ha.registry.namespace", "restCatalogHA",
"The parent node in ZooKeeper used by REST Catalog when supporting HA."
),
REST_CATALOG_HA_MODE("metastore.rest.catalog.ha.mode",
"hive.metastore.rest.catalog.ha.mode", "active-passive",
new StringSetValidator("active-passive", "active-active"),
"REST Catalog HA mode: 'active-passive' for leader election, 'active-active' for load balancing."
),
REST_CATALOG_INSTANCE_URI("metastore.rest.catalog.instance.uri",
"hive.metastore.rest.catalog.instance.uri", "",
"REST Catalog instance URI (host:port) for service discovery registration."
),
HTTPSERVER_THREADPOOL_MIN("hive.metastore.httpserver.threadpool.min",
"hive.metastore.httpserver.threadpool.min", 8,
"HMS embedded HTTP server minimum number of threads."
Expand Down
Loading