+ + #### Unix キャラクタデバイス、Unix ブロックデバイスのホットプラグのサポート + + unix タイプのデバイスに新しい必須プロパティを追加しました。false に設定すると、LXD は要求されたパスがホスト上で利用できるようになってから、自動的にコンテナに追加します。 + + + これで次のようなことができるようになります: + + lxc config device add c1 ttyUSB0 unix-char path=/dev/ttyUSB0 required=false + + + c1 コンテナは、USB シリアルデバイスがシステムにプラグインされるとすぐにアクセスし、システムから抜かれると自動的に削除されます。 + + #### ストレージボリュームのローカルコピー/移動 + + ストレージプール間で、カスタムのストレージボリュームをコピーや移動できるようになりました。 + + stgraber at castiana:~$ lxc storage volume copy ssd/example default/example + Storage volume copied successfully! + + stgraber at castiana:~$ lxc storage volume move ssd/example default/example + Storage volume moved successfully! + + #### カスタムストレージボリュームのリモート転送 + + 新しいストレージマイグレーション API が導入されました。コンテナのマイグレーションで使うのと同じ構文を使って、LXD サーバ間で同様に操作できます。 + + #### ネットワーク接続を転送する新しい `proxy` デバイスタイプ + + ホストとコンテナ間の TCP 接続を転送できるデバイスタイプである proxy デバイスタイプが新たに追加されました。 + + + 例えば、ホスト上の port 80 への任意の接続をコンテナ c1 の localhost の IP アドレスの 80 番に転送するには: + + lxc config device add c1 http proxy listen=tcp:0.0.0.0:80 connect=tcp:127.0.0.1:80 + + #### /dev/lxd を経由したイベント通知 + + コンテナ内に対して提供されている REST API 使い、設定やデバイスが追加、削除、変更された場合のイベントを受け取ることができるようになりました。 + + root at c1:~# curl -i -N -H "Connection: Upgrade" -H "Upgrade: websocket" --header "Sec-WebSocket-Version: 13" --header "Sec-WebSocket-Key: SGVsbG8sIHdvcmxkIQ==" --unix-socket /dev/lxd/sock lxd/1.0/events + HTTP/1.1 101 Switching Protocols + Upgrade: websocket + Connection: Upgrade + Sec-WebSocket-Accept: qGEgH3En71di5rrssAZTmtRTyFk= + + {"metadata":{"key":"user.foo","old_value":"","value":"bar"},"timestamp":"2018-04-02T23:58:54.433992023-04:00","type":"config"} + {"metadata":{"action":"added","config":{"path":"/home","source":"/home","type":"disk"},"name":"home"},"timestamp":"2018-04-02T23:59:25.65007597-04:00","type":"device"} + + #### コマンドラインパーサーの変更 + + 以前使っていたコマンドラインパーサの gnuflag は、LXD のコマンドライン構造とあまりマッチしておらず、ヘルプやエラーメッセージがわかりづらくなっていました。そこで、多数の主要な Go プロジェクトに使われている、[cobra](https://github.com/spf13/cobra) コマンドラインパーサに移行しました。 + + #### `lxc list` のプロセス数表示 + + lxc list で表示を指定できるカラムに "processes" が追加されました。コンテナの内部で動作しているプロセスの数を表示します。 + + stgraber at castiana:~$ lxc list -c nsN c1 + +------+---------+-----------+ + | NAME | STATE | PROCESSES | + +------+---------+-----------+ + | c1 | RUNNING | 33 | + +------+---------+-----------+ + + #### `lxc storage info` サブコマンド + + ストレージプールの情報をわかりやすく取得できる info サブコマンドが新たに追加されました: + + stgraber at castiana:~$ lxc storage info ssd + info: + description: "" + driver: dir + name: ssd + space used: 9.29GB + total space: 173.12GB + used by: {} + + #### 代替 IPv4 ゲートウェイ向けのオプション + + LXD が管理するブリッジ用に新たに `ipv4.dhcp.gateway` オプションが利用できます。LXD 自身が作るゲートウェイ以外を設定することができ、LXD のブリッジと物理ネットワークを混在させる場合に便利です。 + + #### ファイル転送時のシンボリックリンクサポート + + シンボリックリンクを含む再帰的なファイル転送を行う場合、リンク先のファイルの内容ではなく、転送先でもただしくシンボリックリンクとして作られるようになりました。 + + #### `lxc monitor` コマンドでのログエントリの Pretty レンダリング + + LXD のログは、lxc monitor ツールを使って、イベントインターフェース経由で利用できました。しかし、そのままでは非常に読みにくいことがありました。 + + + コマンドラインクライアントでは、このようなログイベントをフィルタし、再フォーマットして、サーバのログ出力を見ているように見れるようになりました。 + + stgraber at castiana:~$ lxc monitor --pretty --loglevel=info --type=logging + INFO[04-02|22:57:39] Stopping container action=stop created="2018-02-27 18:02:02 -0500 EST" ephemeral=false name=snapcraft stateful=false used="2018-03-29 15:33:05 -0400 EDT" + INFO[04-02|22:57:40] Stopped container action=stop created="2018-02-27 18:02:02 -0500 EST" ephemeral=false name=snapcraft stateful=false used="2018-03-29 15:33:05 -0400 EDT" + INFO[04-02|22:57:40] Starting container action=start created="2018-02-27 18:02:02 -0500 EST" ephemeral=false name=snapcraft stateful=false used="2018-03-29 15:33:05 -0400 EDT" + INFO[04-02|22:57:41] Started container action=start created="2018-02-27 18:02:02 -0500 EST" ephemeral=false name=snapcraft stateful=false used="2018-03-29 15:33:05 -0400 EDT" + + #### `lxc network list-leases` サブコマンド + + LXD が管理するブリッジの DHCP リース情報が API 経由とコマンドライン経由で直接取得できるようになりました。 + + stgraber at castiana:~$ lxc network list-leases lxdbr0 + +-----------+-------------------+---------------+---------+ + | HOSTNAME | MAC ADDRESS | IP ADDRESS | TYPE | + +-----------+-------------------+---------------+---------+ + | bar | 00:16:3e:e0:36:3a | 10.166.11.185 | DYNAMIC | + +-----------+-------------------+---------------+---------+ + | snapcraft | 00:16:3e:be:f1:87 | 10.166.11.120 | DYNAMIC | + +-----------+-------------------+---------------+---------+ + + #### `lxc alias` コマンド + + コマンドエイリアスを管理するのに、設定ファイルを直接編集するのではなく、コマンドラインツールを使って直接コマンドエイリアスを一覧表示、作成、削除できるようになりました。 + + stgraber at castiana:~$ lxc alias list + +--------+-------------------------------------------+ + | ALIAS | TARGET | + +--------+-------------------------------------------+ + | delete | delete -f | + +--------+-------------------------------------------+ + | ls | list -c ns46S | + +--------+-------------------------------------------+ + | ubuntu | exec @ARGS@ -- sudo --login --user ubuntu | + +--------+-------------------------------------------+ + + #### `lxc config device override` サブコマンド + + デフォルトのネットワークインターフェースのような、プロファイルから継承したデバイスの特定のオプションを上書きするには、コンテナにローカルなデバイスを作成し、プロファイルと同じ名前を使う必要があります。このデバイスはプロファイルのデバイスよりも優先されますので、必要な任意の設定を行うことができます。 + + + この操作を簡単にするために、変更が必要なコンテナ、デバイス、設定キーを指定して、`lxc config device override` を使うことができます。 + + stgraber at castiana:~$ lxc launch ubuntu:16.04 c1 + Creating c1 + Starting c1 + stgraber at castiana:~$ lxc config device override c1 eth0 ipv4.address=10.166.11.42 + Device eth0 overridden for c1 + stgraber at castiana:~$ lxc restart c1 + stgraber at castiana:~$ lxc list c1 + +------+---------+---------------------+----------------------------------------------+------------+-----------+ + | NAME | STATE | IPV4 | IPV6 | TYPE | SNAPSHOTS | + +------+---------+---------------------+----------------------------------------------+------------+-----------+ + | c1 | RUNNING | 10.166.11.42 (eth0) | 2001:470:b368:4242:216:3eff:fed1:aff3 (eth0) | PERSISTENT | 0 | + +------+---------+---------------------+----------------------------------------------+------------+-----------+ + + #### オペレーションへの説明（description）の追加 + + すべてのバックグラウンド操作用に、新たに API に説明（description）フィールドが追加されました。コマンドラインツールからも表示できます。 + + stgraber at castiana:~$ lxc operation list + +--------------------------------------+-----------+---------------------+---------+------------+----------------------+ + | ID | TYPE | DESCRIPTION | STATUS | CANCELABLE | CREATED | + +--------------------------------------+-----------+---------------------+---------+------------+----------------------+ + | 343b1700-c0bd-44fa-8b1f-e6a8fdb91b42 | WEBSOCKET | Migrating container | RUNNING | NO | 2018/04/03 02:51 UTC | + +--------------------------------------+-----------+---------------------+---------+------------+----------------------+ + | 65494c6e-7643-4ed5-8abf-497e57cfdd5c | WEBSOCKET | Executing command | RUNNING | NO | 2018/04/03 02:51 UTC | + +--------------------------------------+-----------+---------------------+---------+------------+----------------------+ + + #### `lifecycle` タイプのイベント + + 新しいイベントクラスとして "lifecycle" と呼ばれるクラスが導入されました。これにより、スクリプトや他の API を使ったクライアントから、LXD が何をしているのかトラッキングしやすくなりました。LXD のログメッセージを読み取る必要はありません。 + + stgraber at castiana:~$ lxc monitor --type=lifecycle + metadata: + action: container-updated + source: /1.0/containers/bar + timestamp: "2018-04-02T22:53:06.742745596-04:00" + type: lifecycle + + + metadata: + action: container-started + source: /1.0/containers/bar + timestamp: "2018-04-02T22:53:07.234066242-04:00" + type: lifecycle + + + metadata: + action: container-shutdown + source: /1.0/containers/bar + timestamp: "2018-04-02T22:53:19.885795751-04:00" + type: lifecycle + + + metadata: + action: container-deleted + source: /1.0/containers/bar + timestamp: "2018-04-02T22:53:23.813480386-04:00" + type: lifecycle + + ### システム要件 + + LXD 3.0 の動作には Go 1.9 以上が必要です。現時点では、これより古いバージョンでもビルドできるかもしれませんが、今後のバグフィックスリリースでは、より新しい Go の関数を使わないという保証はありません。 + + ### サポートとアップグレード + + LXD 3.0.0 は 2023 年 6 月までサポートされ、最新の LTS リリースとなります。LXD 2.0 はより遅いペースでのメンテナンスとなり、致命的なバグ修正とセキュリティ修正のみなされます。 + + + LXD のフィーチャーブランチ (現在 2.21) のユーザは、サポートを継続して受け、すべてのバグ修正と LXD 3.0 が提供する新しい機能を使うには、3.0 へのアップデートが必要です。 + + + LXD の LTS ブランチ (現在 2.0.11) のユーザは、LXD 2.0 を使い続け、重要なセキュリティ修正を入手するか、LXD 3.0 へアップグレードするかを選択できます。重要なプロダクション環境で LXD LTS を使っているユーザは、いくつかのテストシステムで LXD 3.0 へのアップグレードを開始し、潜在的な問題をチェックし、LXD 3.0.1 がリリースされた後で残りのマシンをアップグレードしても良いでしょう。 + + ### 開発元からの snap パッケージの利用が可能に + + LXD をインストールし、最新の状態に保つおすすめの方法は、開発元が提供する snap パッケージを使うことです。すべてのシステムが確実に LXD の同じコピーが実行されますし、バグレポートとデバッグのプロセスが簡単になります。 + + + LXD の snap として、3 つのトラックが提供されます: + + - latest（最新の LXD フィーチャーリリース、現時点では 3.0） + - 2.0 （前の LTS リリース） + - 3.0 （現在の LTS リリース） + + + それぞれのトラックで、3 つのチャンネルがメンテナンスされます: + + - edge（開発元のリポジトリから取得したコードから自動的にビルドされテストされていない） + - candidate （将来の stable ビルド、バージョンアップ前の約 48 時間のテスト用） + - stable（現時点の stable なサポート対象のビルド） + + + LXD 3.0 をインストールし、1 ヶ月程度で 3.1 にアップグレードするには、次のように実行します: + + snap install lxd + + + LXD 3.0 をインストールし、その後はバグフィックスとセキュリティフィックスのみ取得するには、つぎのように実行します: + + snap install lxd --channel=3.0 + + + ステージングのシステムを実行する場合、`--channel=candidate` と `--channel=3.0/candidate` を使うことで、candidate チャンネルの LXD をそれぞれ実行できます。 + + + トラックやチャンネルは snap refresh コマンドを使って変更できます。しかし LXD はダウングレードはサポートしませんので、実行しても起動しないでしょう。 + + ### ダウンロード + - リリース tarball : [lxd-3.0.0.tar.gz](https://linuxcontainers.org/downloads/lxd/lxd-3.0.0.tar.gz) + - GPGシグネチャ : [lxd-3.0.0.tar.gz.asc](https://linuxcontainers.org/downloads/lxd/lxd-3.0.0.tar.gz.asc) + + ### コントリビューター + + LXD 3.0.0 は、全部で 18 名の貢献によりリリースされました。 From b2aa4576b33142467832a7981d65e74fae26d3c0 Mon Sep 17 00:00:00 2001 From: KATOH Yasufumi Date: Wed, 25 Apr 2018 21:37:56 +0900 Subject: [PATCH 2/2] Tweak Japanese LXD 3.0.0 announcement Reviewed-by: Hiroaki Nakamura Signed-off-by: KATOH Yasufumi --- content/lxd/news.ja/lxd-3.0.0.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/lxd/news.ja/lxd-3.0.0.yaml b/content/lxd/news.ja/lxd-3.0.0.yaml index 647000f..2fa9b2f 100644 --- a/content/lxd/news.ja/lxd-3.0.0.yaml +++ b/content/lxd/news.ja/lxd-3.0.0.yaml @@ -48,7 +48,7 @@ content: |- - この機能のメインコントリビューターである Free Ekanayaka も FOSDEM 2018 で LXD クラスタの長いプレゼンを行いました。こちらでチェックできます: + この機能のメインコントリビューターである Free Ekanayaka も FOSDEM 2018 で LXD クラスタの長いプレゼンテーションを行いました。こちらでチェックできます: - 新たに導入された設定である nvidia.runtime と、nvidia-container-cli ツールと liblxc 3.0 を組み合わせると、ホスト上で正しい情報を自動で検出し、コンテナの起動時に必要な情報を与えるようになりました。（訳注: よくわからないけど、nvidia.runtime の設定とデバイスの設定を行えば、色々情報はホスト上で lxc が集めて、cli ツールもコンテナ上で使えるようにしてコンテナを起動する、という感じか? 下の asciinema を参照） + 新たに導入された設定である nvidia.runtime と、nvidia-container-cli ツールと liblxc 3.0 を組み合わせると、ホスト上で正しい情報を自動で検出し、コンテナの起動時に必要な情報を与えるようになりました。（訳注: よくわからないけど、nvidia.runtime の設定とデバイスの設定を行えば、色々情報はホスト上で lxc が集めて、cli ツールやライブラリもコンテナ上で使えるようにしてコンテナを起動する、という感じか? 下の asciinema を参照） - ストレージプール間で、カスタムのストレージボリュームをコピーや移動できるようになりました。 + ストレージプール間で、カスタムのストレージボリュームをコピーや移動ができるようになりました。 stgraber at castiana:~$ lxc storage volume copy ssd/example default/example Storage volume copied successfully! From lxc-bot at linuxcontainers.org Wed Apr 25 14:11:06 2018 From: lxc-bot at linuxcontainers.org (brauner on Github) Date: Wed, 25 Apr 2018 14:11:06 -0000 Subject: [lxc-devel] [lxd/master] migration: fix btrfs live migration Message-ID: A non-text attachment was scrubbed... Name: not available Type: text/x-mailbox Size: 381 bytes Desc: not available URL: -------------- next part -------------- From 795d74cafced1b4c39c6623d197754ef9d42a83c Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Wed, 25 Apr 2018 16:09:42 +0200 Subject: [PATCH] migration: fix btrfs live migration Closes #4475. Signed-off-by: Christian Brauner --- lxd/container_lxc.go | 5 +++++ lxd/migrate_container.go | 4 ++++ lxd/storage_btrfs.go | 10 ++++++++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/lxd/container_lxc.go b/lxd/container_lxc.go index 63e137031..640dbc552 100644 --- a/lxd/container_lxc.go +++ b/lxd/container_lxc.go @@ -5104,6 +5104,11 @@ func (c *containerLXC) Migrate(args *CriuMigrationArgs) error { opts.PredumpDir = fmt.Sprintf("../%s", args.preDumpDir) } + if !c.IsRunning() { + // otherwise the migration will needlessly fail + args.stop = false + } + migrateErr = c.c.Migrate(args.cmd, opts) } diff --git a/lxd/migrate_container.go b/lxd/migrate_container.go index 9e1bd8aca..2d583fc28 100644 --- a/lxd/migrate_container.go +++ b/lxd/migrate_container.go @@ -993,6 +993,10 @@ func (c *migrationSink) Do(migrateOp *operation) error { for { select { case err = <-restore: + if err != nil { + disconnector() + return err + } controller(err) return err case msg, ok := <-source: diff --git a/lxd/storage_btrfs.go b/lxd/storage_btrfs.go index 6c2e02f4f..67ef92d95 100644 --- a/lxd/storage_btrfs.go +++ b/lxd/storage_btrfs.go @@ -2097,8 +2097,6 @@ func (s *storageBtrfs) MigrationSink(live bool, container container, snapshots [ return err } - defer os.RemoveAll(btrfsPath) - err = btrfsSubVolumesDelete(receivedSnapshot) if err != nil { logger.Errorf("Failed to delete BTRFS subvolume \"%s\": %s.", btrfsPath, err) @@ -2184,6 +2182,7 @@ func (s *storageBtrfs) MigrationSink(live bool, container container, snapshots [ wrapper := StorageProgressWriter(op, "fs_progress", *snap.Name) err = btrfsRecv(*(snap.Name), tmpSnapshotMntPoint, snapshotMntPoint, true, wrapper) + os.RemoveAll(tmpSnapshotMntPoint) if err != nil { return err } @@ -2215,6 +2214,13 @@ func (s *storageBtrfs) MigrationSink(live bool, container container, snapshots [ return err } + if live { + err = btrfsRecv("", tmpContainerMntPoint, containerMntPoint, false, wrapper) + if err != nil { + return err + } + } + return nil } From lxc-bot at linuxcontainers.org Wed Apr 25 21:07:16 2018 From: lxc-bot at linuxcontainers.org (stgraber on Github) Date: Wed, 25 Apr 2018 21:07:16 -0000 Subject: [lxc-devel] [lxd/master] lxd/containers: Fix broken unix hotplug logic Message-ID: A non-text attachment was scrubbed... Name: not available Type: text/x-mailbox Size: 542 bytes Desc: not available URL: -------------- next part -------------- From 61f68f6bfa11916d158fe89e8e5934eb37d9464f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Wed, 25 Apr 2018 17:05:52 -0400 Subject: [PATCH] lxd/containers: Fix broken unix hotplug logic MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes: - Setup of the inotify watch when required=false - Empty file created when host file is missing - Validation error when required=false an path missing Closes #4495 Signed-off-by: Stéphane Graber --- lxd/container_lxc.go | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/lxd/container_lxc.go b/lxd/container_lxc.go index 640dbc552..c1d7845b1 100644 --- a/lxd/container_lxc.go +++ b/lxd/container_lxc.go @@ -1436,14 +1436,18 @@ func (c *containerLXC) initLXC(config bool) error { if destPath == "" { destPath = m["source"] } + + srcPath := m["source"] + if srcPath == "" { + srcPath = m["path"] + } + relativeDestPath := strings.TrimPrefix(destPath, "/") sourceDevPath := filepath.Join(c.DevicesPath(), fmt.Sprintf("unix.%s.%s", strings.Replace(k, "/", "-", -1), strings.Replace(relativeDestPath, "/", "-", -1))) - // Do not fail to start when the device doesn't need to - // exist. - opts := "none bind,create=file" - if m["required"] != "" && !shared.IsTrue(m["required"]) { - opts = "none bind,create=file,optional" + // Don't add mount entry for devices that don't yet exist + if m["required"] != "" && !shared.IsTrue(m["required"]) && srcPath != "" && !shared.PathExists(srcPath) { + continue } // inform liblxc about the mount @@ -1451,7 +1455,7 @@ func (c *containerLXC) initLXC(config bool) error { fmt.Sprintf("%s %s %s", shared.EscapePathFstab(sourceDevPath), shared.EscapePathFstab(relativeDestPath), - opts)) + "none bind,create=file")) if err != nil { return err } @@ -1812,16 +1816,15 @@ func (c *containerLXC) startCommon() (string, error) { if !exist { srcPath = m["path"] } - if m["path"] != "" && m["major"] == "" && m["minor"] == "" && !shared.PathExists(srcPath) { - return "", fmt.Errorf("Missing source '%s' for device '%s'", srcPath, name) - } - if m["required"] != "" && !shared.IsTrue(m["required"]) { - err = deviceInotifyAddClosestLivingAncestor(c.state, srcPath) + if srcPath != "" && m["required"] != "" && !shared.IsTrue(m["required"]) { + err = deviceInotifyAddClosestLivingAncestor(c.state, filepath.Dir(srcPath)) if err != nil { logger.Errorf("Failed to add \"%s\" to inotify targets", srcPath) - return "", err + return "", fmt.Errorf("Failed to setup inotify watch for '%s': %v", srcPath, err) } + } else if srcPath != "" && m["major"] == "" && m["minor"] == "" && !shared.PathExists(srcPath) { + return "", fmt.Errorf("Missing source '%s' for device '%s'", srcPath, name) } } } From lxc-bot at linuxcontainers.org Thu Apr 26 11:06:07 2018 From: lxc-bot at linuxcontainers.org (pkun on Github) Date: Thu, 26 Apr 2018 11:06:07 -0000 Subject: [lxc-devel] [lxc/master] Fix tool_utils.c build when HAVE_SETNS is unset Message-ID: A non-text attachment was scrubbed... Name: not available Type: text/x-mailbox Size: 622 bytes Desc: not available URL: -------------- next part -------------- From 9051c53ee8a8b0a16d5d37853f3b977fc6ce9cd8 Mon Sep 17 00:00:00 2001 From: Serj Kalichev Date: Thu, 26 Apr 2018 13:44:20 +0300 Subject: [PATCH 1/2] Headers in src/tools dir use their own defines to disable double includes --- src/lxc/tools/arguments.h | 6 +++--- src/lxc/tools/tool_list.h | 6 +++--- src/lxc/tools/tool_utils.h | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/lxc/tools/arguments.h b/src/lxc/tools/arguments.h index 15941bcc3..e4cf8fc0a 100644 --- a/src/lxc/tools/arguments.h +++ b/src/lxc/tools/arguments.h @@ -22,8 +22,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __LXC_ARGUMENTS_H -#define __LXC_ARGUMENTS_H +#ifndef __LXC_TOOLS_ARGUMENTS_H +#define __LXC_TOOLS_ARGUMENTS_H #include #include @@ -177,4 +177,4 @@ extern int lxc_arguments_str_to_int(struct lxc_arguments *args, extern bool lxc_setup_shared_ns(struct lxc_arguments *args, struct lxc_container *c); -#endif /* __LXC_ARGUMENTS_H */ +#endif /* __LXC_TOOLS_ARGUMENTS_H */ diff --git a/src/lxc/tools/tool_list.h b/src/lxc/tools/tool_list.h index 9858081ab..1dd82d28e 100644 --- a/src/lxc/tools/tool_list.h +++ b/src/lxc/tools/tool_list.h @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __LXC_LIST_H -#define __LXC_LIST_H +#ifndef __LXC_TOOLS_LIST_H +#define __LXC_TOOLS_LIST_H #include @@ -164,4 +164,4 @@ static inline size_t lxc_list_len(struct lxc_list *list) return i; } -#endif /* __LXC_LIST_H */ +#endif /* __LXC_TOOLS_LIST_H */ diff --git a/src/lxc/tools/tool_utils.h b/src/lxc/tools/tool_utils.h index 25f2dfd61..3e8fa93a2 100644 --- a/src/lxc/tools/tool_utils.h +++ b/src/lxc/tools/tool_utils.h @@ -17,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __LXC_UTILS_H -#define __LXC_UTILS_H +#ifndef __LXC_TOOLS_UTILS_H +#define __LXC_TOOLS_UTILS_H /* Properly support loop devices on 32bit systems. */ #define _FILE_OFFSET_BITS 64 @@ -201,4 +201,4 @@ int clone(int (*fn)(void *), void *child_stack, extern pid_t lxc_clone(int (*fn)(void *), void *arg, int flags); -#endif /* __LXC_UTILS_H */ +#endif /* __LXC_TOOLS_UTILS_H */ From 6c4bec671b158b9e7a5177f572266928339097aa Mon Sep 17 00:00:00 2001 From: Serj Kalichev Date: Thu, 26 Apr 2018 13:50:57 +0300 Subject: [PATCH 2/2] Add inline setns() function to tool_utils.h. Without it tool_utils.c can't be build when HAVE_SETNS is unset. --- src/lxc/tools/tool_utils.h | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/src/lxc/tools/tool_utils.h b/src/lxc/tools/tool_utils.h index 3e8fa93a2..0aae00e05 100644 --- a/src/lxc/tools/tool_utils.h +++ b/src/lxc/tools/tool_utils.h @@ -109,6 +109,37 @@ extern signed long lxc_config_parse_arch(const char *arch); extern int lxc_namespace_2_cloneflag(const char *namespace); extern int lxc_fill_namespace_flags(char *flaglist, int *flags); +#if !defined(__NR_setns) && !defined(__NR_set_ns) + #if defined(__x86_64__) + #define __NR_setns 308 + #elif defined(__i386__) + #define __NR_setns 346 + #elif defined(__arm__) + #define __NR_setns 375 + #elif defined(__aarch64__) + #define __NR_setns 375 + #elif defined(__powerpc__) + #define __NR_setns 350 + #elif defined(__s390__) + #define __NR_setns 339 + #endif +#endif + +/* Define setns() if missing from the C library */ +#ifndef HAVE_SETNS +static inline int setns(int fd, int nstype) +{ +#ifdef __NR_setns + return syscall(__NR_setns, fd, nstype); +#elif defined(__NR_set_ns) + return syscall(__NR_set_ns, fd, nstype); +#else + errno = ENOSYS; + return -1; +#endif +} +#endif + #if HAVE_LIBCAP #include From lxc-bot at linuxcontainers.org Thu Apr 26 12:55:31 2018 From: lxc-bot at linuxcontainers.org (pkun on Github) Date: Thu, 26 Apr 2018 12:55:31 -0000 Subject: [lxc-devel] [lxc/master] Fix build when HAVE_SETNS is unset Message-ID: A non-text attachment was scrubbed... Name: not available Type: text/x-mailbox Size: 439 bytes Desc: not available URL: -------------- next part -------------- From 636063bc832bc9ffd7020c73d1ff5da95c8c7140 Mon Sep 17 00:00:00 2001 From: Serj Kalichev Date: Thu, 26 Apr 2018 15:49:44 +0300 Subject: [PATCH] Add inline setns() function to tool_utils.h. Without it tool_utils.c can't be build when HAVE_SETNS is unset. Signed-off-by: Serj Kalichev --- src/lxc/tools/tool_utils.h | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/src/lxc/tools/tool_utils.h b/src/lxc/tools/tool_utils.h index 25f2dfd61..51c8854e1 100644 --- a/src/lxc/tools/tool_utils.h +++ b/src/lxc/tools/tool_utils.h @@ -109,6 +109,37 @@ extern signed long lxc_config_parse_arch(const char *arch); extern int lxc_namespace_2_cloneflag(const char *namespace); extern int lxc_fill_namespace_flags(char *flaglist, int *flags); +#if !defined(__NR_setns) && !defined(__NR_set_ns) + #if defined(__x86_64__) + #define __NR_setns 308 + #elif defined(__i386__) + #define __NR_setns 346 + #elif defined(__arm__) + #define __NR_setns 375 + #elif defined(__aarch64__) + #define __NR_setns 375 + #elif defined(__powerpc__) + #define __NR_setns 350 + #elif defined(__s390__) + #define __NR_setns 339 + #endif +#endif + +/* Define setns() if missing from the C library */ +#ifndef HAVE_SETNS +static inline int setns(int fd, int nstype) +{ +#ifdef __NR_setns + return syscall(__NR_setns, fd, nstype); +#elif defined(__NR_set_ns) + return syscall(__NR_set_ns, fd, nstype); +#else + errno = ENOSYS; + return -1; +#endif +} +#endif + #if HAVE_LIBCAP #include From lxc-bot at linuxcontainers.org Thu Apr 26 13:26:40 2018 From: lxc-bot at linuxcontainers.org (pkun on Github) Date: Thu, 26 Apr 2018 13:26:40 -0000 Subject: [lxc-devel] [lxc/master] Fix tool_utils.c build when HAVE_SETNS is unset Message-ID: A non-text attachment was scrubbed... Name: not available Type: text/x-mailbox Size: 413 bytes Desc: not available URL: -------------- next part -------------- From 09e6e41e05aee308c532bcbae66aeb13077840f8 Mon Sep 17 00:00:00 2001 From: Serj Kalichev Date: Thu, 26 Apr 2018 16:20:30 +0300 Subject: [PATCH] Fix tool_utils.c build when HAVE_SETNS is unset Add inline setns() function to tool_utils.h. Without it tool_utils.c can't be build when HAVE_SETNS is unset. Signed-off-by: Serj Kalichev --- src/lxc/tools/tool_utils.h | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/src/lxc/tools/tool_utils.h b/src/lxc/tools/tool_utils.h index 25f2dfd61..ed361e30f 100644 --- a/src/lxc/tools/tool_utils.h +++ b/src/lxc/tools/tool_utils.h @@ -23,6 +23,8 @@ /* Properly support loop devices on 32bit systems. */ #define _FILE_OFFSET_BITS 64 +#include "config.h" + #include #include #include @@ -109,6 +111,37 @@ extern signed long lxc_config_parse_arch(const char *arch); extern int lxc_namespace_2_cloneflag(const char *namespace); extern int lxc_fill_namespace_flags(char *flaglist, int *flags); +#if !defined(__NR_setns) && !defined(__NR_set_ns) + #if defined(__x86_64__) + #define __NR_setns 308 + #elif defined(__i386__) + #define __NR_setns 346 + #elif defined(__arm__) + #define __NR_setns 375 + #elif defined(__aarch64__) + #define __NR_setns 375 + #elif defined(__powerpc__) + #define __NR_setns 350 + #elif defined(__s390__) + #define __NR_setns 339 + #endif +#endif + +/* Define setns() if missing from the C library */ +#ifndef HAVE_SETNS +static inline int setns(int fd, int nstype) +{ +#ifdef __NR_setns + return syscall(__NR_setns, fd, nstype); +#elif defined(__NR_set_ns) + return syscall(__NR_set_ns, fd, nstype); +#else + errno = ENOSYS; + return -1; +#endif +} +#endif + #if HAVE_LIBCAP #include From noreply at github.com Thu Apr 26 16:36:49 2018 From: noreply at github.com (GitHub) Date: Thu, 26 Apr 2018 09:36:49 -0700 Subject: [lxc-devel] [lxc/lxc] 09e6e4: Fix tool_utils.c build when HAVE_SETNS is unset Message-ID: <5ae2002120acc_2a352ad90195bc082421@hookshot-fe-31feec6.cp1-iad.github.net.mail> Branch: refs/heads/master Home: https://github.com/lxc/lxc Commit: 09e6e41e05aee308c532bcbae66aeb13077840f8 https://github.com/lxc/lxc/commit/09e6e41e05aee308c532bcbae66aeb13077840f8 Author: Serj Kalichev Date: 2018-04-26 (Thu, 26 Apr 2018) Changed paths: M src/lxc/tools/tool_utils.h Log Message: ----------- Fix tool_utils.c build when HAVE_SETNS is unset Add inline setns() function to tool_utils.h. Without it tool_utils.c can't be build when HAVE_SETNS is unset. Signed-off-by: Serj Kalichev Commit: 61068d39af1c9dafd2cb26711cb52b23c83d3584 https://github.com/lxc/lxc/commit/61068d39af1c9dafd2cb26711cb52b23c83d3584 Author: Christian Brauner Date: 2018-04-26 (Thu, 26 Apr 2018) Changed paths: M src/lxc/tools/tool_utils.h Log Message: ----------- Merge pull request #2293 from pkun/master Fix tool_utils.c build when HAVE_SETNS is unset Compare: https://github.com/lxc/lxc/compare/fca96eb6daf2...61068d39af1c From lxc-bot at linuxcontainers.org Thu Apr 26 17:27:12 2018 From: lxc-bot at linuxcontainers.org (stgraber on Github) Date: Thu, 26 Apr 2018 17:27:12 -0000 Subject: [lxc-devel] [lxd/master] lxc/list: Reduce number of API calls Message-ID: A non-text attachment was scrubbed... Name: not available Type: text/x-mailbox Size: 354 bytes Desc: not available URL: -------------- next part -------------- From 905d24aa8216832a84b02737f3fd2bcd440b765b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Thu, 26 Apr 2018 13:26:51 -0400 Subject: [PATCH] lxc/list: Reduce number of API calls MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber --- lxc/list.go | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/lxc/list.go b/lxc/list.go index a4d590bf1..68b497e29 100644 --- a/lxc/list.go +++ b/lxc/list.go @@ -201,7 +201,7 @@ func (c *cmdList) shouldShow(filters []string, state *api.Container) bool { return true } -func (c *cmdList) listContainers(conf *config.Config, remote string, cinfos []api.Container, filters []string, columns []column) error { +func (c *cmdList) listContainers(conf *config.Config, d lxd.ContainerServer, cinfos []api.Container, filters []string, columns []column) error { headers := []string{} for _, column := range columns { headers = append(headers, column.Name) @@ -225,22 +225,12 @@ func (c *cmdList) listContainers(conf *config.Config, remote string, cinfos []ap for i := 0; i < threads; i++ { cStatesWg.Add(1) go func() { - var d lxd.ContainerServer - var err error for { cName, more := <-cStatesQueue if !more { break } - if d == nil { - d, err = conf.GetContainerServer(remote) - if err != nil { - cStatesWg.Done() - return - } - } - state, _, err := d.GetContainerState(cName) if err != nil { continue @@ -255,23 +245,12 @@ func (c *cmdList) listContainers(conf *config.Config, remote string, cinfos []ap cSnapshotsWg.Add(1) go func() { - var d lxd.ContainerServer - var err error for { cName, more := <-cSnapshotsQueue if !more { break } - if d == nil { - d, err = conf.GetContainerServer(remote) - if err != nil { - cSnapshotsWg.Done() - return - } - - } - snaps, err := d.GetContainerSnapshots(cName) if err != nil { continue @@ -460,7 +439,7 @@ func (c *cmdList) Run(cmd *cobra.Command, args []string) error { } // Fetch any remaining data and render the table - return c.listContainers(conf, remote, cts, filters, columns) + return c.listContainers(conf, d, cts, filters, columns) } func (c *cmdList) parseColumns(clustered bool) ([]column, error) { From lxc-bot at linuxcontainers.org Fri Apr 27 09:39:43 2018 From: lxc-bot at linuxcontainers.org (freeekanayaka on Github) Date: Fri, 27 Apr 2018 09:39:43 -0000 Subject: [lxc-devel] [lxd/master] Custom schema queries Message-ID: A non-text attachment was scrubbed... Name: not available Type: text/x-mailbox Size: 406 bytes Desc: not available URL: -------------- next part -------------- From 97c9d706c2f70d6e418bde5c812c785d07785439 Mon Sep 17 00:00:00 2001 From: Free Ekanayaka Date: Fri, 27 Apr 2018 09:00:29 +0000 Subject: [PATCH 1/3] Add a new Schema.File() method to load extra queries from a file Signed-off-by: Free Ekanayaka --- lxd/db/schema/query.go | 28 ++++++++++++++++++++ lxd/db/schema/schema.go | 16 ++++++++++- lxd/db/schema/schema_test.go | 63 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 106 insertions(+), 1 deletion(-) diff --git a/lxd/db/schema/query.go b/lxd/db/schema/query.go index 6ec5ea6c4..6a421d6b3 100644 --- a/lxd/db/schema/query.go +++ b/lxd/db/schema/query.go @@ -3,8 +3,12 @@ package schema import ( "database/sql" "fmt" + "io/ioutil" + "os" "github.com/lxc/lxd/lxd/db/query" + "github.com/lxc/lxd/shared" + "github.com/pkg/errors" ) // Return whether the schema table is present in the database. @@ -68,3 +72,27 @@ INSERT INTO schema (version, updated_at) VALUES (?, strftime("%s")) _, err := tx.Exec(statement, new) return err } + +// Read the given file (if it exists) and executes all queries it contains. +func execFromFile(tx *sql.Tx, path string) error { + if !shared.PathExists(path) { + return nil + } + + bytes, err := ioutil.ReadFile(path) + if err != nil { + return errors.Wrap(err, "failed to read file") + } + + _, err = tx.Exec(string(bytes)) + if err != nil { + return err + } + + err = os.Remove(path) + if err != nil { + return errors.Wrap(err, "failed to remove file") + } + + return nil +} diff --git a/lxd/db/schema/schema.go b/lxd/db/schema/schema.go index 7015977c4..f8166e826 100644 --- a/lxd/db/schema/schema.go +++ b/lxd/db/schema/schema.go @@ -8,6 +8,7 @@ import ( "github.com/lxc/lxd/lxd/db/query" "github.com/lxc/lxd/shared" + "github.com/pkg/errors" ) // Schema captures the schema of a database in terms of a series of ordered @@ -17,6 +18,7 @@ type Schema struct { hook Hook // Optional hook to execute whenever a update gets applied fresh string // Optional SQL statement used to create schema from scratch check Check // Optional callback invoked before doing any update + path string // Optional path to a file containing extra queries to run } // Update applies a specific schema change to a database, and returns an error @@ -111,6 +113,13 @@ func (s *Schema) Fresh(statement string) { s.fresh = statement } +// File extra queries from a file. If the file is exists, all SQL queries in it +// will be executed transactionally at the very start of Ensure(), before +// anything else is done. +func (s *Schema) File(path string) { + s.path = path +} + // Ensure makes sure that the actual schema in the given database matches the // one defined by our updates. // @@ -127,7 +136,12 @@ func (s *Schema) Ensure(db *sql.DB) (int, error) { var current int aborted := false err := query.Transaction(db, func(tx *sql.Tx) error { - err := ensureSchemaTableExists(tx) + err := execFromFile(tx, s.path) + if err != nil { + return errors.Wrapf(err, "failed to execute queries from %s", s.path) + } + + err = ensureSchemaTableExists(tx) if err != nil { return err } diff --git a/lxd/db/schema/schema_test.go b/lxd/db/schema/schema_test.go index 4c225980e..b48425093 100644 --- a/lxd/db/schema/schema_test.go +++ b/lxd/db/schema/schema_test.go @@ -3,6 +3,7 @@ package schema_test import ( "database/sql" "fmt" + "os" "testing" "github.com/stretchr/testify/assert" @@ -10,6 +11,7 @@ import ( "github.com/lxc/lxd/lxd/db/query" "github.com/lxc/lxd/lxd/db/schema" + "github.com/lxc/lxd/shared" ) // Create a new Schema by specifying an explicit map from versions to Update @@ -334,6 +336,67 @@ func TestSchema_ExeciseUpdate(t *testing.T) { require.EqualError(t, err, "no such column: name") } +// A custom schema file path is given, but it does not exists. This is a no-op. +func TestSchema_File_NotExists(t *testing.T) { + schema, db := newSchemaAndDB(t) + schema.Add(updateCreateTable) + schema.File("/non/existing/file/path") + + _, err := schema.Ensure(db) + require.NoError(t, err) +} + +// A custom schema file path is given, but it contains non valid SQL. An error +// is returned an no change to the database is performed at all. +func TestSchema_File_Garbage(t *testing.T) { + schema, db := newSchemaAndDB(t) + schema.Add(updateCreateTable) + + path, err := shared.WriteTempFile("", "lxd-db-schema-", "SELECT FROM baz") + require.NoError(t, err) + defer os.Remove(path) + + schema.File(path) + + _, err = schema.Ensure(db) + + message := fmt.Sprintf("failed to execute queries from %s: near \"FROM\": syntax error", path) + require.EqualError(t, err, message) +} + +// A custom schema file path is given, it runs some queries that repair an +// otherwise broken update, before the update is run. +func TestSchema_File(t *testing.T) { + schema, db := newSchemaAndDB(t) + + // Add an update that would insert a value into a non-existing table. + schema.Add(updateInsertValue) + + path, err := shared.WriteTempFile("", "lxd-db-schema-", + `CREATE TABLE test (id INTEGER); +INSERT INTO test VALUES (2); +`) + + require.NoError(t, err) + defer os.Remove(path) + + schema.File(path) + + _, err = schema.Ensure(db) + require.NoError(t, err) + + // The file does not exist anymore. + assert.False(t, shared.PathExists(path)) + + // The table was created, and the extra row inserted as well. + tx, err := db.Begin() + require.NoError(t, err) + + ids, err := query.SelectIntegers(tx, "SELECT id FROM test ORDER BY id") + require.NoError(t, err) + assert.Equal(t, []int{1, 2}, ids) +} + // Return a new in-memory SQLite database. func newDB(t *testing.T) *sql.DB { db, err := sql.Open("sqlite3", ":memory:") From 467c795740e9a8578e64f7684aa5649dc5c35ceb Mon Sep 17 00:00:00 2001 From: Free Ekanayaka Date: Fri, 27 Apr 2018 09:15:02 +0000 Subject: [PATCH 2/3] Add support for patch.local.sql and patch.global.sql Signed-off-by: Free Ekanayaka --- lxd/api_cluster.go | 2 +- lxd/cluster/heartbeat_test.go | 2 +- lxd/cluster/membership_test.go | 8 ++++---- lxd/daemon.go | 3 ++- lxd/db/cluster/open.go | 4 +++- lxd/db/cluster/open_test.go | 6 +++--- lxd/db/db.go | 6 +++--- lxd/db/node/open.go | 1 + lxd/db/testing.go | 2 +- 9 files changed, 19 insertions(+), 15 deletions(-) diff --git a/lxd/api_cluster.go b/lxd/api_cluster.go index 0fd89ed3b..a8cc8f978 100644 --- a/lxd/api_cluster.go +++ b/lxd/api_cluster.go @@ -318,7 +318,7 @@ func clusterPutDisable(d *Daemon) Response { if err != nil { return SmartError(err) } - d.cluster, err = db.OpenCluster("db.bin", d.gateway.Dialer(), address) + d.cluster, err = db.OpenCluster("db.bin", d.gateway.Dialer(), address, "/unused/db/dir") if err != nil { return SmartError(err) } diff --git a/lxd/cluster/heartbeat_test.go b/lxd/cluster/heartbeat_test.go index bc4e7624f..b1def2ed1 100644 --- a/lxd/cluster/heartbeat_test.go +++ b/lxd/cluster/heartbeat_test.go @@ -249,7 +249,7 @@ func (f *heartbeatFixture) node() (*state.State, *cluster.Gateway, string) { var err error require.NoError(f.t, state.Cluster.Close()) - state.Cluster, err = db.OpenCluster("db.bin", gateway.Dialer(), address) + state.Cluster, err = db.OpenCluster("db.bin", gateway.Dialer(), address, "/unused/db/dir") require.NoError(f.t, err) f.gateways[len(f.gateways)] = gateway diff --git a/lxd/cluster/membership_test.go b/lxd/cluster/membership_test.go index 5d3523350..b1cbc7c86 100644 --- a/lxd/cluster/membership_test.go +++ b/lxd/cluster/membership_test.go @@ -256,7 +256,7 @@ func TestJoin(t *testing.T) { targetAddress := targetServer.Listener.Addr().String() var err error require.NoError(t, targetState.Cluster.Close()) - targetState.Cluster, err = db.OpenCluster("db.bin", targetGateway.Dialer(), targetAddress) + targetState.Cluster, err = db.OpenCluster("db.bin", targetGateway.Dialer(), targetAddress, "/unused/db/dir") require.NoError(t, err) targetF := &membershipFixtures{t: t, state: targetState} targetF.NetworkAddress(targetAddress) @@ -283,7 +283,7 @@ func TestJoin(t *testing.T) { address := server.Listener.Addr().String() require.NoError(t, state.Cluster.Close()) - state.Cluster, err = db.OpenCluster("db.bin", gateway.Dialer(), address) + state.Cluster, err = db.OpenCluster("db.bin", gateway.Dialer(), address, "/unused/db/dir") require.NoError(t, err) f := &membershipFixtures{t: t, state: state} @@ -368,7 +368,7 @@ func FLAKY_TestPromote(t *testing.T) { targetAddress := targetServer.Listener.Addr().String() var err error require.NoError(t, targetState.Cluster.Close()) - targetState.Cluster, err = db.OpenCluster("db.bin", targetGateway.Dialer(), targetAddress) + targetState.Cluster, err = db.OpenCluster("db.bin", targetGateway.Dialer(), targetAddress, "/unused/db/dir") require.NoError(t, err) targetF := &membershipFixtures{t: t, state: targetState} targetF.NetworkAddress(targetAddress) @@ -397,7 +397,7 @@ func FLAKY_TestPromote(t *testing.T) { mux.HandleFunc(path, handler) } - state.Cluster, err = db.OpenCluster("db.bin", gateway.Dialer(), address) + state.Cluster, err = db.OpenCluster("db.bin", gateway.Dialer(), address, "/unused/db/dir") require.NoError(t, err) // Promote the node. diff --git a/lxd/daemon.go b/lxd/daemon.go index 2b76ab2ec..75691226c 100644 --- a/lxd/daemon.go +++ b/lxd/daemon.go @@ -463,7 +463,8 @@ func (d *Daemon) init() error { /* Open the cluster database */ for { - d.cluster, err = db.OpenCluster("db.bin", d.gateway.Dialer(), address) + dir := filepath.Join(d.os.VarDir, "database") + d.cluster, err = db.OpenCluster("db.bin", d.gateway.Dialer(), address, dir) if err == nil { break } diff --git a/lxd/db/cluster/open.go b/lxd/db/cluster/open.go index 498e5d923..b11347bd0 100644 --- a/lxd/db/cluster/open.go +++ b/lxd/db/cluster/open.go @@ -3,6 +3,7 @@ package cluster import ( "database/sql" "fmt" + "path/filepath" "sync/atomic" "github.com/CanonicalLtd/go-grpc-sql" @@ -47,7 +48,7 @@ func Open(name string, dialer grpcsql.Dialer) (*sql.DB, error) { // nodes have version greater than us and we need to be upgraded), or return // false and no error (if some nodes have a lower version, and we need to wait // till they get upgraded and restarted). -func EnsureSchema(db *sql.DB, address string) (bool, error) { +func EnsureSchema(db *sql.DB, address string, dir string) (bool, error) { someNodesAreBehind := false apiExtensions := version.APIExtensionsCount() @@ -86,6 +87,7 @@ func EnsureSchema(db *sql.DB, address string) (bool, error) { } schema := Schema() + schema.File(filepath.Join(dir, "patch.global.sql")) // Optional custom queries schema.Check(check) var initial int diff --git a/lxd/db/cluster/open_test.go b/lxd/db/cluster/open_test.go index 63ac1c4f7..2b74fa309 100644 --- a/lxd/db/cluster/open_test.go +++ b/lxd/db/cluster/open_test.go @@ -17,7 +17,7 @@ import ( func TestEnsureSchema_NoClustered(t *testing.T) { db := newDB(t) addNode(t, db, "0.0.0.0", 1, 1) - ready, err := cluster.EnsureSchema(db, "1.2.3.4:666") + ready, err := cluster.EnsureSchema(db, "1.2.3.4:666", "/unused/db/dir") assert.True(t, ready) assert.NoError(t, err) } @@ -83,7 +83,7 @@ func TestEnsureSchema_ClusterNotUpgradable(t *testing.T) { subtest.Run(t, c.title, func(t *testing.T) { db := newDB(t) c.setup(t, db) - ready, err := cluster.EnsureSchema(db, "1") + ready, err := cluster.EnsureSchema(db, "1", "/unused/db/dir") assert.Equal(t, c.ready, ready) if c.error == "" { assert.NoError(t, err) @@ -125,7 +125,7 @@ func TestEnsureSchema_UpdateNodeVersion(t *testing.T) { addNode(t, db, "1", schema-1, apiExtensions-1) // Ensure the schema. - ready, err := cluster.EnsureSchema(db, "1") + ready, err := cluster.EnsureSchema(db, "1", "/unused/db/dir") assert.NoError(t, err) assert.Equal(t, c.ready, ready) diff --git a/lxd/db/db.go b/lxd/db/db.go index 3c540c322..f2742babc 100644 --- a/lxd/db/db.go +++ b/lxd/db/db.go @@ -149,13 +149,13 @@ type Cluster struct { // - name: Basename of the database file holding the data. Typically "db.bin". // - dialer: Function used to connect to the dqlite backend via gRPC SQL. // - address: Network address of this node (or empty string). -// - api: Number of API extensions that this node supports. +// - dir: Base LXD database directory (e.g. /var/lib/lxd/database) // // The address and api parameters will be used to determine if the cluster // database matches our version, and possibly trigger a schema update. If the // schema update can't be performed right now, because some nodes are still // behind, an Upgrading error is returned. -func OpenCluster(name string, dialer grpcsql.Dialer, address string) (*Cluster, error) { +func OpenCluster(name string, dialer grpcsql.Dialer, address, dir string) (*Cluster, error) { db, err := cluster.Open(name, dialer) if err != nil { return nil, errors.Wrap(err, "failed to open database") @@ -181,7 +181,7 @@ func OpenCluster(name string, dialer grpcsql.Dialer, address string) (*Cluster, } } - nodesVersionsMatch, err := cluster.EnsureSchema(db, address) + nodesVersionsMatch, err := cluster.EnsureSchema(db, address, dir) if err != nil { return nil, errors.Wrap(err, "failed to ensure schema") } diff --git a/lxd/db/node/open.go b/lxd/db/node/open.go index 23048820f..05c556ae4 100644 --- a/lxd/db/node/open.go +++ b/lxd/db/node/open.go @@ -30,6 +30,7 @@ func EnsureSchema(db *sql.DB, dir string, hook schema.Hook) (int, error) { backupDone := false schema := Schema() + schema.File(filepath.Join(dir, "patch.local.sql")) // Optional custom queries schema.Hook(func(version int, tx *sql.Tx) error { if !backupDone { logger.Infof("Updating the LXD database schema. Backup made as \"local.db.bak\"") diff --git a/lxd/db/testing.go b/lxd/db/testing.go index beb025384..e2d77cb4d 100644 --- a/lxd/db/testing.go +++ b/lxd/db/testing.go @@ -56,7 +56,7 @@ func NewTestCluster(t *testing.T) (*Cluster, func()) { // Create an in-memory gRPC SQL server and dialer. server, dialer := newGrpcServer() - cluster, err := OpenCluster(":memory:", dialer, "1") + cluster, err := OpenCluster(":memory:", dialer, "1", "/unused/db/dir") require.NoError(t, err) cleanup := func() { From c12c708aa9c9e1c2065e80a884c563b63bfd3079 Mon Sep 17 00:00:00 2001 From: Free Ekanayaka Date: Fri, 27 Apr 2018 09:37:38 +0000 Subject: [PATCH 3/3] Add integration tests Signed-off-by: Free Ekanayaka --- test/suites/database_update.sh | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/test/suites/database_update.sh b/test/suites/database_update.sh index 6259d5c34..d212c739b 100644 --- a/test/suites/database_update.sh +++ b/test/suites/database_update.sh @@ -3,6 +3,19 @@ test_database_update(){ mkdir -p "${LXD_MIGRATE_DIR}/database" MIGRATE_DB=${LXD_MIGRATE_DIR}/database/local.db + # Add some custom queries in patch.local.sql + cat << EOF > "${LXD_MIGRATE_DIR}/database/patch.local.sql" +INSERT INTO certificates(fingerprint, type, name, certificate) VALUES('abc', 0, 'cert1', 'blob1'); +CREATE TABLE test (n INT); +INSERT INTO test(n) VALUES(1); +EOF + + # Add some custom queries in patch.global.sql + cat << EOF > "${LXD_MIGRATE_DIR}/database/patch.global.sql" +CREATE TABLE test (n INT); +INSERT INTO test(n) VALUES(1); +EOF + # Create the version 1 schema as the database sqlite3 "${MIGRATE_DB}" > /dev/null < deps/schema1.sql @@ -10,9 +23,18 @@ test_database_update(){ spawn_lxd "${LXD_MIGRATE_DIR}" true # Assert there are enough tables. - expected_tables=4 + expected_tables=5 tables=$(sqlite3 "${MIGRATE_DB}" ".dump" | grep -c "CREATE TABLE") [ "${tables}" -eq "${expected_tables}" ] || { echo "FAIL: Wrong number of tables after database migration. Found: ${tables}, expected ${expected_tables}"; false; } + # Check that the custom queries were executed. + LXD_DIR="${LXD_MIGRATE_DIR}" lxd sql local "SELECT * FROM test" | grep -q "1" + LXD_DIR="${LXD_MIGRATE_DIR}" lxd sql global "SELECT * FROM certificates" | grep -q "cert1" + LXD_DIR="${LXD_MIGRATE_DIR}" lxd sql global "SELECT * FROM test" | grep -q "1" + + # The custom patch files were deleted. + ! [ -e "${LXD_MIGRATE_DIR}/database/patch.local.sql" ] + ! [ -e "${LXD_MIGRATE_DIR}/database/patch.global.sql" ] + kill_lxd "$LXD_MIGRATE_DIR" } From lxc-bot at linuxcontainers.org Sat Apr 28 01:52:04 2018 From: lxc-bot at linuxcontainers.org (stgraber on Github) Date: Sat, 28 Apr 2018 01:52:04 -0000 Subject: [lxc-devel] [lxd/master] lxd/init: Offer to setup a Fan bridge when clustered Message-ID: A non-text attachment was scrubbed... Name: not available Type: text/x-mailbox Size: 354 bytes Desc: not available URL: -------------- next part -------------- From 0f95ec8a2247ad7a78acac855f6a1532279106c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Fri, 27 Apr 2018 21:20:02 -0400 Subject: [PATCH] lxd/init: Offer to setup a Fan bridge when clustered MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber --- lxd/main_init_interactive.go | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/lxd/main_init_interactive.go b/lxd/main_init_interactive.go index 311b1968d..33efafb16 100644 --- a/lxd/main_init_interactive.go +++ b/lxd/main_init_interactive.go @@ -3,6 +3,7 @@ package main import ( "encoding/pem" "fmt" + "io/ioutil" "net" "os" "os/exec" @@ -274,7 +275,16 @@ func (c *cmdInit) askMAAS(config *initData, d lxd.ContainerServer) error { } func (c *cmdInit) askNetworking(config *initData, d lxd.ContainerServer) error { - if !cli.AskBool("Would you like to create a new network bridge? (yes/no) [default=yes]: ", "yes") { + if config.Cluster != nil || !cli.AskBool("Would you like to create a new local network bridge? (yes/no) [default=yes]: ", "yes") { + // At this time, only the Ubuntu kernel supports the Fan, detect it + fanKernel := false + if shared.PathExists("/proc/sys/kernel/version") { + content, _ := ioutil.ReadFile("/proc/sys/kernel/version") + if content != nil && strings.Contains(string(content), "Ubuntu") { + fanKernel = true + } + } + if cli.AskBool("Would you like to configure LXD to use an existing bridge or host interface? (yes/no) [default=no]: ", "no") { for { name := cli.AskString("Name of the existing bridge or host interface: ", "", nil) @@ -314,6 +324,24 @@ func (c *cmdInit) askNetworking(config *initData, d lxd.ContainerServer) error { break } + } else if config.Cluster != nil && fanKernel && cli.AskBool("Would you like to create a new Fan overlay network? (yes/no) [default=yes]", "yes") { + // Define the network + network := api.NetworksPost{} + network.Name = "lxdfan0" + network.Config = map[string]string{ + "bridge.mode": "fan", + } + + // Add the new network + config.Networks = append(config.Networks, network) + + // Add to the default profile + config.Profiles[0].Devices["eth0"] = map[string]string{ + "type": "nic", + "nictype": "bridged", + "name": "eth0", + "parent": "lxdfan0", + } } return nil From noreply at github.com Sat Apr 28 21:23:29 2018 From: noreply at github.com (GitHub) Date: Sat, 28 Apr 2018 14:23:29 -0700 Subject: [lxc-devel] [lxc/lxc] 51f0f7: do_lxcapi_create: set umask Message-ID: <5ae4e651b140f_4f882afbc6263c1024346@hookshot-fe-6b2eebc.cp1-iad.github.net.mail> Branch: refs/heads/master Home: https://github.com/lxc/lxc Commit: 51f0f73b4f34bdccc9194c126f267b92a092d968 https://github.com/lxc/lxc/commit/51f0f73b4f34bdccc9194c126f267b92a092d968 Author: Kaarle Ritvanen Date: 2018-04-15 (Sun, 15 Apr 2018) Changed paths: M src/lxc/lxccontainer.c Log Message: ----------- do_lxcapi_create: set umask Always use 022 as the umask when creating the rootfs directory and executing the template. A too loose umask may cause security issues. A too strict umask may cause programs to fail inside the container. Signed-off-by: Kaarle Ritvanen Commit: ad38dca193671d4359ed54768426d256d8f72d16 https://github.com/lxc/lxc/commit/ad38dca193671d4359ed54768426d256d8f72d16 Author: Christian Brauner Date: 2018-04-28 (Sat, 28 Apr 2018) Changed paths: M src/lxc/lxccontainer.c Log Message: ----------- Merge pull request #2279 from kunkku/create-umask do_lxcapi_create: set umask Compare: https://github.com/lxc/lxc/compare/61068d39af1c...ad38dca19367 From lxc-bot at linuxcontainers.org Sat Apr 28 22:54:37 2018 From: lxc-bot at linuxcontainers.org (brauner on Github) Date: Sat, 28 Apr 2018 22:54:37 -0000 Subject: [lxc-devel] [lxc/master] coverity Message-ID: A non-text attachment was scrubbed... Name: not available Type: text/x-mailbox Size: 364 bytes Desc: not available URL: -------------- next part -------------- coverity by brauner · Pull Request #2297 · lxc/lxc · GitHub

coverity #2297

Open

brauner wants to merge 9 commits into lxc:master from brauner:2018-04-29/bugfixes

+29 −46

Member

brauner commented Apr 28, 2018

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

brauner added some commits Apr 28, 2018


      coverity: #1435210

Logically dead code

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


      coverity: #1435208

Unused value

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

8186c5c


      coverity: #1435207

Unchecked return value

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

91ae555


      coverity: #1435206

Time of check time of use

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

46768cc


      coverity: #1435205

Unchecked return value

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

dbdf8cf


      coverity: #1435203

Resource leak

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

c1768f3


      coverity: #1435200

Resource leak

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

205fc01


      coverity: #1435198

Unchecked return value

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

ba1de6d


      coverity: #1426734

Argument cannot be negative

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

fb7292d

You can’t perform that action at this time.

From noreply at github.com Sun Apr 29 09:09:55 2018 From: noreply at github.com (GitHub) Date: Sun, 29 Apr 2018 02:09:55 -0700 Subject: [lxc-devel] [lxc/lxc] 0c3e8f: do_lxcapi_create: set umask Message-ID: <5ae58be36f3e0_a4112ae1ecd17c1859350@hookshot-fe-dfcc362.cp1-iad.github.net.mail> Branch: refs/heads/stable-3.0 Home: https://github.com/lxc/lxc Commit: 0c3e8f142c4d1825227c956b09a6c7f2d53be6a7 https://github.com/lxc/lxc/commit/0c3e8f142c4d1825227c956b09a6c7f2d53be6a7 Author: Kaarle Ritvanen Date: 2018-04-29 (Sun, 29 Apr 2018) Changed paths: M src/lxc/lxccontainer.c Log Message: ----------- do_lxcapi_create: set umask Always use 022 as the umask when creating the rootfs directory and executing the template. A too loose umask may cause security issues. A too strict umask may cause programs to fail inside the container. Signed-off-by: Kaarle Ritvanen Commit: e75a2146d010d940c3afc64699c2b145df0e9ea7 https://github.com/lxc/lxc/commit/e75a2146d010d940c3afc64699c2b145df0e9ea7 Author: Thomas Petazzoni Date: 2018-04-29 (Sun, 29 Apr 2018) Changed paths: M src/lxc/tools/lxc_monitor.c Log Message: ----------- lxc/tools/lxc_monitor: include missing lxc_monitor.c uses offsetof(), so it should include . Otherwise the build fails with the musl C library: tools/lxc_monitor.c: In function ‘lxc_abstract_unix_connect’: tools/lxc_monitor.c:324:9: warning: implicit declaration of function ‘offsetof’ [-Wimplicit-function-declaration] offsetof(struct sockaddr_un, sun_path) + len + 1); ^~~~~~~~ tools/lxc_monitor.c:324:18: error: expected expression before ‘struct’ offsetof(struct sockaddr_un, sun_path) + len + 1); ^~~~~~ Signed-off-by: Thomas Petazzoni Commit: 4b088194d63f5f28ee671e30c7be58e8800c5b63 https://github.com/lxc/lxc/commit/4b088194d63f5f28ee671e30c7be58e8800c5b63 Author: Jonathan Calmels Date: 2018-04-29 (Sun, 29 Apr 2018) Changed paths: M src/lxc/pam/pam_cgfs.c Log Message: ----------- pam-cgfs: ignore the system umask when creating the cgroup hierarchy Fixes: #2277 Signed-off-by: Jonathan Calmels Commit: 244508d16ce764fcafeedae69d0a0b05283a0e18 https://github.com/lxc/lxc/commit/244508d16ce764fcafeedae69d0a0b05283a0e18 Author: Daniel Selifonov Date: 2018-04-29 (Sun, 29 Apr 2018) Changed paths: M src/lxc/tools/lxc_checkpoint.c Log Message: ----------- Also pass action scripts to CRIU on checkpointing Signed-off-by: Daniel Selifonov Commit: 98097794f71ae6b7f854e24f12109ec3c608ac3e https://github.com/lxc/lxc/commit/98097794f71ae6b7f854e24f12109ec3c608ac3e Author: LiFeng Date: 2018-04-29 (Sun, 29 Apr 2018) Changed paths: M src/lxc/cgroups/cgfsng.c Log Message: ----------- Fix the memory leak in cgfsng_attach Signed-off-by: LiFeng Commit: 8312779972d7349d39d74389f088adc9b9a37245 https://github.com/lxc/lxc/commit/8312779972d7349d39d74389f088adc9b9a37245 Author: LiFeng Date: 2018-04-29 (Sun, 29 Apr 2018) Changed paths: M src/lxc/lxccontainer.c Log Message: ----------- Fix memory leak in list_active_containers Signed-off-by: LiFeng Commit: c42734f80090cfa44a3f41fa6f3c7a5b83ebbf54 https://github.com/lxc/lxc/commit/c42734f80090cfa44a3f41fa6f3c7a5b83ebbf54 Author: Serj Kalichev Date: 2018-04-29 (Sun, 29 Apr 2018) Changed paths: M src/lxc/tools/tool_utils.h Log Message: ----------- Fix tool_utils.c build when HAVE_SETNS is unset Add inline setns() function to tool_utils.h. Without it tool_utils.c can't be build when HAVE_SETNS is unset. Signed-off-by: Serj Kalichev Compare: https://github.com/lxc/lxc/compare/d0adf63a044d...c42734f80090 From noreply at github.com Mon Apr 30 09:29:43 2018 From: noreply at github.com (GitHub) Date: Mon, 30 Apr 2018 02:29:43 -0700 Subject: [lxc-devel] [lxc/lxc] 139394: coverity: #1435210 Message-ID: <5ae6e207bddac_4f582af352a81c0c124f1@hookshot-fe-6b2eebc.cp1-iad.github.net.mail> Branch: refs/heads/master Home: https://github.com/lxc/lxc Commit: 13939498edf6936ebd4c5c39d016d7e25996fabc https://github.com/lxc/lxc/commit/13939498edf6936ebd4c5c39d016d7e25996fabc Author: Christian Brauner Date: 2018-04-29 (Sun, 29 Apr 2018) Changed paths: M src/lxc/tools/tool_utils.c Log Message: ----------- coverity: #1435210 Logically dead code Signed-off-by: Christian Brauner Commit: 8186c5c7c3bca23f7cfcc4a3fb867ba88add1a8e https://github.com/lxc/lxc/commit/8186c5c7c3bca23f7cfcc4a3fb867ba88add1a8e Author: Christian Brauner Date: 2018-04-29 (Sun, 29 Apr 2018) Changed paths: M src/lxc/cgroups/cgfsng.c Log Message: ----------- coverity: #1435208 Unused value Signed-off-by: Christian Brauner Commit: 91ae555c994febcf60b8ae243fc28e0cdbd04bab https://github.com/lxc/lxc/commit/91ae555c994febcf60b8ae243fc28e0cdbd04bab Author: Christian Brauner Date: 2018-04-29 (Sun, 29 Apr 2018) Changed paths: M src/tests/aa.c Log Message: ----------- coverity: #1435207 Unchecked return value Signed-off-by: Christian Brauner Commit: 46768cced9127002c7ee0fef3c63131c53692a65 https://github.com/lxc/lxc/commit/46768cced9127002c7ee0fef3c63131c53692a65 Author: Christian Brauner Date: 2018-04-29 (Sun, 29 Apr 2018) Changed paths: M src/lxc/terminal.c Log Message: ----------- coverity: #1435206 Time of check time of use Signed-off-by: Christian Brauner Commit: dbdf8cf4203c4c655c7fdf0f67cb358a6fa96a71 https://github.com/lxc/lxc/commit/dbdf8cf4203c4c655c7fdf0f67cb358a6fa96a71 Author: Christian Brauner Date: 2018-04-29 (Sun, 29 Apr 2018) Changed paths: M src/tests/attach.c Log Message: ----------- coverity: #1435205 Unchecked return value Signed-off-by: Christian Brauner Commit: c1768f3f2527463af508aed60b5171bc7e82025a https://github.com/lxc/lxc/commit/c1768f3f2527463af508aed60b5171bc7e82025a Author: Christian Brauner Date: 2018-04-29 (Sun, 29 Apr 2018) Changed paths: M src/lxc/parse.c Log Message: ----------- coverity: #1435203 Resource leak Signed-off-by: Christian Brauner Commit: 205fc0103b0ef16e6acaae7175e63a8b01e59494 https://github.com/lxc/lxc/commit/205fc0103b0ef16e6acaae7175e63a8b01e59494 Author: Christian Brauner Date: 2018-04-29 (Sun, 29 Apr 2018) Changed paths: M src/lxc/conf.c Log Message: ----------- coverity: #1435200 Resource leak Signed-off-by: Christian Brauner Commit: ba1de6dbfe630d3ed49cede91846602c5f497f48 https://github.com/lxc/lxc/commit/ba1de6dbfe630d3ed49cede91846602c5f497f48 Author: Christian Brauner Date: 2018-04-29 (Sun, 29 Apr 2018) Changed paths: M src/lxc/tools/lxc_create.c Log Message: ----------- coverity: #1435198 Unchecked return value Signed-off-by: Christian Brauner Commit: d2b5aceceaf14b19895a64ec0d3ba1b422a4f92b https://github.com/lxc/lxc/commit/d2b5aceceaf14b19895a64ec0d3ba1b422a4f92b Author: Christian Brauner Date: 2018-04-29 (Sun, 29 Apr 2018) Changed paths: M src/lxc/tools/lxc_monitor.c Log Message: ----------- coverity: #1426734 Argument cannot be negative Signed-off-by: Christian Brauner Commit: 0e14584db8024539e9d7d0e1b4f5ab33bba09366 https://github.com/lxc/lxc/commit/0e14584db8024539e9d7d0e1b4f5ab33bba09366 Author: Christian Brauner Date: 2018-04-29 (Sun, 29 Apr 2018) Changed paths: M src/lxc/lxccontainer.c Log Message: ----------- lxccontainer: non-functional changes Signed-off-by: Christian Brauner Commit: 5647455516eaa745e37a32db8e839b6857cc77fb https://github.com/lxc/lxc/commit/5647455516eaa745e37a32db8e839b6857cc77fb Author: Christian Brauner Date: 2018-04-29 (Sun, 29 Apr 2018) Changed paths: M src/lxc/lxccontainer.c M src/lxc/lxclock.c Log Message: ----------- lxccontainer: use thread-safe *_OFD_* locks If they aren't available fallback to BSD flock()s. Signed-off-by: Christian Brauner Commit: 44619b6cd26eca8bc414344af4ba834a075659a0 https://github.com/lxc/lxc/commit/44619b6cd26eca8bc414344af4ba834a075659a0 Author: Christian Brauner Date: 2018-04-29 (Sun, 29 Apr 2018) Changed paths: M src/lxc/lxccontainer.c Log Message: ----------- lxccontainer: non-functional changes Signed-off-by: Christian Brauner Commit: 9e6304187bc71541779c2692777c25bed8c80724 https://github.com/lxc/lxc/commit/9e6304187bc71541779c2692777c25bed8c80724 Author: Christian Brauner Date: 2018-04-29 (Sun, 29 Apr 2018) Changed paths: M src/lxc/lxccontainer.c Log Message: ----------- lxccontainer: do_lxcapi_is_running() There's no need to do string comparisons. Signed-off-by: Christian Brauner Commit: 5df46fad0cda33f0cb098943bcbe659ce3409266 https://github.com/lxc/lxc/commit/5df46fad0cda33f0cb098943bcbe659ce3409266 Author: Christian Brauner Date: 2018-04-29 (Sun, 29 Apr 2018) Changed paths: M src/lxc/lxccontainer.c Log Message: ----------- lxccontainer: do_lxcapi_freeze() Signed-off-by: Christian Brauner Commit: e898947399c2f44537e9b5b9d95b8f3abb989c86 https://github.com/lxc/lxc/commit/e898947399c2f44537e9b5b9d95b8f3abb989c86 Author: Christian Brauner Date: 2018-04-29 (Sun, 29 Apr 2018) Changed paths: M src/lxc/lxccontainer.c Log Message: ----------- lxccontainer: do_lxcapi_unfreeze() Signed-off-by: Christian Brauner Commit: d630991d8f25dd29bf6d17bc6992cf19b1faa2ec https://github.com/lxc/lxc/commit/d630991d8f25dd29bf6d17bc6992cf19b1faa2ec Author: Christian Brauner Date: 2018-04-29 (Sun, 29 Apr 2018) Changed paths: M src/lxc/lxccontainer.c Log Message: ----------- lxccontainer: non-functional changes Signed-off-by: Christian Brauner Commit: 7cea5905852bf935fa486f05192a5cb13942ad51 https://github.com/lxc/lxc/commit/7cea5905852bf935fa486f05192a5cb13942ad51 Author: Christian Brauner Date: 2018-04-29 (Sun, 29 Apr 2018) Changed paths: M src/lxc/cgroups/cgfsng.c M src/lxc/conf.c M src/lxc/lxccontainer.c M src/lxc/utils.c M src/lxc/utils.h Log Message: ----------- lxccontainer: use thread-safe open() + write() Signed-off-by: Christian Brauner Commit: 9640c6a76763a5dfa7b7fd268772b1b0d195d9a9 https://github.com/lxc/lxc/commit/9640c6a76763a5dfa7b7fd268772b1b0d195d9a9 Author: Christian Brauner Date: 2018-04-29 (Sun, 29 Apr 2018) Changed paths: M src/lxc/lxccontainer.c Log Message: ----------- lxccontainer: non-functional changes Signed-off-by: Christian Brauner Commit: 630ac7c61bf76868f97de77a63b3b5e9826a8e75 https://github.com/lxc/lxc/commit/630ac7c61bf76868f97de77a63b3b5e9826a8e75 Author: Christian Brauner Date: 2018-04-29 (Sun, 29 Apr 2018) Changed paths: M src/lxc/lxccontainer.c Log Message: ----------- lxccontainer: non-functional changes Signed-off-by: Christian Brauner Commit: e62fd16fff675f4ec2dac7dd57a61f082bdbc206 https://github.com/lxc/lxc/commit/e62fd16fff675f4ec2dac7dd57a61f082bdbc206 Author: Christian Brauner Date: 2018-04-29 (Sun, 29 Apr 2018) Changed paths: M src/lxc/lxccontainer.c Log Message: ----------- lxccontainer: non-functional changes Signed-off-by: Christian Brauner Commit: ff62067703a7ec289cf450794a5ae919b1316667 https://github.com/lxc/lxc/commit/ff62067703a7ec289cf450794a5ae919b1316667 Author: Stéphane Graber Date: 2018-04-30 (Mon, 30 Apr 2018) Changed paths: M src/lxc/cgroups/cgfsng.c M src/lxc/conf.c M src/lxc/lxccontainer.c M src/lxc/lxclock.c M src/lxc/parse.c M src/lxc/terminal.c M src/lxc/tools/lxc_create.c M src/lxc/tools/lxc_monitor.c M src/lxc/tools/tool_utils.c M src/lxc/utils.c M src/lxc/utils.h M src/tests/aa.c M src/tests/attach.c Log Message: ----------- Merge pull request #2297 from brauner/2018-04-29/bugfixes coverity Compare: https://github.com/lxc/lxc/compare/ad38dca19367...ff62067703a7 From noreply at github.com Mon Apr 30 10:19:22 2018 From: noreply at github.com (GitHub) Date: Mon, 30 Apr 2018 03:19:22 -0700 Subject: [lxc-devel] [lxc/lxc] cef701: coverity: #1435263 Message-ID: <5ae6edaa5e1_567e2aefd86efc1069416@hookshot-fe-da92815.cp1-iad.github.net.mail> Branch: refs/heads/master Home: https://github.com/lxc/lxc Commit: cef701ede302a70f52bb1951f2dec2c0f88c2e5f https://github.com/lxc/lxc/commit/cef701ede302a70f52bb1951f2dec2c0f88c2e5f Author: Christian Brauner Date: 2018-04-30 (Mon, 30 Apr 2018) Changed paths: M src/lxc/lxccontainer.c Log Message: ----------- coverity: #1435263 Use after free Signed-off-by: Christian Brauner From lxc-bot at linuxcontainers.org Mon Apr 30 19:23:50 2018 From: lxc-bot at linuxcontainers.org (dnegreira on Github) Date: Mon, 30 Apr 2018 19:23:50 -0000 Subject: [lxc-devel] [lxd/master] lxd init: fix maas.api.url check when setting up existing bridge Message-ID: A non-text attachment was scrubbed... Name: not available Type: text/x-mailbox Size: 568 bytes Desc: not available URL: -------------- next part -------------- lxd init: fix maas.api.url check when setting up existing bridge by dnegreira · Pull Request #4515 · lxc/lxd · GitHub

lxd init: fix maas.api.url check when setting up existing bridge #4515

Open

dnegreira wants to merge 1 commit into lxc:master from dnegreira:init_maas_option

+1 −1

Collaborator

dnegreira commented Apr 30, 2018

When one selects the no option when setting up MAAS and then selects the option to set up a custom bridge, the prompt still appears to ask if the interface is connected to MAAS. This is due to the value config.Config["maas.api.url"] is set to nil and not to "".


      lxd init: fix maas.api.url check when setting up existing bridge

Signed-off-by: David Negreira <David at otherreality.net>

65a77b6

lxc-jenkins commented Apr 30, 2018

This pull request didn't trigger Jenkins as its author isn't in the whitelist.

An organization member must perform one of the following:

To have this branch tested by Jenkins, use the "ok to test" command.
To have a one time test done, use the "test this please" command.

Those commands are simple Github comments of the format: "jenkins: COMMAND"

You can’t perform that action at this time.

From mihamina.rakotomandimby at rktmb.org Sat Apr 7 21:36:49 2018 From: mihamina.rakotomandimby at rktmb.org (Mihamina RAKOTOMANDIMBY) Date: Sat, 07 Apr 2018 21:36:49 -0000 Subject: [lxc-devel] [lxc-users] LXC 3.0.0: Packaging Changes To Be Aware Of In-Reply-To: <20180407145406.GA30838@gmail.com> References: <20180407145406.GA30838@gmail.com> Message-ID: <646547d1-6747-a52d-ec4c-67a6d9dffc70@rktmb.org> On 4/7/18 5:54 PM, Christian Brauner wrote: > 2. **Important** distrobuilder is the new way of creating machine/system > container images > The templates have been replaced by a new project called "distrobuilder" > [5]. It aims to be a very simple Go project focussed on letting you easily > build full system container images by either using the official cloud image > if one is provided by the distro or by using the respective distro's > recommended tooling (e.g. debootstrap for Debian or pacman for ArchLinux). > It aims to be declarative, using the same set of options for all > distributions while having extensive validation code to ensure everything > that's downloaded is properly validated. > > **Warning: Advertisement** please consider packaging distrobuilder. > https://github.com/lxc/distrobuilder > > A more lengthy justification can be found at: > https://brauner.github.io/2018/02/27/lxc-removes-legacy-template-build-system.html Hello, I'm looking for some tutorial of using the image built with distrobuilder. After having build the image: how to start it with lxc-start? -- -- *Mihamina RAKOTOMANDIMBY Tél: +261 32 11 635 03 Calendar: http://mihamina.rktmb.org/p/calendar.html /DevOps, Linux, Jira, Confluence, PHP, Java/ * -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: profil-25.png Type: image/png Size: 15616 bytes Desc: not available URL: From mangoo at wpkg.org Thu Apr 12 02:24:30 2018 From: mangoo at wpkg.org (Tomasz Chmielewski) Date: Thu, 12 Apr 2018 02:24:30 -0000 Subject: [lxc-devel] [lxc-users] Announcing LXC, LXD and LXCFS 3.0 LTS In-Reply-To: <20180411212500.GI12419@castiana> References: <20180411212500.GI12419@castiana> Message-ID: <6d9df24520c7849819bc21439de99e37@wpkg.org> On 2018-04-12 06:25, Stéphane Graber wrote: > The LXC, LXD and LXCFS teams are proud to announce the release of the > 3.0 version of all three projects. Great news, great features! What's the best way to upgrade from a 2.xx deb to a 3.xx snap? Tomasz Chmielewski https://lxadm.com From venefax at gmail.com Wed Apr 25 20:37:13 2018 From: venefax at gmail.com (Saint Michael) Date: Wed, 25 Apr 2018 20:37:13 -0000 Subject: [lxc-devel] Incrond service fails inside a container Message-ID: I cannot get the service incrond to work inside a container. This service uses inotify to monitor the FS for changes. My systctl.conf has plenty of watches, etc. That is not the issue These are privileged containers. Does anybody have any idea why this service does work on the host just fine and not in a container? Philip Orleans -------------- next part -------------- An HTML attachment was scrubbed... URL: From scan-admin at coverity.com Sat Apr 28 21:30:19 2018 From: scan-admin at coverity.com (scan-admin at coverity.com) Date: Sat, 28 Apr 2018 21:30:19 +0000 (UTC) Subject: [lxc-devel] Coverity Scan: Analysis completed for lxc/lxc Message-ID: <5ae4e7eb2e205_45552ab1dd750f587140@node1.mail> Your request for analysis of lxc/lxc has been completed successfully. The results are available at https://u2389337.ct.sendgrid.net/wf/click?upn=08onrYu34A-2BWcWUl-2F-2BfV0V05UPxvVjWch-2Bd2MGckcRYoXYgQ2e2tKLnM6MqGzNY8FAzCQK-2BzLV9iymHduSZ4hA-3D-3D_c81vr0QxbJCVSbFDnanNJrrLFCUOCvqAsyQ-2B3NJpxewmWc9OuinSxQVe93vKzeQAyFmDLFls64hf7ABu-2BKmUulgF-2Fr-2BcfY6LW7WYaZetrle0ck5cFJ8aWafIxhjon9QXJs4GcoS7LwPV-2BSgWij-2FUeCHptQAP1iGofbXxcRind-2B9eD2kiW3Ma7J3sEINBIXyyzyQAHB5QXdKz-2FE319yIqgZCW5peY4PzKpO4Vem9UsuE-3D Build ID: 208656 Analysis Summary: New defects found: 15 Defects eliminated: 25 If you have difficulty understanding any defects, email us at scan-admin at coverity.com, or post your question to StackOverflow at https://u2389337.ct.sendgrid.net/wf/click?upn=OgIsEqWzmIl4S-2FzEUMxLXL-2BukuZt9UUdRZhgmgzAKchwAzH1nH3073xDEXNRgHN6q227lMNIWoOb8ZgSjAjKcg-3D-3D_c81vr0QxbJCVSbFDnanNJrrLFCUOCvqAsyQ-2B3NJpxewmWc9OuinSxQVe93vKzeQAyFmDLFls64hf7ABu-2BKmUukbo7syziK8T0iC35JXADh-2Bn2b0mNuZvVj7QjUxYOA4MUB-2FY4zVj3MsEeqm-2BWpIAfT-2FMepL5gztZ4FGhACaER6ptq1B2mK-2BWHuOuXGsM058NuPphB7kgLzRJUMiqvYeUZURX-2BGLEBR6wCr26LlSbpdE-3D From scan-admin at coverity.com Mon Apr 30 09:35:51 2018 From: scan-admin at coverity.com (scan-admin at coverity.com) Date: Mon, 30 Apr 2018 09:35:51 +0000 (UTC) Subject: [lxc-devel] Coverity Scan: Analysis completed for lxc/lxc Message-ID: <5ae6e37735b3f_6f3a2ab1dd750f587149a@node1.mail> Your request for analysis of lxc/lxc has been completed successfully. The results are available at https://u2389337.ct.sendgrid.net/wf/click?upn=08onrYu34A-2BWcWUl-2F-2BfV0V05UPxvVjWch-2Bd2MGckcRYoXYgQ2e2tKLnM6MqGzNY8FAzCQK-2BzLV9iymHduSZ4hA-3D-3D_c81vr0QxbJCVSbFDnanNJrrLFCUOCvqAsyQ-2B3NJpxewmWc9OuinSxQVe93vKzeQAmQoY-2BtzmxSFxHm8xCTZqo0BuguHDBjOwosFSHQbZgMbR7SPxZfsruMF2dSyPjbPLs9WRiFvpPp8kcZzZFc3lTq6bZSXklpoik5BIOhCpYLf0VdA1lgfCcVZtC12AQsvyuGX9unsvEikEMLQm2PVNUB3EWOigrGVMLweqQxEo2JlKjcIqpiOopbFtAuuKNEsm Build ID: 208848 Analysis Summary: New defects found: 1 Defects eliminated: 12 If you have difficulty understanding any defects, email us at scan-admin at coverity.com, or post your question to StackOverflow at https://u2389337.ct.sendgrid.net/wf/click?upn=OgIsEqWzmIl4S-2FzEUMxLXL-2BukuZt9UUdRZhgmgzAKchwAzH1nH3073xDEXNRgHN6q227lMNIWoOb8ZgSjAjKcg-3D-3D_c81vr0QxbJCVSbFDnanNJrrLFCUOCvqAsyQ-2B3NJpxewmWc9OuinSxQVe93vKzeQAmQoY-2BtzmxSFxHm8xCTZqo3y6Fbpnik79C18-2FcMiaKOSC0JsYfuXJ-2Ff5-2FKRGg1DO6izPplmnCMuY2oNGp-2F0OcrDoB-2F4-2F-2B6H8qAM9RmTXxyYIdq77Ow0fKOqYmYW-2BlaR1BpJjpBeTwQvSDNHezAhxcPyeLwufOl5O3c1K-2BZiIlTEQiGfqSkoqPC319fqVJuzXK From scan-admin at coverity.com Mon Apr 30 10:25:57 2018 From: scan-admin at coverity.com (scan-admin at coverity.com) Date: Mon, 30 Apr 2018 10:25:57 +0000 (UTC) Subject: [lxc-devel] Coverity Scan: Analysis completed for lxc/lxc Message-ID: <5ae6ef347a9b9_91112ab1dd750f5871428@node1.mail> Your request for analysis of lxc/lxc has been completed successfully. The results are available at https://u2389337.ct.sendgrid.net/wf/click?upn=08onrYu34A-2BWcWUl-2F-2BfV0V05UPxvVjWch-2Bd2MGckcRYoXYgQ2e2tKLnM6MqGzNY8FAzCQK-2BzLV9iymHduSZ4hA-3D-3D_c81vr0QxbJCVSbFDnanNJrrLFCUOCvqAsyQ-2B3NJpxewmWc9OuinSxQVe93vKzeQAY1QyTuatR0-2Ftb5H3rcSLqRRgAkChhbTSmlS0Qz8VAeR0G-2FMCXbT-2FsjxolfHotv-2Bn657sSJYQAGR4DmgAy-2FqiWfoQjiPeCzMUHtrdf2Zec9Gv1I8vDcNC-2FrA3ceh8ENp-2FJrbIPGHeAOIY4icf-2B-2FYWSbYf36vRC8ycK1lfzXz3IZuSZi-2FNyswGQJb3f8TGzlN3 Build ID: 208856 Analysis Summary: New defects found: 0 Defects eliminated: 1

lxc/lxc

Join GitHub today

coverity #2297

Conversation