S2S/listeners #4455
S2S/listeners #4455
Conversation
NelsonVides
force-pushed
the
s2s/listeners
branch
3 times, most recently
from
97411af to
b3aa6d2
Compare
This comment was marked as outdated.
This comment was marked as outdated.
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## feature/listeners #4455 +/- ##
=====================================================
- Coverage 85.35% 85.16% -0.19%
=====================================================
Files 553 554 +1
Lines 33959 34021 +62
=====================================================
- Hits 28985 28975 -10
- Misses 4974 5046 +72 ☔ View full report in Codecov by Sentry. |
|
elasticsearch_and_cassandra_27 / elasticsearch_and_cassandra_mnesia / 69764e3 small_tests_26 / small_tests / 69764e3 small_tests_27 / small_tests / 69764e3 small_tests_27_arm64 / small_tests / 69764e3 ldap_mnesia_26 / ldap_mnesia / 69764e3 ldap_mnesia_27 / ldap_mnesia / 69764e3 dynamic_domains_mysql_redis_27 / mysql_redis / 69764e3 dynamic_domains_mssql_mnesia_27 / odbc_mssql_mnesia / 69764e3 graphql_server_SUITE:admin_cli:clustering_tests:remove_alive_from_cluster{error,{{badrpc,nodedown},
[{distributed_helper,rpc,
[#{timeout => 60000,
node => mongooseim3@localhost},
mongoose_cluster,join,
[mongooseim@localhost]],
[{file,"/home/circleci/project/big_tests/../test/common/distributed_helper.erl"},
{line,140}]},
{graphql_server_SUITE,remove_alive_from_cluster,1,
[{file,"/home/circleci/project/big_tests/tests/graphql_server_SUITE.erl"},
{line,214}]},
{test_server,ts_tc,3,[{file,"test_server.erl"},{line,1794}]},
{test_server,run_test_case_eval1,6,
[{file,"test_server.erl"},{line,1303}]},
{test_server,run_test_case_eval,9,
[{file,"test_server.erl"},{line,1235}]}]}}graphql_server_SUITE:admin_cli:clustering_tests:remove_node_test{error,{#{what => invalid_response_code,expected_type => ok,
response_code => {exit_status,3}},
[{graphql_helper,assert_response_code,2,
[{file,"/home/circleci/project/big_tests/tests/graphql_helper.erl"},
{line,258}]},
{graphql_helper,get_ok_value,2,
[{file,"/home/circleci/project/big_tests/tests/graphql_helper.erl"},
{line,241}]},
{graphql_server_SUITE,remove_node_test,1,
[{file,"/home/circleci/project/big_tests/tests/graphql_server_SUITE.erl"},
{line,225}]},
{test_server,ts_tc,3,[{file,"test_server.erl"},{line,1794}]},
{test_server,run_test_case_eval1,6,
[{file,"test_server.erl"},{line,1303}]},
{test_server,run_test_case_eval,9,
[{file,"test_server.erl"},{line,1235}]}]}}graphql_server_SUITE:admin_cli:clustering_tests:stop_node_test{error,{#{what => invalid_response_code,expected_type => ok,
response_code => {exit_status,3}},
[{graphql_helper,assert_response_code,2,
[{file,"/home/circleci/project/big_tests/tests/graphql_helper.erl"},
{line,258}]},
{graphql_helper,get_ok_value,2,
[{file,"/home/circleci/project/big_tests/tests/graphql_helper.erl"},
{line,241}]},
{graphql_server_SUITE,stop_node_test,1,
[{file,"/home/circleci/project/big_tests/tests/graphql_server_SUITE.erl"},
{line,230}]},
{test_server,ts_tc,3,[{file,"test_server.erl"},{line,1794}]},
{test_server,run_test_case_eval1,6,
[{file,"test_server.erl"},{line,1303}]},
{test_server,run_test_case_eval,9,
[{file,"test_server.erl"},{line,1235}]}]}}last_SUITE:init_per_suite{fail,[{validate_node_failed,{badrpc,nodedown},mongooseim3@localhost}]}metrics_api_SUITE:init_per_suite{fail,[{validate_node_failed,{badrpc,nodedown},mongooseim3@localhost}]}persistent_cluster_id_SUITE:init_per_suite{fail,[{validate_node_failed,{badrpc,nodedown},mongooseim3@localhost}]}sasl_external_SUITE:init_per_suite{fail,[{validate_node_failed,{badrpc,nodedown},mongooseim3@localhost}]}service_domain_db_SUITE:init_per_suite{fail,[{validate_node_failed,{badrpc,nodedown},mongooseim3@localhost}]}service_mongoose_system_metrics_SUITE:init_per_suite{fail,[{validate_node_failed,{badrpc,nodedown},mongooseim3@localhost}]}shutdown_SUITE:init_per_suite{fail,[{validate_node_failed,{badrpc,nodedown},mongooseim3@localhost}]}dynamic_domains_pgsql_mnesia_26 / pgsql_mnesia / 69764e3 internal_mnesia_27 / internal_mnesia / 69764e3 dynamic_domains_pgsql_mnesia_27 / pgsql_mnesia / 69764e3 pgsql_cets_27 / pgsql_cets / 69764e3 mysql_redis_27 / mysql_redis / 69764e3 pgsql_mnesia_26 / pgsql_mnesia / 69764e3 pgsql_mnesia_27 / pgsql_mnesia / 69764e3 cockroachdb_cets_27 / cockroachdb_cets / 69764e3 pubsub_SUITE:tree+hometree_specific:can_create_node_with_existing_parent_path{error,{{badmatch,false},
[{pubsub_tools,check_response,2,
[{file,"/home/circleci/project/big_tests/tests/pubsub_tools.erl"},
{line,444}]},
{pubsub_tools,receive_response,3,
[{file,"/home/circleci/project/big_tests/tests/pubsub_tools.erl"},
{line,434}]},
{pubsub_tools,receive_and_check_response,4,
[{file,"/home/circleci/project/big_tests/tests/pubsub_tools.erl"},
{line,424}]},
{pubsub_SUITE,'-can_create_node_with_existing_parent_path/1-fun-0-',
1,
[{file,"/home/circleci/project/big_tests/tests/pubsub_SUITE.erl"},
{line,1830}]},
{escalus_story,story,4,
[{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
{line,72}]},
{test_server,ts_tc,3,[{file,"test_server.erl"},{line,1794}]},
{test_server,run_test_case_eval1,6,
[{file,"test_server.erl"},{line,1303}]},
{test_server,run_test_case_eval,9,
[{file,"test_server.erl"},{line,1235}]}]}}mssql_mnesia_27 / odbc_mssql_mnesia / 69764e3 cockroachdb_cets_27 / cockroachdb_cets / 69764e3 dynamic_domains_mssql_mnesia_27 / odbc_mssql_mnesia / 69764e3 |
This will probably be possible to revert once c2s does'n require `fast_tls` and so all components really have the same configs here.
NelsonVides
force-pushed
the
s2s/listeners
branch
from
69764e3 to
4a99ce6
Compare
|
elasticsearch_and_cassandra_27 / elasticsearch_and_cassandra_mnesia / 4a99ce6 small_tests_27 / small_tests / 4a99ce6 small_tests_26 / small_tests / 4a99ce6 small_tests_27_arm64 / small_tests / 4a99ce6 ldap_mnesia_26 / ldap_mnesia / 4a99ce6 ldap_mnesia_27 / ldap_mnesia / 4a99ce6 dynamic_domains_pgsql_mnesia_26 / pgsql_mnesia / 4a99ce6 dynamic_domains_mysql_redis_27 / mysql_redis / 4a99ce6 internal_mnesia_27 / internal_mnesia / 4a99ce6 cluster_commands_SUITE:join_twice_in_parallel_using_rpc{'EXIT',{{badrpc,timeout},
{distributed_helper,rpc,
[#{timeout => 60000,
node => mongooseim2@localhost},
mongoose_cluster,join,
[mongooseim@localhost]],
[{file,"/home/circleci/project/big_tests/../test/common/distributed_helper.erl"},
{line,140}]}}}cluster_commands_SUITE:cluster_of_three{error,
{{assertEqual,
[{module,cluster_commands_SUITE},
{line,357},
{expression,"OpCode1"},
{expected,0},
{value,1}]},
[{cluster_commands_SUITE,cluster_of_three,1,
[{file,
"/home/circleci/project/big_tests/tests/cluster_commands_SUITE.erl"},
{line,357}]},
{test_server,ts_tc,3,[{file,"test_server.erl"},{line,1794}]},
{test_server,run_test_case_eval1,6,
[{file,"test_server.erl"},{line,1303}]},
{test_server,run_test_case_eval,9,
[{file,"test_server.erl"},{line,1235}]}]}}cluster_commands_SUITE:leave_the_three{error,
{{badrpc,timeout},
[{distributed_helper,rpc,
[#{timeout => 60000,node => mongooseim2@localhost},
mongoose_cluster,join,
[mongooseim@localhost]],
[{file,
"/home/circleci/project/big_tests/../test/common/distributed_helper.erl"},
{line,140}]},
{cluster_commands_SUITE,leave_the_three,1,
[{file,
"/home/circleci/project/big_tests/tests/cluster_commands_SUITE.erl"},
{line,369}]},
{test_server,ts_tc,3,[{file,"test_server.erl"},{line,1794}]},
{test_server,run_test_case_eval1,6,
[{file,"test_server.erl"},{line,1303}]},
{test_server,run_test_case_eval,9,
[{file,"test_server.erl"},{line,1235}]}]}}cluster_commands_SUITE:remove_alive_from_cluster{error,
{{badrpc,timeout},
[{distributed_helper,rpc,
[#{timeout => 60000,node => mongooseim2@localhost},
mongoose_cluster,join,
[mongooseim@localhost]],
[{file,
"/home/circleci/project/big_tests/../test/common/distributed_helper.erl"},
{line,140}]},
{cluster_commands_SUITE,remove_alive_from_cluster,1,
[{file,
"/home/circleci/project/big_tests/tests/cluster_commands_SUITE.erl"},
{line,411}]},
{test_server,ts_tc,3,[{file,"test_server.erl"},{line,1794}]},
{test_server,run_test_case_eval1,6,
[{file,"test_server.erl"},{line,1303}]},
{test_server,run_test_case_eval,9,
[{file,"test_server.erl"},{line,1235}]}]}}component_SUITE:init_per_suite{fail,[{validate_node_failed,mongooseim_not_running,mongooseim2@localhost}]}dynamic_domains_SUITE:init_per_suite{fail,[{validate_node_failed,mongooseim_not_running,mongooseim2@localhost}]}graphql_server_SUITE:init_per_suite{fail,[{validate_node_failed,mongooseim_not_running,mongooseim2@localhost}]}jingle_SUITE:init_per_suite{fail,[{validate_node_failed,mongooseim_not_running,mongooseim2@localhost}]}last_SUITE:init_per_suite{fail,[{validate_node_failed,mongooseim_not_running,mongooseim2@localhost}]}local_iq_SUITE:init_per_suite{fail,[{validate_node_failed,mongooseim_not_running,mongooseim2@localhost}]}metrics_api_SUITE:init_per_suite{fail,[{validate_node_failed,mongooseim_not_running,mongooseim2@localhost}]}mod_global_distrib_SUITE:init_per_suite{fail,[{validate_node_failed,mongooseim_not_running,mongooseim2@localhost}]}persistent_cluster_id_SUITE:init_per_suite{fail,[{validate_node_failed,mongooseim_not_running,mongooseim2@localhost}]}s2s_SUITE:init_per_suite{fail,[{validate_node_failed,mongooseim_not_running,mongooseim2@localhost}]}sasl_external_SUITE:init_per_suite{fail,[{validate_node_failed,mongooseim_not_running,mongooseim2@localhost}]}service_domain_db_SUITE:init_per_suite{fail,[{validate_node_failed,mongooseim_not_running,mongooseim2@localhost}]}service_mongoose_system_metrics_SUITE:init_per_suite{fail,[{validate_node_failed,mongooseim_not_running,mongooseim2@localhost}]}shutdown_SUITE:init_per_suite{fail,[{validate_node_failed,mongooseim_not_running,mongooseim2@localhost}]}system_probes_SUITE:init_per_suite{fail,[{validate_node_failed,mongooseim_not_running,mongooseim2@localhost}]}dynamic_domains_pgsql_mnesia_27 / pgsql_mnesia / 4a99ce6 dynamic_domains_mssql_mnesia_27 / odbc_mssql_mnesia / 4a99ce6 pgsql_cets_27 / pgsql_cets / 4a99ce6 pgsql_mnesia_27 / pgsql_mnesia / 4a99ce6 mysql_redis_27 / mysql_redis / 4a99ce6 cockroachdb_cets_27 / cockroachdb_cets / 4a99ce6 pubsub_SUITE:dag+basic:request_particular_item_test{error,
{timeout_when_waiting_for_stanza,
[{escalus_client,wait_for_stanza,
[{client,
<<"alice_request_particular_item_test_2893@localhost/res1">>,
escalus_tcp,<0.102325.0>,
[{event_manager,<0.102239.0>},
{server,<<"localhost">>},
{username,<<"alicE_request_particular_item_test_2893">>},
{resource,<<"res1">>}],
[{event_client,
[{event_manager,<0.102239.0>},
{server,<<"localhost">>},
{username,
<<"alicE_request_particular_item_test_2893">>},
{resource,<<"res1">>}]},
{resource,<<"res1">>},
{username,<<"alice_request_particular_item_test_2893">>},
{server,<<"localhost">>},
{host,<<"localhost">>},
{port,5222},
{auth,{escalus_auth,auth_plain}},
{wspath,undefined},
{username,<<"alicE_request_particular_item_test_2893">>},
{server,<<"localhost">>},
{password,<<"matygrysa">>},
{stream_id,<<"f60a136fc23731b5">>}]},
5000],
[{file,
"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_client.erl"},
{line,136}]},
{pubsub_tools,receive_response,3,
[{file,"/home/circleci/project/big_tests/tests/pubsub_tools.erl"},
{line,433}]},
{pubsub_tools,receive_and_check_response,4,
[{file,"/home/circleci/project/big_tests/tests/pubsub_tools.erl"},
...pubsub_SUITE:dag+manage_subscriptions:retrieve_node_subscriptions_test{error,
{timeout_when_waiting_for_stanza,
[{escalus_client,wait_for_stanza,
[{client,
<<"alice_retrieve_node_subscriptions_test_2934@localhost/res1">>,
escalus_tcp,<0.103349.0>,
[{event_manager,<0.103317.0>},
{server,<<"localhost">>},
{username,
<<"alicE_retrieve_node_subscriptions_test_2934">>},
{resource,<<"res1">>}],
[{event_client,
[{event_manager,<0.103317.0>},
{server,<<"localhost">>},
{username,
<<"alicE_retrieve_node_subscriptions_test_2934">>},
{resource,<<"res1">>}]},
{resource,<<"res1">>},
{username,
<<"alice_retrieve_node_subscriptions_test_2934">>},
{server,<<"localhost">>},
{host,<<"localhost">>},
{port,5222},
{auth,{escalus_auth,auth_plain}},
{wspath,undefined},
{username,
<<"alicE_retrieve_node_subscriptions_test_2934">>},
{server,<<"localhost">>},
{password,<<"matygrysa">>},
{stream_id,<<"3307524545cedb72">>}]},
5000],
[{file,
"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_client.erl"},
{line,136}]},
{pubsub_tools,receive_response,3,
[{file,"/home/circleci/project/big_tests/tests/pubsub_tools.erl"},
{line,433}]},
{pubsub_tools,receive_and_check_response,4,
[{file,"/h...pgsql_mnesia_26 / pgsql_mnesia / 4a99ce6 mssql_mnesia_27 / odbc_mssql_mnesia / 4a99ce6 |
This PR introduces ranch listeners to S2S, which was the last XMPP listener using our old
mongoose_tcp_listener. This means we can remove this custom module together with the tests for it, and it also means that now S2S uses the same listener logic than Components and C2S, and therefore a lot of code can be extracted to be shared, most importantly in the config, but also in instrumentation.Note the following:
mongoose_transportas the transport layer, which implemented both logic to be a server as well as a client. I split this, the server logic was removed entirely frommongoose_transport, which is now the TCP client implementation forejabberd_s2s_out.ejabberd_s2s_ingot a new TCP server logic implemented inmongoose_s2s_socket. It's very similar to the socket implementation for components and c2s, but it is still running on its owngen_serverinstead of having been integrated into a newergen_statemas it was done for components and c2s already, so until then, those three modules aren't refactored together yet.mongoose_s2s_listener, which is incredibly similar tomongoose_components_listenerandmongoose_c2s_listener. So similar that common code between the three was extracted intomongoose_listenerand instrumentation for all listeners was finally unified, no longer having weird adhoc initialisers as it was initially the case for c2s. Tests were updated to take this into account.