Index: src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java =================================================================== --- src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (revision 647900) +++ src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (working copy) @@ -685,11 +685,12 @@ LOG.debug("Done telling master we are up"); } break; + } catch (IllegalStateException e) { + System.out.println("Waiting for old lease to expire..."); } catch(IOException e) { LOG.warn("error telling master we are up", e); - sleeper.sleep(lastMsg); - continue; } + sleeper.sleep(lastMsg); } return result; }