Commit 6fa1d9ae authored by Levin Zimmermann's avatar Levin Zimmermann

stack/erp5: Fix master node separation in NEO URI

In 0cf70a6e we already migrated the NEO URI concatenation to the
recent format used by WCFS. Unfortunately we missed separating the address
(IPv6 + port) of the master nodes from each other. Without adding the
separator ',' between them, WCFS doesn't work with NEO clusters which have
multiple master nodes, because NEO/go can't split the different master node
addresses.
parent e5ecb6c4
Pipeline #27818 failed with stage
......@@ -102,4 +102,4 @@ md5sum = 5cf0316fdd17a940031e4083bbededd8
[instance-wcfs.cfg.in]
filename = instance-wcfs.cfg.in
md5sum = 0f921643a68e3a8de5529d653710ddca
md5sum = a495f84194a46c585b89947f8bc7d754
......@@ -24,7 +24,7 @@
{% else -%}
{% set zurl = 'neo://' -%}
{% endif -%}
{% set zurl = ('%s%s/%s' % (zurl, z.pop('master_nodes'), z.pop('name'))) -%}
{% set zurl = ('%s%s/%s' % (zurl, z.pop('master_nodes')|replace(" ", ","), z.pop('name'))) -%}
{% set zurl = zurl + '?' + (z | dictsort | urlencode) -%}
{% else -%}
{% do assert(False, ("unsupported ZODB type", zodb)) -%}
......
......@@ -102,4 +102,4 @@ md5sum = 5cf0316fdd17a940031e4083bbededd8
[instance-wcfs.cfg.in]
filename = instance-wcfs.cfg.in
md5sum = 0f921643a68e3a8de5529d653710ddca
md5sum = a495f84194a46c585b89947f8bc7d754
......@@ -24,7 +24,7 @@
{% else -%}
{% set zurl = 'neo://' -%}
{% endif -%}
{% set zurl = ('%s%s/%s' % (zurl, z.pop('master_nodes'), z.pop('name'))) -%}
{% set zurl = ('%s%s/%s' % (zurl, z.pop('master_nodes')|replace(" ", ","), z.pop('name'))) -%}
{% set zurl = zurl + '?' + (z | dictsort | urlencode) -%}
{% else -%}
{% do assert(False, ("unsupported ZODB type", zodb)) -%}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment