alihan/microk8s
1
0
Fork 0
mirror of https://github.com/ubuntu/microk8s.git synced 2021-05-23 02:23:41 +03:00
Code Issues Projects Releases Wiki Activity

Update dqlite bootup timeout (#2209)

Browse Source
This commit is contained in:
Konstantinos Tsakalozos
2021-04-28 09:26:58 +03:00
committed by GitHub
parent 3d8210f98a
commit 932348f7b3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build-scripts/patches/0000-Dqlite-integration.patch
View File

@@ -1,4 +1,4 @@
From 27055368ab7dafd005a9f4e3ff72571f3c6810bd Mon Sep 17 00:00:00 2001
From 95141653d8414110e01fa724f6c9921559197338 Mon Sep 17 00:00:00 2001
From: Konstantinos Tsakalozos <kos.tsakalozos@canonical.com>
Date: Wed, 3 Mar 2021 17:54:14 +0200
Subject: [PATCH] Dqlite integration
@@ -15153,7 +15153,7 @@ index 00000000000..898e293a0f8
+}
diff --git a/vendor/github.com/canonical/kvsql-dqlite/server/server.go b/vendor/github.com/canonical/kvsql-dqlite/server/server.go
new file mode 100644
index 00000000000..78bfa54375d
index 00000000000..701c161e3ad
--- /dev/null
+++ b/vendor/github.com/canonical/kvsql-dqlite/server/server.go
@@ -0,0 +1,126 @@
@@ -15245,7 +15245,7 @@ index 00000000000..78bfa54375d
+ }
+ }
+
+ ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
+ ctx, cancel := context.WithTimeout(context.Background(), 5 * time.Minute)
+ defer cancel()
+
+ if err := app.Ready(ctx); err != nil {