[lxc-devel] [lxc/lxc] 7aebd7: openvswitch: delete ports intelligently

GitHub noreply at github.com
Tue Aug 29 21:22:33 UTC 2017


  Branch: refs/heads/stable-2.0
  Home:   https://github.com/lxc/lxc
  Commit: 7aebd70c35588e2315f3832b12df98a481bdafb3
      https://github.com/lxc/lxc/commit/7aebd70c35588e2315f3832b12df98a481bdafb3
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-29 (Tue, 29 Aug 2017)

  Changed paths:
    M src/lxc/conf.c
    M src/lxc/lxc_user_nic.c
    M src/lxc/network.c
    M src/lxc/network.h

  Log Message:
  -----------
  openvswitch: delete ports intelligently

So far, when creating veth devices attached to openvswitch bridges we used to
fork() off a thread on container startup. This thread was kept around until the
container shut down. I have no good explanation why we did it that why but it's
certainly not necessary. Instead, let's fork() off the thread on container
shutdown to delete the veth.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: 8fb5d4f8161a6f5af6c2d06f3871b1ad20aa14e5
      https://github.com/lxc/lxc/commit/8fb5d4f8161a6f5af6c2d06f3871b1ad20aa14e5
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-29 (Tue, 29 Aug 2017)

  Changed paths:
    M src/lxc/conf.c

  Log Message:
  -----------
  conf: refactor network deletion

I'm ashamed at how aweful my previous code was.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: da92a44e6969bf4f4e14256c09fc90223bb19910
      https://github.com/lxc/lxc/commit/da92a44e6969bf4f4e14256c09fc90223bb19910
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-29 (Tue, 29 Aug 2017)

  Changed paths:
    M src/lxc/conf.c

  Log Message:
  -----------
  conf: do not check union on wrong net type

This will obviously not work.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: 6df3fc2dbe061e1c1da072be540a1583877268b7
      https://github.com/lxc/lxc/commit/6df3fc2dbe061e1c1da072be540a1583877268b7
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-29 (Tue, 29 Aug 2017)

  Changed paths:
    M src/lxc/attach.c
    M src/lxc/attach.h

  Log Message:
  -----------
  attach: non-functional changes

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: 90ac6b6d0d781497490302c9739617420cbafe6a
      https://github.com/lxc/lxc/commit/90ac6b6d0d781497490302c9739617420cbafe6a
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-29 (Tue, 29 Aug 2017)

  Changed paths:
    M src/lxc/conf.c

  Log Message:
  -----------
  conf: non-functional changes

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: 291e454c9ae3a2dd2979f0f43b8f573db0f7adaf
      https://github.com/lxc/lxc/commit/291e454c9ae3a2dd2979f0f43b8f573db0f7adaf
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-29 (Tue, 29 Aug 2017)

  Changed paths:
    M src/lxc/conf.c

  Log Message:
  -----------
  conf: do not deref null pointer

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: 2882c08543b951f27695b8ac1a89f25a3ff05367
      https://github.com/lxc/lxc/commit/2882c08543b951f27695b8ac1a89f25a3ff05367
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-29 (Tue, 29 Aug 2017)

  Changed paths:
    M src/lxc/cgroups/cgfsng.c

  Log Message:
  -----------
  cgfsng: non-functional changes

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: b59c609a72c2c6fb75914e8be9adc3dbdb651866
      https://github.com/lxc/lxc/commit/b59c609a72c2c6fb75914e8be9adc3dbdb651866
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-29 (Tue, 29 Aug 2017)

  Changed paths:
    M src/lxc/lxc_user_nic.c

  Log Message:
  -----------
  lxc-user-nic: non-functional changes

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: 5af4d18cab4408a9a797a92e2cea945efbd2f791
      https://github.com/lxc/lxc/commit/5af4d18cab4408a9a797a92e2cea945efbd2f791
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-29 (Tue, 29 Aug 2017)

  Changed paths:
    M src/lxc/lxc_user_nic.c

  Log Message:
  -----------
  lxc-user-nic: fix memleak

get_new_nicname() calls lxc_mkifname() which allocates memory and returns it to
the caller. The way get_new_nicname() and get_nic_if_avail() were implemented
they hid that fact by returning a boolean. That doesn't make sense. Let's
rather have them return a pointer to the allocated nic name which the caller
needs to free.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: c76f89f0638d5e57ba77c40f66b4bf7a4ab2b61b
      https://github.com/lxc/lxc/commit/c76f89f0638d5e57ba77c40f66b4bf7a4ab2b61b
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-29 (Tue, 29 Aug 2017)

  Changed paths:
    M src/lxc/lxc_user_nic.c

  Log Message:
  -----------
  lxc-user-nic: add new {create,delete} subcommands

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: ee6ce99dd627d44c0dc10bfe9d83c5a46051b7be
      https://github.com/lxc/lxc/commit/ee6ce99dd627d44c0dc10bfe9d83c5a46051b7be
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-29 (Tue, 29 Aug 2017)

  Changed paths:
    M src/tests/lxc-test-usernic.in

  Log Message:
  -----------
  tests: adapt lxc-user-nic tests to new syntax

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: 859d1a2860a524309fde8f07c0d52d0ec1987ebf
      https://github.com/lxc/lxc/commit/859d1a2860a524309fde8f07c0d52d0ec1987ebf
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-29 (Tue, 29 Aug 2017)

  Changed paths:
    M src/lxc/conf.c
    M src/lxc/lxc_user_nic.c

  Log Message:
  -----------
  conf: adapt to lxc-user-nic usage

- lxc-user-nic gains the subcommands {create,delete}
- dup2() STDERR_FILENO as well so that we can show helpful messages in our logs
  on failure
- initialize output buffer so that we don't print garbage

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: d3925ebd4d40bd7de3b37f8097f441cf6cfcada0
      https://github.com/lxc/lxc/commit/d3925ebd4d40bd7de3b37f8097f441cf6cfcada0
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-29 (Tue, 29 Aug 2017)

  Changed paths:
    M src/lxc/lxc_user_nic.c

  Log Message:
  -----------
  lxc-user-nic: rework renaming net devices

This should make things a little less convoluted.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: 07bb83244b563a5205230864cbdd71ae75b890bd
      https://github.com/lxc/lxc/commit/07bb83244b563a5205230864cbdd71ae75b890bd
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-29 (Tue, 29 Aug 2017)

  Changed paths:
    M src/lxc/conf.c
    M src/lxc/lxc_user_nic.c

  Log Message:
  -----------
  network: send ifindex for unpriv networks

We use the ifindex as an indicator that liblxc created the network so let's
record it for the unprivileged case as well.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: baeba6732ff143ecb345284d667f673980d91ad3
      https://github.com/lxc/lxc/commit/baeba6732ff143ecb345284d667f673980d91ad3
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-29 (Tue, 29 Aug 2017)

  Changed paths:
    M src/lxc/conf.h
    M src/lxc/confile_utils.c

  Log Message:
  -----------
  network: log ifindex

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: 6e3df68926018111486ce678ecfcf2220b97efd1
      https://github.com/lxc/lxc/commit/6e3df68926018111486ce678ecfcf2220b97efd1
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-29 (Tue, 29 Aug 2017)

  Changed paths:
    M src/lxc/conf.c
    M src/lxc/conf.h
    M src/lxc/lxc_user_nic.c

  Log Message:
  -----------
  network: delete ovs for unprivileged networks

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: eb0f82a1c276dd8d582b1170720c09af67fc2fc5
      https://github.com/lxc/lxc/commit/eb0f82a1c276dd8d582b1170720c09af67fc2fc5
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-29 (Tue, 29 Aug 2017)

  Changed paths:
    M src/lxc/lxc_user_nic.c

  Log Message:
  -----------
  lxc-user-nic: non-functional changes

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: e7012687ebc5d251c2b57a029fa8758278417175
      https://github.com/lxc/lxc/commit/e7012687ebc5d251c2b57a029fa8758278417175
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-29 (Tue, 29 Aug 2017)

  Changed paths:
    M src/lxc/conf.c
    M src/lxc/conf.h
    M src/lxc/lxc_user_nic.c

  Log Message:
  -----------
  lxc-user-nic: check db before trying to delete

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: 9d4408c37ba74c00fde96fa427a1e58e92b903e0
      https://github.com/lxc/lxc/commit/9d4408c37ba74c00fde96fa427a1e58e92b903e0
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-29 (Tue, 29 Aug 2017)

  Changed paths:
    M src/lxc/conf.c

  Log Message:
  -----------
  conf: increase lxc-user-nic buffer

This will allow us log more detailed failures.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: 4d26f2474ae2de8aa9e1b295513f49b0fcb52992
      https://github.com/lxc/lxc/commit/4d26f2474ae2de8aa9e1b295513f49b0fcb52992
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-29 (Tue, 29 Aug 2017)

  Changed paths:
    M src/lxc/conf.c
    M src/lxc/conf.h
    M src/lxc/confile_utils.c
    M src/lxc/lxc_user_nic.c
    M src/lxc/network.c
    M src/lxc/network.h
    M src/lxc/start.c

  Log Message:
  -----------
  network: non-functional changes

This moves all of the network handling code into network.{c,h}. This makes what
is going on much clearer. Also it's easier to find relevant code if it is all
in one place.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: d3e7b8ad181e6052ccb572c6c5c0140ef9d80385
      https://github.com/lxc/lxc/commit/d3e7b8ad181e6052ccb572c6c5c0140ef9d80385
  Author: Stéphane Graber <stgraber at stgraber.org>
  Date:   2017-08-29 (Tue, 29 Aug 2017)

  Changed paths:
    M src/lxc/attach.c
    M src/lxc/attach.h
    M src/lxc/cgroups/cgfsng.c
    M src/lxc/conf.c
    M src/lxc/conf.h
    M src/lxc/confile_utils.c
    M src/lxc/lxc_user_nic.c
    M src/lxc/network.c
    M src/lxc/network.h
    M src/lxc/start.c
    M src/tests/lxc-test-usernic.in

  Log Message:
  -----------
  Merge pull request #1768 from brauner/2017-08-29/stable_2.0_cherry_picks

stable 2.0: cherry picks


Compare: https://github.com/lxc/lxc/compare/d99d8dbc5d8c...d3e7b8ad181e


More information about the lxc-devel mailing list