[lxc-devel] [lxd/master] lxd/db: Start-up check ignores pending nodes with out-of-date schema

[freeekanayaka on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 361 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20200227/54b3102c/attachment.bin>
-------------- next part --------------
From 58d20f1636381df28bb1b20419546d352df86321 Mon Sep 17 00:00:00 2001
From: Free Ekanayaka <free.ekanayaka at canonical.com>
Date: Thu, 27 Feb 2020 10:29:17 +0000
Subject: [PATCH] lxd/db: Start-up check ignores pending nodes with out-of-date
 schema

Signed-off-by: Free Ekanayaka <free.ekanayaka at canonical.com>
---
 lxd/db/cluster/query.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lxd/db/cluster/query.go b/lxd/db/cluster/query.go
index 0df5ac33b6..16b7aedf99 100644
--- a/lxd/db/cluster/query.go
+++ b/lxd/db/cluster/query.go
@@ -43,7 +43,7 @@ func selectNodesVersions(tx *sql.Tx) ([][2]int, error) {
 		return []interface{}{&versions[i][0], &versions[i][1]}
 	}
 
-	stmt, err := tx.Prepare("SELECT schema, api_extensions FROM nodes")
+	stmt, err := tx.Prepare("SELECT schema, api_extensions FROM nodes WHERE pending=0")
 	if err != nil {
 		return nil, err
 	}