Repository: asterixdb Updated Branches: refs/heads/master fbccee6bc -> 82a831d26
ASTERIXDB-1710: Redo fails on WAIT log record Simple fix :) It would be best to have a test for this (and all other logtypes), but the LogManager will have to be maniupulated into generating the record for this specifically because the conditions upon which it happens naturally are hard to encounter. Change-Id: I4443b716bc791878fabbbf3b374fc7c7c592668f Reviewed-on: https://asterix-gerrit.ics.uci.edu/1315 Sonar-Qube: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Tested-by: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Integration-Tests: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Reviewed-by: Murtadha Hubail <hubail...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/82a831d2 Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/82a831d2 Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/82a831d2 Branch: refs/heads/master Commit: 82a831d26d8c3c45478240f77dab9cf1b4c9eb79 Parents: fbccee6 Author: Ian Maxon <ima...@apache.org> Authored: Wed Oct 26 19:13:17 2016 -0700 Committer: Ian Maxon <ima...@apache.org> Committed: Thu Oct 27 12:46:33 2016 -0700 ---------------------------------------------------------------------- .../transaction/management/service/recovery/RecoveryManager.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/82a831d2/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/recovery/RecoveryManager.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/recovery/RecoveryManager.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/recovery/RecoveryManager.java index 6eb758c..286fc16 100644 --- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/recovery/RecoveryManager.java +++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/recovery/RecoveryManager.java @@ -405,6 +405,7 @@ public class RecoveryManager implements IRecoveryManager, ILifeCycleComponent { case LogType.ABORT: case LogType.FLUSH: case LogType.UPSERT_ENTITY_COMMIT: + case LogType.WAIT: case LogType.MARKER: //do nothing break;