File 0156-mnesia-Fix-checkpoint-crash.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0156-mnesia-Fix-checkpoint-crash.patch of Package erlang

From e038b56530804a3e59cc8832db64e021b4b33d25 Mon Sep 17 00:00:00 2001
From: Dan Gudmundsson <dgud@erlang.org>
Date: Mon, 18 Dec 2017 15:30:39 +0100
Subject: [PATCH] mnesia: Fix checkpoint crash

Bad timing can cause retain messages to go to a new process if
checkpoint name is reused directly and the checkpoints contain
different tables.

Ignore those messages instead of crash.
---
 lib/mnesia/src/mnesia_checkpoint.erl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/mnesia/src/mnesia_checkpoint.erl b/lib/mnesia/src/mnesia_checkpoint.erl
index 2ff77326a9..8112378ffd 100644
--- a/lib/mnesia/src/mnesia_checkpoint.erl
+++ b/lib/mnesia/src/mnesia_checkpoint.erl
@@ -857,9 +857,9 @@ retainer_loop(Cp = #checkpoint_args{is_activated=false, name=Name}) ->
 retainer_loop(Cp = #checkpoint_args{name=Name}) ->
     receive
 	{_From, {retain, Tid, Tab, Key, OldRecs}} ->
-	    R = val({Tab, {retainer, Name}}),
+	    R = ?catch_val({Tab, {retainer, Name}}),
 	    PendingTab = Cp#checkpoint_args.pending_tab,
-	    case R#retainer.really_retain of
+            case is_record(R, retainer) andalso R#retainer.really_retain of
 		true ->
 		    Store = R#retainer.store,
 		    try true = ets:member(PendingTab, Tid),
-- 
2.15.1

Places

File 0156-mnesia-Fix-checkpoint-crash.patch of Package erlang

Places