diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/RecoverableZooKeeper.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/RecoverableZooKeeper.java index e3c3b8c..8c1ee19 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/RecoverableZooKeeper.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/RecoverableZooKeeper.java @@ -189,7 +189,6 @@ public class RecoverableZooKeeper { throw e; case CONNECTIONLOSS: - case SESSIONEXPIRED: case OPERATIONTIMEOUT: retryOrThrow(retryCounter, e, "delete"); break; @@ -222,7 +221,6 @@ public class RecoverableZooKeeper { } catch (KeeperException e) { switch (e.code()) { case CONNECTIONLOSS: - case SESSIONEXPIRED: case OPERATIONTIMEOUT: retryOrThrow(retryCounter, e, "exists"); break; @@ -296,7 +294,6 @@ public class RecoverableZooKeeper { } catch (KeeperException e) { switch (e.code()) { case CONNECTIONLOSS: - case SESSIONEXPIRED: case OPERATIONTIMEOUT: retryOrThrow(retryCounter, e, "getChildren"); break; @@ -328,7 +325,6 @@ public class RecoverableZooKeeper { } catch (KeeperException e) { switch (e.code()) { case CONNECTIONLOSS: - case SESSIONEXPIRED: case OPERATIONTIMEOUT: retryOrThrow(retryCounter, e, "getChildren"); break; @@ -361,7 +357,6 @@ public class RecoverableZooKeeper { } catch (KeeperException e) { switch (e.code()) { case CONNECTIONLOSS: - case SESSIONEXPIRED: case OPERATIONTIMEOUT: retryOrThrow(retryCounter, e, "getData"); break; @@ -394,7 +389,6 @@ public class RecoverableZooKeeper { } catch (KeeperException e) { switch (e.code()) { case CONNECTIONLOSS: - case SESSIONEXPIRED: case OPERATIONTIMEOUT: retryOrThrow(retryCounter, e, "getData"); break; @@ -430,7 +424,6 @@ public class RecoverableZooKeeper { } catch (KeeperException e) { switch (e.code()) { case CONNECTIONLOSS: - case SESSIONEXPIRED: case OPERATIONTIMEOUT: retryOrThrow(retryCounter, e, "setData"); break; @@ -478,7 +471,6 @@ public class RecoverableZooKeeper { } catch (KeeperException e) { switch (e.code()) { case CONNECTIONLOSS: - case SESSIONEXPIRED: case OPERATIONTIMEOUT: retryOrThrow(retryCounter, e, "getAcl"); break; @@ -510,7 +502,6 @@ public class RecoverableZooKeeper { } catch (KeeperException e) { switch (e.code()) { case CONNECTIONLOSS: - case SESSIONEXPIRED: case OPERATIONTIMEOUT: retryOrThrow(retryCounter, e, "setAcl"); break; @@ -595,7 +586,6 @@ public class RecoverableZooKeeper { throw e; case CONNECTIONLOSS: - case SESSIONEXPIRED: case OPERATIONTIMEOUT: retryOrThrow(retryCounter, e, "create"); break; @@ -629,7 +619,6 @@ public class RecoverableZooKeeper { } catch (KeeperException e) { switch (e.code()) { case CONNECTIONLOSS: - case SESSIONEXPIRED: case OPERATIONTIMEOUT: retryOrThrow(retryCounter, e, "create"); break; @@ -685,7 +674,6 @@ public class RecoverableZooKeeper { } catch (KeeperException e) { switch (e.code()) { case CONNECTIONLOSS: - case SESSIONEXPIRED: case OPERATIONTIMEOUT: retryOrThrow(retryCounter, e, "multi"); break; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java index 1c1000e..d7262ae 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java @@ -601,6 +601,7 @@ public class HRegionServer extends HasThread implements // Open connection to zookeeper and set primary watcher zooKeeper = new ZooKeeperWatcher(conf, getProcessName() + ":" + rpcServices.isa.getPort(), this, canCreateBaseZNode()); + zooKeeper = zooKeeper; // this is a trivial change to trigger hbase-server test, dont't submit it this.csm = (BaseCoordinatedStateManager) csm; this.csm.initialize(this);