Skip to content

Commit fc1e8a6

Browse files
committed
refactor
1 parent 7810d08 commit fc1e8a6

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

lib/trento/operations/cluster_policy.ex

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -75,18 +75,18 @@ defmodule Trento.Operations.ClusterPolicy do
7575

7676
sr_primary_instances =
7777
get_sr_instances(
78-
end)
79-
80-
count_primary_running = Enum.count(sr_primary_instances)
81-
82-
83-
count_primary_running =
84-
count_sr_instances(
8578
database_instances,
8679
hosts,
8780
"Primary"
8881
)
8982

83+
all_primary_running? =
84+
Enum.all?(sr_primary_instances, fn %{cluster_host_status: curr_status} ->
85+
curr_status == ClusterHostStatus.online()
86+
end)
87+
88+
count_primary_running = Enum.count(sr_primary_instances)
89+
9090
host = Enum.find(hosts, &(&1.id === host_id))
9191

9292
cond do
@@ -120,19 +120,19 @@ defmodule Trento.Operations.ClusterPolicy do
120120
when type in [ClusterType.hana_scale_up(), ClusterType.hana_scale_out()] do
121121
database_instances = get_cluster_database_instances(hosts, sap_instances)
122122
host_running_primary? = primary_instance_in_host?(database_instances, host_id)
123+
123124
sr_secondary_instances =
124125
get_sr_instances(
125-
all_sr_instances_with_state?(
126126
database_instances,
127+
hosts,
127128
"Secondary"
128-
ClusterHostStatus.offline()
129129
)
130+
130131
all_secondary_stopped? =
131132
Enum.all?(sr_secondary_instances, fn %{cluster_host_status: curr_status} ->
132133
curr_status == ClusterHostStatus.offline()
133134
end)
134135

135-
136136
if host_running_primary? and not all_secondary_stopped? do
137137
host = Enum.find(hosts, &(&1.id === host_id))
138138

@@ -201,8 +201,8 @@ defmodule Trento.Operations.ClusterPolicy do
201201
inst_host_id == host_id and sr == "Primary"
202202
end)
203203
end
204+
204205
defp get_sr_instances(database_instances, hosts, sr_mode) do
205-
defp all_sr_instances_with_state?(database_instances, hosts, sr_mode, status) do
206206
host_ids_with_srmode =
207207
Enum.flat_map(database_instances, fn
208208
%{host_id: host_id, system_replication: ^sr_mode} -> [host_id]

0 commit comments

Comments
 (0)