You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ey...@apache.org on 2019/04/18 23:01:30 UTC
[hadoop] branch branch-3.2 updated: YARN-8622. Fixed
container-executor compilation on MacOSX. Contributed by Siyao Meng
This is an automated email from the ASF dual-hosted git repository.
eyang pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.2 by this push:
new 4a64dab YARN-8622. Fixed container-executor compilation on MacOSX. Contributed by Siyao Meng
4a64dab is described below
commit 4a64dab0ddb07c0724f9e805bd73fe3cff6db809
Author: Eric Yang <ey...@apache.org>
AuthorDate: Thu Apr 18 18:57:14 2019 -0400
YARN-8622. Fixed container-executor compilation on MacOSX.
Contributed by Siyao Meng
(cherry picked from commit ef97a20831677c055aa6bff6ad0649cbb3a56a86)
---
.../src/main/native/container-executor/impl/utils/docker-util.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/utils/docker-util.c b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/utils/docker-util.c
index 1786062..44adfc2 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/utils/docker-util.c
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/utils/docker-util.c
@@ -1381,14 +1381,22 @@ static int check_privileges(const char *user) {
exit(INITIALIZE_USER_FAILED);
}
+#ifdef __linux__
int rc = getgrouplist(user, pw->pw_gid, groups, &ngroups);
+#else
+ int rc = getgrouplist(user, pw->pw_gid, (int *)groups, &ngroups);
+#endif
if (rc < 0) {
groups = (gid_t *) alloc_and_clear_memory(ngroups, sizeof(gid_t));
if (groups == NULL) {
fprintf(ERRORFILE, "Failed to allocate buffer for group lookup for user %s.\n", user);
exit(OUT_OF_MEMORY);
}
+#ifdef __linux__
if (getgrouplist(user, pw->pw_gid, groups, &ngroups) == -1) {
+#else
+ if (getgrouplist(user, pw->pw_gid, (int *)groups, &ngroups) == -1) {
+#endif
fprintf(ERRORFILE, "Fail to lookup groups for user %s.\n", user);
ret = 2;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org