Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
29 changes: 9 additions & 20 deletions fe/fe-core/src/main/java/org/apache/doris/PaloFe.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import org.apache.doris.common.Version;
import org.apache.doris.common.util.JdkUtils;
import org.apache.doris.common.util.NetUtils;
import org.apache.doris.http.HttpServer;
import org.apache.doris.httpv2.HttpServer;
import org.apache.doris.journal.bdbje.BDBDebugger;
import org.apache.doris.journal.bdbje.BDBTool;
import org.apache.doris.journal.bdbje.BDBToolOptions;
Expand Down Expand Up @@ -134,25 +134,14 @@ public static void start(String dorisHomeDir, String pidDir, String[] args) {

feServer.start();

if (!Config.enable_http_server_v2) {
HttpServer httpServer = new HttpServer(
Config.http_port,
Config.http_max_line_length,
Config.http_max_header_size,
Config.http_max_chunk_size
);
httpServer.setup();
httpServer.start();
} else {
org.apache.doris.httpv2.HttpServer httpServer2 = new org.apache.doris.httpv2.HttpServer();
httpServer2.setPort(Config.http_port);
httpServer2.setMaxHttpPostSize(Config.jetty_server_max_http_post_size);
httpServer2.setAcceptors(Config.jetty_server_acceptors);
httpServer2.setSelectors(Config.jetty_server_selectors);
httpServer2.setWorkers(Config.jetty_server_workers);
httpServer2.start(dorisHomeDir);
}

HttpServer httpServer = new HttpServer();
httpServer.setPort(Config.http_port);
httpServer.setMaxHttpPostSize(Config.jetty_server_max_http_post_size);
httpServer.setAcceptors(Config.jetty_server_acceptors);
httpServer.setSelectors(Config.jetty_server_selectors);
httpServer.setWorkers(Config.jetty_server_workers);
httpServer.start(dorisHomeDir);

qeService.start();

ThreadPoolManager.registerAllThreadPoolMetric();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@
import org.apache.doris.ha.FrontendNodeType;
import org.apache.doris.ha.HAProtocol;
import org.apache.doris.ha.MasterInfo;
import org.apache.doris.http.meta.MetaBaseAction;
import org.apache.doris.httpv2.meta.MetaBaseAction;
import org.apache.doris.journal.JournalCursor;
import org.apache.doris.journal.JournalEntity;
import org.apache.doris.journal.bdbje.Timestamp;
Expand Down
16 changes: 0 additions & 16 deletions fe/fe-core/src/main/java/org/apache/doris/common/Config.java
Original file line number Diff line number Diff line change
Expand Up @@ -327,22 +327,6 @@ public class Config extends ConfigBase {
*/
@ConfField public static int http_port = 8030;

/*
* Netty http param
*/
@ConfField public static int http_max_line_length = HttpServer.DEFAULT_MAX_LINE_LENGTH;

@ConfField public static int http_max_header_size = HttpServer.DEFAULT_MAX_HEADER_SIZE;

@ConfField public static int http_max_chunk_size = HttpServer.DEFAULT_MAX_CHUNK_SIZE;

/**
* The backlog_num for netty http server
* When you enlarge this backlog_num, you should enlarge the value in
* the linux /proc/sys/net/core/somaxconn file at the same time
*/
@ConfField public static int http_backlog_num = 1024;

/**
* Jetty container default configuration
* Jetty's thread architecture model is very simple, divided into three thread pools:
Expand Down

This file was deleted.

Loading