Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Symlinks support, handle non-zero exit status, small log changes #1

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Symlinks support, handle non-zero exit status, small log changes #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a7b6e11
spfs: Handle non-zero exit status in cleanup_spfs_mount()
Jan 23, 2018
1aa22a7
spfs: Main process wakes and kills its children on exit
Jan 18, 2018
387e19a
file_obj: add symlinks support
mihalicyn Feb 27, 2020
0096660
socket: add socket fd in log messages
mihalicyn Mar 4, 2020
a52b763
manager: add logs in sigchld_handler for "replacer" process exit event
mihalicyn Mar 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 30 additions & 21 deletions manager/context.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,25 +45,37 @@ const char *mgr_ovz_id(void)
static void cleanup_spfs_mount(struct spfs_manager_context_s *ctx,
struct spfs_info_s *info, int status)
{
bool killed = WIFSIGNALED(status);
bool failed = WIFSIGNALED(status) || !!WEXITSTATUS(status);

pr_debug("removing info %s from the list\n", info->mnt.id);
pr_debug("removing info %s from the list (replacer pid %d)\n",
info->mnt.id, info->replacer);

if (killed)
/* SPFS master was killed. We need to release the reference */
if (failed) {
/* SPFS master was failed. We need to release the reference */
spfs_release_mnt(info);
if (info->replacer > 0 && kill(info->replacer, SIGKILL))
pr_perror("Failed to kill replacer");
}

info->dead = true;
del_spfs_info(ctx->spfs_mounts, info);

if (unlink(info->socket_path))
pr_perror("failed to unlink %s", info->socket_path);

spfs_cleanup_env(info, killed);
spfs_cleanup_env(info, failed);

close_namespaces(info->ns_fds);
}

static inline void pr_term_mnt_service_info(pid_t pid, int status, const char *mnt, const char* tag)
{
if (WIFEXITED(status))
pr_debug("spfs (mnt_id %s) %s (pid %d) exited, status=%d\n", mnt, tag, pid, WEXITSTATUS(status));
else
pr_err("spfs (mnt_id %s) %s (pid %d) killed by signal %d (%s)\n", mnt, tag, pid, WTERMSIG(status), strsignal(WTERMSIG(status)));
}

static void sigchld_handler(int signal, siginfo_t *siginfo, void *data)
{
struct spfs_manager_context_s *ctx = &spfs_manager_context;
Expand All @@ -75,29 +87,26 @@ static void sigchld_handler(int signal, siginfo_t *siginfo, void *data)
while ((pid = waitpid(-1, &status, WNOHANG)) > 0) {
struct spfs_info_s *info;

if (WIFEXITED(status))
pr_debug("%d exited, status=%d\n", pid, WEXITSTATUS(status));
else
pr_err("%d killed by signal %d (%s)\n", pid, WTERMSIG(status), strsignal(WTERMSIG(status)));

info = find_spfs_by_replacer(ctx->spfs_mounts, pid);
if (info) {
if ((info = find_spfs_by_replacer(ctx->spfs_mounts, pid))) {
if (WEXITSTATUS(status) == 0)
/* SPFS has been successfully replaced.
* Now we can release spfs mount by closing
* corresponding fd.
*/
spfs_release_mnt(info);
} else {
info = find_spfs_by_pid(ctx->spfs_mounts, pid);
if (info) {
pr_info("spfs %s master has exited\n", info->mnt.id);
cleanup_spfs_mount(ctx, info, status);
if (list_empty(&ctx->spfs_mounts->list) && ctx->exit_with_spfs) {
pr_info("spfs list is empty. Exiting.\n");
exit(0);
}

pr_term_mnt_service_info(pid, status, info->mnt.id, "replacer");
info->replacer = -1;
} else if ((info = find_spfs_by_pid(ctx->spfs_mounts, pid))) {
pr_term_mnt_service_info(pid, status, info->mnt.id, "master");

cleanup_spfs_mount(ctx, info, status);
if (list_empty(&ctx->spfs_mounts->list) && ctx->exit_with_spfs) {
pr_info("spfs list is empty. Exiting.\n");
exit(0);
}
} else {
pr_term_mnt_service_info(pid, status, "unknown", "unknown");
}
}

Expand Down
6 changes: 5 additions & 1 deletion manager/file_obj.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,10 @@ fobj_ops_t fobj_ops[] = {
.early_open = unix_sk_early_open,
.close = reg_file_close,
},
[FTYPE_LINK] = {
.open = reg_file_open,
.close = reg_file_close,
},
};

static file_type_t convert_mode_to_type(mode_t mode)
Expand Down Expand Up @@ -233,9 +237,9 @@ static int get_file_ops(mode_t mode, fobj_ops_t **ops)
case FTYPE_DIR:
case FTYPE_FIFO:
case FTYPE_SOCK:
case FTYPE_LINK:
*ops = &fobj_ops[type];
return 0;
case FTYPE_LINK:
case FTYPE_CHR:
case FTYPE_BLK:
break;
Expand Down
9 changes: 5 additions & 4 deletions manager/spfs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ int create_spfs_info(const char *id,
INIT_LIST_HEAD(&info->processes);

info->mode = SPFS_REPLACE_MODE_HOLD;
info->replacer = -1;

*i = info;

Expand Down Expand Up @@ -409,9 +410,9 @@ int spfs_prepare_env(struct spfs_info_s *info, const char *proxy_dir)
return err ? err : res;
}

static int __spfs_cleanup_env(struct spfs_info_s *info, bool killed)
static int __spfs_cleanup_env(struct spfs_info_s *info, bool failed)
{
if (killed && umount(info->work_dir)) {
if (failed && umount(info->work_dir)) {
pr_perror("failed to umount %s", info->work_dir);
return -errno;
}
Expand All @@ -423,7 +424,7 @@ static int __spfs_cleanup_env(struct spfs_info_s *info, bool killed)
return 0;
}

int spfs_cleanup_env(struct spfs_info_s *info, bool killed)
int spfs_cleanup_env(struct spfs_info_s *info, bool failed)
{
int err, res;
unsigned orig_ns_mask;
Expand All @@ -432,7 +433,7 @@ int spfs_cleanup_env(struct spfs_info_s *info, bool killed)
if (res)
return res;

err = __spfs_cleanup_env(info, killed);
err = __spfs_cleanup_env(info, failed);

res = leave_spfs_context(info, orig_ns_mask);

Expand Down
4 changes: 2 additions & 2 deletions src/socket.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ int unreliable_conn_handler(int sock, void *data,
return -errno;
}
if (bytes == 0) {
pr_debug("%s: peer was closed\n", __func__);
pr_debug("%s: peer was closed for fd %d\n", __func__, sock);
return -ECONNABORTED;
}

Expand Down Expand Up @@ -105,7 +105,7 @@ int unreliable_socket_loop(int psock, void *data, bool async,
break;
}

pr_debug("%s: accepted new socket\n", __func__);
pr_debug("%s: accepted new socket fd %d\n", __func__, sock);

do {
err = unreliable_conn_handler(sock, data, packet_handler);
Expand Down