Handle errors reported from begin/commit inside transaction

src/ejabberd_sql.erl

@@ -560,15 +560,22 @@ outer_transaction(F, NRestarts, _Reason) ->
 		     [T]),
 	  erlang:exit(implementation_faulty)
     end,
-    sql_begin(),
+    case sql_begin() of
+	{error, Reason} ->
+	    maybe_restart_transaction(F, NRestarts, Reason, false);
+	_ ->
 	    put(?NESTING_KEY, PreviousNestingLevel + 1),
 	    try F() of
 		Res ->
-	    sql_commit(),
+		    case sql_commit() of
+			{error, Reason} ->
+			    restart(Reason);
+			_ ->
 			    {atomic, Res}
+		    end
 	    catch
 		?EX_RULE(throw, {aborted, Reason}, _) when NRestarts > 0 ->
-	    rollback_transaction(F, NRestarts, Reason);
+		    maybe_restart_transaction(F, NRestarts, Reason, true);
 		?EX_RULE(throw, {aborted, Reason}, Stack) when NRestarts =:= 0 ->
 		    StackTrace = ?EX_STACK(Stack),
 		    ?ERROR_MSG("SQL transaction restarts exceeded~n** "
@@ -577,18 +584,19 @@ outer_transaction(F, NRestarts, _Reason) ->
 			       "== ~p",
 			       [?MAX_TRANSACTION_RESTARTS, Reason,
 				StackTrace, get(?STATE_KEY)]),
-	    rollback_transaction(F, NRestarts, Reason);
+		    maybe_restart_transaction(F, NRestarts, Reason, true);
 		?EX_RULE(exit, Reason, _) ->
-	    rollback_transaction(F, 0, Reason)
+		    maybe_restart_transaction(F, 0, Reason, true)
+	    end
     end.
 
-rollback_transaction(F, NRestarts, Reason) ->
+maybe_restart_transaction(F, NRestarts, Reason, DoRollback) ->
     Res = case driver_restart_required(Reason) of
 	      true ->
 		  {aborted, Reason};
-	_ ->
+	      _ when DoRollback ->
 		  case sql_rollback() of
-		{Tag, Reason2} when Tag == error; Tag == aborted ->
+		      {error, Reason2} ->
 			  case driver_restart_required(Reason2) of
 			      true ->
 				  {aborted, Reason2};
@@ -597,7 +605,9 @@ rollback_transaction(F, NRestarts, Reason) ->
 			  end;
 		      _ ->
 			  continue
-	    end
+		  end;
+	      _ ->
+		  continue
     end,
     case Res of
 	continue when NRestarts > 0 ->