1 files changed, 14 insertions, 6 deletions

diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index 9e662632b4..1f6adb98ef 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -12095,6 +12095,7 @@ erts_proc_exit_handle_dist_monitor(ErtsMonitor *mon, void *vctxt, Sint reds)
     Eterm watched;
     Uint watcher_sz, ref_sz;
     ErtsHeapFactory factory;
+    Sint reds_consumed = 0;
 
     ASSERT(erts_monitor_is_target(mon) && mon->type == ERTS_MON_TYPE_DIST_PROC);
 
@@ -12139,16 +12140,18 @@ erts_proc_exit_handle_dist_monitor(ErtsMonitor *mon, void *vctxt, Sint reds)
                                      watched,
                                      ref,
                                      reason);
+        reds_consumed = reds - (ctx.reds / TERM_TO_BINARY_LOOP_FACTOR);
         switch (code) {
         case ERTS_DSIG_SEND_CONTINUE:
+        case ERTS_DSIG_SEND_YIELD:
             erts_set_gc_state(c_p, 0);
             ctxt->dist_state = erts_dsend_export_trap_context(c_p, &ctx);
-            /* fall-through */
-        case ERTS_DSIG_SEND_YIELD:
+            reds_consumed = reds; /* force yield */
             break;
         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:
@@ -12164,7 +12167,7 @@ erts_proc_exit_handle_dist_monitor(ErtsMonitor *mon, void *vctxt, Sint reds)
         erts_monitor_release(mon);
     else
         erts_monitor_release_both(mdp);
-    return reds - (ctx.reds / TERM_TO_BINARY_LOOP_FACTOR);
+    return reds_consumed;
 }
 
 int
@@ -12351,6 +12354,7 @@ erts_proc_exit_handle_dist_link(ErtsLink *lnk, void *vctxt, Sint reds)
     ErtsLink *dlnk;
     ErtsLinkData *ldp = NULL;
     ErtsHeapFactory factory;
+    Sint reds_consumed = 0;
 
     ASSERT(lnk->type == ERTS_LNK_TYPE_DIST_PROC);
     dlnk = erts_link_to_other(lnk, &ldp);
@@ -12387,16 +12391,18 @@ erts_proc_exit_handle_dist_link(ErtsLink *lnk, void *vctxt, Sint reds)
                                       item,
                                       reason,
                                       SEQ_TRACE_TOKEN(c_p));
+        reds_consumed = reds - (ctx.reds / TERM_TO_BINARY_LOOP_FACTOR);
         switch (code) {
+        case ERTS_DSIG_SEND_YIELD:
         case ERTS_DSIG_SEND_CONTINUE:
             erts_set_gc_state(c_p, 0);
             ctxt->dist_state = erts_dsend_export_trap_context(c_p, &ctx);
-            /* fall-through */
-        case ERTS_DSIG_SEND_YIELD:
+            reds_consumed = reds; /* force yield */
             break;
         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:
@@ -12412,7 +12418,7 @@ erts_proc_exit_handle_dist_link(ErtsLink *lnk, void *vctxt, Sint reds)
         erts_link_release_both(ldp);
     else if (lnk)
         erts_link_release(lnk);
-    return reds - (ctx.reds / TERM_TO_BINARY_LOOP_FACTOR);
+    return reds_consumed;
 }
 
 int
@@ -12893,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*/