6:30 p.m.
Radostin Stoyanov (2):
lxc: s/subtreee/subtree/
lxc: Clean up /.oldroot
src/lxc/lxc_container.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
--
2.14.3
6:30 p.m.
New subject: [libvirt] [PATCH 1/2] lxc: s/subtreee/subtree/
Signed-off-by: Radostin Stoyanov <rstoyanov1(a)gmail.com>
---
src/lxc/lxc_container.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index 532fd0be0..665b93a0a 100644
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -574,7 +574,7 @@ static int lxcContainerUnmountSubtree(const char *prefix,
const char *failedUmount = NULL;
int ret = -1;
- VIR_DEBUG("Unmount subtreee from %s", prefix);
+ VIR_DEBUG("Unmount subtree from %s", prefix);
if (virFileGetMountReverseSubtree("/proc/mounts", prefix,
&mounts, &nmounts) < 0)
--
2.14.3
11:40 p.m.
New subject: [libvirt] [PATCH 1/2] lxc: s/subtreee/subtree/
On Sun, Apr 15, 2018 at 04:30:10PM +0100, Radostin Stoyanov wrote:
Signed-off-by: Radostin Stoyanov <rstoyanov1(a)gmail.com>
---
src/lxc/lxc_container.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
And pushed.
Jano
6:30 p.m.
New subject: [libvirt] [PATCH 2/2] lxc: Clean up /.oldroot
Remove the /.oldroot directory after it has been unmounted (at the end
of lxcContainerSetupPivotRoot). Ignore errors silently.
Signed-off-by: Radostin Stoyanov <rstoyanov1(a)gmail.com>
---
src/lxc/lxc_container.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index 665b93a0a..dd4e38703 100644
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -1811,6 +1811,9 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef,
if (lxcContainerUnmountSubtree("/.oldroot", true) < 0)
goto cleanup;
+ if (virFileRemove("/.oldroot", 0, 0) < 0)
+ VIR_DEBUG("Failed to remove /.oldroot after start");
+
ret = 0;
cleanup:
--
2.14.3
12:33 p.m.
New subject: [libvirt] [PATCH 2/2] lxc: Clean up /.oldroot
On Sun, Apr 15, 2018 at 04:30:11PM +0100, Radostin Stoyanov wrote:
Remove the /.oldroot directory after it has been unmounted (at the
end
of lxcContainerSetupPivotRoot). Ignore errors silently.
Signed-off-by: Radostin Stoyanov <rstoyanov1(a)gmail.com>
---
src/lxc/lxc_container.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index 665b93a0a..dd4e38703 100644
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -1811,6 +1811,9 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef,
if (lxcContainerUnmountSubtree("/.oldroot", true) < 0)
goto cleanup;
+ if (virFileRemove("/.oldroot", 0, 0) < 0)
+ VIR_DEBUG("Failed to remove /.oldroot after start");
+
I think this introduces a race condition. There can be two containers
with the same root filesystem. If we start both at the same time, then
this deletion of /.oldroot can cause the other contanier to fail to
start if it saw that /.oldroot already existed & it thus tried to skip
mkdir.
Leaving the empty directory is harmless IMHO
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
2:24 p.m.
New subject: [libvirt] [PATCH 2/2] lxc: Clean up /.oldroot
On 16/04/18 10:33, Daniel P. Berrangé wrote:
On Sun, Apr 15, 2018 at 04:30:11PM +0100, Radostin Stoyanov wrote:
> Remove the /.oldroot directory after it has been unmounted (at the end
> of lxcContainerSetupPivotRoot). Ignore errors silently.
>
> Signed-off-by: Radostin Stoyanov <rstoyanov1(a)gmail.com>
> ---
> src/lxc/lxc_container.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
> index 665b93a0a..dd4e38703 100644
> --- a/src/lxc/lxc_container.c
> +++ b/src/lxc/lxc_container.c
> @@ -1811,6 +1811,9 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef,
> if (lxcContainerUnmountSubtree("/.oldroot", true) < 0)
> goto cleanup;
>
> + if (virFileRemove("/.oldroot", 0, 0) < 0)
> + VIR_DEBUG("Failed to remove /.oldroot after start");
> +
I think this introduces a race condition. There can be two containers
with the same root filesystem. If we start both at the same time, then
this deletion of /.oldroot can cause the other contanier to fail to
start if it saw that /.oldroot already existed & it thus tried to skip
mkdir.
Thank you for the review, I hadn't thought about this case.
Leaving the empty directory is harmless IMHO
I agree that
leaving the empty directory is harmless.
Regards,
Radostin
2487
days inactive
2488
days old
5 comments
3 participants
participants (3)
-
Daniel P. Berrangé -
Ján Tomko -
Radostin Stoyanov