From b6abd051520740a87b5436c64dd5d60cc6a59122 Mon Sep 17 00:00:00 2001 From: anlicheng <244108715@qq.com> Date: Fri, 9 May 2025 18:01:47 +0800 Subject: [PATCH] fix --- apps/efka/include/efka.hrl | 6 +- apps/efka/include/message_pb.hrl | 7 +++ apps/efka/src/efka_agent.erl | 35 +++++++++-- apps/efka/src/proto/message_pb.erl | 97 ++++++++++++++++++++++++++++-- message_pb.proto | 7 ++- 5 files changed, 138 insertions(+), 14 deletions(-) diff --git a/apps/efka/include/efka.hrl b/apps/efka/include/efka.hrl index ea6c056..2cacebd 100644 --- a/apps/efka/include/efka.hrl +++ b/apps/efka/include/efka.hrl @@ -41,7 +41,7 @@ %%%% 主动推送的消息类型子分类, 需要返回值 -%% 部署微服务 -define(PUSH_DEPLOY, 16#01). -%% 服务配置 --define(PUSH_SERVICE_CONFIG, 16#02). \ No newline at end of file +-define(PUSH_SERVICE_CONFIG, 16#02). +-define(PUSH_INVOKE, 16#03). +-define(PUSH_TASK_LOG, 16#04). diff --git a/apps/efka/include/message_pb.hrl b/apps/efka/include/message_pb.hrl index fbb0188..0032f5d 100644 --- a/apps/efka/include/message_pb.hrl +++ b/apps/efka/include/message_pb.hrl @@ -53,6 +53,13 @@ }). -endif. +-ifndef('FETCH_TASK_LOG_PB_H'). +-define('FETCH_TASK_LOG_PB_H', true). +-record(fetch_task_log, + {task_id = 0 :: non_neg_integer() | undefined % = 1, optional, 32 bits + }). +-endif. + -ifndef('INVOKE_PB_H'). -define('INVOKE_PB_H', true). -record(invoke, diff --git a/apps/efka/src/efka_agent.erl b/apps/efka/src/efka_agent.erl index 8d03407..3ce6ef0 100644 --- a/apps/efka/src/efka_agent.erl +++ b/apps/efka/src/efka_agent.erl @@ -233,6 +233,21 @@ handle_info({server_push, PacketId, <>}, State {noreply, State}; +%% 获取task的部署日志 +handle_info({server_push, PacketId, <>}, State = #state{transport_pid = TransportPid}) -> + #deploy{task_id = TaskId, service_id = ServiceId, tar_url = TarUrl} = message_pb:decode_msg(DeployBin, deploy), + + %% 短暂的等待，efka_inetd收到消息后就立即返回了 + Reply = case efka_inetd:deploy(TaskId, ServiceId, TarUrl) of + ok -> + #push_reply{code = 1, message = <<"">>}; + {error, Reason} when is_binary(Reason) -> + #push_reply{code = 0, message = Reason} + end, + is_pid(TransportPid) andalso efka_transport:push_response(TransportPid, PacketId, message_pb:encode_msg(Reply)), + + {noreply, State}; + %% config.json配置信息 handle_info({server_push, PacketId, <>}, State = #state{transport_pid = TransportPid, inflight = Inflight}) -> #service_config{service_id = ServiceId, config_json = ConfigJson, timeout = Timeout} = message_pb:decode_msg(ConfigBin, service_config), @@ -253,10 +268,8 @@ handle_info({server_push, PacketId, <> end; %% 收到需要回复的指令 -handle_info({server_push, PacketId, Invoke = #invoke{service_id = ServiceId, payload = Payload, timeout = Timeout}}, - State = #state{status = ?STATE_ACTIVATED, inflight = Inflight}) -> - - efka_logger:debug("[efka_agent] get invoke: ~p", [Invoke]), +handle_info({server_push, PacketId, <>}, State = #state{status = ?STATE_ACTIVATED, inflight = Inflight}) -> + #invoke{service_id = ServiceId, payload = Payload, timeout = Timeout} = message_pb:decode_msg(InvokeBin, invoke), %% 消息发送到订阅系统 case efka_service:get_pid(ServiceId) of undefined -> @@ -272,6 +285,20 @@ handle_info({server_push, PacketId, Invoke = #invoke{service_id = ServiceId, pay {noreply, State#state{inflight = maps:put(Ref, PacketId, Inflight)}} end; +%% 处理task_log +handle_info({server_push, PacketId, <>}, State = #state{status = ?STATE_ACTIVATED}) -> + #fetch_task_log{task_id = TaskId} = message_pb:decode_msg(TaskLogBin, fetch_task_log), + {ok, Logs} = efka_inetd_task_log:get_logs(TaskId), + Reply = case length(Logs) > 0 of + true -> + Result = iolist_to_binary(jiffy:encode(Logs, [force_utf8])), + #push_reply{code = 1, result = Result}; + false -> + #push_reply{code = 1, result = <<"[]">>} + end, + safe_push_response(PacketId, message_pb:encode_msg(Reply), State), + {noreply, State}; + %% 处理命令 handle_info({server_command, ?COMMAND_AUTH, <>}, State = #state{transport_pid = TransportPid, status = Status}) -> case {Auth, Status} of diff --git a/apps/efka/src/proto/message_pb.erl b/apps/efka/src/proto/message_pb.erl index 338d24b..056408d 100644 --- a/apps/efka/src/proto/message_pb.erl +++ b/apps/efka/src/proto/message_pb.erl @@ -65,6 +65,8 @@ -type deploy() :: #deploy{}. +-type fetch_task_log() :: #fetch_task_log{}. + -type invoke() :: #invoke{}. -type service_config() :: #service_config{}. @@ -77,9 +79,9 @@ -type event() :: #event{}. --export_type(['auth_request'/0, 'auth_reply'/0, 'pub'/0, 'push_reply'/0, 'deploy'/0, 'invoke'/0, 'service_config'/0, 'data'/0, 'ping'/0, 'service_inform'/0, 'event'/0]). --type '$msg_name'() :: auth_request | auth_reply | pub | push_reply | deploy | invoke | service_config | data | ping | service_inform | event. --type '$msg'() :: auth_request() | auth_reply() | pub() | push_reply() | deploy() | invoke() | service_config() | data() | ping() | service_inform() | event(). +-export_type(['auth_request'/0, 'auth_reply'/0, 'pub'/0, 'push_reply'/0, 'deploy'/0, 'fetch_task_log'/0, 'invoke'/0, 'service_config'/0, 'data'/0, 'ping'/0, 'service_inform'/0, 'event'/0]). +-type '$msg_name'() :: auth_request | auth_reply | pub | push_reply | deploy | fetch_task_log | invoke | service_config | data | ping | service_inform | event. +-type '$msg'() :: auth_request() | auth_reply() | pub() | push_reply() | deploy() | fetch_task_log() | invoke() | service_config() | data() | ping() | service_inform() | event(). -export_type(['$msg_name'/0, '$msg'/0]). -if(?OTP_RELEASE >= 24). @@ -111,6 +113,7 @@ encode_msg(Msg, MsgName, Opts) -> pub -> encode_msg_pub(id(Msg, TrUserData), TrUserData); push_reply -> encode_msg_push_reply(id(Msg, TrUserData), TrUserData); deploy -> encode_msg_deploy(id(Msg, TrUserData), TrUserData); + fetch_task_log -> encode_msg_fetch_task_log(id(Msg, TrUserData), TrUserData); invoke -> encode_msg_invoke(id(Msg, TrUserData), TrUserData); service_config -> encode_msg_service_config(id(Msg, TrUserData), TrUserData); data -> encode_msg_data(id(Msg, TrUserData), TrUserData); @@ -291,6 +294,20 @@ encode_msg_deploy(#deploy{task_id = F1, service_id = F2, tar_url = F3}, Bin, TrU end end. +encode_msg_fetch_task_log(Msg, TrUserData) -> encode_msg_fetch_task_log(Msg, <<>>, TrUserData). + + +encode_msg_fetch_task_log(#fetch_task_log{task_id = F1}, Bin, TrUserData) -> + if F1 == undefined -> Bin; + true -> + begin + TrF1 = id(F1, TrUserData), + if TrF1 =:= 0 -> Bin; + true -> e_varint(TrF1, <>, TrUserData) + end + end + end. + encode_msg_invoke(Msg, TrUserData) -> encode_msg_invoke(Msg, <<>>, TrUserData). @@ -763,6 +780,7 @@ decode_msg_2_doit(auth_reply, Bin, TrUserData) -> id(decode_msg_auth_reply(Bin, decode_msg_2_doit(pub, Bin, TrUserData) -> id(decode_msg_pub(Bin, TrUserData), TrUserData); decode_msg_2_doit(push_reply, Bin, TrUserData) -> id(decode_msg_push_reply(Bin, TrUserData), TrUserData); decode_msg_2_doit(deploy, Bin, TrUserData) -> id(decode_msg_deploy(Bin, TrUserData), TrUserData); +decode_msg_2_doit(fetch_task_log, Bin, TrUserData) -> id(decode_msg_fetch_task_log(Bin, TrUserData), TrUserData); decode_msg_2_doit(invoke, Bin, TrUserData) -> id(decode_msg_invoke(Bin, TrUserData), TrUserData); decode_msg_2_doit(service_config, Bin, TrUserData) -> id(decode_msg_service_config(Bin, TrUserData), TrUserData); decode_msg_2_doit(data, Bin, TrUserData) -> id(decode_msg_data(Bin, TrUserData), TrUserData); @@ -1062,6 +1080,50 @@ skip_32_deploy(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) - skip_64_deploy(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> dfp_read_field_def_deploy(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData). +decode_msg_fetch_task_log(Bin, TrUserData) -> dfp_read_field_def_fetch_task_log(Bin, 0, 0, 0, id(0, TrUserData), TrUserData). + +dfp_read_field_def_fetch_task_log(<<8, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> d_field_fetch_task_log_task_id(Rest, Z1, Z2, F, F@_1, TrUserData); +dfp_read_field_def_fetch_task_log(<<>>, 0, 0, _, F@_1, _) -> #fetch_task_log{task_id = F@_1}; +dfp_read_field_def_fetch_task_log(Other, Z1, Z2, F, F@_1, TrUserData) -> dg_read_field_def_fetch_task_log(Other, Z1, Z2, F, F@_1, TrUserData). + +dg_read_field_def_fetch_task_log(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, TrUserData) when N < 32 - 7 -> dg_read_field_def_fetch_task_log(Rest, N + 7, X bsl N + Acc, F, F@_1, TrUserData); +dg_read_field_def_fetch_task_log(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, TrUserData) -> + Key = X bsl N + Acc, + case Key of + 8 -> d_field_fetch_task_log_task_id(Rest, 0, 0, 0, F@_1, TrUserData); + _ -> + case Key band 7 of + 0 -> skip_varint_fetch_task_log(Rest, 0, 0, Key bsr 3, F@_1, TrUserData); + 1 -> skip_64_fetch_task_log(Rest, 0, 0, Key bsr 3, F@_1, TrUserData); + 2 -> skip_length_delimited_fetch_task_log(Rest, 0, 0, Key bsr 3, F@_1, TrUserData); + 3 -> skip_group_fetch_task_log(Rest, 0, 0, Key bsr 3, F@_1, TrUserData); + 5 -> skip_32_fetch_task_log(Rest, 0, 0, Key bsr 3, F@_1, TrUserData) + end + end; +dg_read_field_def_fetch_task_log(<<>>, 0, 0, _, F@_1, _) -> #fetch_task_log{task_id = F@_1}. + +d_field_fetch_task_log_task_id(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, TrUserData) when N < 57 -> d_field_fetch_task_log_task_id(Rest, N + 7, X bsl N + Acc, F, F@_1, TrUserData); +d_field_fetch_task_log_task_id(<<0:1, X:7, Rest/binary>>, N, Acc, F, _, TrUserData) -> + {NewFValue, RestF} = {id((X bsl N + Acc) band 4294967295, TrUserData), Rest}, + dfp_read_field_def_fetch_task_log(RestF, 0, 0, F, NewFValue, TrUserData). + +skip_varint_fetch_task_log(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> skip_varint_fetch_task_log(Rest, Z1, Z2, F, F@_1, TrUserData); +skip_varint_fetch_task_log(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> dfp_read_field_def_fetch_task_log(Rest, Z1, Z2, F, F@_1, TrUserData). + +skip_length_delimited_fetch_task_log(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, TrUserData) when N < 57 -> skip_length_delimited_fetch_task_log(Rest, N + 7, X bsl N + Acc, F, F@_1, TrUserData); +skip_length_delimited_fetch_task_log(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, TrUserData) -> + Length = X bsl N + Acc, + <<_:Length/binary, Rest2/binary>> = Rest, + dfp_read_field_def_fetch_task_log(Rest2, 0, 0, F, F@_1, TrUserData). + +skip_group_fetch_task_log(Bin, _, Z2, FNum, F@_1, TrUserData) -> + {_, Rest} = read_group(Bin, FNum), + dfp_read_field_def_fetch_task_log(Rest, 0, Z2, FNum, F@_1, TrUserData). + +skip_32_fetch_task_log(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> dfp_read_field_def_fetch_task_log(Rest, Z1, Z2, F, F@_1, TrUserData). + +skip_64_fetch_task_log(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> dfp_read_field_def_fetch_task_log(Rest, Z1, Z2, F, F@_1, TrUserData). + decode_msg_invoke(Bin, TrUserData) -> dfp_read_field_def_invoke(Bin, 0, 0, 0, id(<<>>, TrUserData), id(<<>>, TrUserData), id(0, TrUserData), TrUserData). dfp_read_field_def_invoke(<<10, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> d_field_invoke_service_id(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData); @@ -1650,6 +1712,7 @@ merge_msgs(Prev, New, MsgName, Opts) -> pub -> merge_msg_pub(Prev, New, TrUserData); push_reply -> merge_msg_push_reply(Prev, New, TrUserData); deploy -> merge_msg_deploy(Prev, New, TrUserData); + fetch_task_log -> merge_msg_fetch_task_log(Prev, New, TrUserData); invoke -> merge_msg_invoke(Prev, New, TrUserData); service_config -> merge_msg_service_config(Prev, New, TrUserData); data -> merge_msg_data(Prev, New, TrUserData); @@ -1733,6 +1796,13 @@ merge_msg_deploy(#deploy{task_id = PFtask_id, service_id = PFservice_id, tar_url true -> NFtar_url end}. +-compile({nowarn_unused_function,merge_msg_fetch_task_log/3}). +merge_msg_fetch_task_log(#fetch_task_log{task_id = PFtask_id}, #fetch_task_log{task_id = NFtask_id}, _) -> + #fetch_task_log{task_id = + if NFtask_id =:= undefined -> PFtask_id; + true -> NFtask_id + end}. + -compile({nowarn_unused_function,merge_msg_invoke/3}). merge_msg_invoke(#invoke{service_id = PFservice_id, payload = PFpayload, timeout = PFtimeout}, #invoke{service_id = NFservice_id, payload = NFpayload, timeout = NFtimeout}, _) -> #invoke{service_id = @@ -1890,6 +1960,7 @@ verify_msg(Msg, MsgName, Opts) -> pub -> v_msg_pub(Msg, [MsgName], TrUserData); push_reply -> v_msg_push_reply(Msg, [MsgName], TrUserData); deploy -> v_msg_deploy(Msg, [MsgName], TrUserData); + fetch_task_log -> v_msg_fetch_task_log(Msg, [MsgName], TrUserData); invoke -> v_msg_invoke(Msg, [MsgName], TrUserData); service_config -> v_msg_service_config(Msg, [MsgName], TrUserData); data -> v_msg_data(Msg, [MsgName], TrUserData); @@ -1975,6 +2046,15 @@ v_msg_deploy(#deploy{task_id = F1, service_id = F2, tar_url = F3}, Path, TrUserD ok; v_msg_deploy(X, Path, _TrUserData) -> mk_type_error({expected_msg, deploy}, X, Path). +-compile({nowarn_unused_function,v_msg_fetch_task_log/3}). +-dialyzer({nowarn_function,v_msg_fetch_task_log/3}). +v_msg_fetch_task_log(#fetch_task_log{task_id = F1}, Path, TrUserData) -> + if F1 == undefined -> ok; + true -> v_type_uint32(F1, [task_id | Path], TrUserData) + end, + ok; +v_msg_fetch_task_log(X, Path, _TrUserData) -> mk_type_error({expected_msg, fetch_task_log}, X, Path). + -compile({nowarn_unused_function,v_msg_invoke/3}). -dialyzer({nowarn_function,v_msg_invoke/3}). v_msg_invoke(#invoke{service_id = F1, payload = F2, timeout = F3}, Path, TrUserData) -> @@ -2190,6 +2270,7 @@ get_msg_defs() -> [#field{name = task_id, fnum = 1, rnum = 2, type = uint32, occurrence = optional, opts = []}, #field{name = service_id, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}, #field{name = tar_url, fnum = 3, rnum = 4, type = string, occurrence = optional, opts = []}]}, + {{msg, fetch_task_log}, [#field{name = task_id, fnum = 1, rnum = 2, type = uint32, occurrence = optional, opts = []}]}, {{msg, invoke}, [#field{name = service_id, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []}, #field{name = payload, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}, @@ -2227,13 +2308,13 @@ get_msg_defs() -> #field{name = params, fnum = 3, rnum = 4, type = string, occurrence = optional, opts = []}]}]. -get_msg_names() -> [auth_request, auth_reply, pub, push_reply, deploy, invoke, service_config, data, ping, service_inform, event]. +get_msg_names() -> [auth_request, auth_reply, pub, push_reply, deploy, fetch_task_log, invoke, service_config, data, ping, service_inform, event]. get_group_names() -> []. -get_msg_or_group_names() -> [auth_request, auth_reply, pub, push_reply, deploy, invoke, service_config, data, ping, service_inform, event]. +get_msg_or_group_names() -> [auth_request, auth_reply, pub, push_reply, deploy, fetch_task_log, invoke, service_config, data, ping, service_inform, event]. get_enum_names() -> []. @@ -2266,6 +2347,7 @@ find_msg_def(deploy) -> [#field{name = task_id, fnum = 1, rnum = 2, type = uint32, occurrence = optional, opts = []}, #field{name = service_id, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}, #field{name = tar_url, fnum = 3, rnum = 4, type = string, occurrence = optional, opts = []}]; +find_msg_def(fetch_task_log) -> [#field{name = task_id, fnum = 1, rnum = 2, type = uint32, occurrence = optional, opts = []}]; find_msg_def(invoke) -> [#field{name = service_id, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []}, #field{name = payload, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}, @@ -2364,6 +2446,7 @@ fqbin_to_msg_name(<<"AuthReply">>) -> auth_reply; fqbin_to_msg_name(<<"Pub">>) -> pub; fqbin_to_msg_name(<<"PushReply">>) -> push_reply; fqbin_to_msg_name(<<"Deploy">>) -> deploy; +fqbin_to_msg_name(<<"FetchTaskLog">>) -> fetch_task_log; fqbin_to_msg_name(<<"Invoke">>) -> invoke; fqbin_to_msg_name(<<"ServiceConfig">>) -> service_config; fqbin_to_msg_name(<<"Data">>) -> data; @@ -2378,6 +2461,7 @@ msg_name_to_fqbin(auth_reply) -> <<"AuthReply">>; msg_name_to_fqbin(pub) -> <<"Pub">>; msg_name_to_fqbin(push_reply) -> <<"PushReply">>; msg_name_to_fqbin(deploy) -> <<"Deploy">>; +msg_name_to_fqbin(fetch_task_log) -> <<"FetchTaskLog">>; msg_name_to_fqbin(invoke) -> <<"Invoke">>; msg_name_to_fqbin(service_config) -> <<"ServiceConfig">>; msg_name_to_fqbin(data) -> <<"Data">>; @@ -2422,7 +2506,7 @@ get_all_source_basenames() -> ["message_pb.proto"]. get_all_proto_names() -> ["message_pb"]. -get_msg_containment("message_pb") -> [auth_reply, auth_request, data, deploy, event, invoke, ping, pub, push_reply, service_config, service_inform]; +get_msg_containment("message_pb") -> [auth_reply, auth_request, data, deploy, event, fetch_task_log, invoke, ping, pub, push_reply, service_config, service_inform]; get_msg_containment(P) -> error({gpb_error, {badproto, P}}). @@ -2449,6 +2533,7 @@ get_proto_by_msg_name_as_fqbin(<<"AuthRequest">>) -> "message_pb"; get_proto_by_msg_name_as_fqbin(<<"Invoke">>) -> "message_pb"; get_proto_by_msg_name_as_fqbin(<<"ServiceConfig">>) -> "message_pb"; get_proto_by_msg_name_as_fqbin(<<"Ping">>) -> "message_pb"; +get_proto_by_msg_name_as_fqbin(<<"FetchTaskLog">>) -> "message_pb"; get_proto_by_msg_name_as_fqbin(<<"PushReply">>) -> "message_pb"; get_proto_by_msg_name_as_fqbin(<<"Deploy">>) -> "message_pb"; get_proto_by_msg_name_as_fqbin(<<"AuthReply">>) -> "message_pb"; diff --git a/message_pb.proto b/message_pb.proto index b04f301..a2098b8 100644 --- a/message_pb.proto +++ b/message_pb.proto @@ -38,7 +38,12 @@ message Deploy { string tar_url = 3; } -// 需要响应, 云端主动发起的调用 +// 获取task的logs +message FetchTaskLog { + uint32 task_id = 1; +} + +// 需要响应, 云端主动发起的调用; 提供给用户 message Invoke { string service_id = 1; string payload = 2;