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

Only mount non-empty directories for cgroups (miklos.szegedi@cloudera.com via rkanter) 

(cherry picked from commit 0838fe8337)
(cherry picked from commit c1dc4ca2c6)
This commit is contained in:
Robert Kanter 2018-07-09 10:37:20 -07:00 committed by Miklos Szegedi
parent f5fd5aa025
commit 92f02f97fd
2 changed files with 49 additions and 1 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/container-executor.c
View File

@ -2221,6 +2221,28 @@ void chown_dir_contents(const char *dir_path, uid_t uid, gid_t gid) {
free(path_tmp); free(path_tmp);
} }
int is_empty(char *target_dir) {
DIR *dir = NULL;
struct dirent *entry = NULL;
dir = opendir(target_dir);
if (!dir) {
fprintf(LOGFILE, "Could not open directory %s - %s\n", target_dir,
strerror(errno));
return 0;
}
while ((entry = readdir(dir)) != NULL) {
if (strcmp(entry->d_name, ".") == 0) {
continue;
}
if (strcmp(entry->d_name, "..") == 0) {
continue;
}
fprintf(LOGFILE, "Directory is not empty %s\n", target_dir);
return 0;
}
return 1;
}
/** /**
* Mount a cgroup controller at the requested mount point and create * Mount a cgroup controller at the requested mount point and create
* a hierarchy for the Hadoop NodeManager to manage. * a hierarchy for the Hadoop NodeManager to manage.
@ -2255,7 +2277,13 @@ int mount_cgroup(const char *pair, const char *hierarchy) {
result = -1; result = -1;
} else { } else {
if (strstr(mount_path, "..") != NULL) { if (strstr(mount_path, "..") != NULL) {
fprintf(LOGFILE, "Unsupported cgroup mount path detected.\n"); fprintf(LOGFILE, "Unsupported cgroup mount path detected. %s\n",
mount_path);
result = INVALID_COMMAND_PROVIDED;
goto cleanup;
}
if (!is_empty(mount_path)) {
fprintf(LOGFILE, "cgroup mount path is not empty. %s\n", mount_path);
result = INVALID_COMMAND_PROVIDED; result = INVALID_COMMAND_PROVIDED;
goto cleanup; goto cleanup;
} }

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

@ -1197,6 +1197,23 @@ void test_trim_function() {
free(trimmed); free(trimmed);
} }
void test_is_empty() {
printf("\nTesting is_empty function\n");
if (is_empty("/")) {
printf("FAIL: / should not be empty\n");
exit(1);
}
if (is_empty("/tmp/2938rf2983hcqnw8ud/noexist")) {
printf("FAIL: /tmp/2938rf2983hcqnw8ud/noexist should not exist\n");
exit(1);
}
mkdir("/tmp/2938rf2983hcqnw8ud/emptydir", S_IRWXU);
if (!is_empty("/tmp/2938rf2983hcqnw8ud/emptydir")) {
printf("FAIL: /tmp/2938rf2983hcqnw8ud/emptydir be empty\n");
exit(1);
}
}
// This test is expected to be executed either by a regular // This test is expected to be executed either by a regular
// user or by root. If executed by a regular user it doesn't // user or by root. If executed by a regular user it doesn't
// test all the functions that would depend on changing the // test all the functions that would depend on changing the
@ -1258,6 +1275,9 @@ int main(int argc, char **argv) {
printf("\nStarting tests\n"); printf("\nStarting tests\n");
printf("\ntest_is_empty()\n");
test_is_empty();
printf("\nTesting recursive_unlink_children()\n"); printf("\nTesting recursive_unlink_children()\n");
test_recursive_unlink_children(); test_recursive_unlink_children();