chore: put the pool_size default value to avoid hot upgrade failure

This commit is contained in:
JianBo He 2021-11-10 18:40:40 +08:00 committed by JianBo He
parent 2be33b33e3
commit 6b40048d29
3 changed files with 8 additions and 4 deletions

View File

@ -58,6 +58,8 @@
-define(SUBOPTS, #{rh => 0, rap => 0, nl => 0, qos => ?QOS_0, is_new => false}). -define(SUBOPTS, #{rh => 0, rap => 0, nl => 0, qos => ?QOS_0, is_new => false}).
-define(PROTO_VER, 1).
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
%% API %% API
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
@ -260,7 +262,7 @@ packet_to_message(Topic, Payload,
emqx_message:make(ClientId, ?QOS_0, Topic, Payload) emqx_message:make(ClientId, ?QOS_0, Topic, Payload)
), ),
emqx_message:set_headers( emqx_message:set_headers(
#{ proto_ver => 1 #{ proto_ver => ?PROTO_VER
, protocol => coap , protocol => coap
, username => Username , username => Username
, peerhost => PeerHost}, Message). , peerhost => PeerHost}, Message).
@ -335,7 +337,7 @@ conninfo(#state{peername = Peername,
peercert => nossl, %% TODO: dtls peercert => nossl, %% TODO: dtls
conn_mod => ?MODULE, conn_mod => ?MODULE,
proto_name => <<"CoAP">>, proto_name => <<"CoAP">>,
proto_ver => 1, proto_ver => ?PROTO_VER,
clean_start => true, clean_start => true,
clientid => ClientId, clientid => ClientId,
username => undefined, username => undefined,

View File

@ -295,7 +295,9 @@ put_pool_size(Val) ->
persistent_term:put({?APP, pool_size}, Val). persistent_term:put({?APP, pool_size}, Val).
get_pool_size() -> get_pool_size() ->
persistent_term:get({?APP, pool_size}). %% Avoid the scenario that the parameter is not set after
%% the hot upgrade completed.
persistent_term:get({?APP, pool_size}, erlang:system_info(schedulers)).
save(Name, ServerState) -> save(Name, ServerState) ->
Saved = persistent_term:get(?APP, []), Saved = persistent_term:get(?APP, []),

View File

@ -295,7 +295,7 @@ on_session_terminated(Req, Md) ->
| {error, grpc_cowboy_h:error_response()}. | {error, grpc_cowboy_h:error_response()}.
on_message_publish(#{message := #{from := From} = Msg} = Req, Md) -> on_message_publish(#{message := #{from := From} = Msg} = Req, Md) ->
?MODULE:in({?FUNCTION_NAME, Req}), ?MODULE:in({?FUNCTION_NAME, Req}),
%io:format(standard_error, "fun: ~p, req: ~0p~n", [?FUNCTION_NAME, Req]), %io:format("fun: ~p, req: ~0p~n", [?FUNCTION_NAME, Req]),
%% some cases for testing %% some cases for testing
case From of case From of
<<"baduser">> -> <<"baduser">> ->