Merge branch 'w/2.8/improvement/improve-upgrade-robustness' into tmp/…

…octopus/q/2.8
scality · Feb 18, 2021 · b330fe6 · b330fe6
2 parents 9d1d867 + 83a8197
commit b330fe6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -76,6 +76,10 @@
   (PR [#3083](https://github.com/scality/metalk8s/pull/3083))
 
 ## Release 2.7.2 (in development)
+### Enhancements
+- Improve Salt master and cluster upgrade stability in slow environments
+  (PR [#3125](https://github.com/scality/metalk8s/pull/3125))
+
 ### Bug fixes
 - Embed `pause` image version 3.2 instead of 3.1 needed for MetalK8s to work
   offline (needed by containerd version superior to 1.4.0)

diff --git a/salt/metalk8s/salt/master/files/master-99-metalk8s.conf.j2 b/salt/metalk8s/salt/master/files/master-99-metalk8s.conf.j2
@@ -3,6 +3,8 @@ interface: {{ salt_ip }}
 log_level: {{ 'debug' if debug else 'info' }}
 
 timeout: 20
+sock_pool_size: 15
+worker_threads: 10
 
 peer:
   .*:

diff --git a/salt/tests/unit/modules/test_cri.py b/salt/tests/unit/modules/test_cri.py
@@ -230,6 +230,7 @@ def test_wait_container(
         """
         cmd = utils.cmd_output(retcode=retcode, stdout=stdout)
         mock_cmd = MagicMock(return_value=cmd)
+
         with patch.dict(cri.__salt__, {"cmd.run_all": mock_cmd}), patch(
             "time.sleep", MagicMock()
         ):

diff --git a/scripts/upgrade.sh.in b/scripts/upgrade.sh.in
@@ -151,7 +151,7 @@ upgrade_local_engines () {
     )
     for container in "${containers_to_check[@]}"; do
         "${SALT_CALL}" --local --retcode-passthrough cri.wait_container \
-            name="$container" state=running || return 1
+            name="$container" state=running timeout=120 || return 1
     done
 }