Support dynamic domains in mod_last #3188

chrzaszcz · 2021-07-15T14:11:16Z

Add support for dynamic domains to mod_last and its backends.

Side changes:

Fix error handling when updating last info. Previously the error tuple would result in badmatch as Acc was expected in both hooks.

This PR does not include:

Supporting remove_domain.
Migration guide.

Both tasks will be done separately.

codecov · 2021-07-15T14:35:50Z

Codecov Report

Merging #3188 (21c00e5) into master (f351a3d) will increase coverage by 0.00%.
The diff coverage is 87.69%.

@@           Coverage Diff           @@
##           master    #3188   +/-   ##
=======================================
  Coverage   80.29%   80.30%           
=======================================
  Files         397      397           
  Lines       32453    32459    +6     
=======================================
+ Hits        26059    26066    +7     
+ Misses       6394     6393    -1

Impacted Files	Coverage Δ
src/auth/ejabberd_auth_external.erl	`29.00% <0.00%> (ø)`
src/mod_last_mnesia.erl	`83.33% <ø> (ø)`
src/mongoose_hooks.erl	`95.10% <ø> (ø)`
src/admin_extra/service_admin_extra_accounts.erl	`90.66% <83.33%> (+0.25%)`	⬆️
src/mod_last.erl	`87.87% <96.77%> (+0.57%)`	⬆️
src/admin_extra/service_admin_extra_last.erl	`75.00% <100.00%> (+3.57%)`	⬆️
src/mod_last_rdbms.erl	`95.83% <100.00%> (+4.16%)`	⬆️
src/mod_last_riak.erl	`95.23% <100.00%> (ø)`
src/elasticsearch/mongoose_elasticsearch.erl	`76.92% <0.00%> (-7.70%)`	⬇️
src/event_pusher/mod_event_pusher_sns.erl	`84.21% <0.00%> (-5.27%)`	⬇️
... and 13 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f351a3d...21c00e5. Read the comment docs.

Reason: it is required to support the new IQ handler registration

Also: update the index to allow counting users per server (as in the API) There was no such index for MSSQL yet.

Use the new 'server' column as well.

Do it in a simple way as it would require a significant rework to minimize the amount of 'get_domain_host_type' calls. the rework will be done later.

Also: use host types when testing modules that support them

NelsonVides

Simply neat, just one small comment 👌🏽

src/auth/ejabberd_auth_external.erl

mongoose-im · 2021-07-28T06:27:51Z

small_tests_24 / small_tests / 21c00e5
Reports root / small

internal_mnesia_24 / internal_mnesia / 21c00e5
Reports root/ big
OK: 1588 / Failed: 0 / User-skipped: 286 / Auto-skipped: 0

dynamic_domains_23 / pgsql_mnesia / 21c00e5
Reports root/ big
OK: 1619 / Failed: 0 / User-skipped: 111 / Auto-skipped: 0

dynamic_domains_24 / pgsql_mnesia / 21c00e5
Reports root/ big
OK: 1619 / Failed: 0 / User-skipped: 111 / Auto-skipped: 0

small_tests_22 / small_tests / 21c00e5
Reports root / small

small_tests_23 / small_tests / 21c00e5
Reports root / small

ldap_mnesia_24 / ldap_mnesia / 21c00e5
Reports root/ big
OK: 1515 / Failed: 0 / User-skipped: 359 / Auto-skipped: 0

ldap_mnesia_22 / ldap_mnesia / 21c00e5
Reports root/ big
OK: 1515 / Failed: 0 / User-skipped: 359 / Auto-skipped: 0

ldap_mnesia_23 / ldap_mnesia / 21c00e5
Reports root/ big
OK: 1515 / Failed: 0 / User-skipped: 359 / Auto-skipped: 0

pgsql_mnesia_24 / pgsql_mnesia / 21c00e5
Reports root/ big
OK: 3085 / Failed: 0 / User-skipped: 184 / Auto-skipped: 0

pgsql_mnesia_23 / pgsql_mnesia / 21c00e5
Reports root/ big
OK: 3085 / Failed: 0 / User-skipped: 184 / Auto-skipped: 0

elasticsearch_and_cassandra_24 / elasticsearch_and_cassandra_mnesia / 21c00e5
Reports root/ big
OK: 1898 / Failed: 1 / User-skipped: 282 / Auto-skipped: 0

sm_SUITE:parallel_manual_ack_freq_1:resume_session_state_send_message

{error,
  {{assertion_failed,assert,is_presence,
     {xmlel,<<"message">>,
       [{<<"from">>,
         <<"bOb_resume_session_state_send_message_13.442196@localhost/escalus-default-resource">>},
        {<<"to">>,
         <<"alicE_resume_session_state_send_message_13.472899@localhost">>},
        {<<"xml:lang">>,<<"en">>},
        {<<"type">>,<<"chat">>}],
       [{xmlel,<<"body">>,[],[{xmlcdata,<<"msg-3">>}]},
        {xmlel,<<"delay">>,
          [{<<"xmlns">>,<<"urn:xmpp:delay">>},
           {<<"stamp">>,<<"2021-07-28T06:48:33.555325Z">>},
           {<<"from">>,<<"localhost">>}],
          [{xmlcdata,<<"Offline Storage">>}]}]},
     "<message from='bOb_resume_session_state_send_message_13.442196@localhost/escalus-default-resource' to='alicE_resume_session_state_send_message_13.472899@localhost' xml:lang='en' type='chat'><body>msg-3</body><delay xmlns='urn:xmpp:delay' stamp='2021-07-28T06:48:33.555325Z' from='localhost'>Offline Storage</delay></message>"},
   [{escalus_new_assert,assert_true,2,
      [{file,
         "/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_new_assert.erl"},
       {line,84}]},
    {sm_SUITE,resume_session_state_send_message,1,
      [{file,"/home/circleci/app/big_tests/tests/sm_SUITE.erl"},
       {line,727}]},
    {test_server,ts_tc,3,[{file,"test_server.erl"},{line,1783}]},
    {test_server,run_test_case_eval1,6,
      [{file,"test_server.erl"},{line,1292}]},
    {test_server,run_test_case_eval,9,
      [{file,"test_serve...

Report log

mysql_redis_24 / mysql_redis / 21c00e5
Reports root/ big
OK: 3068 / Failed: 0 / User-skipped: 201 / Auto-skipped: 0

pgsql_mnesia_22 / pgsql_mnesia / 21c00e5
Reports root/ big
OK: 3085 / Failed: 0 / User-skipped: 184 / Auto-skipped: 0

mssql_mnesia_24 / odbc_mssql_mnesia / 21c00e5
Reports root/ big
OK: 3096 / Failed: 1 / User-skipped: 184 / Auto-skipped: 0

carboncopy_SUITE:all:unavailable_resources_dont_get_carbons

{error,{{assertion_failed,assert_many,false,[is_presence,is_presence],[],[]},
    [{escalus_new_assert,assert_true,2,
               [{file,"/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_new_assert.erl"},
                {line,84}]},
     {escalus_story,story,4,
            [{file,"/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
             {line,72}]},
     {test_server,ts_tc,3,[{file,"test_server.erl"},{line,1783}]},
     {test_server,run_test_case_eval1,6,
            [{file,"test_server.erl"},{line,1292}]},
     {test_server,run_test_case_eval,9,
            [{file,"test_server.erl"},{line,1224}]}]}}

Report log

riak_mnesia_24 / riak_mnesia / 21c00e5
Reports root/ big
OK: 1738 / Failed: 0 / User-skipped: 285 / Auto-skipped: 0

This comment has been minimized.

Sign in to view

chrzaszcz force-pushed the mod-last-with-dynamic-domains branch from a6eaf5d to 9676977 Compare July 26, 2021 14:07

This comment has been minimized.

Sign in to view

chrzaszcz added 3 commits July 27, 2021 11:49

Update hooks and iq handlers in mod_last

0326547

Start mongoose_lazy_routing in small tests for mod_last

c78c64f

Reason: it is required to support the new IQ handler registration

Add host type to mod_last backend callbacks

0e6b3fd

chrzaszcz force-pushed the mod-last-with-dynamic-domains branch from 6c8bb5c to 9ee98c8 Compare July 27, 2021 09:58

This comment has been minimized.

Sign in to view

chrzaszcz added 12 commits July 27, 2021 14:33

Add 'server' column to the 'last' table

ff1e9a0

Also: update the index to allow counting users per server (as in the API) There was no such index for MSSQL yet.

Update callbacks in mod_last_riak

3ddf674

Update callbacks in mod_last_rdbms

dd638b6

Use the new 'server' column as well.

Update callbacks in mod_last_mnesia

fed5925

Use host types in mod_last

879c173

Remove TODO which is now done

99a2aa4

Use the new mod_last API with host types in service_admin_extra

854f1df

Do it in a simple way as it would require a significant rework to minimize the amount of 'get_domain_host_type' calls. the rework will be done later.

Use the new mod_last API with host_types in ejabberd_auth_anonymous

60c4ed0

Use the new mod_last API with host types in mongoose_cleanup_SUITE

160271a

Also: use host types when testing modules that support them

Update big tests after mod_last changes

e68ac05

Enable mod_last for dynamic domains

5554a99

Improve type specs

90d6156

chrzaszcz force-pushed the mod-last-with-dynamic-domains branch from 9ee98c8 to 90d6156 Compare July 27, 2021 12:33

This comment has been minimized.

Sign in to view

chrzaszcz marked this pull request as ready for review July 27, 2021 13:41

NelsonVides approved these changes Jul 27, 2021

View reviewed changes

src/auth/ejabberd_auth_external.erl Outdated Show resolved Hide resolved

vkatsuba approved these changes Jul 27, 2021

View reviewed changes

Remove unnecessary stringprepping

21c00e5

vkatsuba merged commit 9a3cd46 into master Jul 28, 2021

vkatsuba deleted the mod-last-with-dynamic-domains branch July 28, 2021 07:17

Premwoik added this to the 5.0.0 milestone Oct 5, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support dynamic domains in mod_last #3188

Support dynamic domains in mod_last #3188

chrzaszcz commented Jul 15, 2021 •

edited

Loading

This comment has been minimized.

codecov bot commented Jul 15, 2021 •

edited

Loading

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

NelsonVides left a comment

mongoose-im commented Jul 28, 2021 •

edited

Loading

Support dynamic domains in mod_last #3188

Support dynamic domains in mod_last #3188

Conversation

chrzaszcz commented Jul 15, 2021 • edited Loading

This comment has been minimized.

codecov bot commented Jul 15, 2021 • edited Loading

Codecov Report

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

NelsonVides left a comment

Choose a reason for hiding this comment

mongoose-im commented Jul 28, 2021 • edited Loading

chrzaszcz commented Jul 15, 2021 •

edited

Loading

codecov bot commented Jul 15, 2021 •

edited

Loading

mongoose-im commented Jul 28, 2021 •

edited

Loading