You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2011/05/02 20:14:06 UTC
svn commit: r1098705 - in /hbase/trunk: CHANGES.txt
src/main/java/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java
Author: stack
Date: Mon May 2 18:14:05 2011
New Revision: 1098705
URL: http://svn.apache.org/viewvc?rev=1098705&view=rev
Log:
HBASE-3838 RegionCoprocesorHost.preWALRestore throws npe in case there is no RegionObserver registered
Modified:
hbase/trunk/CHANGES.txt
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java
Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1098705&r1=1098704&r2=1098705&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Mon May 2 18:14:05 2011
@@ -93,6 +93,8 @@ Release 0.91.0 - Unreleased
cluster and was returning master hostname for rs to use
HBASE-3829 TestMasterFailover failures in jenkins
HBASE-3843 splitLogWorker starts too early (Prakash Khemani)
+ HBASE-3838 RegionCoprocesorHost.preWALRestore throws npe in case there is
+ no RegionObserver registered (Himanshu Vashishtha)
IMPROVEMENTS
HBASE-3290 Max Compaction Size (Nicolas Spiegelberg via Stack)
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java?rev=1098705&r1=1098704&r2=1098705&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java Mon May 2 18:14:05 2011
@@ -920,11 +920,12 @@ public class RegionCoprocessorHost
ctx = ObserverContext.createAndPrepare(env, ctx);
((RegionObserver)env.getInstance()).preWALRestore(ctx, info, logKey,
logEdit);
+ bypass |= ctx.shouldBypass();
+ if (ctx.shouldComplete()) {
+ break;
+ }
}
- bypass |= ctx.shouldBypass();
- if (ctx.shouldComplete()) {
- break;
- }
+
}
return bypass;
}
@@ -943,10 +944,11 @@ public class RegionCoprocessorHost
ctx = ObserverContext.createAndPrepare(env, ctx);
((RegionObserver)env.getInstance()).postWALRestore(ctx, info,
logKey, logEdit);
+ if (ctx.shouldComplete()) {
+ break;
+ }
}
- if (ctx.shouldComplete()) {
- break;
- }
+
}
}
}