hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mbau...@apache.org
Subject svn commit: r1378323 - /hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWrapper.java
Date Tue, 28 Aug 2012 20:47:57 GMT
Author: mbautin
Date: Tue Aug 28 20:47:57 2012
New Revision: 1378323

URL: http://svn.apache.org/viewvc?rev=1378323&view=rev
Log:
[master] Fix for trunk -> saturn rpc incompat: client stuck on /hbase/root-region-server-complete

Author: kranganathan

Summary: If we don't find /hbase/root-region-server-complete, also try the legacy location
(/hbase/root-region-server). Once all clients are upgraded, we can remove this code.

Test Plan:
Tested by running the load tester against a table:
bin/hbase org.apache.hadoop.hbase.util.LoadTestTool -num_keys 50 -write 1:50:20 -tn kannan_interop_test
-compression NONE -zk hbasectrl047.ash3.facebook.com

Reviewers: kannan, mycnyc, aaiyer

Reviewed By: kannan

CC: hbase-eng@

Differential Revision: https://phabricator.fb.com/D547972

Task ID: 1373721

Modified:
    hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWrapper.java

Modified: hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWrapper.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWrapper.java?rev=1378323&r1=1378322&r2=1378323&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWrapper.java
(original)
+++ hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWrapper.java
Tue Aug 28 20:47:57 2012
@@ -573,7 +573,11 @@ public class ZooKeeperWrapper implements
    *         there was a problem reading the ZNode.
    */
   public HServerAddress readRootRegionLocation() {
-    return HServerInfo.getAddress(readAddress(rootRegionZNode, null));
+    HServerInfo rootRSInfo = readAddress(rootRegionZNode, null);
+    if (rootRSInfo == null) {
+      rootRSInfo = readAddress(legacyRootRegionZNode, null);
+    }
+    return HServerInfo.getAddress(rootRSInfo);
   }
 
   /**



Mime
View raw message