Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Properly handle get_subhosts in mod_mam_muc_rdbms_arch #3231

Merged
merged 1 commit into from
Aug 27, 2021

Conversation

arcusfelis
Copy link
Contributor

Proposed changes include:

  • That actually required to support dynamic domains.

@mongoose-im
Copy link
Collaborator

mongoose-im commented Aug 26, 2021

small_tests_24 / small_tests / badb426
Reports root / small


internal_mnesia_24 / internal_mnesia / badb426
Reports root/ big
OK: 1588 / Failed: 0 / User-skipped: 288 / Auto-skipped: 0


small_tests_22 / small_tests / badb426
Reports root / small


dynamic_domains_24 / pgsql_mnesia / badb426
Reports root/ big
OK: 1684 / Failed: 0 / User-skipped: 114 / Auto-skipped: 0


dynamic_domains_23 / pgsql_mnesia / badb426
Reports root/ big
OK: 1684 / Failed: 0 / User-skipped: 114 / Auto-skipped: 0


small_tests_23 / small_tests / badb426
Reports root / small


ldap_mnesia_22 / ldap_mnesia / badb426
Reports root/ big
OK: 1515 / Failed: 0 / User-skipped: 361 / Auto-skipped: 0


ldap_mnesia_24 / ldap_mnesia / badb426
Reports root/ big
OK: 1515 / Failed: 0 / User-skipped: 361 / Auto-skipped: 0


ldap_mnesia_23 / ldap_mnesia / badb426
Reports root/ big
OK: 1515 / Failed: 0 / User-skipped: 361 / Auto-skipped: 0


elasticsearch_and_cassandra_24 / elasticsearch_and_cassandra_mnesia / badb426
Reports root/ big
OK: 1891 / Failed: 0 / User-skipped: 284 / Auto-skipped: 0


pgsql_mnesia_24 / pgsql_mnesia / badb426
Reports root/ big
OK: 3088 / Failed: 0 / User-skipped: 184 / Auto-skipped: 0


mysql_redis_24 / mysql_redis / badb426
Reports root/ big
OK: 3077 / Failed: 1 / User-skipped: 201 / Auto-skipped: 0

mam_SUITE:rdbms_async_cache_prefs_cases:messages_filtered_when_prefs_default_policy_is_roster
{error,{test_case_failed,"ASSERT EQUAL\n\tExpected []\n\tValue [ok]\n"}}

Report log


pgsql_mnesia_23 / pgsql_mnesia / badb426
Reports root/ big
OK: 3088 / Failed: 0 / User-skipped: 184 / Auto-skipped: 0


mssql_mnesia_24 / odbc_mssql_mnesia / badb426
Reports root/ big
OK: 3088 / Failed: 0 / User-skipped: 184 / Auto-skipped: 0


pgsql_mnesia_22 / pgsql_mnesia / badb426
Reports root/ big
OK: 3088 / Failed: 0 / User-skipped: 184 / Auto-skipped: 0


riak_mnesia_24 / riak_mnesia / badb426
Reports root/ big
OK: 1738 / Failed: 0 / User-skipped: 287 / Auto-skipped: 0

@codecov
Copy link

codecov bot commented Aug 26, 2021

Codecov Report

Merging #3231 (98e05f5) into master (413e706) will increase coverage by 0.01%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3231      +/-   ##
==========================================
+ Coverage   80.30%   80.31%   +0.01%     
==========================================
  Files         398      398              
  Lines       32524    32526       +2     
==========================================
+ Hits        26117    26122       +5     
+ Misses       6407     6404       -3     
Impacted Files Coverage Δ
src/mam/mod_mam_muc_rdbms_arch.erl 94.94% <100.00%> (+0.10%) ⬆️
src/ejabberd_s2s_out.erl 60.82% <0.00%> (-1.60%) ⬇️
src/mod_muc_room.erl 77.12% <0.00%> (-0.06%) ⬇️
src/mod_muc_log.erl 77.88% <0.00%> (ø)
src/ejabberd_c2s.erl 89.28% <0.00%> (+0.07%) ⬆️
src/mod_muc.erl 75.11% <0.00%> (+0.22%) ⬆️
src/ejabberd_sm.erl 84.59% <0.00%> (+0.32%) ⬆️
src/inbox/mod_inbox_rdbms.erl 93.12% <0.00%> (+0.62%) ⬆️
src/rdbms/mongoose_rdbms.erl 61.69% <0.00%> (+0.80%) ⬆️
src/global_distrib/mod_global_distrib_utils.erl 65.42% <0.00%> (+0.93%) ⬆️
... and 3 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 413e706...98e05f5. Read the comment docs.

Copy link
Member

@chrzaszcz chrzaszcz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, I could only ask for a small additional fix.

Comment on lines 317 to 320
MucHostPattern = gen_mod:get_module_opt(HostType, mod_muc_light, host,
mod_muc_light:default_host()),
LightHostPattern = gen_mod:get_module_opt(HostType, mod_muc, host,
mod_muc:default_host()),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you swap these variable names as you are already changing these lines?

@arcusfelis arcusfelis force-pushed the mu-fix-get_subhosts-in-mam-muc branch from badb426 to 98e05f5 Compare August 27, 2021 09:25
@mongoose-im
Copy link
Collaborator

mongoose-im commented Aug 27, 2021

small_tests_24 / small_tests / 98e05f5
Reports root / small


internal_mnesia_24 / internal_mnesia / 98e05f5
Reports root/ big
OK: 1588 / Failed: 0 / User-skipped: 288 / Auto-skipped: 0


dynamic_domains_24 / pgsql_mnesia / 98e05f5
Reports root/ big
OK: 1684 / Failed: 0 / User-skipped: 114 / Auto-skipped: 0


small_tests_22 / small_tests / 98e05f5
Reports root / small


dynamic_domains_23 / pgsql_mnesia / 98e05f5
Reports root/ big
OK: 1684 / Failed: 0 / User-skipped: 114 / Auto-skipped: 0


small_tests_23 / small_tests / 98e05f5
Reports root / small


ldap_mnesia_23 / ldap_mnesia / 98e05f5
Reports root/ big
OK: 1515 / Failed: 0 / User-skipped: 361 / Auto-skipped: 0


ldap_mnesia_22 / ldap_mnesia / 98e05f5
Reports root/ big
OK: 1515 / Failed: 0 / User-skipped: 361 / Auto-skipped: 0


pgsql_mnesia_24 / pgsql_mnesia / 98e05f5
Reports root/ big
OK: 3088 / Failed: 0 / User-skipped: 184 / Auto-skipped: 0


elasticsearch_and_cassandra_24 / elasticsearch_and_cassandra_mnesia / 98e05f5
Reports root/ big
OK: 1891 / Failed: 0 / User-skipped: 284 / Auto-skipped: 0


pgsql_mnesia_22 / pgsql_mnesia / 98e05f5
Reports root/ big
OK: 3088 / Failed: 0 / User-skipped: 184 / Auto-skipped: 0


pgsql_mnesia_23 / pgsql_mnesia / 98e05f5
Reports root/ big
OK: 3088 / Failed: 0 / User-skipped: 184 / Auto-skipped: 0


mysql_redis_24 / mysql_redis / 98e05f5
Reports root/ big
OK: 3071 / Failed: 0 / User-skipped: 201 / Auto-skipped: 0


mssql_mnesia_24 / odbc_mssql_mnesia / 98e05f5
Reports root/ big
OK: 3098 / Failed: 2 / 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

carboncopy_SUITE:all:prop_forward_sent_chat_messages
{error,
  {{assertEqual,
     [{module,carboncopy_SUITE},
      {line,277},
      {expression,
        "proper : quickcheck ( proper : conjunction ( [ { PropName , Property } ] ) , [ verbose , long_result , { numtests , 3 } ] )"},
      {expected,true},
      {value,
        [[{forward_sent,
          [{5,<<"Draws on apace; four happy days bring in">>}]}]]}]},
   [{carboncopy_SUITE,run_prop,2,
      [{file,"/home/circleci/app/big_tests/tests/carboncopy_SUITE.erl"},
       {line,277}]},
    {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 / 98e05f5
Reports root/ big
OK: 1738 / Failed: 0 / User-skipped: 287 / Auto-skipped: 0

@chrzaszcz chrzaszcz merged commit 6afa847 into master Aug 27, 2021
@chrzaszcz chrzaszcz deleted the mu-fix-get_subhosts-in-mam-muc branch August 27, 2021 10:19
@Premwoik Premwoik added this to the 5.0.0 milestone Oct 5, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants