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

Use 'erlexec' directly to avoid overwriting the 'erl' executable #3698

Merged
merged 1 commit into from
Jun 29, 2022

Conversation

chrzaszcz
Copy link
Member

The main motivation is that on some installations the Erlang executables are not writable, and the overwriting would fail.

The 'erl' script was initially created to fix escript, but escript is no longer using it, so the entire script can be removed.

@codecov
Copy link

codecov bot commented Jun 28, 2022

Codecov Report

Merging #3698 (f96cb77) into master (891f7ab) will decrease coverage by 0.01%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #3698      +/-   ##
==========================================
- Coverage   82.15%   82.13%   -0.02%     
==========================================
  Files         510      510              
  Lines       33596    33596              
==========================================
- Hits        27600    27594       -6     
- Misses       5996     6002       +6     
Impacted Files Coverage Δ
src/pubsub/node_pep.erl 77.77% <0.00%> (-1.86%) ⬇️
src/muc_light/mod_muc_light_db_mnesia.erl 91.57% <0.00%> (-1.06%) ⬇️
src/mod_roster.erl 78.70% <0.00%> (-0.72%) ⬇️
src/ejabberd_c2s.erl 88.93% <0.00%> (-0.30%) ⬇️
src/mod_muc_room.erl 78.52% <0.00%> (-0.18%) ⬇️
src/mod_muc_log.erl 62.82% <0.00%> (ø)
src/ejabberd_sm.erl 84.91% <0.00%> (+0.32%) ⬆️
src/privacy/mod_privacy_rdbms.erl 78.46% <0.00%> (+0.51%) ⬆️
src/mod_blocking.erl 89.74% <0.00%> (+1.28%) ⬆️
src/mam/mod_mam_elasticsearch_arch.erl 88.39% <0.00%> (+1.78%) ⬆️
... and 1 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 891f7ab...f96cb77. Read the comment docs.

@mongoose-im
Copy link
Collaborator

mongoose-im commented Jun 28, 2022

small_tests_24 / small_tests / 730b3ac
Reports root / small


small_tests_25 / small_tests / 730b3ac
Reports root / small


dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / 730b3ac
Reports root/ big
OK: 3113 / Failed: 0 / User-skipped: 88 / Auto-skipped: 0


ldap_mnesia_24 / ldap_mnesia / 730b3ac
Reports root/ big
OK: 1738 / Failed: 0 / User-skipped: 459 / Auto-skipped: 0


dynamic_domains_pgsql_mnesia_25 / pgsql_mnesia / 730b3ac
Reports root/ big
OK: 3113 / Failed: 0 / User-skipped: 88 / Auto-skipped: 0


dynamic_domains_mysql_redis_25 / mysql_redis / 730b3ac
Reports root/ big
OK: 3096 / Failed: 0 / User-skipped: 105 / Auto-skipped: 0


dynamic_domains_mssql_mnesia_25 / odbc_mssql_mnesia / 730b3ac
Reports root/ big
OK: 3113 / Failed: 0 / User-skipped: 88 / Auto-skipped: 0


ldap_mnesia_25 / ldap_mnesia / 730b3ac
Reports root/ big
OK: 1738 / Failed: 0 / User-skipped: 459 / Auto-skipped: 0


internal_mnesia_25 / internal_mnesia / 730b3ac
Reports root/ big
OK: 1844 / Failed: 0 / User-skipped: 353 / Auto-skipped: 0


pgsql_mnesia_24 / pgsql_mnesia / 730b3ac
Reports root/ big
OK: 3487 / Failed: 0 / User-skipped: 97 / Auto-skipped: 0


elasticsearch_and_cassandra_25 / elasticsearch_and_cassandra_mnesia / 730b3ac
Reports root/ big
OK: 2134 / Failed: 0 / User-skipped: 354 / Auto-skipped: 0


pgsql_mnesia_25 / pgsql_mnesia / 730b3ac
Reports root/ big
OK: 3487 / Failed: 0 / User-skipped: 97 / Auto-skipped: 0


mysql_redis_25 / mysql_redis / 730b3ac
Reports root/ big
OK: 3482 / Failed: 0 / User-skipped: 102 / Auto-skipped: 0


riak_mnesia_24 / riak_mnesia / 730b3ac
Reports root/ big
OK: 1993 / Failed: 0 / User-skipped: 349 / Auto-skipped: 0


mssql_mnesia_25 / odbc_mssql_mnesia / 730b3ac
Reports root/ big
OK: 3487 / Failed: 0 / User-skipped: 97 / Auto-skipped: 0

@mongoose-im
Copy link
Collaborator

mongoose-im commented Jun 28, 2022

small_tests_24 / small_tests / 7c30b89
Reports root / small


small_tests_25 / small_tests / 7c30b89
Reports root / small


dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / 7c30b89
Reports root/ big
OK: 3113 / Failed: 0 / User-skipped: 88 / Auto-skipped: 0


dynamic_domains_mysql_redis_25 / mysql_redis / 7c30b89
Reports root/ big
OK: 3096 / Failed: 0 / User-skipped: 105 / Auto-skipped: 0


dynamic_domains_pgsql_mnesia_25 / pgsql_mnesia / 7c30b89
Reports root/ big
OK: 3113 / Failed: 0 / User-skipped: 88 / Auto-skipped: 0


ldap_mnesia_24 / ldap_mnesia / 7c30b89
Reports root/ big
OK: 1738 / Failed: 0 / User-skipped: 459 / Auto-skipped: 0


ldap_mnesia_25 / ldap_mnesia / 7c30b89
Reports root/ big
OK: 1738 / Failed: 0 / User-skipped: 459 / Auto-skipped: 0


internal_mnesia_25 / internal_mnesia / 7c30b89
Reports root/ big
OK: 1844 / Failed: 0 / User-skipped: 353 / Auto-skipped: 0


dynamic_domains_mssql_mnesia_25 / odbc_mssql_mnesia / 7c30b89
Reports root/ big
OK: 3113 / Failed: 0 / User-skipped: 88 / Auto-skipped: 0


pgsql_mnesia_24 / pgsql_mnesia / 7c30b89
Reports root/ big
OK: 3487 / Failed: 0 / User-skipped: 97 / Auto-skipped: 0


elasticsearch_and_cassandra_25 / elasticsearch_and_cassandra_mnesia / 7c30b89
Reports root/ big
OK: 2134 / Failed: 0 / User-skipped: 354 / Auto-skipped: 0


pgsql_mnesia_25 / pgsql_mnesia / 7c30b89
Reports root/ big
OK: 3487 / Failed: 0 / User-skipped: 97 / Auto-skipped: 0


mysql_redis_25 / mysql_redis / 7c30b89
Reports root/ big
OK: 3493 / Failed: 1 / User-skipped: 102 / Auto-skipped: 0

pep_SUITE:pep_tests:unsubscribe_after_presence_unsubscription
{error,{{badmatch,[{xmlel,<<"presence">>,
              [{<<"from">>,
              <<"alice_unsubscribe_after_presence_unsubscription_2106@localhost/res1">>},
               {<<"to">>,
              <<"bob_unsubscribe_after_presence_unsubscription_2106@localhost/res1">>},
               {<<"type">>,<<"unavailable">>}],
              []}]},
    [{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 / 7c30b89
Reports root/ big
OK: 1993 / Failed: 0 / User-skipped: 349 / Auto-skipped: 0


mssql_mnesia_25 / odbc_mssql_mnesia / 7c30b89
Reports root/ big
OK: 3487 / Failed: 0 / User-skipped: 97 / Auto-skipped: 0

@chrzaszcz chrzaszcz marked this pull request as ready for review June 28, 2022 13:42
The main motivation is that on some installations the Erlang
executables are not writable, and the overwriting would fail.

The 'erl' script was initially created to fix escript,
but escript is no longer using it, so the entire script can be removed.
@mongoose-im
Copy link
Collaborator

mongoose-im commented Jun 29, 2022

small_tests_24 / small_tests / f96cb77
Reports root / small


small_tests_25 / small_tests / f96cb77
Reports root / small


dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / f96cb77
Reports root/ big
OK: 3113 / Failed: 0 / User-skipped: 88 / Auto-skipped: 0


ldap_mnesia_24 / ldap_mnesia / f96cb77
Reports root/ big
OK: 1738 / Failed: 0 / User-skipped: 459 / Auto-skipped: 0


dynamic_domains_mysql_redis_25 / mysql_redis / f96cb77
Reports root/ big
OK: 3096 / Failed: 0 / User-skipped: 105 / Auto-skipped: 0


dynamic_domains_pgsql_mnesia_25 / pgsql_mnesia / f96cb77
Reports root/ big
OK: 3113 / Failed: 0 / User-skipped: 88 / Auto-skipped: 0


ldap_mnesia_25 / ldap_mnesia / f96cb77
Reports root/ big
OK: 1738 / Failed: 0 / User-skipped: 459 / Auto-skipped: 0


internal_mnesia_25 / internal_mnesia / f96cb77
Reports root/ big
OK: 1844 / Failed: 0 / User-skipped: 353 / Auto-skipped: 0


dynamic_domains_mssql_mnesia_25 / odbc_mssql_mnesia / f96cb77
Reports root/ big
OK: 3113 / Failed: 0 / User-skipped: 88 / Auto-skipped: 0


elasticsearch_and_cassandra_25 / elasticsearch_and_cassandra_mnesia / f96cb77
Reports root/ big
OK: 2134 / Failed: 0 / User-skipped: 354 / Auto-skipped: 0


pgsql_mnesia_25 / pgsql_mnesia / f96cb77
Reports root/ big
OK: 3487 / Failed: 0 / User-skipped: 97 / Auto-skipped: 0


mysql_redis_25 / mysql_redis / f96cb77
Reports root/ big
OK: 3493 / Failed: 1 / User-skipped: 102 / Auto-skipped: 0

pep_SUITE:pep_tests:unsubscribe_after_presence_unsubscription
{error,
  {{badmatch,
     [{xmlel,<<"message">>,
        [{<<"from">>,
        <<"alice_unsubscribe_after_presence_unsubscription_2083@localhost">>},
         {<<"to">>,
        <<"bob_unsubscribe_after_presence_unsubscription_2083@localhost/res1">>},
         {<<"type">>,<<"headline">>}],
        [{xmlel,<<"event">>,
           [{<<"xmlns">>,
           <<"http://jabber.org/protocol/pubsub#event">>}],
           [{xmlel,<<"items">>,
            [{<<"node">>,<<"ib5Y5gZO6JXq5fds+5K/lw==">>}],
            [{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


pgsql_mnesia_24 / pgsql_mnesia / f96cb77
Reports root/ big
OK: 3486 / Failed: 1 / User-skipped: 97 / Auto-skipped: 0

bosh_SUITE:essential_https:accept_higher_hold_value
{error,
  {{assertEqual,
     [{module,bosh_SUITE},
      {line,251},
      {expression,"get_bosh_sessions ( )"},
      {expected,[]},
      {value,
        [{bosh_session,<<"f6de659fb8de3dbf3f30defff6b5801755dadd9f">>,
           <8837.6157.0>}]}]},
   [{bosh_SUITE,accept_higher_hold_value,1,
      [{file,"/home/circleci/project/big_tests/tests/bosh_SUITE.erl"},
       {line,251}]},
    {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


mssql_mnesia_25 / odbc_mssql_mnesia / f96cb77
Reports root/ big
OK: 3491 / Failed: 6 / User-skipped: 97 / Auto-skipped: 0

mod_blocking_SUITE:manage:add_another_user_to_blocklist
{error,{{assertion_failed,assert_many,false,
              [is_iq_result,#Fun<mod_blocking_SUITE.32.29136960>],
              [],[]},
    [{escalus_new_assert,assert_true,2,
               [{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_new_assert.erl"},
                {line,84}]},
     {mod_blocking_SUITE,'-add_another_user_to_blocklist/1-fun-0-',2,
               [{file,"/home/circleci/project/big_tests/tests/mod_blocking_SUITE.erl"},
                {line,182}]},
     {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

mod_blocking_SUITE:manage:remove_user_from_blocklist
{error,{{assertion_failed,assert_many,false,
              [is_iq_result,#Fun<mod_blocking_SUITE.36.29136960>],
              [],[]},
    [{escalus_new_assert,assert_true,2,
               [{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_new_assert.erl"},
                {line,84}]},
     {mod_blocking_SUITE,'-remove_user_from_blocklist/1-fun-0-',2,
               [{file,"/home/circleci/project/big_tests/tests/mod_blocking_SUITE.erl"},
                {line,203}]},
     {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

mod_blocking_SUITE:manage:add_many_users_to_blocklist
{error,{{assertion_failed,assert_many,false,
              [is_iq_result,#Fun<mod_blocking_SUITE.32.29136960>],
              [],[]},
    [{escalus_new_assert,assert_true,2,
               [{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_new_assert.erl"},
                {line,84}]},
     {mod_blocking_SUITE,'-add_many_users_to_blocklist/1-fun-0-',4,
               [{file,"/home/circleci/project/big_tests/tests/mod_blocking_SUITE.erl"},
                {line,191}]},
     {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

mod_blocking_SUITE:manage:add_user_to_blocklist
{error,
  {timeout_when_waiting_for_stanza,
    [{escalus_client,wait_for_stanza,
       [{client,
          <<"alice_unnamed_1805_add_user_to_blocklist_1809@localhost/res1">>,
          escalus_tcp,<0.19287.1>,
          [{event_manager,<0.19241.1>},
           {server,<<"localhost">>},
           {username,
             <<"alicE_unnamed_1805_add_user_to_blocklist_1809">>},
           {resource,<<"res1">>}],
          [{event_client,
             [{event_manager,<0.19241.1>},
            {server,<<"localhost">>},
            {username,
              <<"alicE_unnamed_1805_add_user_to_blocklist_1809">>},
            {resource,<<"res1">>}]},
           {resource,<<"res1">>},
           {username,
             <<"alice_unnamed_1805_add_user_to_blocklist_1809">>},
           {server,<<"localhost">>},
           {host,<<"localhost">>},
           {port,5222},
           {auth,{escalus_auth,auth_plain}},
           {wspath,undefined},
           {username,
             <<"alicE_unnamed_1805_add_user_to_blocklist_1809">>},
           {server,<<"localhost">>},
           {password,<<"matygrysa">>},
           {stream_id,<<"ea90b698847f63ab">>}]},
        5000],
       [{file,
          "/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_client.erl"},
        {line,136}]},
     {mod_blocking_SUITE,'-add_user_to_blocklist/1-fun-0-',2,
       [{file,
          "/home/circleci/project/big_tests/tests/mod_blocking_SUITE.erl"},
        {line,163}]},
     {escalus_story...

Report log

mod_blocking_SUITE:manage:clear_blocklist
{error,{{assertion_failed,assert_many,false,
              [is_iq_result,#Fun<mod_blocking_SUITE.36.29136960>],
              [],[]},
    [{escalus_new_assert,assert_true,2,
               [{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_new_assert.erl"},
                {line,84}]},
     {mod_blocking_SUITE,'-clear_blocklist/1-fun-0-',3,
               [{file,"/home/circleci/project/big_tests/tests/mod_blocking_SUITE.erl"},
                {line,224}]},
     {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

mod_blocking_SUITE:manage:remove_many_user_from_blocklist
{error,{{assertion_failed,assert_many,false,
              [is_iq_result,#Fun<mod_blocking_SUITE.32.29136960>],
              [],[]},
    [{escalus_new_assert,assert_true,2,
               [{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_new_assert.erl"},
                {line,84}]},
     {mod_blocking_SUITE,'-remove_many_user_from_blocklist/1-fun-0-',3,
               [{file,"/home/circleci/project/big_tests/tests/mod_blocking_SUITE.erl"},
                {line,212}]},
     {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 / f96cb77
Reports root/ big
OK: 1992 / Failed: 1 / User-skipped: 349 / Auto-skipped: 0

sm_SUITE:parallel_unacknowledged_message_hook:unacknowledged_message_hook_bounce
{error,
  {{assertion_failed,assert,is_chat_message,
     [<<"msg-1">>],
     {xmlel,<<"message">>,
       [{<<"from">>,
         <<"bob_unacknowledged_message_hook_bounce_2259@localhost/escalus-default-resource">>},
        {<<"to">>,
         <<"alice_unacknowledged_message_hook_bounce_2263@localhost">>},
        {<<"xml:lang">>,<<"en">>},
        {<<"type">>,<<"chat">>}],
       [{xmlel,<<"body">>,[],[{xmlcdata,<<"msg-2">>}]},
        {xmlel,<<"delay">>,
          [{<<"xmlns">>,<<"urn:xmpp:delay">>},
           {<<"stamp">>,<<"2022-06-29T06:52:51.478698Z">>},
           {<<"from">>,<<"localhost">>}],
          [{xmlcdata,<<"SM Storage">>}]}]},
     "<message from='bob_unacknowledged_message_hook_bounce_2259@localhost/escalus-default-resource' to='alice_unacknowledged_message_hook_bounce_2263@localhost' xml:lang='en' type='chat'><body>msg-2</body><delay xmlns='urn:xmpp:delay' stamp='2022-06-29T06:52:51.478698Z' from='localhost'>SM Storage</delay></message>"},
   [{escalus_new_assert,assert_true,2,
      [{file,
         "/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_new_assert.erl"},
       {line,84}]},
    {sm_SUITE,unacknowledged_message_hook_common,2,
      [{file,"/home/circleci/project/big_tests/tests/sm_SUITE.erl"},
       {line,857}]},
    {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,"tes...

Report log


pgsql_mnesia_24 / pgsql_mnesia / f96cb77
Reports root/ big
OK: 3487 / Failed: 0 / User-skipped: 97 / Auto-skipped: 0


riak_mnesia_24 / riak_mnesia / f96cb77
Reports root/ big
OK: 1993 / Failed: 0 / User-skipped: 349 / Auto-skipped: 0

Copy link
Contributor

@Premwoik Premwoik 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👌🏻

@Premwoik Premwoik merged commit ad9d534 into master Jun 29, 2022
@Premwoik Premwoik deleted the mongooseimctl-fix branch June 29, 2022 10:04
@chrzaszcz chrzaszcz added this to the 6.0.0 milestone Dec 12, 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.

4 participants