You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by jm...@apache.org on 2013/02/14 14:08:24 UTC

svn commit: r1446160 - in /hbase/branches/hbase-7290v2/hbase-server/src: main/java/org/apache/hadoop/hbase/procedure/ZKProcedureUtil.java test/java/org/apache/hadoop/hbase/client/TestSnapshotMetadata.java

Author: jmhsieh
Date: Thu Feb 14 13:08:24 2013
New Revision: 1446160

URL: http://svn.apache.org/r1446160
Log:
HBASE-7779 [snapshot 130201 merge] Fix TestMultiParallel (Ted Yu)


Modified:
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureUtil.java
    hbase/branches/hbase-7290v2/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotMetadata.java

Modified: hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureUtil.java
URL: http://svn.apache.org/viewvc/hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureUtil.java?rev=1446160&r1=1446159&r2=1446160&view=diff
==============================================================================
--- hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureUtil.java (original)
+++ hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureUtil.java Thu Feb 14 13:08:24 2013
@@ -99,9 +99,8 @@ public abstract class ZKProcedureUtil
 
   @Override
   public void close() throws IOException {
-    if (watcher != null) {
-      watcher.close();
-    }
+    // the watcher is passed from either Master or Region Server
+    // watcher.close() will be called by the owner so no need to call close() here
   }
 
   public String getAcquiredBarrierNode(String opInstanceName) {

Modified: hbase/branches/hbase-7290v2/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotMetadata.java
URL: http://svn.apache.org/viewvc/hbase/branches/hbase-7290v2/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotMetadata.java?rev=1446160&r1=1446159&r2=1446160&view=diff
==============================================================================
--- hbase/branches/hbase-7290v2/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotMetadata.java (original)
+++ hbase/branches/hbase-7290v2/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotMetadata.java Thu Feb 14 13:08:24 2013
@@ -26,11 +26,13 @@ import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hbase.HBaseTestingUtility;
 import org.apache.hadoop.hbase.HColumnDescriptor;
+import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.HTableDescriptor;
 import org.apache.hadoop.hbase.MediumTests;
 import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding;
 import org.apache.hadoop.hbase.master.snapshot.SnapshotManager;
 import org.apache.hadoop.hbase.regionserver.BloomType;
+import org.apache.hadoop.hbase.regionserver.ConstantSizeRegionSplitPolicy;
 import org.apache.hadoop.hbase.snapshot.SnapshotTestingUtils;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.junit.After;
@@ -107,6 +109,9 @@ public class TestSnapshotMetadata {
     conf.setInt("hbase.client.pause", 250);
     conf.setInt("hbase.client.retries.number", 6);
     conf.setBoolean("hbase.master.enabletable.roundrobin", true);
+    // Avoid potentially aggressive splitting which would cause snapshot to fail
+    conf.set(HConstants.HBASE_REGION_SPLIT_POLICY_KEY,
+      ConstantSizeRegionSplitPolicy.class.getName());
   }
 
   @Before