* [PATCH] user-cr: Add --netns switch to user-cr checkpoint
@ 2010-04-02 13:38 Dan Smith
[not found] ` <1270215495-4371-1-git-send-email-danms-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
0 siblings, 1 reply; 3+ messages in thread
From: Dan Smith @ 2010-04-02 13:38 UTC (permalink / raw)
To: containers-qjLDD68F18O7TbgM5vRIOg
This allows the caller to set the CHECKPOINT_NETNS flag on the checkpoint
operation, thus triggering the checkpoint of network namespaces.
Signed-off-by: Dan Smith <danms-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
---
app-checkpoint.h | 1 +
checkpoint-main.c | 8 +++++++-
2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/app-checkpoint.h b/app-checkpoint.h
index f740085..c078f04 100644
--- a/app-checkpoint.h
+++ b/app-checkpoint.h
@@ -5,6 +5,7 @@ struct app_checkpoint_args {
int uerrfd;
int container;
int verbose;
+ int flags;
};
struct app_restart_args {
diff --git a/checkpoint-main.c b/checkpoint-main.c
index f6faa32..3fde9b6 100644
--- a/checkpoint-main.c
+++ b/checkpoint-main.c
@@ -30,6 +30,7 @@ static char usage_str[] =
" -l,--logfile=FILE write error and debug data to FILE (default=none)\n"
" --logile-fd=FD write error and debug data to file descriptor FD\n"
" -c,--container require the PID is a container-init\n"
+" -N,--netns checkpoint network namespace(s)\n"
" -v,--verbose verbose output\n"
"";
@@ -61,9 +62,10 @@ static void parse_args(struct app_checkpoint_args *args, int argc, char *argv[])
{ "logfile-fd", required_argument, NULL, 2 },
{ "container", no_argument, NULL, 'c' },
{ "verbose", no_argument, NULL, 'v' },
+ { "netns", no_argument, NULL, 'N' },
{ NULL, 0, NULL, 0 }
};
- static char optc[] = "hvco:l:";
+ static char optc[] = "hvco:l:N";
char *output;
char *logfile;
@@ -109,6 +111,9 @@ static void parse_args(struct app_checkpoint_args *args, int argc, char *argv[])
case 'v':
args->verbose = 1;
break;
+ case 'N':
+ args->flags |= CHECKPOINT_NETNS;
+ break;
default:
usage(usage_str);
}
@@ -164,6 +169,7 @@ int main(int argc, char *argv[])
exit(1);
}
+ flags = args.flags;
if (!args.container)
flags |= CHECKPOINT_SUBTREE;
--
1.6.3.3
^ permalink raw reply related [flat|nested] 3+ messages in thread[parent not found: <1270215495-4371-1-git-send-email-danms-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>]
* Re: [PATCH] user-cr: Add --netns switch to user-cr checkpoint [not found] ` <1270215495-4371-1-git-send-email-danms-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org> @ 2010-04-05 13:24 ` Serge E. Hallyn [not found] ` <20100405132402.GD32049-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org> 0 siblings, 1 reply; 3+ messages in thread From: Serge E. Hallyn @ 2010-04-05 13:24 UTC (permalink / raw) To: Dan Smith; +Cc: containers-qjLDD68F18O7TbgM5vRIOg Quoting Dan Smith (danms-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org): > This allows the caller to set the CHECKPOINT_NETNS flag on the checkpoint > operation, thus triggering the checkpoint of network namespaces. > > Signed-off-by: Dan Smith <danms-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org> Acked-by: Serge Hallyn <serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org> > --- > app-checkpoint.h | 1 + > checkpoint-main.c | 8 +++++++- > 2 files changed, 8 insertions(+), 1 deletions(-) > > diff --git a/app-checkpoint.h b/app-checkpoint.h > index f740085..c078f04 100644 > --- a/app-checkpoint.h > +++ b/app-checkpoint.h > @@ -5,6 +5,7 @@ struct app_checkpoint_args { > int uerrfd; > int container; > int verbose; > + int flags; > }; > > struct app_restart_args { > diff --git a/checkpoint-main.c b/checkpoint-main.c > index f6faa32..3fde9b6 100644 > --- a/checkpoint-main.c > +++ b/checkpoint-main.c > @@ -30,6 +30,7 @@ static char usage_str[] = > " -l,--logfile=FILE write error and debug data to FILE (default=none)\n" > " --logile-fd=FD write error and debug data to file descriptor FD\n" > " -c,--container require the PID is a container-init\n" > +" -N,--netns checkpoint network namespace(s)\n" > " -v,--verbose verbose output\n" > ""; > > @@ -61,9 +62,10 @@ static void parse_args(struct app_checkpoint_args *args, int argc, char *argv[]) > { "logfile-fd", required_argument, NULL, 2 }, > { "container", no_argument, NULL, 'c' }, > { "verbose", no_argument, NULL, 'v' }, > + { "netns", no_argument, NULL, 'N' }, > { NULL, 0, NULL, 0 } > }; > - static char optc[] = "hvco:l:"; > + static char optc[] = "hvco:l:N"; > char *output; > char *logfile; > > @@ -109,6 +111,9 @@ static void parse_args(struct app_checkpoint_args *args, int argc, char *argv[]) > case 'v': > args->verbose = 1; > break; > + case 'N': > + args->flags |= CHECKPOINT_NETNS; > + break; > default: > usage(usage_str); > } > @@ -164,6 +169,7 @@ int main(int argc, char *argv[]) > exit(1); > } > > + flags = args.flags; > if (!args.container) > flags |= CHECKPOINT_SUBTREE; > > -- > 1.6.3.3 > > _______________________________________________ > Containers mailing list > Containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org > https://lists.linux-foundation.org/mailman/listinfo/containers ^ permalink raw reply [flat|nested] 3+ messages in thread
[parent not found: <20100405132402.GD32049-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>]
* Re: [PATCH] user-cr: Add --netns switch to user-cr checkpoint [not found] ` <20100405132402.GD32049-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org> @ 2010-04-25 4:51 ` Oren Laadan 0 siblings, 0 replies; 3+ messages in thread From: Oren Laadan @ 2010-04-25 4:51 UTC (permalink / raw) To: Serge E. Hallyn; +Cc: containers-qjLDD68F18O7TbgM5vRIOg, Dan Smith Pulled, thanks. Serge E. Hallyn wrote: > Quoting Dan Smith (danms-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org): >> This allows the caller to set the CHECKPOINT_NETNS flag on the checkpoint >> operation, thus triggering the checkpoint of network namespaces. >> >> Signed-off-by: Dan Smith <danms-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org> > > Acked-by: Serge Hallyn <serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org> > >> --- >> app-checkpoint.h | 1 + >> checkpoint-main.c | 8 +++++++- >> 2 files changed, 8 insertions(+), 1 deletions(-) >> >> diff --git a/app-checkpoint.h b/app-checkpoint.h >> index f740085..c078f04 100644 >> --- a/app-checkpoint.h >> +++ b/app-checkpoint.h >> @@ -5,6 +5,7 @@ struct app_checkpoint_args { >> int uerrfd; >> int container; >> int verbose; >> + int flags; >> }; >> >> struct app_restart_args { >> diff --git a/checkpoint-main.c b/checkpoint-main.c >> index f6faa32..3fde9b6 100644 >> --- a/checkpoint-main.c >> +++ b/checkpoint-main.c >> @@ -30,6 +30,7 @@ static char usage_str[] = >> " -l,--logfile=FILE write error and debug data to FILE (default=none)\n" >> " --logile-fd=FD write error and debug data to file descriptor FD\n" >> " -c,--container require the PID is a container-init\n" >> +" -N,--netns checkpoint network namespace(s)\n" >> " -v,--verbose verbose output\n" >> ""; >> >> @@ -61,9 +62,10 @@ static void parse_args(struct app_checkpoint_args *args, int argc, char *argv[]) >> { "logfile-fd", required_argument, NULL, 2 }, >> { "container", no_argument, NULL, 'c' }, >> { "verbose", no_argument, NULL, 'v' }, >> + { "netns", no_argument, NULL, 'N' }, >> { NULL, 0, NULL, 0 } >> }; >> - static char optc[] = "hvco:l:"; >> + static char optc[] = "hvco:l:N"; >> char *output; >> char *logfile; >> >> @@ -109,6 +111,9 @@ static void parse_args(struct app_checkpoint_args *args, int argc, char *argv[]) >> case 'v': >> args->verbose = 1; >> break; >> + case 'N': >> + args->flags |= CHECKPOINT_NETNS; >> + break; >> default: >> usage(usage_str); >> } >> @@ -164,6 +169,7 @@ int main(int argc, char *argv[]) >> exit(1); >> } >> >> + flags = args.flags; >> if (!args.container) >> flags |= CHECKPOINT_SUBTREE; >> >> -- >> 1.6.3.3 >> >> _______________________________________________ >> Containers mailing list >> Containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org >> https://lists.linux-foundation.org/mailman/listinfo/containers > _______________________________________________ > Containers mailing list > Containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org > https://lists.linux-foundation.org/mailman/listinfo/containers > ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-04-25 4:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-02 13:38 [PATCH] user-cr: Add --netns switch to user-cr checkpoint Dan Smith
[not found] ` <1270215495-4371-1-git-send-email-danms-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
2010-04-05 13:24 ` Serge E. Hallyn
[not found] ` <20100405132402.GD32049-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
2010-04-25 4:51 ` Oren Laadan
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.