Apache/hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "YARN-10063. Add container-executor arguments --http/--https to usage. Contributed by Siddharth Ahuja"

Browse Source 
This reverts commit a2067aafa941344c2c1713ba835a107f7231c2cc.
This commit is contained in:
Wei-Chiu Chuang 2020-04-23 12:37:21 -07:00
parent c81844d8a5
commit 48f1c8ffb6
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/main.c
View File

@ -72,7 +72,7 @@ static void display_usage(FILE *stream) {
" initialize container: %2d appid tokens nm-local-dirs "
"nm-log-dirs cmd app...\n"
" launch container: %2d appid containerid workdir "
"container-script tokens http-option pidfile nm-local-dirs nm-log-dirs resources ",
"container-script tokens pidfile nm-local-dirs nm-log-dirs resources ",
INITIALIZE_CONTAINER, LAUNCH_CONTAINER);
if(is_tc_support_enabled()) {
@ -81,16 +81,17 @@ static void display_usage(FILE *stream) {
fprintf(stream, "\n");
}
fputs(
" where http-option is one of:\n"
" --http\n"
" --https keystorepath truststorepath\n", stream);
de = is_docker_support_enabled() ? enabled : disabled;
fprintf(stream,
"%11s launch docker container:%2d appid containerid workdir "
"container-script tokens http-option pidfile nm-local-dirs nm-log-dirs "
"docker-command-file resources ", de, LAUNCH_DOCKER_CONTAINER);
if(is_docker_support_enabled()) {
fprintf(stream,
" launch docker container: %2d appid containerid workdir "
"container-script tokens pidfile nm-local-dirs nm-log-dirs "
"docker-command-file resources ", LAUNCH_DOCKER_CONTAINER);
} else {
fprintf(stream,
"[DISABLED] launch docker container: %2d appid containerid workdir "
"container-script tokens pidfile nm-local-dirs nm-log-dirs "
"docker-command-file resources ", LAUNCH_DOCKER_CONTAINER);
}
if(is_tc_support_enabled()) {
fprintf(stream, "optional-tc-command-file\n");
@ -98,12 +99,7 @@ static void display_usage(FILE *stream) {
fprintf(stream, "\n");
}
fputs(
" where http-option is one of:\n"
" --http\n"
" --https keystorepath truststorepath\n", stream);
fprintf(stream,
fprintf(stream,
" signal container: %2d container-pid signal\n"
" delete as user: %2d relative-path\n"
" list as user: %2d relative-path\n",