Skip to content

Commit dd95dec

Browse files
update jm names
1 parent 34b002d commit dd95dec

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

env_var

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
SIMPLY_BLOCK_COMMAND_NAME=sbcli-ha
2-
SIMPLY_BLOCK_VERSION=0.0.7
2+
SIMPLY_BLOCK_VERSION=0.0.8
33

44

55
SIMPLY_BLOCK_DOCKER_IMAGE=simplyblock/simplyblock:ha-jm

simplyblock_core/controllers/lvol_controller.py

+7-5
Original file line numberDiff line numberDiff line change
@@ -169,15 +169,17 @@ def get_jm_names(snode):
169169
return [snode.jm_device.jm_bdev] if snode.jm_device else []
170170

171171

172-
def get_ha_jm_names(snode_list):
172+
def get_ha_jm_names(current_node, snode_list):
173173
jm_list = []
174-
if snode_list[0].jm_device:
175-
jm_list.append(snode_list[0].jm_device.jm_bdev)
174+
if current_node.jm_device:
175+
jm_list.append(current_node.jm_device.jm_bdev)
176176
else:
177177
jm_list.append("JM_LOCAL")
178178

179-
for snode in snode_list[1:]:
180-
name = f"remote_{snode.jm_device.jm_bdev}n1"
179+
for node in snode_list:
180+
if node.get_id() == current_node.get_id():
181+
continue
182+
name = f"remote_{node.jm_device.jm_bdev}n1"
181183
jm_list.append(name)
182184
return jm_list
183185

simplyblock_core/storage_node_ops.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2534,7 +2534,7 @@ def create_lvstore(snode, ndcs, npcs, distr_bs, distr_chunk_bs, page_size_in_blo
25342534
cluster_sz = ndcs * page_size_in_blocks
25352535
if len(nodes) > 3:
25362536
nodes = nodes[:3]
2537-
jm_names = lvol_controller.get_ha_jm_names(nodes)
2537+
jm_names = lvol_controller.get_ha_jm_names(snode, nodes)
25382538

25392539
for _ in range(snode.number_of_distribs):
25402540
distrib_vuid = utils.get_random_vuid()

0 commit comments

Comments
 (0)