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

Do not display a warning when processing a message with repeated markers #3673

Merged
merged 1 commit into from
Jun 8, 2022

Conversation

Premwoik
Copy link
Contributor

@Premwoik Premwoik commented Jun 7, 2022

This PR refers to a warning or error log when the smart_markers upsert query resulted in 0 updated rows. This could happen when a message contains repeated markers. The repeated markers have the same timestamp, and it fails the condition that the updated timeout must be greater.

@codecov
Copy link

codecov bot commented Jun 7, 2022

Codecov Report

Merging #3673 (8cca12d) into master (a1399e3) will increase coverage by 0.01%.
The diff coverage is 85.71%.

@@            Coverage Diff             @@
##           master    #3673      +/-   ##
==========================================
+ Coverage   81.13%   81.14%   +0.01%     
==========================================
  Files         433      433              
  Lines       31881    31883       +2     
==========================================
+ Hits        25866    25871       +5     
+ Misses       6015     6012       -3     
Impacted Files Coverage Δ
src/smart_markers/mod_smart_markers_rdbms.erl 95.00% <83.33%> (+0.45%) ⬆️
...rc/smart_markers/mod_smart_markers_rdbms_async.erl 95.83% <100.00%> (+6.94%) ⬆️
src/logger/mongoose_log_filter.erl 78.08% <0.00%> (-1.37%) ⬇️
src/domain/mongoose_domain_loader.erl 89.28% <0.00%> (-0.90%) ⬇️
src/mod_muc_room.erl 76.68% <0.00%> (-0.18%) ⬇️
src/ejabberd_c2s.erl 88.93% <0.00%> (-0.08%) ⬇️
src/pubsub/mod_pubsub_db_rdbms.erl 95.60% <0.00%> (+0.25%) ⬆️
src/pubsub/node_flat.erl 74.70% <0.00%> (+0.39%) ⬆️
src/inbox/mod_inbox_rdbms_async.erl 73.13% <0.00%> (+1.49%) ⬆️
... 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 a1399e3...8cca12d. Read the comment docs.

@mongoose-im
Copy link
Collaborator

mongoose-im commented Jun 7, 2022

small_tests_24 / small_tests / 8cca12d
Reports root / small


small_tests_25 / small_tests / 8cca12d
Reports root / small


dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / 8cca12d
Reports root/ big
OK: 2909 / Failed: 0 / User-skipped: 88 / Auto-skipped: 0


ldap_mnesia_24 / ldap_mnesia / 8cca12d
Reports root/ big
OK: 1508 / Failed: 0 / User-skipped: 401 / Auto-skipped: 0


dynamic_domains_pgsql_mnesia_25 / pgsql_mnesia / 8cca12d
Reports root/ big
OK: 2909 / Failed: 0 / User-skipped: 88 / Auto-skipped: 0


dynamic_domains_mysql_redis_25 / mysql_redis / 8cca12d
Reports root/ big
OK: 2892 / Failed: 0 / User-skipped: 105 / Auto-skipped: 0


ldap_mnesia_25 / ldap_mnesia / 8cca12d
Reports root/ big
OK: 1508 / Failed: 0 / User-skipped: 401 / Auto-skipped: 0


dynamic_domains_mssql_mnesia_25 / odbc_mssql_mnesia / 8cca12d
Reports root/ big
OK: 2909 / Failed: 0 / User-skipped: 88 / Auto-skipped: 0


pgsql_mnesia_24 / pgsql_mnesia / 8cca12d
Reports root/ big
OK: 3295 / Failed: 1 / User-skipped: 97 / Auto-skipped: 0

muc_SUITE:hibernation:hibernated_room_can_be_queried_for_archive
{error,{{assertion_failed,assert,is_groupchat_message,
              [<<"Restorable message">>],
              undefined,"undefined"},
    [{escalus_new_assert,assert_true,2,
               [{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_new_assert.erl"},
                {line,84}]},
     {muc_SUITE,wait_for_mam_result,3,
          [{file,"/home/circleci/project/big_tests/tests/muc_SUITE.erl"},
           {line,4383}]},
     {muc_SUITE,'-hibernated_room_can_be_queried_for_archive/1-fun-0-',3,
          [{file,"/home/circleci/project/big_tests/tests/muc_SUITE.erl"},
           {line,4124}]},
     {escalus_story,story,4,
            [{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
             {line,72}]},
     {muc_SUITE,hibernated_room_can_be_queried_for_archive,1,
          [{file,"/home/circleci/project/big_tests/tests/muc_SUITE.erl"},
           {line,4120}]},
     {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


internal_mnesia_25 / internal_mnesia / 8cca12d
Reports root/ big
OK: 1593 / Failed: 0 / User-skipped: 316 / Auto-skipped: 0


mysql_redis_25 / mysql_redis / 8cca12d
Reports root/ big
OK: 3285 / Failed: 1 / User-skipped: 103 / Auto-skipped: 0

pubsub_SUITE:dag+node_config:send_last_published_item_test
{error,{{badmatch,false},
    [{pubsub_tools,check_response,2,
             [{file,"/home/circleci/project/big_tests/tests/pubsub_tools.erl"},
            {line,491}]},
     {pubsub_tools,receive_response,3,
             [{file,"/home/circleci/project/big_tests/tests/pubsub_tools.erl"},
            {line,481}]},
     {pubsub_tools,receive_subscribe_response,3,
             [{file,"/home/circleci/project/big_tests/tests/pubsub_tools.erl"},
            {line,334}]},
     {pubsub_SUITE,'-send_last_published_item_test/1-fun-0-',2,
             [{file,"/home/circleci/project/big_tests/tests/pubsub_SUITE.erl"},
            {line,937}]},
     {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,1782}]},
     {test_server,run_test_case_eval1,6,
            [{file,"test_server.erl"},{line,1291}]},
     {test_server,run_test_case_eval,9,
            [{file,"test_server.erl"},{line,1223}]}]}}

Report log


elasticsearch_and_cassandra_25 / elasticsearch_and_cassandra_mnesia / 8cca12d
Reports root/ big
OK: 1900 / Failed: 0 / User-skipped: 324 / Auto-skipped: 0


pgsql_mnesia_25 / pgsql_mnesia / 8cca12d
Reports root/ big
OK: 3294 / Failed: 1 / User-skipped: 97 / Auto-skipped: 0

pep_SUITE:pep_tests:unsubscribe_after_presence_unsubscription
{error,
  {{badmatch,
     [{xmlel,<<"message">>,
        [{<<"from">>,
        <<"alice_unsubscribe_after_presence_unsubscription_2026@localhost">>},
         {<<"to">>,
        <<"bob_unsubscribe_after_presence_unsubscription_2026@localhost/res1">>},
         {<<"type">>,<<"headline">>}],
        [{xmlel,<<"event">>,
           [{<<"xmlns">>,
           <<"http://jabber.org/protocol/pubsub#event">>}],
           [{xmlel,<<"items">>,
            [{<<"node">>,<<"5xHBxbivZVmvW6VeXXHtMQ==">>}],
            [{xmlel,<<"item">>,
               [{<<"id">>,<<"salmon">>}],
               [{xmlel,<<"entry">>,
                  [{<<"xmlns">>,
                  <<"http://www.w3.org/2005/Atom">>}],
                  []}]}]}]},
         {xmlel,<<"headers">>,
           [{<<"xmlns">>,<<"http://jabber.org/protocol/shim">>}],
           []}]}]},
   [{pep_SUITE,'-unsubscribe_after_presence_unsubscription/1-fun-0-',2,
      [{file,"/home/circleci/project/big_tests/tests/pep_SUITE.erl"},
       {line,384}]},
    {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,1782}]},
    {test_server,run_test_case_eval1,6,
      [{file,"test_server.erl"},{line,1291}]},
    {test_server,run_test_case_eval,9,
      [{file,"test_server.erl"},{line,1223}]}]}}

Report log


riak_mnesia_24 / riak_mnesia / 8cca12d
Reports root/ big
OK: 1743 / Failed: 0 / User-skipped: 323 / Auto-skipped: 0


mssql_mnesia_25 / odbc_mssql_mnesia / 8cca12d
Reports root/ big
OK: 3283 / Failed: 0 / User-skipped: 97 / Auto-skipped: 0

@Premwoik Premwoik marked this pull request as ready for review June 8, 2022 07:32
@Premwoik Premwoik requested a review from NelsonVides June 8, 2022 07:32
Copy link
Collaborator

@NelsonVides NelsonVides left a comment

Choose a reason for hiding this comment

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

LGTM 👌🏽

@NelsonVides NelsonVides merged commit 7b2787b into master Jun 8, 2022
@NelsonVides NelsonVides deleted the remove-repeated-markers-warning branch June 8, 2022 07:42
@Premwoik Premwoik added this to the 5.1.0 milestone Jun 8, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants