Skip to content

Commit

Permalink
fix(backend): redis集群列表超出下标问题 #8996
Browse files Browse the repository at this point in the history
  • Loading branch information
ygcyao authored and zhangzhw8 committed Jan 9, 2025
1 parent de37ce1 commit 260f762
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
13 changes: 11 additions & 2 deletions dbm-ui/backend/db_services/redis/resources/redis_cluster/query.py
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,17 @@ def _to_cluster_representation(
)
except IndexError:
# 异常处理 因nosqlstoragesetdtl的分片数据只有redis为master才有seg_range值 以下处理是slave找出对应master seg_range并赋予值 供主从对应排序处理
master = ejector_id__storage_map.get(inst.as_receiver.all()[0].ejector_id)
seg_range = master.nosqlstoragesetdtl_set.all()[0].seg_range if master is not None else "-1"
receivers = inst.as_receiver.all()
# 检查receivers是否为空
if receivers:
master = ejector_id__storage_map.get(receivers[0].ejector_id)
seg_range = (
master.nosqlstoragesetdtl_set.all()[0].seg_range
if master.nosqlstoragesetdtl_set.all()
else "-1"
)
else:
seg_range = "-1"
except Exception:
# 如果无法找到seg_range,则默认为-1。有可能实例处于restoring状态(比如集群容量变更时)
seg_range = "-1"
Expand Down
2 changes: 1 addition & 1 deletion dbm-ui/backend/ticket/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@ def calculate_status_count(field_name, relation_name):
return count_map

# 计算我的代办
results["Pending"] = calculate_status_count("operators", "todo_of_ticket")
results["pending"] = calculate_status_count("operators", "todo_of_ticket")
# 计算我的协助
results["to_help"] = calculate_status_count("helpers", "todo_of_ticket")
# 我负责的业务
Expand Down

0 comments on commit 260f762

Please sign in to comment.