[12/51] [abbrv] hbase git commit: HBASE-21490 WALProcedure may remove proc wal files still with active procedures

2018-12-07 Thread elserj 
HBASE-21490 WALProcedure may remove proc wal files still with active procedures

Signed-off-by: Allan Yang 


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/405bf5e6
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/405bf5e6
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/405bf5e6

Branch: refs/heads/HBASE-20952
Commit: 405bf5e6383a09f435baadbac6c389e9f6c43ac6
Parents: 83dc38a
Author: Duo Zhang 
Authored: Mon Nov 19 11:03:52 2018 +0800
Committer: stack 
Committed: Mon Nov 19 08:21:28 2018 -0800

--
 .../procedure2/store/ProcedureStoreTracker.java |   3 +-
 .../store/wal/ProcedureWALFormat.java   |  33 ++--
 .../procedure2/store/wal/WALProcedureStore.java |  40 +++--
 .../hbase/master/TestLoadProcedureError.java| 150 +++
 4 files changed, 192 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/405bf5e6/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreTracker.java
--
diff --git 
a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreTracker.java
 
b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreTracker.java
index 25c9427..7d430d6 100644
--- 
a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreTracker.java
+++ 
b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreTracker.java
@@ -274,7 +274,8 @@ public class ProcedureStoreTracker {
 this.keepDeletes = false;
 this.partial = false;
 this.map.clear();
-resetModified();
+minModifiedProcId = Long.MAX_VALUE;
+maxModifiedProcId = Long.MIN_VALUE;
   }
 
   public boolean isModified(long procId) {

http://git-wip-us.apache.org/repos/asf/hbase/blob/405bf5e6/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormat.java
--
diff --git 
a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormat.java
 
b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormat.java
index 179c740..9686593 100644
--- 
a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormat.java
+++ 
b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormat.java
@@ -88,27 +88,24 @@ public final class ProcedureWALFormat {
   Loader loader) throws IOException {
 ProcedureWALFormatReader reader = new ProcedureWALFormatReader(tracker, 
loader);
 tracker.setKeepDeletes(true);
-try {
-  // Ignore the last log which is current active log.
-  while (logs.hasNext()) {
-ProcedureWALFile log = logs.next();
-log.open();
-try {
-  reader.read(log);
-} finally {
-  log.close();
-}
+// Ignore the last log which is current active log.
+while (logs.hasNext()) {
+  ProcedureWALFile log = logs.next();
+  log.open();
+  try {
+reader.read(log);
+  } finally {
+log.close();
   }
-  reader.finish();
+}
+reader.finish();
 
-  // The tracker is now updated with all the procedures read from the logs
-  if (tracker.isPartial()) {
-tracker.setPartialFlag(false);
-  }
-  tracker.resetModified();
-} finally {
-  tracker.setKeepDeletes(false);
+// The tracker is now updated with all the procedures read from the logs
+if (tracker.isPartial()) {
+  tracker.setPartialFlag(false);
 }
+tracker.resetModified();
+tracker.setKeepDeletes(false);
   }
 
   public static void writeHeader(OutputStream stream, ProcedureWALHeader 
header)

http://git-wip-us.apache.org/repos/asf/hbase/blob/405bf5e6/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java
--
diff --git 
a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java
 
b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java
index dbab6b7..82dc9df 100644
--- 
a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java
+++ 
b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java
@@ -448,13 +448,14 @@ public class WALProcedureStore extends ProcedureStoreBase 
{
 lock.lock();
 try {
   if (logs.isEmpty()) {
-throw new RuntimeException("recoverLease() must be called before 
loading data");
+throw new

hbase git commit: HBASE-21490 WALProcedure may remove proc wal files still with active procedures

2018-11-19 Thread stack 
Repository: hbase
Updated Branches:
  refs/heads/master 83dc38a1d -> 405bf5e63


HBASE-21490 WALProcedure may remove proc wal files still with active procedures

Signed-off-by: Allan Yang 


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/405bf5e6
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/405bf5e6
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/405bf5e6

Branch: refs/heads/master
Commit: 405bf5e6383a09f435baadbac6c389e9f6c43ac6
Parents: 83dc38a
Author: Duo Zhang 
Authored: Mon Nov 19 11:03:52 2018 +0800
Committer: stack 
Committed: Mon Nov 19 08:21:28 2018 -0800

--
 .../procedure2/store/ProcedureStoreTracker.java |   3 +-
 .../store/wal/ProcedureWALFormat.java   |  33 ++--
 .../procedure2/store/wal/WALProcedureStore.java |  40 +++--
 .../hbase/master/TestLoadProcedureError.java| 150 +++
 4 files changed, 192 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/405bf5e6/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreTracker.java
--
diff --git 
a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreTracker.java
 
b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreTracker.java
index 25c9427..7d430d6 100644
--- 
a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreTracker.java
+++ 
b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreTracker.java
@@ -274,7 +274,8 @@ public class ProcedureStoreTracker {
 this.keepDeletes = false;
 this.partial = false;
 this.map.clear();
-resetModified();
+minModifiedProcId = Long.MAX_VALUE;
+maxModifiedProcId = Long.MIN_VALUE;
   }
 
   public boolean isModified(long procId) {

http://git-wip-us.apache.org/repos/asf/hbase/blob/405bf5e6/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormat.java
--
diff --git 
a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormat.java
 
b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormat.java
index 179c740..9686593 100644
--- 
a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormat.java
+++ 
b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormat.java
@@ -88,27 +88,24 @@ public final class ProcedureWALFormat {
   Loader loader) throws IOException {
 ProcedureWALFormatReader reader = new ProcedureWALFormatReader(tracker, 
loader);
 tracker.setKeepDeletes(true);
-try {
-  // Ignore the last log which is current active log.
-  while (logs.hasNext()) {
-ProcedureWALFile log = logs.next();
-log.open();
-try {
-  reader.read(log);
-} finally {
-  log.close();
-}
+// Ignore the last log which is current active log.
+while (logs.hasNext()) {
+  ProcedureWALFile log = logs.next();
+  log.open();
+  try {
+reader.read(log);
+  } finally {
+log.close();
   }
-  reader.finish();
+}
+reader.finish();
 
-  // The tracker is now updated with all the procedures read from the logs
-  if (tracker.isPartial()) {
-tracker.setPartialFlag(false);
-  }
-  tracker.resetModified();
-} finally {
-  tracker.setKeepDeletes(false);
+// The tracker is now updated with all the procedures read from the logs
+if (tracker.isPartial()) {
+  tracker.setPartialFlag(false);
 }
+tracker.resetModified();
+tracker.setKeepDeletes(false);
   }
 
   public static void writeHeader(OutputStream stream, ProcedureWALHeader 
header)

http://git-wip-us.apache.org/repos/asf/hbase/blob/405bf5e6/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java
--
diff --git 
a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java
 
b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java
index dbab6b7..82dc9df 100644
--- 
a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java
+++ 
b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java
@@ -448,13 +448,14 @@ public class WALProcedureStore extends ProcedureStoreBase 
{
 lock.lock();
 try {
   if (logs.isEmpty()) {
-throw new

hbase git commit: HBASE-21490 WALProcedure may remove proc wal files still with active procedures

2018-11-19 Thread stack 
Repository: hbase
Updated Branches:
  refs/heads/branch-2.1 dd1aa88dd -> 030d06141


HBASE-21490 WALProcedure may remove proc wal files still with active procedures

Signed-off-by: Allan Yang 


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/030d0614
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/030d0614
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/030d0614

Branch: refs/heads/branch-2.1
Commit: 030d06141ccc6fc524385a20c5bb2ba574f7bbe3
Parents: dd1aa88
Author: Duo Zhang 
Authored: Mon Nov 19 11:03:52 2018 +0800
Committer: stack 
Committed: Mon Nov 19 08:20:49 2018 -0800

--
 .../procedure2/store/ProcedureStoreTracker.java |   3 +-
 .../store/wal/ProcedureWALFormat.java   |  33 ++--
 .../procedure2/store/wal/WALProcedureStore.java |  40 +++--
 .../hbase/master/TestLoadProcedureError.java| 150 +++
 4 files changed, 192 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/030d0614/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreTracker.java
--
diff --git 
a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreTracker.java
 
b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreTracker.java
index 25c9427..7d430d6 100644
--- 
a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreTracker.java
+++ 
b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreTracker.java
@@ -274,7 +274,8 @@ public class ProcedureStoreTracker {
 this.keepDeletes = false;
 this.partial = false;
 this.map.clear();
-resetModified();
+minModifiedProcId = Long.MAX_VALUE;
+maxModifiedProcId = Long.MIN_VALUE;
   }
 
   public boolean isModified(long procId) {

http://git-wip-us.apache.org/repos/asf/hbase/blob/030d0614/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormat.java
--
diff --git 
a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormat.java
 
b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormat.java
index 179c740..9686593 100644
--- 
a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormat.java
+++ 
b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormat.java
@@ -88,27 +88,24 @@ public final class ProcedureWALFormat {
   Loader loader) throws IOException {
 ProcedureWALFormatReader reader = new ProcedureWALFormatReader(tracker, 
loader);
 tracker.setKeepDeletes(true);
-try {
-  // Ignore the last log which is current active log.
-  while (logs.hasNext()) {
-ProcedureWALFile log = logs.next();
-log.open();
-try {
-  reader.read(log);
-} finally {
-  log.close();
-}
+// Ignore the last log which is current active log.
+while (logs.hasNext()) {
+  ProcedureWALFile log = logs.next();
+  log.open();
+  try {
+reader.read(log);
+  } finally {
+log.close();
   }
-  reader.finish();
+}
+reader.finish();
 
-  // The tracker is now updated with all the procedures read from the logs
-  if (tracker.isPartial()) {
-tracker.setPartialFlag(false);
-  }
-  tracker.resetModified();
-} finally {
-  tracker.setKeepDeletes(false);
+// The tracker is now updated with all the procedures read from the logs
+if (tracker.isPartial()) {
+  tracker.setPartialFlag(false);
 }
+tracker.resetModified();
+tracker.setKeepDeletes(false);
   }
 
   public static void writeHeader(OutputStream stream, ProcedureWALHeader 
header)

http://git-wip-us.apache.org/repos/asf/hbase/blob/030d0614/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java
--
diff --git 
a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java
 
b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java
index 39ad939..4b9dd7e 100644
--- 
a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java
+++ 
b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java
@@ -447,13 +447,14 @@ public class WALProcedureStore extends ProcedureStoreBase 
{
 lock.lock();
 try {
   if (logs.isEmpty()) {
-throw new

hbase git commit: HBASE-21490 WALProcedure may remove proc wal files still with active procedures

2018-11-19 Thread stack 
Repository: hbase
Updated Branches:
  refs/heads/branch-2 e958d7360 -> 6a64811f4


HBASE-21490 WALProcedure may remove proc wal files still with active procedures

Signed-off-by: Allan Yang 


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/6a64811f
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6a64811f
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6a64811f

Branch: refs/heads/branch-2
Commit: 6a64811f447a1440663c179641d337c8dc1dfd2d
Parents: e958d73
Author: Duo Zhang 
Authored: Mon Nov 19 11:03:52 2018 +0800
Committer: stack 
Committed: Mon Nov 19 08:21:09 2018 -0800

--
 .../procedure2/store/ProcedureStoreTracker.java |   3 +-
 .../store/wal/ProcedureWALFormat.java   |  33 ++--
 .../procedure2/store/wal/WALProcedureStore.java |  40 +++--
 .../hbase/master/TestLoadProcedureError.java| 150 +++
 4 files changed, 192 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/6a64811f/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreTracker.java
--
diff --git 
a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreTracker.java
 
b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreTracker.java
index 25c9427..7d430d6 100644
--- 
a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreTracker.java
+++ 
b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreTracker.java
@@ -274,7 +274,8 @@ public class ProcedureStoreTracker {
 this.keepDeletes = false;
 this.partial = false;
 this.map.clear();
-resetModified();
+minModifiedProcId = Long.MAX_VALUE;
+maxModifiedProcId = Long.MIN_VALUE;
   }
 
   public boolean isModified(long procId) {

http://git-wip-us.apache.org/repos/asf/hbase/blob/6a64811f/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormat.java
--
diff --git 
a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormat.java
 
b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormat.java
index 179c740..9686593 100644
--- 
a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormat.java
+++ 
b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormat.java
@@ -88,27 +88,24 @@ public final class ProcedureWALFormat {
   Loader loader) throws IOException {
 ProcedureWALFormatReader reader = new ProcedureWALFormatReader(tracker, 
loader);
 tracker.setKeepDeletes(true);
-try {
-  // Ignore the last log which is current active log.
-  while (logs.hasNext()) {
-ProcedureWALFile log = logs.next();
-log.open();
-try {
-  reader.read(log);
-} finally {
-  log.close();
-}
+// Ignore the last log which is current active log.
+while (logs.hasNext()) {
+  ProcedureWALFile log = logs.next();
+  log.open();
+  try {
+reader.read(log);
+  } finally {
+log.close();
   }
-  reader.finish();
+}
+reader.finish();
 
-  // The tracker is now updated with all the procedures read from the logs
-  if (tracker.isPartial()) {
-tracker.setPartialFlag(false);
-  }
-  tracker.resetModified();
-} finally {
-  tracker.setKeepDeletes(false);
+// The tracker is now updated with all the procedures read from the logs
+if (tracker.isPartial()) {
+  tracker.setPartialFlag(false);
 }
+tracker.resetModified();
+tracker.setKeepDeletes(false);
   }
 
   public static void writeHeader(OutputStream stream, ProcedureWALHeader 
header)

http://git-wip-us.apache.org/repos/asf/hbase/blob/6a64811f/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java
--
diff --git 
a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java
 
b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java
index 1b1018e..e8a6d97 100644
--- 
a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java
+++ 
b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java
@@ -448,13 +448,14 @@ public class WALProcedureStore extends ProcedureStoreBase 
{
 lock.lock();
 try {
   if (logs.isEmpty()) {
-throw new

hbase git commit: HBASE-21490 WALProcedure may remove proc wal files still with active procedures

2018-11-19 Thread stack 
Repository: hbase
Updated Branches:
  refs/heads/branch-2.0 cce1d61e4 -> db802d939


HBASE-21490 WALProcedure may remove proc wal files still with active procedures

Signed-off-by: Allan Yang 


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/db802d93
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/db802d93
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/db802d93

Branch: refs/heads/branch-2.0
Commit: db802d939340aef8a5744583654cc04b1bac3808
Parents: cce1d61
Author: Duo Zhang 
Authored: Mon Nov 19 11:03:52 2018 +0800
Committer: stack 
Committed: Mon Nov 19 08:20:16 2018 -0800

--
 .../procedure2/store/ProcedureStoreTracker.java |   3 +-
 .../store/wal/ProcedureWALFormat.java   |  33 ++--
 .../procedure2/store/wal/WALProcedureStore.java |  40 +++--
 .../hbase/master/TestLoadProcedureError.java| 150 +++
 4 files changed, 192 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/db802d93/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreTracker.java
--
diff --git 
a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreTracker.java
 
b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreTracker.java
index 25c9427..7d430d6 100644
--- 
a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreTracker.java
+++ 
b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreTracker.java
@@ -274,7 +274,8 @@ public class ProcedureStoreTracker {
 this.keepDeletes = false;
 this.partial = false;
 this.map.clear();
-resetModified();
+minModifiedProcId = Long.MAX_VALUE;
+maxModifiedProcId = Long.MIN_VALUE;
   }
 
   public boolean isModified(long procId) {

http://git-wip-us.apache.org/repos/asf/hbase/blob/db802d93/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormat.java
--
diff --git 
a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormat.java
 
b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormat.java
index 179c740..9686593 100644
--- 
a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormat.java
+++ 
b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormat.java
@@ -88,27 +88,24 @@ public final class ProcedureWALFormat {
   Loader loader) throws IOException {
 ProcedureWALFormatReader reader = new ProcedureWALFormatReader(tracker, 
loader);
 tracker.setKeepDeletes(true);
-try {
-  // Ignore the last log which is current active log.
-  while (logs.hasNext()) {
-ProcedureWALFile log = logs.next();
-log.open();
-try {
-  reader.read(log);
-} finally {
-  log.close();
-}
+// Ignore the last log which is current active log.
+while (logs.hasNext()) {
+  ProcedureWALFile log = logs.next();
+  log.open();
+  try {
+reader.read(log);
+  } finally {
+log.close();
   }
-  reader.finish();
+}
+reader.finish();
 
-  // The tracker is now updated with all the procedures read from the logs
-  if (tracker.isPartial()) {
-tracker.setPartialFlag(false);
-  }
-  tracker.resetModified();
-} finally {
-  tracker.setKeepDeletes(false);
+// The tracker is now updated with all the procedures read from the logs
+if (tracker.isPartial()) {
+  tracker.setPartialFlag(false);
 }
+tracker.resetModified();
+tracker.setKeepDeletes(false);
   }
 
   public static void writeHeader(OutputStream stream, ProcedureWALHeader 
header)

http://git-wip-us.apache.org/repos/asf/hbase/blob/db802d93/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java
--
diff --git 
a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java
 
b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java
index f169512..aa5bfa9 100644
--- 
a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java
+++ 
b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java
@@ -445,13 +445,14 @@ public class WALProcedureStore extends ProcedureStoreBase 
{
 lock.lock();
 try {
   if (logs.isEmpty()) {
-throw new