----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: http://review.cloudera.org/r/1087/#review1662 -----------------------------------------------------------
Ship it! Looks good. Not sure if I can +1 my patch but I think we should commit :) trunk/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java <http://review.cloudera.org/r/1087/#comment5542> Should we remove this code from inside of ServerShutdownHandler now? Not a big deal but being done twice. - Jonathan On 2010-10-25 16:29:36, Jonathan Gray wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > http://review.cloudera.org/r/1087/ > ----------------------------------------------------------- > > (Updated 2010-10-25 16:29:36) > > > Review request for hbase and stack. > > > Summary > ------- > > Adds new handling of the timeouts for PENDING_OPEN and PENDING_CLOSE > in-memory master RIT states. > > Adds some new broken RIT states into TestMasterFailover. > > Some of these broken states don't seem possible to me but as long as we > aren't breaking the existing behaviors and tests I think it's okay if we > handle odd cases that can be mocked. Who knows what will happen in the real > world. > > The reason TestMasterFailover didn't/doesn't really test for the issue in > HBASE-3147 is this new broken condition happens when an RS dies / goes > offline rather than a master failover concurrent w/ RS failure. > > > v4 of the patch adds to Jons' fixes. It adds a shutdown server handler for > root and another for meta so the processing of servers hosting meta/root do > not get frozen out. I've seen this in my testing. > > > This addresses bug HBASE-3147. > http://issues.apache.org/jira/browse/HBASE-3147 > > > Diffs > ----- > > trunk/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java > 1027291 > trunk/src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java 1027291 > trunk/src/main/java/org/apache/hadoop/hbase/executor/EventHandler.java > 1027291 > trunk/src/main/java/org/apache/hadoop/hbase/executor/ExecutorService.java > 1027291 > trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java > 1027291 > trunk/src/main/java/org/apache/hadoop/hbase/master/HMaster.java 1027291 > trunk/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java > 1027291 > > trunk/src/main/java/org/apache/hadoop/hbase/master/handler/MetaServerShutdownHandler.java > PRE-CREATION > > trunk/src/main/java/org/apache/hadoop/hbase/master/handler/RootServerShutdownHandler.java > PRE-CREATION > > trunk/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java > 1027292 > trunk/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKAssign.java 1027291 > trunk/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java > 1027291 > > Diff: http://review.cloudera.org/r/1087/diff > > > Testing > ------- > > TestMasterFailover passes. > > > Thanks, > > Jonathan > >