Skip to content

[AMORO-2810] Support rest service for follower AMS #3737

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
zhoujinsong merged 6 commits into from
Aug 20, 2025
Merged

[AMORO-2810] Support rest service for follower AMS #3737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7e19d4a
Support multiple nodes to access Amoro Rest service in a high availab…
czy006 May 16, 2025
815e96c
Fix conflicts
zhoujinsong Aug 19, 2025
6c90c36
server dispose rename
czy006 May 29, 2025
8ece674
Split dispose processing of rest service and optimizing service
zhoujinsong Jun 6, 2025
c79a8a2
as head
zhoujinsong Jun 6, 2025
f2c3773
Remove useless codes
zhoujinsong Aug 19, 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
50 changes: 30 additions & 20 deletions amoro-ams/src/main/java/org/apache/amoro/server/AmoroServiceContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,15 +126,16 @@ public static void main(String[] args) {
service.dispose();
LOG.info("AMS service has been shut down");
}));
service.startRestServices();
while (true) {
try {
service.waitLeaderShip();
service.startService();
service.startOptimizingService();
service.waitFollowerShip();
} catch (Exception e) {
LOG.error("AMS start error", e);
} finally {
service.dispose();
service.disposeOptimizingService();
}
}
} catch (Throwable t) {
Expand All @@ -151,14 +152,21 @@ public void waitFollowerShip() throws Exception {
haContainer.waitFollowerShip();
}

public void startService() throws Exception {
public void startRestServices() throws Exception {
EventsManager.getInstance();
MetricManager.getInstance();

catalogManager = new DefaultCatalogManager(serviceConfig);
tableManager = new DefaultTableManager(serviceConfig, catalogManager);
optimizerManager = new DefaultOptimizerManager(serviceConfig, catalogManager);
terminalManager = new TerminalManager(serviceConfig, catalogManager);

initHttpService();
startHttpService();
registerAmsServiceMetric();
}

public void startOptimizingService() throws Exception {
tableService = new DefaultTableService(serviceConfig, catalogManager);

optimizingService =
Expand All @@ -180,14 +188,9 @@ public void startService() throws Exception {
tableService.initialize();
LOG.info("AMS table service have been initialized");
tableManager.setTableService(tableService);
terminalManager = new TerminalManager(serviceConfig, catalogManager);

initThriftService();
startThriftService();

initHttpService();
startHttpService();
registerAmsServiceMetric();
}

private void addHandlerChain(RuntimeHandlerChain chain) {
Expand All @@ -196,7 +199,7 @@ private void addHandlerChain(RuntimeHandlerChain chain) {
}
}

public void dispose() {
public void disposeOptimizingService() {
if (tableManagementServer != null && tableManagementServer.isServing()) {
LOG.info("Stopping table management server...");
tableManagementServer.stop();
Expand All @@ -205,6 +208,19 @@ public void dispose() {
LOG.info("Stopping optimizing server...");
optimizingServiceServer.stop();
}
if (tableService != null) {
LOG.info("Stopping table service...");
tableService.dispose();
tableService = null;
}
if (optimizingService != null) {
LOG.info("Stopping optimizing service...");
optimizingService.dispose();
optimizingService = null;
}
}

public void disposeRestService() {
if (httpServer != null) {
LOG.info("Stopping http server...");
try {
Expand All @@ -213,22 +229,11 @@ public void dispose() {
LOG.error("Error stopping http server", e);
}
}
if (tableService != null) {
LOG.info("Stopping table service...");
tableService.dispose();
tableService = null;
}
if (terminalManager != null) {
LOG.info("Stopping terminal manager...");
terminalManager.dispose();
terminalManager = null;
}
if (optimizingService != null) {
LOG.info("Stopping optimizing service...");
optimizingService.dispose();
optimizingService = null;
}

if (amsServiceMetrics != null) {
amsServiceMetrics.unregister();
}
Expand All @@ -237,6 +242,11 @@ public void dispose() {
MetricManager.dispose();
}

public void dispose() {
disposeOptimizingService();
disposeRestService();
}

private void initConfig() throws Exception {
LOG.info("initializing configurations...");
new ConfigurationHelper().init();
Expand Down
3 changes: 2 additions & 1 deletion amoro-ams/src/test/java/org/apache/amoro/server/AmsEnvironment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,8 @@ private void startAms() throws Exception {
AmoroManagementConf.OPTIMIZING_SERVICE_THRIFT_BIND_PORT, optimizingServiceBindPort);
serviceConfig.set(
AmoroManagementConf.REFRESH_EXTERNAL_CATALOGS_INTERVAL, Duration.ofMillis(1000L));
serviceContainer.startService();
serviceContainer.startRestServices();
serviceContainer.startOptimizingService();
LOG.info("Started test AMS.");
break;
} catch (TTransportException e) {
Expand Down