Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions lib/arke/boundary/group_manager.ex
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ defmodule Arke.Boundary.GroupManager do
manager_id(:group)

defp check_module(%{__module__: nil} = unit),
do: Unit.update(unit, __module__: Arke.System.BaseGroup)
do: Unit.update(unit, __module__: Arke.System.BaseGroup)

defp check_module(unit), do: unit

Expand Down Expand Up @@ -59,11 +59,11 @@ defmodule Arke.Boundary.GroupManager do

unit ->
with %Unit{} = arke <-
Enum.find(get_arke_list(unit), {:error, "arke id not found"}, fn f ->
f.id == arke_id
end),
do: arke,
else: ({:error, msg} -> nil)
Enum.find(get_arke_list(unit), {:error, "arke id not found"}, fn f ->
f.id == arke_id
end),
do: arke,
else: ({:error, msg} -> nil)
end
end

Expand All @@ -77,23 +77,24 @@ defmodule Arke.Boundary.GroupManager do

Enum.reduce(group_keys, [], fn {g, _}, groups ->
group = get(g, project)

if arke_id in Enum.map(group.data.arke_list, fn a -> a.id end) do
[group | groups]
[group | groups]
else
groups
groups
end
end)
end

def get_parameters(group_id, project), do: get(group_id, project) |> get_parameters

def get_parameters(%{id: id, metadata: %{project: project}} = group) do
parameters =
get_arke_list(group)
|> get_group_parameters(project)
|> init_parameters_by_ids(project)
end


defp get_group_parameters(arke_list, _project) do
Enum.reduce(arke_list, [], fn arke, group_parameters ->
check_group_parameters(group_parameters, Arke.Boundary.ArkeManager.get_parameters(arke))
Expand Down
47 changes: 30 additions & 17 deletions lib/arke/boundary/unit_manager.ex
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ defmodule Arke.Boundary.UnitManager do
{manager, opts} = Keyword.pop(opts, :manager, __MODULE__)
{unit, project} = before_create(unit, project)
current_node_create = GenServer.call(manager, {:create, unit, project})
call_nodes_manager(manager,:create,[unit,project])
call_nodes_manager(manager, :create, [unit, project])
current_node_create
end

Expand All @@ -113,7 +113,7 @@ defmodule Arke.Boundary.UnitManager do
def update(unit_id, project, new_unit) do
unit = get(unit_id, project)
current_node_update = GenServer.call(__MODULE__, {:update, new_unit, project})
call_nodes_manager(__MODULE__,:update,[new_unit,project])
call_nodes_manager(__MODULE__, :update, [new_unit, project])
current_node_update
end

Expand All @@ -126,9 +126,8 @@ defmodule Arke.Boundary.UnitManager do
defp exec_call_func(unit, func, opts) when is_nil(unit),
do: get(:arke, :arke_system) |> exec_call_func(func, opts)

defp exec_call_func(%{__module__: module} = unit, func, opts) when is_nil(module), do:
{:error, "No Module"}

defp exec_call_func(%{__module__: module} = unit, func, opts) when is_nil(module),
do: {:error, "No Module"}

defp exec_call_func(
%{id: id, metadata: %{project: project}, __module__: module} = unit,
Expand Down Expand Up @@ -171,10 +170,15 @@ defmodule Arke.Boundary.UnitManager do
manager = __MODULE__

case get(unit_id, project) do
nil -> {:error, "#{unit_id} doesn't exist in project: #{project}"}
nil ->
{:error, "#{unit_id} doesn't exist in project: #{project}"}

unit ->
current_node_update = GenServer.call(manager, {:add_link, unit, parameter_id, child_id, metadata})
call_nodes_manager(manager,:add_link,[unit, parameter_id, child_id, metadata])
current_node_update =
GenServer.call(manager, {:add_link, unit, parameter_id, child_id, metadata})

call_nodes_manager(manager, :add_link, [unit, parameter_id, child_id, metadata])

current_node_update
end
end
Expand All @@ -188,10 +192,14 @@ defmodule Arke.Boundary.UnitManager do
manager = __MODULE__

case get(unit_id, project) do
nil -> {:error, "#{unit_id} doesn't exist in project: #{project}"}
nil ->
{:error, "#{unit_id} doesn't exist in project: #{project}"}

unit ->
current_node_update = GenServer.call(manager, {:remove_link, unit, parameter_id, child_id})
call_nodes_manager(manager,:remove_link,[unit, parameter_id, child_id])
current_node_update =
GenServer.call(manager, {:remove_link, unit, parameter_id, child_id})

call_nodes_manager(manager, :remove_link, [unit, parameter_id, child_id])
current_node_update
end
end
Expand Down Expand Up @@ -222,6 +230,8 @@ defmodule Arke.Boundary.UnitManager do
_from,
state
) do


opts =
%{}
|> Map.put(parameter_id, [
Expand All @@ -238,16 +248,19 @@ defmodule Arke.Boundary.UnitManager do
do: %{id: child_id, metadata: metadata}

# Update all nodes manager
defp call_nodes_manager(manager,func_name,opts) do
tuple_data = Enum.reduce(opts,{func_name},fn opt,acc -> Tuple.append(acc,opt) end)
{right_nodes, bad_nodes} = :rpc.multicall(Node.list(),GenServer,:call,[manager, tuple_data])
if length(bad_nodes)>0 do
defp call_nodes_manager(manager, func_name, opts) do
tuple_data = Enum.reduce(opts, {func_name}, fn opt, acc -> Tuple.append(acc, opt) end)

{right_nodes, bad_nodes} =
:rpc.multicall(Node.list(), GenServer, :call, [manager, tuple_data])

if length(bad_nodes) > 0 do
Enum.each(bad_nodes, fn unit ->
Logger.warning("Something went wrong during multi node update for unit: `#{unit.id}`")
end)

end
{right_nodes,bad_nodes}

{right_nodes, bad_nodes}
end

# Remove link
Expand Down
Loading