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

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

Conflicts:
	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/main.c

(cherry picked from commit 2214005c0f)
This commit is contained in:
Wilfred Spiegelenburg 2020-04-08 11:30:03 +10:00
parent 11aff6c269
commit a2067aafa9
No known key found for this signature in database
GPG Key ID: 7BB711D7AC5E7F29
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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