Commit 6d41413
authored
Fix DockerCluster with non-HA backend (#1738)
When running a non-HA storage backend, such as inmem,
ensureLeaderMatches will timeout through the context as leader.IsSelf
never reports true in a non-HA environment. Ensure we only have a single
node during cluster setup and annotate it as being HA disabled.
setupNode0's return code was not checked. This made the HA support
_technically_ work, if we used a scoped context which had a shorter
timeout (but, longer than the Docker calls took), but was hard to
accurately time.
Signed-off-by: Alexander Scheel <ascheel@gitlab.com>1 parent 01c2bd5 commit 6d41413
1 file changed
+25
-10
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
74 | 74 | | |
75 | 75 | | |
76 | 76 | | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
77 | 80 | | |
78 | 81 | | |
79 | 82 | | |
| |||
208 | 211 | | |
209 | 212 | | |
210 | 213 | | |
211 | | - | |
212 | | - | |
213 | | - | |
214 | | - | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
215 | 219 | | |
216 | | - | |
217 | | - | |
218 | | - | |
219 | | - | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
220 | 225 | | |
221 | 226 | | |
222 | 227 | | |
| |||
443 | 448 | | |
444 | 449 | | |
445 | 450 | | |
| 451 | + | |
| 452 | + | |
| 453 | + | |
| 454 | + | |
| 455 | + | |
446 | 456 | | |
447 | 457 | | |
448 | 458 | | |
| |||
950 | 960 | | |
951 | 961 | | |
952 | 962 | | |
| 963 | + | |
953 | 964 | | |
954 | 965 | | |
955 | 966 | | |
| |||
1012 | 1023 | | |
1013 | 1024 | | |
1014 | 1025 | | |
1015 | | - | |
| 1026 | + | |
| 1027 | + | |
| 1028 | + | |
| 1029 | + | |
| 1030 | + | |
1016 | 1031 | | |
1017 | 1032 | | |
1018 | 1033 | | |
| |||
1040 | 1055 | | |
1041 | 1056 | | |
1042 | 1057 | | |
1043 | | - | |
| 1058 | + | |
1044 | 1059 | | |
1045 | 1060 | | |
1046 | 1061 | | |
| |||
0 commit comments