Skip to content

Commit 3bcaae4

Browse files
halibobo1205halibobo1205
committed
feat(api): optimize api service startup
1 parent f16c3f8 commit 3bcaae4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1145
-1331
lines changed

‎common/src/main/java/org/tron/common/parameter/CommonParameter.java‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -456,12 +456,30 @@ public class CommonParameter {
456456
@Getter
457457
@Setter
458458
public String cryptoEngine = Constant.ECKey_ENGINE;
459+
460+
@Getter
461+
@Setter
462+
public boolean rpcEnable = true;
463+
464+
@Getter
465+
@Setter
466+
public boolean rpcSolidityEnable = true;
467+
468+
@Getter
469+
@Setter
470+
public boolean rpcPBFTEnable = true;
471+
459472
@Getter
460473
@Setter
461474
public boolean fullNodeHttpEnable = true;
462475
@Getter
463476
@Setter
464477
public boolean solidityNodeHttpEnable = true;
478+
479+
@Getter
480+
@Setter
481+
public boolean pBFTHttpEnable = true;
482+
465483
@Getter
466484
@Setter
467485
public boolean jsonRpcHttpFullNodeEnable = false;

‎common/src/main/java/org/tron/core/Constant.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,15 +124,21 @@ public class Constant {
124124
public static final String NODE_DNS_AWS_REGION = "node.dns.awsRegion";
125125
public static final String NODE_DNS_AWS_HOST_ZONE_ID = "node.dns.awsHostZoneId";
126126

127+
// config for rpc
127128
public static final String NODE_RPC_PORT = "node.rpc.port";
128129
public static final String NODE_RPC_SOLIDITY_PORT = "node.rpc.solidityPort";
129130
public static final String NODE_RPC_PBFT_PORT = "node.rpc.PBFTPort";
131+
public static final String NODE_RPC_ENABLE = "node.rpc.enable";
132+
public static final String NODE_RPC_SOLIDITY_ENABLE = "node.rpc.solidityEnable";
133+
public static final String NODE_RPC_PBFT_ENABLE = "node.rpc.PBFTEnable";
134+
// config for http
130135
public static final String NODE_HTTP_FULLNODE_PORT = "node.http.fullNodePort";
131136
public static final String NODE_HTTP_SOLIDITY_PORT = "node.http.solidityPort";
132137
public static final String NODE_HTTP_FULLNODE_ENABLE = "node.http.fullNodeEnable";
133138
public static final String NODE_HTTP_SOLIDITY_ENABLE = "node.http.solidityEnable";
139+
public static final String NODE_HTTP_PBFT_ENABLE = "node.http.PBFTEnable";
134140
public static final String NODE_HTTP_PBFT_PORT = "node.http.PBFTPort";
135-
141+
// config for jsonrpc
136142
public static final String NODE_JSONRPC_HTTP_FULLNODE_ENABLE = "node.jsonrpc.httpFullNodeEnable";
137143
public static final String NODE_JSONRPC_HTTP_FULLNODE_PORT = "node.jsonrpc.httpFullNodePort";
138144
public static final String NODE_JSONRPC_HTTP_SOLIDITY_ENABLE = "node.jsonrpc.httpSolidityEnable";

‎framework/src/main/java/org/tron/common/application/AbstractService.java‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
package org.tron.common.application;
2+
3+
import com.google.common.base.Objects;
4+
import java.util.concurrent.CompletableFuture;
5+
import lombok.Getter;
6+
import lombok.extern.slf4j.Slf4j;
7+
import org.tron.core.config.args.Args;
8+
9+
10+
@Slf4j(topic = "service")
11+
public abstract class AbstractService implements Service {
12+
13+
protected int port;
14+
@Getter
15+
protected boolean enable;
16+
@Getter
17+
protected final String name = this.getClass().getSimpleName();
18+
19+
20+
@Override
21+
public CompletableFuture<Boolean> start() {
22+
logger.info("{} starting on {}", name, port);
23+
final CompletableFuture<Boolean> resultFuture = new CompletableFuture<>();
24+
try {
25+
innerStart();
26+
resultFuture.complete(true);
27+
logger.info("{} started, listening on {}", name, port);
28+
} catch (Exception e) {
29+
resultFuture.completeExceptionally(e);
30+
}
31+
return resultFuture;
32+
}
33+
34+
@Override
35+
public CompletableFuture<Boolean> stop() {
36+
logger.info("{} shutdown...", name);
37+
final CompletableFuture<Boolean> resultFuture = new CompletableFuture<>();
38+
try {
39+
innerStop();
40+
resultFuture.complete(true);
41+
logger.info("{} shutdown complete", name);
42+
} catch (Exception e) {
43+
resultFuture.completeExceptionally(e);
44+
}
45+
return resultFuture;
46+
}
47+
48+
@Override
49+
public boolean equals(Object o) {
50+
if (this == o) {
51+
return true;
52+
}
53+
if (o == null || getClass() != o.getClass()) {
54+
return false;
55+
}
56+
AbstractService that = (AbstractService) o;
57+
return port == that.port;
58+
}
59+
60+
@Override
61+
public int hashCode() {
62+
return Objects.hashCode(name, port);
63+
}
64+
65+
public abstract void innerStart() throws Exception;
66+
67+
public abstract void innerStop() throws Exception;
68+
69+
protected boolean isFullNode() {
70+
return !Args.getInstance().isSolidityNode();
71+
}
72+
73+
}

‎framework/src/main/java/org/tron/common/application/Application.java‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,11 @@
1515

1616
package org.tron.common.application;
1717

18-
import org.tron.common.parameter.CommonParameter;
1918
import org.tron.core.ChainBaseManager;
20-
import org.tron.core.config.args.Args;
2119
import org.tron.core.db.Manager;
2220

2321
public interface Application {
2422

25-
void setOptions(Args args);
26-
27-
void init(CommonParameter parameter);
28-
29-
void initServices(CommonParameter parameter);
30-
3123
void startup();
3224

3325
void shutdown();
@@ -40,8 +32,6 @@ default void blockUntilShutdown() {
4032

4133
void shutdownServices();
4234

43-
void addService(Service service);
44-
4535
Manager getDbManager();
4636

4737
ChainBaseManager getChainBaseManager();

‎framework/src/main/java/org/tron/common/application/ApplicationImpl.java‎

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package org.tron.common.application;
22

3+
import java.util.concurrent.CountDownLatch;
34
import lombok.extern.slf4j.Slf4j;
45
import org.springframework.beans.factory.annotation.Autowired;
56
import org.springframework.stereotype.Component;
6-
import org.tron.common.parameter.CommonParameter;
77
import org.tron.core.ChainBaseManager;
88
import org.tron.core.config.args.Args;
99
import org.tron.core.consensus.ConsensusService;
@@ -15,6 +15,7 @@
1515
@Component
1616
public class ApplicationImpl implements Application {
1717

18+
@Autowired
1819
private ServiceContainer services;
1920

2021
@Autowired
@@ -29,32 +30,12 @@ public class ApplicationImpl implements Application {
2930
@Autowired
3031
private ConsensusService consensusService;
3132

32-
@Override
33-
public void setOptions(Args args) {
34-
// not used
35-
}
36-
37-
@Override
38-
@Autowired
39-
public void init(CommonParameter parameter) {
40-
services = new ServiceContainer();
41-
}
42-
43-
@Override
44-
public void addService(Service service) {
45-
services.add(service);
46-
}
47-
48-
@Override
49-
public void initServices(CommonParameter parameter) {
50-
services.init(parameter);
51-
}
33+
private final CountDownLatch shutdown = new CountDownLatch(1);
5234

5335
/**
5436
* start up the app.
5537
*/
5638
public void startup() {
57-
this.initServices(Args.getInstance());
5839
this.startServices();
5940
if ((!Args.getInstance().isSolidityNode()) && (!Args.getInstance().isP2pDisable())) {
6041
tronNetService.start();
@@ -71,6 +52,7 @@ public void shutdown() {
7152
tronNetService.close();
7253
}
7354
dbManager.close();
55+
shutdown.countDown();
7456
}
7557

7658
@Override
@@ -80,7 +62,12 @@ public void startServices() {
8062

8163
@Override
8264
public void blockUntilShutdown() {
83-
services.blockUntilShutdown();
65+
try {
66+
shutdown.await();
67+
} catch (final InterruptedException e) {
68+
logger.debug("Interrupted, exiting", e);
69+
Thread.currentThread().interrupt();
70+
}
8471
}
8572

8673
@Override

‎framework/src/main/java/org/tron/common/application/CliApplication.java‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,28 +15,11 @@
1515

1616
package org.tron.common.application;
1717

18-
import org.tron.common.parameter.CommonParameter;
1918
import org.tron.core.ChainBaseManager;
20-
import org.tron.core.config.args.Args;
2119
import org.tron.core.db.Manager;
2220

2321
public class CliApplication implements Application {
2422

25-
@Override
26-
public void setOptions(Args args) {
27-
28-
}
29-
30-
@Override
31-
public void init(CommonParameter parameter) {
32-
33-
}
34-
35-
@Override
36-
public void initServices(CommonParameter parameter) {
37-
38-
}
39-
4023
@Override
4124
public void startup() {
4225

@@ -57,11 +40,6 @@ public void shutdownServices() {
5740

5841
}
5942

60-
@Override
61-
public void addService(Service service) {
62-
63-
}
64-
6543
@Override
6644
public Manager getDbManager() {
6745
return null;

‎framework/src/main/java/org/tron/common/application/HttpService.java‎

Lines changed: 35 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -15,67 +15,61 @@
1515

1616
package org.tron.common.application;
1717

18-
import com.google.common.base.Objects;
18+
import java.util.concurrent.CompletableFuture;
1919
import lombok.extern.slf4j.Slf4j;
20+
import org.eclipse.jetty.server.ConnectionLimit;
2021
import org.eclipse.jetty.server.Server;
22+
import org.eclipse.jetty.servlet.ServletContextHandler;
23+
import org.tron.core.config.args.Args;
2124

2225
@Slf4j(topic = "rpc")
23-
public abstract class HttpService implements Service {
26+
public abstract class HttpService extends AbstractService {
2427

2528
protected Server apiServer;
26-
protected int port;
29+
30+
protected String contextPath;
2731

2832
@Override
29-
public void blockUntilShutdown() {
30-
if (apiServer != null) {
31-
try {
32-
apiServer.join();
33-
} catch (InterruptedException e) {
34-
logger.warn("{}", e.getMessage());
35-
Thread.currentThread().interrupt();
36-
}
33+
public void innerStart() throws Exception {
34+
if (this.apiServer != null) {
35+
this.apiServer.start();
3736
}
3837
}
3938

4039
@Override
41-
public void start() {
42-
if (apiServer != null) {
43-
try {
44-
apiServer.start();
45-
logger.info("{} started, listening on {}", this.getClass().getSimpleName(), port);
46-
} catch (Exception e) {
47-
logger.error("{}", this.getClass().getSimpleName(), e);
48-
}
40+
public void innerStop() throws Exception {
41+
if (this.apiServer != null) {
42+
this.apiServer.stop();
4943
}
5044
}
5145

5246
@Override
53-
public void stop() {
54-
if (apiServer != null) {
55-
logger.info("{} shutdown...", this.getClass().getSimpleName());
56-
try {
57-
apiServer.stop();
58-
} catch (Exception e) {
59-
logger.warn("{}", this.getClass().getSimpleName(), e);
60-
}
61-
logger.info("{} shutdown complete", this.getClass().getSimpleName());
62-
}
47+
public CompletableFuture<Boolean> start() {
48+
initServer();
49+
ServletContextHandler context = initContextHandler();
50+
addServlet(context);
51+
addFilter(context);
52+
return super.start();
6353
}
6454

65-
@Override
66-
public boolean equals(Object o) {
67-
if (this == o) {
68-
return true;
55+
protected void initServer() {
56+
this.apiServer = new Server(this.port);
57+
int maxHttpConnectNumber = Args.getInstance().getMaxHttpConnectNumber();
58+
if (maxHttpConnectNumber > 0) {
59+
this.apiServer.addBean(new ConnectionLimit(maxHttpConnectNumber, this.apiServer));
6960
}
70-
if (o == null || getClass() != o.getClass()) {
71-
return false;
72-
}
73-
HttpService that = (HttpService) o;
74-
return port == that.port;
7561
}
7662

77-
@Override
78-
public int hashCode() {
79-
return Objects.hashCode(getClass().getSimpleName(), port);
63+
protected ServletContextHandler initContextHandler() {
64+
ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);
65+
context.setContextPath(this.contextPath);
66+
this.apiServer.setHandler(context);
67+
return context;
68+
}
69+
70+
protected abstract void addServlet(ServletContextHandler context);
71+
72+
protected void addFilter(ServletContextHandler context) {
73+
8074
}
8175
}

0 commit comments

Comments
 (0)