diff options
| author | Rickard Green <[email protected]> | 2019-04-18 17:41:24 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2019-04-18 17:41:24 +0200 |
| commit | e6a69b021bc2aee6aca42bd72583a96d06f4ba9d (patch) | |
| tree | 40f44a59587006bd0999a5688674d5d7627f4f8e /erts/emulator/beam/erl_process.c | |
| parent | d0d4f2be1ebfe8293a627531b65819e85482c1d9 (diff) | |
| parent | f2671c2ef47f8c49cd5fab6e1737ed08d99ea5d2 (diff) | |
| download | otp-e6a69b021bc2aee6aca42bd72583a96d06f4ba9d.tar.gz otp-e6a69b021bc2aee6aca42bd72583a96d06f4ba9d.tar.bz2 otp-e6a69b021bc2aee6aca42bd72583a96d06f4ba9d.zip | |
Merge branch 'rickard/dist-system-limit/OTP-15708'
* rickard/dist-system-limit/OTP-15708:
Fail when we cannot encode term in binary
Diffstat (limited to 'erts/emulator/beam/erl_process.c')
| -rw-r--r-- | erts/emulator/beam/erl_process.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c index 76eec96372..1f6adb98ef 100644 --- a/erts/emulator/beam/erl_process.c +++ b/erts/emulator/beam/erl_process.c @@ -12151,6 +12151,7 @@ erts_proc_exit_handle_dist_monitor(ErtsMonitor *mon, void *vctxt, Sint reds) case ERTS_DSIG_SEND_OK: break; case ERTS_DSIG_SEND_TOO_LRG: + erts_kill_dist_connection(dep, dist->connection_id); erts_set_gc_state(c_p, 1); break; default: @@ -12401,6 +12402,7 @@ erts_proc_exit_handle_dist_link(ErtsLink *lnk, void *vctxt, Sint reds) case ERTS_DSIG_SEND_OK: break; case ERTS_DSIG_SEND_TOO_LRG: + erts_kill_dist_connection(dep, dist->connection_id); erts_set_gc_state(c_p, 1); break; default: @@ -12897,7 +12899,9 @@ restart: switch (result) { case ERTS_DSIG_SEND_OK: + break; case ERTS_DSIG_SEND_TOO_LRG: /*SEND_SYSTEM_LIMIT*/ + erts_kill_dist_connection(ctx->dep, ctx->connection_id); break; case ERTS_DSIG_SEND_YIELD: /*SEND_YIELD_RETURN*/ case ERTS_DSIG_SEND_CONTINUE: { /*SEND_YIELD_CONTINUE*/ |