Update vshard to 0.1.25 (#2172)

* Update vshard to 0.1.25 * tests: fix vshard error check Since vshard is compatible with Tarantool 3.0 it supports string replicaset identifiers so they renamed replicaset_uuid to replicaset. * add "vshard.conn_man" fiber to ignore This fiber runs infinite loop and seems to have reaction to only module reload. * fix doc build Seems before this patch some dependencies broke rst build. This patch should fix it. See apache/flink#24086 --------- Co-authored-by: Oleg Babin <[email protected]>
tarantool · Jan 16, 2024 · b469d08 · b469d08
1 parent b9dc61e
commit b469d08
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -38,6 +38,12 @@ Fixed
 
 - An error with ``cartridge.utils.version_is_at_least`` parsing.
 
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Changed
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- Update ``vshard`` dependency to `0.1.25 <https://github.com/tarantool/vshard/releases/tag/0.1.25>`_.
+
 -------------------------------------------------------------------------------
 [2.8.4] - 2023-10-31
 -------------------------------------------------------------------------------

diff --git a/cartridge-scm-1.rockspec b/cartridge-scm-1.rockspec
@@ -10,7 +10,7 @@ dependencies = {
     'http == 1.5.0-1',
     'checks == 3.3.0-1',
     'errors == 2.2.1-1',
-    'vshard == 0.1.24-1',
+    'vshard == 0.1.25-1',
     'membership == 2.4.1-1',
     'frontend-core == 8.2.2-1',
     'cartridge-metrics-role == 0.1.1',

diff --git a/rst/requirements.txt b/rst/requirements.txt
@@ -1,5 +1,11 @@
 Jinja2<3.1
 Sphinx==3.0.4
 sphinx-intl==2.0.1
+sphinxcontrib-applehelp<1.0.8
+sphinxcontrib.devhelp<1.0.6
+sphinxcontrib.htmlhelp<2.0.5
+sphinxcontrib-serializinghtml<1.1.10
+sphinxcontrib-qthelp<1.0.7
+alabaster<0.7.14
 polib==1.1.0
 docutils==0.14
diff --git a/test/integration/failover_stateful_test.lua b/test/integration/failover_stateful_test.lua
@@ -574,7 +574,7 @@ add('test_leaderless', function(g)
     t.assert_covers(err, {
         name = "MISSING_MASTER",
         type = "ShardingError",
-        replicaset_uuid = storage_uuid,
+        replicaset = storage_uuid,
         message = "Master is not configured for replicaset " .. storage_uuid,
     })
 

diff --git a/test/integration/rebalancing_test.lua b/test/integration/rebalancing_test.lua
@@ -159,7 +159,7 @@ function g.test()
     t.assert_covers(err, {
         type = 'ShardingError',
         name = 'MISSING_MASTER',
-        replicaset_uuid = g.sA1.replicaset_uuid,
+        replicaset = g.sA1.replicaset_uuid,
         message = 'Master is not configured for' ..
             ' replicaset ' .. g.sA1.replicaset_uuid,
     })
@@ -168,7 +168,7 @@ function g.test()
 
     helpers.retrying({}, function() g.sA1:eval([[
         for _, f in pairs(require('fiber').info()) do
-            if f.name:startswith('vshard.') then
+            if f.name:startswith('vshard.') and f.name ~= 'vshard.conn_man' then
                 error('Fiber ' .. f.name .. ' still alive', 0)
             end
         end