YARN-9061. Improve the GPU/FPGA module log message of container-executor. (Zhankun Tang via wangda)
Change-Id: Iece9b47438357077a53984a820d4d6423f480518 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9ed87567 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9ed87567 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9ed87567 Branch: refs/heads/HDFS-12943 Commit: 9ed87567ad0f1c26a263ce6d8fba56d066260c5c Parents: 579ef4b Author: Wangda Tan <wan...@apache.org> Authored: Wed Nov 28 14:31:31 2018 -0800 Committer: Wangda Tan <wan...@apache.org> Committed: Wed Nov 28 14:31:31 2018 -0800 ---------------------------------------------------------------------- .../native/container-executor/impl/modules/fpga/fpga-module.c | 5 +++-- .../native/container-executor/impl/modules/gpu/gpu-module.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/9ed87567/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/modules/fpga/fpga-module.c ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/modules/fpga/fpga-module.c b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/modules/fpga/fpga-module.c index c1a2f83..e947d7c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/modules/fpga/fpga-module.c +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/modules/fpga/fpga-module.c @@ -141,7 +141,7 @@ void reload_fpga_configuration() { /* * Format of FPGA request commandline: * - * c-e fpga --excluded_fpgas 0,1,3 --container_id container_x_y + * c-e --module-fpga --excluded_fpgas 0,1,3 --container_id container_x_y */ int handle_fpga_request(update_cgroups_parameters_function func, const char* module_name, int module_argc, char** module_argv) { @@ -213,7 +213,8 @@ int handle_fpga_request(update_cgroups_parameters_function func, if (!minor_devices) { // Minor devices is null, skip following call. - fprintf(ERRORFILE, "is not specified, skip cgroups call.\n"); + fprintf(ERRORFILE, + "--excluded-fpgas is not specified, skip cgroups call.\n"); goto cleanup; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/9ed87567/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/modules/gpu/gpu-module.c ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/modules/gpu/gpu-module.c b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/modules/gpu/gpu-module.c index 1a1b164..7522338 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/modules/gpu/gpu-module.c +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/modules/gpu/gpu-module.c @@ -141,7 +141,7 @@ void reload_gpu_configuration() { /* * Format of GPU request commandline: * - * c-e gpu --excluded_gpus 0,1,3 --container_id container_x_y + * c-e --module-gpu --excluded_gpus 0,1,3 --container_id container_x_y */ int handle_gpu_request(update_cgroups_parameters_func func, const char* module_name, int module_argc, char** module_argv) { @@ -213,7 +213,8 @@ int handle_gpu_request(update_cgroups_parameters_func func, if (!minor_devices) { // Minor devices is null, skip following call. - fprintf(ERRORFILE, "is not specified, skip cgroups call.\n"); + fprintf(ERRORFILE, + "--excluded_gpus is not specified, skip cgroups call.\n"); goto cleanup; } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
