[2/2] hbase git commit: HBASE-19792 TestReplicationSmallTests.testDisableEnable fails

2018-01-16 Thread zhangduo 
HBASE-19792 TestReplicationSmallTests.testDisableEnable fails


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/48bb1901
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/48bb1901
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/48bb1901

Branch: refs/heads/branch-2
Commit: 48bb19012c33ab724ed4f1e2a5a7b98f9ded841b
Parents: 20afaca
Author: zhangduo 
Authored: Wed Jan 17 14:23:05 2018 +0800
Committer: zhangduo 
Committed: Wed Jan 17 14:23:17 2018 +0800

--
 .../replication/TestReplicationSmallTests.java  | 1079 --
 .../replication/TestVerifyReplication.java  |  493 
 .../hbase/replication/TestReplicationBase.java  |  163 ++-
 .../TestReplicationEmptyWALRecovery.java|  117 ++
 .../replication/TestReplicationSmallTests.java  |  436 +++
 5 files changed, 1190 insertions(+), 1098 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/48bb1901/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSmallTests.java
--
diff --git 
a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSmallTests.java
 
b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSmallTests.java
deleted file mode 100644
index 3877f71..000
--- 
a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSmallTests.java
+++ /dev/null
@@ -1,1079 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.replication;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.NavigableMap;
-import java.util.TreeMap;
-
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FileStatus;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hbase.Cell;
-import org.apache.hadoop.hbase.CellUtil;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.KeyValue;
-import org.apache.hadoop.hbase.TableName;
-import org.apache.hadoop.hbase.Waiter;
-import org.apache.hadoop.hbase.client.Admin;
-import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
-import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;
-import org.apache.hadoop.hbase.client.Connection;
-import org.apache.hadoop.hbase.client.ConnectionFactory;
-import org.apache.hadoop.hbase.client.Delete;
-import org.apache.hadoop.hbase.client.Get;
-import org.apache.hadoop.hbase.client.Put;
-import org.apache.hadoop.hbase.client.RegionInfo;
-import org.apache.hadoop.hbase.client.RegionInfoBuilder;
-import org.apache.hadoop.hbase.client.Result;
-import org.apache.hadoop.hbase.client.ResultScanner;
-import org.apache.hadoop.hbase.client.Scan;
-import org.apache.hadoop.hbase.client.Table;
-import org.apache.hadoop.hbase.client.TableDescriptor;
-import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
-import org.apache.hadoop.hbase.client.replication.TableCFs;
-import org.apache.hadoop.hbase.mapreduce.replication.VerifyReplication;
-import org.apache.hadoop.hbase.regionserver.HRegion;
-import org.apache.hadoop.hbase.regionserver.HRegionServer;
-import org.apache.hadoop.hbase.regionserver.MultiVersionConcurrencyControl;
-import org.apache.hadoop.hbase.regionserver.wal.AbstractFSWAL;
-import org.apache.hadoop.hbase.replication.regionserver.Replication;
-import org.apache.hadoop.hbase.replication.regionserver.ReplicationSource;
-import 
org.apache.hadoop.hbase.replication.regionserver.ReplicationSourceInterface;
-import

[1/2] hbase git commit: HBASE-19792 TestReplicationSmallTests.testDisableEnable fails

2018-01-16 Thread zhangduo 
Repository: hbase
Updated Branches:
  refs/heads/branch-2 20afaca76 -> 48bb19012


http://git-wip-us.apache.org/repos/asf/hbase/blob/48bb1901/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSmallTests.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSmallTests.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSmallTests.java
new file mode 100644
index 000..cb47827
--- /dev/null
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSmallTests.java
@@ -0,0 +1,436 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hbase.replication;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.NavigableMap;
+import java.util.TreeMap;
+import org.apache.hadoop.hbase.CellUtil;
+import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.KeyValue;
+import org.apache.hadoop.hbase.TableName;
+import org.apache.hadoop.hbase.client.Admin;
+import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;
+import org.apache.hadoop.hbase.client.Delete;
+import org.apache.hadoop.hbase.client.Get;
+import org.apache.hadoop.hbase.client.Put;
+import org.apache.hadoop.hbase.client.RegionInfo;
+import org.apache.hadoop.hbase.client.RegionInfoBuilder;
+import org.apache.hadoop.hbase.client.Result;
+import org.apache.hadoop.hbase.client.ResultScanner;
+import org.apache.hadoop.hbase.client.Scan;
+import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
+import org.apache.hadoop.hbase.client.replication.TableCFs;
+import org.apache.hadoop.hbase.regionserver.HRegion;
+import org.apache.hadoop.hbase.regionserver.MultiVersionConcurrencyControl;
+import org.apache.hadoop.hbase.replication.regionserver.Replication;
+import org.apache.hadoop.hbase.testclassification.LargeTests;
+import org.apache.hadoop.hbase.testclassification.ReplicationTests;
+import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
+import org.apache.hadoop.hbase.wal.WAL;
+import org.apache.hadoop.hbase.wal.WALEdit;
+import org.apache.hadoop.hbase.wal.WALKeyImpl;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos;
+
+@Category({ ReplicationTests.class, LargeTests.class })
+public class TestReplicationSmallTests extends TestReplicationBase {
+
+  private static final Logger LOG = 
LoggerFactory.getLogger(TestReplicationSmallTests.class);
+  private static final String PEER_ID = "2";
+
+  @Before
+  public void setUp() throws Exception {
+cleanUp();
+  }
+
+  /**
+   * Verify that version and column delete marker types are replicated 
correctly.
+   */
+  @Test
+  public void testDeleteTypes() throws Exception {
+LOG.info("testDeleteTypes");
+final byte[] v1 = Bytes.toBytes("v1");
+final byte[] v2 = Bytes.toBytes("v2");
+final byte[] v3 = Bytes.toBytes("v3");
+htable1 = utility1.getConnection().getTable(tableName);
+
+long t = EnvironmentEdgeManager.currentTime();
+// create three versions for "row"
+Put put = new Put(row);
+put.addColumn(famName, row, t, v1);
+htable1.put(put);
+
+put = new Put(row);
+put.addColumn(famName, row, t + 1, v2);
+htable1.put(put);
+
+put = new Put(row);
+put.addColumn(famName, row, t + 2, v3);
+htable1.put(put);
+
+Get get = new Get(row);
+get.readAllVersions();
+for (int i = 0; i < NB_RETRIES; i++) {
+  if (i == NB_RETRIES - 1) {
+fail("Waited too much time for put replication");
+  }
+  Result res = htable2.get(get);
+  if (res.size() < 3) {
+LOG.info("Rows not available");
+Thread.sleep(SLEEP_TIME);
+  } else {
+

[2/2] hbase git commit: HBASE-19792 TestReplicationSmallTests.testDisableEnable fails

2018-01-16 Thread zhangduo 
HBASE-19792 TestReplicationSmallTests.testDisableEnable fails


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d8d6ecda
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d8d6ecda
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d8d6ecda

Branch: refs/heads/master
Commit: d8d6ecdad1b360f877b290e462cf8bf9b717753b
Parents: 8b6b2b0
Author: zhangduo 
Authored: Wed Jan 17 14:23:05 2018 +0800
Committer: zhangduo 
Committed: Wed Jan 17 14:23:05 2018 +0800

--
 .../replication/TestReplicationSmallTests.java  | 1079 --
 .../replication/TestVerifyReplication.java  |  493 
 .../hbase/replication/TestReplicationBase.java  |  163 ++-
 .../TestReplicationEmptyWALRecovery.java|  117 ++
 .../replication/TestReplicationSmallTests.java  |  436 +++
 5 files changed, 1190 insertions(+), 1098 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/d8d6ecda/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSmallTests.java
--
diff --git 
a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSmallTests.java
 
b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSmallTests.java
deleted file mode 100644
index 3877f71..000
--- 
a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSmallTests.java
+++ /dev/null
@@ -1,1079 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.replication;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.NavigableMap;
-import java.util.TreeMap;
-
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FileStatus;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hbase.Cell;
-import org.apache.hadoop.hbase.CellUtil;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.KeyValue;
-import org.apache.hadoop.hbase.TableName;
-import org.apache.hadoop.hbase.Waiter;
-import org.apache.hadoop.hbase.client.Admin;
-import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
-import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;
-import org.apache.hadoop.hbase.client.Connection;
-import org.apache.hadoop.hbase.client.ConnectionFactory;
-import org.apache.hadoop.hbase.client.Delete;
-import org.apache.hadoop.hbase.client.Get;
-import org.apache.hadoop.hbase.client.Put;
-import org.apache.hadoop.hbase.client.RegionInfo;
-import org.apache.hadoop.hbase.client.RegionInfoBuilder;
-import org.apache.hadoop.hbase.client.Result;
-import org.apache.hadoop.hbase.client.ResultScanner;
-import org.apache.hadoop.hbase.client.Scan;
-import org.apache.hadoop.hbase.client.Table;
-import org.apache.hadoop.hbase.client.TableDescriptor;
-import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
-import org.apache.hadoop.hbase.client.replication.TableCFs;
-import org.apache.hadoop.hbase.mapreduce.replication.VerifyReplication;
-import org.apache.hadoop.hbase.regionserver.HRegion;
-import org.apache.hadoop.hbase.regionserver.HRegionServer;
-import org.apache.hadoop.hbase.regionserver.MultiVersionConcurrencyControl;
-import org.apache.hadoop.hbase.regionserver.wal.AbstractFSWAL;
-import org.apache.hadoop.hbase.replication.regionserver.Replication;
-import org.apache.hadoop.hbase.replication.regionserver.ReplicationSource;
-import 
org.apache.hadoop.hbase.replication.regionserver.ReplicationSourceInterface;
-import

[1/2] hbase git commit: HBASE-19792 TestReplicationSmallTests.testDisableEnable fails

2018-01-16 Thread zhangduo 
Repository: hbase
Updated Branches:
  refs/heads/master 8b6b2b0b2 -> d8d6ecdad


http://git-wip-us.apache.org/repos/asf/hbase/blob/d8d6ecda/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSmallTests.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSmallTests.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSmallTests.java
new file mode 100644
index 000..cb47827
--- /dev/null
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSmallTests.java
@@ -0,0 +1,436 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hbase.replication;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.NavigableMap;
+import java.util.TreeMap;
+import org.apache.hadoop.hbase.CellUtil;
+import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.KeyValue;
+import org.apache.hadoop.hbase.TableName;
+import org.apache.hadoop.hbase.client.Admin;
+import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;
+import org.apache.hadoop.hbase.client.Delete;
+import org.apache.hadoop.hbase.client.Get;
+import org.apache.hadoop.hbase.client.Put;
+import org.apache.hadoop.hbase.client.RegionInfo;
+import org.apache.hadoop.hbase.client.RegionInfoBuilder;
+import org.apache.hadoop.hbase.client.Result;
+import org.apache.hadoop.hbase.client.ResultScanner;
+import org.apache.hadoop.hbase.client.Scan;
+import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
+import org.apache.hadoop.hbase.client.replication.TableCFs;
+import org.apache.hadoop.hbase.regionserver.HRegion;
+import org.apache.hadoop.hbase.regionserver.MultiVersionConcurrencyControl;
+import org.apache.hadoop.hbase.replication.regionserver.Replication;
+import org.apache.hadoop.hbase.testclassification.LargeTests;
+import org.apache.hadoop.hbase.testclassification.ReplicationTests;
+import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
+import org.apache.hadoop.hbase.wal.WAL;
+import org.apache.hadoop.hbase.wal.WALEdit;
+import org.apache.hadoop.hbase.wal.WALKeyImpl;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos;
+
+@Category({ ReplicationTests.class, LargeTests.class })
+public class TestReplicationSmallTests extends TestReplicationBase {
+
+  private static final Logger LOG = 
LoggerFactory.getLogger(TestReplicationSmallTests.class);
+  private static final String PEER_ID = "2";
+
+  @Before
+  public void setUp() throws Exception {
+cleanUp();
+  }
+
+  /**
+   * Verify that version and column delete marker types are replicated 
correctly.
+   */
+  @Test
+  public void testDeleteTypes() throws Exception {
+LOG.info("testDeleteTypes");
+final byte[] v1 = Bytes.toBytes("v1");
+final byte[] v2 = Bytes.toBytes("v2");
+final byte[] v3 = Bytes.toBytes("v3");
+htable1 = utility1.getConnection().getTable(tableName);
+
+long t = EnvironmentEdgeManager.currentTime();
+// create three versions for "row"
+Put put = new Put(row);
+put.addColumn(famName, row, t, v1);
+htable1.put(put);
+
+put = new Put(row);
+put.addColumn(famName, row, t + 1, v2);
+htable1.put(put);
+
+put = new Put(row);
+put.addColumn(famName, row, t + 2, v3);
+htable1.put(put);
+
+Get get = new Get(row);
+get.readAllVersions();
+for (int i = 0; i < NB_RETRIES; i++) {
+  if (i == NB_RETRIES - 1) {
+fail("Waited too much time for put replication");
+  }
+  Result res = htable2.get(get);
+  if (res.size() < 3) {
+LOG.info("Rows not available");
+Thread.sleep(SLEEP_TIME);
+  } else {
+

hbase git commit: HBASE-19796 ReplicationSynUp tool is not replicating the data if the WAL is moved to splitting directory

2018-01-16 Thread ashishsinghi 
Repository: hbase
Updated Branches:
  refs/heads/branch-1.2 1a97b33e1 -> 45e99ffa6


HBASE-19796 ReplicationSynUp tool is not replicating the data if the WAL is 
moved to splitting directory

Signed-off-by: Ashish Singhi 


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/45e99ffa
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/45e99ffa
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/45e99ffa

Branch: refs/heads/branch-1.2
Commit: 45e99ffa68c9a7dd71173ffcb707110898950802
Parents: 1a97b33
Author: Ashish Singhi 
Authored: Wed Jan 17 10:47:04 2018 +0530
Committer: Ashish Singhi 
Committed: Wed Jan 17 10:48:14 2018 +0530

--
 .../hbase/replication/regionserver/ReplicationSource.java   | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/45e99ffa/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java
index 4175ad2..ff79976 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java
@@ -780,8 +780,13 @@ public class ReplicationSource extends Thread
   // We found the right new location
   LOG.info("Log " + this.currentPath + " still exists at " +
   possibleLogLocation);
-  // Breaking here will make us sleep since reader is null
-  // TODO why don't we need to set currentPath and call 
openReader here?
+  // When running ReplicationSyncUp tool, we should replicate 
the data from WAL
+  // which is moved to WAL splitting directory also.
+  if (stopper instanceof ReplicationSyncUp.DummyServer) {
+// Open the log at the this location
+this.currentPath = possibleLogLocation;
+this.openReader(sleepMultiplier);
+  }
   return true;
 }
   }

hbase git commit: HBASE-19796 ReplicationSynUp tool is not replicating the data if the WAL is moved to splitting directory

2018-01-16 Thread ashishsinghi 
Repository: hbase
Updated Branches:
  refs/heads/branch-1.3 28f811420 -> 04bb40824


HBASE-19796 ReplicationSynUp tool is not replicating the data if the WAL is 
moved to splitting directory

Signed-off-by: Ashish Singhi 


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/04bb4082
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/04bb4082
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/04bb4082

Branch: refs/heads/branch-1.3
Commit: 04bb4082438faf87c19627a7109c714bf17113b1
Parents: 28f8114
Author: Ashish Singhi 
Authored: Wed Jan 17 10:43:42 2018 +0530
Committer: Ashish Singhi 
Committed: Wed Jan 17 10:43:42 2018 +0530

--
 .../hbase/replication/regionserver/ReplicationSource.java   | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/04bb4082/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java
index d156a36..78b465c 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java
@@ -864,8 +864,13 @@ public class ReplicationSource extends Thread
   // We found the right new location
   LOG.info("Log " + this.currentPath + " still exists at " +
   possibleLogLocation);
-  // Breaking here will make us sleep since reader is null
-  // TODO why don't we need to set currentPath and call 
openReader here?
+  // When running ReplicationSyncUp tool, we should replicate 
the data from WAL
+  // which is moved to WAL splitting directory also.
+  if (stopper instanceof ReplicationSyncUp.DummyServer) {
+// Open the log at the this location
+this.currentPath = possibleLogLocation;
+this.openReader(sleepMultiplier);
+  }
   return true;
 }
   }

hbase git commit: HBASE-19739 Include thrift IDL files in hbase-thrift.jar and .proto files in hbase-protocol-shaded.jar respectively

2018-01-16 Thread stack 
Repository: hbase
Updated Branches:
  refs/heads/branch-2 e60d302b9 -> 20afaca76


HBASE-19739 Include thrift IDL files in hbase-thrift.jar and .proto files in 
hbase-protocol-shaded.jar respectively

Signed-off-by: Michael Stack 


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/20afaca7
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/20afaca7
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/20afaca7

Branch: refs/heads/branch-2
Commit: 20afaca7697ab0dea64d9355fc492b42759c0cfe
Parents: e60d302
Author: Umesh Agashe 
Authored: Wed Jan 10 14:03:30 2018 -0800
Committer: Michael Stack 
Committed: Tue Jan 16 12:35:56 2018 -0800

--
 hbase-protocol-shaded/pom.xml | 8 
 hbase-thrift/pom.xml  | 6 ++
 2 files changed, 14 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/20afaca7/hbase-protocol-shaded/pom.xml
--
diff --git a/hbase-protocol-shaded/pom.xml b/hbase-protocol-shaded/pom.xml
index 1ed4374..14151b0 100644
--- a/hbase-protocol-shaded/pom.xml
+++ b/hbase-protocol-shaded/pom.xml
@@ -38,6 +38,14 @@
 3.3.0
   
   
+
+  
+src/main/
+
+  **/*.proto
+
+  
+
 
   
 org.apache.maven.plugins

http://git-wip-us.apache.org/repos/asf/hbase/blob/20afaca7/hbase-thrift/pom.xml
--
diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml
index 00d8dfc..77e8859 100644
--- a/hbase-thrift/pom.xml
+++ b/hbase-thrift/pom.xml
@@ -43,6 +43,12 @@
   hbase-webapps/**
 
   
+  
+src/main/resources/
+
+  **/*.thrift
+
+

[2/2] hbase git commit: HBASE-19739 Include thrift IDL files in hbase-thrift.jar and .proto files in hbase-protocol-shaded.jar respectively

2018-01-16 Thread stack 
HBASE-19739 Include thrift IDL files in hbase-thrift.jar and .proto files in 
hbase-protocol-shaded.jar respectively

Signed-off-by: Michael Stack 


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/8b6b2b0b
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8b6b2b0b
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8b6b2b0b

Branch: refs/heads/master
Commit: 8b6b2b0b227f9b16d9c85ab69afa1f968ce72400
Parents: d3a306d
Author: Umesh Agashe 
Authored: Wed Jan 10 14:03:30 2018 -0800
Committer: Michael Stack 
Committed: Tue Jan 16 12:35:00 2018 -0800

--
 hbase-protocol-shaded/pom.xml | 8 
 hbase-thrift/pom.xml  | 6 ++
 2 files changed, 14 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/8b6b2b0b/hbase-protocol-shaded/pom.xml
--
diff --git a/hbase-protocol-shaded/pom.xml b/hbase-protocol-shaded/pom.xml
index 03030b8..1da0a32 100644
--- a/hbase-protocol-shaded/pom.xml
+++ b/hbase-protocol-shaded/pom.xml
@@ -38,6 +38,14 @@
 3.3.0
   
   
+
+  
+src/main/
+
+  **/*.proto
+
+  
+
 
   
 org.apache.maven.plugins

http://git-wip-us.apache.org/repos/asf/hbase/blob/8b6b2b0b/hbase-thrift/pom.xml
--
diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml
index 891676a..7410d99 100644
--- a/hbase-thrift/pom.xml
+++ b/hbase-thrift/pom.xml
@@ -43,6 +43,12 @@
   hbase-webapps/**
 
   
+  
+src/main/resources/
+
+  **/*.thrift
+
+

[1/2] hbase git commit: HBASE-19791 TestZKAsyncRegistry hangs

2018-01-16 Thread stack 
Repository: hbase
Updated Branches:
  refs/heads/master 9917244be -> 8b6b2b0b2


HBASE-19791 TestZKAsyncRegistry hangs


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d3a306d8
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d3a306d8
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d3a306d8

Branch: refs/heads/master
Commit: d3a306d81d3f087696fc6d45dd8d6bda939378b2
Parents: 9917244
Author: Michael Stack 
Authored: Sat Jan 13 12:40:36 2018 -0800
Committer: Michael Stack 
Committed: Tue Jan 16 12:34:05 2018 -0800

--
 .../java/org/apache/hadoop/hbase/client/TestZKAsyncRegistry.java  | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/d3a306d8/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestZKAsyncRegistry.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestZKAsyncRegistry.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestZKAsyncRegistry.java
index 3478549..a0c4c25 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestZKAsyncRegistry.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestZKAsyncRegistry.java
@@ -47,6 +47,9 @@ import org.junit.experimental.categories.Category;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+/**
+ * Test the ZooKeeper Async Registry.
+ */
 @Category({ MediumTests.class, ClientTests.class })
 public class TestZKAsyncRegistry {
   private static final Logger LOG = 
LoggerFactory.getLogger(TestZKAsyncRegistry.class);

hbase git commit: HBASE-19789 Not exclude flaky tests from nightly builds.

2018-01-16 Thread appy 
Repository: hbase
Updated Branches:
  refs/heads/branch-1.2 af41979bb -> 1a97b33e1


HBASE-19789 Not exclude flaky tests from nightly builds.


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1a97b33e
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1a97b33e
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1a97b33e

Branch: refs/heads/branch-1.2
Commit: 1a97b33e1cde9b534157a555c8799ee6911a8246
Parents: af41979
Author: Apekshit Sharma 
Authored: Fri Jan 12 16:22:06 2018 -0800
Committer: Apekshit Sharma 
Committed: Tue Jan 16 10:11:55 2018 -0800

--
 dev-support/Jenkinsfile| 7 +--
 dev-support/hbase_nightly_yetus.sh | 7 +--
 2 files changed, 10 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/1a97b33e/dev-support/Jenkinsfile
--
diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index b01a96b..b0d6724 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -44,8 +44,11 @@ pipeline {
 // These tests currently have known failures. Once they burn down to 0, 
remove from here so that new problems will cause a failure.
 TESTS_FILTER = 
'cc,checkstyle,javac,javadoc,pylint,shellcheck,whitespace,perlcritic,ruby-lint,rubocop,mvnsite,xml'
 BRANCH_SPECIFIC_DOCKERFILE = "${env.BASEDIR}/dev-support/docker/Dockerfile"
-// Only used for master branch.
-EXCLUDE_TESTS_URL = 
'https://builds.apache.org/job/HBase-Find-Flaky-Tests/lastSuccessfulBuild/artifact/excludes/'
+// Flaky urls for different branches. Replace '-' and '.' in branch name 
by '_' because those
+// characters are not allowed in bash variable name.
+// Not excluding flakies from the nightly build for now.
+// EXCLUDE_TESTS_URL_master = 
'https://builds.apache.org/job/HBase-Find-Flaky-Tests/lastSuccessfulBuild/artifact/excludes/'
+// EXCLUDE_TESTS_URL_branch_2 = 
'https://builds.apache.org/job/HBase-Find-Flaky-Tests-branch2.0/lastSuccessfulBuild/artifact/excludes/'
   }
   parameters {
 booleanParam(name: 'USE_YETUS_PRERELEASE', defaultValue: false, 
description: '''Check to use the current HEAD of apache/yetus rather than our 
configured release.

http://git-wip-us.apache.org/repos/asf/hbase/blob/1a97b33e/dev-support/hbase_nightly_yetus.sh
--
diff --git a/dev-support/hbase_nightly_yetus.sh 
b/dev-support/hbase_nightly_yetus.sh
index e1175d2..4e67354 100755
--- a/dev-support/hbase_nightly_yetus.sh
+++ b/dev-support/hbase_nightly_yetus.sh
@@ -69,10 +69,13 @@ YETUS_ARGS=("--branch=${BRANCH_NAME}" "${YETUS_ARGS[@]}")
 YETUS_ARGS=("--tests-filter=${TESTS_FILTER}" "${YETUS_ARGS[@]}")
 
 # Currently, flaky list is calculated only for master branch.
-if [[ -n "${EXCLUDE_TESTS_URL}" && "${BRANCH_NAME}" == "master" ]]; then
+UNDERSCORED_BRANCH_NAME=$(echo ${BRANCH_NAME} | tr '.-' '_')
+EXCLUDE_TESTS_URL=$(eval echo "\$EXCLUDE_TESTS_URL_${UNDERSCORED_BRANCH_NAME}")
+INCLUDE_TESTS_URL=$(eval echo "\$INCLUDE_TESTS_URL_${UNDERSCORED_BRANCH_NAME}")
+if [[ -n "${EXCLUDE_TESTS_URL}" ]]; then
   YETUS_ARGS=("--exclude-tests-url=${EXCLUDE_TESTS_URL}" "${YETUS_ARGS[@]}")
 fi
-if [[ -n "${INCLUDE_TESTS_URL}" && "${BRANCH_NAME}" == "master" ]]; then
+if [[ -n "${INCLUDE_TESTS_URL}" ]]; then
   YETUS_ARGS=("--include-tests-url=${INCLUDE_TESTS_URL}" "${YETUS_ARGS[@]}")
 fi

hbase git commit: HBASE-19789 Not exclude flaky tests from nightly builds.

2018-01-16 Thread appy 
Repository: hbase
Updated Branches:
  refs/heads/branch-1.3 b6f4f511a -> 28f811420


HBASE-19789 Not exclude flaky tests from nightly builds.


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/28f81142
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/28f81142
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/28f81142

Branch: refs/heads/branch-1.3
Commit: 28f811420368450ba12be77c2836d529938b2d75
Parents: b6f4f51
Author: Apekshit Sharma 
Authored: Fri Jan 12 16:22:06 2018 -0800
Committer: Apekshit Sharma 
Committed: Tue Jan 16 10:11:32 2018 -0800

--
 dev-support/Jenkinsfile| 7 +--
 dev-support/hbase_nightly_yetus.sh | 7 +--
 2 files changed, 10 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/28f81142/dev-support/Jenkinsfile
--
diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index b01a96b..b0d6724 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -44,8 +44,11 @@ pipeline {
 // These tests currently have known failures. Once they burn down to 0, 
remove from here so that new problems will cause a failure.
 TESTS_FILTER = 
'cc,checkstyle,javac,javadoc,pylint,shellcheck,whitespace,perlcritic,ruby-lint,rubocop,mvnsite,xml'
 BRANCH_SPECIFIC_DOCKERFILE = "${env.BASEDIR}/dev-support/docker/Dockerfile"
-// Only used for master branch.
-EXCLUDE_TESTS_URL = 
'https://builds.apache.org/job/HBase-Find-Flaky-Tests/lastSuccessfulBuild/artifact/excludes/'
+// Flaky urls for different branches. Replace '-' and '.' in branch name 
by '_' because those
+// characters are not allowed in bash variable name.
+// Not excluding flakies from the nightly build for now.
+// EXCLUDE_TESTS_URL_master = 
'https://builds.apache.org/job/HBase-Find-Flaky-Tests/lastSuccessfulBuild/artifact/excludes/'
+// EXCLUDE_TESTS_URL_branch_2 = 
'https://builds.apache.org/job/HBase-Find-Flaky-Tests-branch2.0/lastSuccessfulBuild/artifact/excludes/'
   }
   parameters {
 booleanParam(name: 'USE_YETUS_PRERELEASE', defaultValue: false, 
description: '''Check to use the current HEAD of apache/yetus rather than our 
configured release.

http://git-wip-us.apache.org/repos/asf/hbase/blob/28f81142/dev-support/hbase_nightly_yetus.sh
--
diff --git a/dev-support/hbase_nightly_yetus.sh 
b/dev-support/hbase_nightly_yetus.sh
index e1175d2..4e67354 100755
--- a/dev-support/hbase_nightly_yetus.sh
+++ b/dev-support/hbase_nightly_yetus.sh
@@ -69,10 +69,13 @@ YETUS_ARGS=("--branch=${BRANCH_NAME}" "${YETUS_ARGS[@]}")
 YETUS_ARGS=("--tests-filter=${TESTS_FILTER}" "${YETUS_ARGS[@]}")
 
 # Currently, flaky list is calculated only for master branch.
-if [[ -n "${EXCLUDE_TESTS_URL}" && "${BRANCH_NAME}" == "master" ]]; then
+UNDERSCORED_BRANCH_NAME=$(echo ${BRANCH_NAME} | tr '.-' '_')
+EXCLUDE_TESTS_URL=$(eval echo "\$EXCLUDE_TESTS_URL_${UNDERSCORED_BRANCH_NAME}")
+INCLUDE_TESTS_URL=$(eval echo "\$INCLUDE_TESTS_URL_${UNDERSCORED_BRANCH_NAME}")
+if [[ -n "${EXCLUDE_TESTS_URL}" ]]; then
   YETUS_ARGS=("--exclude-tests-url=${EXCLUDE_TESTS_URL}" "${YETUS_ARGS[@]}")
 fi
-if [[ -n "${INCLUDE_TESTS_URL}" && "${BRANCH_NAME}" == "master" ]]; then
+if [[ -n "${INCLUDE_TESTS_URL}" ]]; then
   YETUS_ARGS=("--include-tests-url=${INCLUDE_TESTS_URL}" "${YETUS_ARGS[@]}")
 fi

hbase git commit: HBASE-19789 Not exclude flaky tests from nightly builds.

2018-01-16 Thread appy 
Repository: hbase
Updated Branches:
  refs/heads/branch-1.4 feb361cd7 -> 882cc0796


HBASE-19789 Not exclude flaky tests from nightly builds.


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/882cc079
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/882cc079
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/882cc079

Branch: refs/heads/branch-1.4
Commit: 882cc079627be69410d296830342123652408f26
Parents: feb361c
Author: Apekshit Sharma 
Authored: Fri Jan 12 16:22:06 2018 -0800
Committer: Apekshit Sharma 
Committed: Tue Jan 16 10:11:08 2018 -0800

--
 dev-support/Jenkinsfile| 7 +--
 dev-support/hbase_nightly_yetus.sh | 7 +--
 2 files changed, 10 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/882cc079/dev-support/Jenkinsfile
--
diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index b01a96b..b0d6724 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -44,8 +44,11 @@ pipeline {
 // These tests currently have known failures. Once they burn down to 0, 
remove from here so that new problems will cause a failure.
 TESTS_FILTER = 
'cc,checkstyle,javac,javadoc,pylint,shellcheck,whitespace,perlcritic,ruby-lint,rubocop,mvnsite,xml'
 BRANCH_SPECIFIC_DOCKERFILE = "${env.BASEDIR}/dev-support/docker/Dockerfile"
-// Only used for master branch.
-EXCLUDE_TESTS_URL = 
'https://builds.apache.org/job/HBase-Find-Flaky-Tests/lastSuccessfulBuild/artifact/excludes/'
+// Flaky urls for different branches. Replace '-' and '.' in branch name 
by '_' because those
+// characters are not allowed in bash variable name.
+// Not excluding flakies from the nightly build for now.
+// EXCLUDE_TESTS_URL_master = 
'https://builds.apache.org/job/HBase-Find-Flaky-Tests/lastSuccessfulBuild/artifact/excludes/'
+// EXCLUDE_TESTS_URL_branch_2 = 
'https://builds.apache.org/job/HBase-Find-Flaky-Tests-branch2.0/lastSuccessfulBuild/artifact/excludes/'
   }
   parameters {
 booleanParam(name: 'USE_YETUS_PRERELEASE', defaultValue: false, 
description: '''Check to use the current HEAD of apache/yetus rather than our 
configured release.

http://git-wip-us.apache.org/repos/asf/hbase/blob/882cc079/dev-support/hbase_nightly_yetus.sh
--
diff --git a/dev-support/hbase_nightly_yetus.sh 
b/dev-support/hbase_nightly_yetus.sh
index e1175d2..4e67354 100755
--- a/dev-support/hbase_nightly_yetus.sh
+++ b/dev-support/hbase_nightly_yetus.sh
@@ -69,10 +69,13 @@ YETUS_ARGS=("--branch=${BRANCH_NAME}" "${YETUS_ARGS[@]}")
 YETUS_ARGS=("--tests-filter=${TESTS_FILTER}" "${YETUS_ARGS[@]}")
 
 # Currently, flaky list is calculated only for master branch.
-if [[ -n "${EXCLUDE_TESTS_URL}" && "${BRANCH_NAME}" == "master" ]]; then
+UNDERSCORED_BRANCH_NAME=$(echo ${BRANCH_NAME} | tr '.-' '_')
+EXCLUDE_TESTS_URL=$(eval echo "\$EXCLUDE_TESTS_URL_${UNDERSCORED_BRANCH_NAME}")
+INCLUDE_TESTS_URL=$(eval echo "\$INCLUDE_TESTS_URL_${UNDERSCORED_BRANCH_NAME}")
+if [[ -n "${EXCLUDE_TESTS_URL}" ]]; then
   YETUS_ARGS=("--exclude-tests-url=${EXCLUDE_TESTS_URL}" "${YETUS_ARGS[@]}")
 fi
-if [[ -n "${INCLUDE_TESTS_URL}" && "${BRANCH_NAME}" == "master" ]]; then
+if [[ -n "${INCLUDE_TESTS_URL}" ]]; then
   YETUS_ARGS=("--include-tests-url=${INCLUDE_TESTS_URL}" "${YETUS_ARGS[@]}")
 fi

hbase git commit: HBASE-19789 Not exclude flaky tests from nightly builds.

2018-01-16 Thread appy 
Repository: hbase
Updated Branches:
  refs/heads/branch-1 48025cc84 -> 2e6bec6f2


HBASE-19789 Not exclude flaky tests from nightly builds.


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/2e6bec6f
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/2e6bec6f
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/2e6bec6f

Branch: refs/heads/branch-1
Commit: 2e6bec6f2fb0d89345dc9aa4a62b45e8821cfc20
Parents: 48025cc
Author: Apekshit Sharma 
Authored: Fri Jan 12 16:22:06 2018 -0800
Committer: Apekshit Sharma 
Committed: Tue Jan 16 10:10:48 2018 -0800

--
 dev-support/Jenkinsfile| 7 +--
 dev-support/hbase_nightly_yetus.sh | 7 +--
 2 files changed, 10 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/2e6bec6f/dev-support/Jenkinsfile
--
diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index c694d1b..dd98734 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -44,8 +44,11 @@ pipeline {
 // These tests currently have known failures. Once they burn down to 0, 
remove from here so that new problems will cause a failure.
 TESTS_FILTER = 
'cc,checkstyle,javac,javadoc,pylint,shellcheck,whitespace,perlcritic,ruby-lint,rubocop,mvnsite,xml'
 BRANCH_SPECIFIC_DOCKERFILE = "${env.BASEDIR}/dev-support/docker/Dockerfile"
-// Only used for master branch.
-EXCLUDE_TESTS_URL = 
'https://builds.apache.org/job/HBase-Find-Flaky-Tests/lastSuccessfulBuild/artifact/excludes/'
+// Flaky urls for different branches. Replace '-' and '.' in branch name 
by '_' because those
+// characters are not allowed in bash variable name.
+// Not excluding flakies from the nightly build for now.
+// EXCLUDE_TESTS_URL_master = 
'https://builds.apache.org/job/HBase-Find-Flaky-Tests/lastSuccessfulBuild/artifact/excludes/'
+// EXCLUDE_TESTS_URL_branch_2 = 
'https://builds.apache.org/job/HBase-Find-Flaky-Tests-branch2.0/lastSuccessfulBuild/artifact/excludes/'
   }
   parameters {
 booleanParam(name: 'USE_YETUS_PRERELEASE', defaultValue: false, 
description: '''Check to use the current HEAD of apache/yetus rather than our 
configured release.

http://git-wip-us.apache.org/repos/asf/hbase/blob/2e6bec6f/dev-support/hbase_nightly_yetus.sh
--
diff --git a/dev-support/hbase_nightly_yetus.sh 
b/dev-support/hbase_nightly_yetus.sh
index e1175d2..4e67354 100755
--- a/dev-support/hbase_nightly_yetus.sh
+++ b/dev-support/hbase_nightly_yetus.sh
@@ -69,10 +69,13 @@ YETUS_ARGS=("--branch=${BRANCH_NAME}" "${YETUS_ARGS[@]}")
 YETUS_ARGS=("--tests-filter=${TESTS_FILTER}" "${YETUS_ARGS[@]}")
 
 # Currently, flaky list is calculated only for master branch.
-if [[ -n "${EXCLUDE_TESTS_URL}" && "${BRANCH_NAME}" == "master" ]]; then
+UNDERSCORED_BRANCH_NAME=$(echo ${BRANCH_NAME} | tr '.-' '_')
+EXCLUDE_TESTS_URL=$(eval echo "\$EXCLUDE_TESTS_URL_${UNDERSCORED_BRANCH_NAME}")
+INCLUDE_TESTS_URL=$(eval echo "\$INCLUDE_TESTS_URL_${UNDERSCORED_BRANCH_NAME}")
+if [[ -n "${EXCLUDE_TESTS_URL}" ]]; then
   YETUS_ARGS=("--exclude-tests-url=${EXCLUDE_TESTS_URL}" "${YETUS_ARGS[@]}")
 fi
-if [[ -n "${INCLUDE_TESTS_URL}" && "${BRANCH_NAME}" == "master" ]]; then
+if [[ -n "${INCLUDE_TESTS_URL}" ]]; then
   YETUS_ARGS=("--include-tests-url=${INCLUDE_TESTS_URL}" "${YETUS_ARGS[@]}")
 fi

hbase git commit: HBASE-19789 Not exclude flaky tests from nightly builds.

2018-01-16 Thread appy 
Repository: hbase
Updated Branches:
  refs/heads/branch-2 f23fd7208 -> e60d302b9


HBASE-19789 Not exclude flaky tests from nightly builds.


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e60d302b
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e60d302b
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e60d302b

Branch: refs/heads/branch-2
Commit: e60d302b90fc892baf69995c3747a859a3c0fbf4
Parents: f23fd72
Author: Apekshit Sharma 
Authored: Fri Jan 12 16:22:06 2018 -0800
Committer: Apekshit Sharma 
Committed: Tue Jan 16 10:09:50 2018 -0800

--
 dev-support/Jenkinsfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/e60d302b/dev-support/Jenkinsfile
--
diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index e5d33e0..14092d5 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -46,8 +46,9 @@ pipeline {
 BRANCH_SPECIFIC_DOCKERFILE = "${env.BASEDIR}/dev-support/docker/Dockerfile"
 // Flaky urls for different branches. Replace '-' and '.' in branch name 
by '_' because those
 // characters are not allowed in bash variable name.
-EXCLUDE_TESTS_URL_master = 
'https://builds.apache.org/job/HBase-Find-Flaky-Tests/lastSuccessfulBuild/artifact/excludes/'
-EXCLUDE_TESTS_URL_branch_2 = 
'https://builds.apache.org/job/HBase-Find-Flaky-Tests-branch2.0/lastSuccessfulBuild/artifact/excludes/'
+// Not excluding flakies from the nightly build for now.
+// EXCLUDE_TESTS_URL_master = 
'https://builds.apache.org/job/HBase-Find-Flaky-Tests/lastSuccessfulBuild/artifact/excludes/'
+// EXCLUDE_TESTS_URL_branch_2 = 
'https://builds.apache.org/job/HBase-Find-Flaky-Tests-branch2.0/lastSuccessfulBuild/artifact/excludes/'
   }
   parameters {
 booleanParam(name: 'USE_YETUS_PRERELEASE', defaultValue: false, 
description: '''Check to use the current HEAD of apache/yetus rather than our 
configured release.

hbase git commit: HBASE-19789 Not exclude flaky tests from nightly builds.

2018-01-16 Thread appy 
Repository: hbase
Updated Branches:
  refs/heads/master d155a4e33 -> 9917244be


HBASE-19789 Not exclude flaky tests from nightly builds.


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/9917244b
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/9917244b
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/9917244b

Branch: refs/heads/master
Commit: 9917244be2c7de7dccf870240f08a90baf341bbb
Parents: d155a4e
Author: Apekshit Sharma 
Authored: Fri Jan 12 16:22:06 2018 -0800
Committer: Apekshit Sharma 
Committed: Tue Jan 16 10:07:48 2018 -0800

--
 dev-support/Jenkinsfile| 7 +--
 dev-support/hbase_nightly_yetus.sh | 7 +--
 2 files changed, 10 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/9917244b/dev-support/Jenkinsfile
--
diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index dcef649..14092d5 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -44,8 +44,11 @@ pipeline {
 // These tests currently have known failures. Once they burn down to 0, 
remove from here so that new problems will cause a failure.
 TESTS_FILTER = 
'cc,checkstyle,javac,javadoc,pylint,shellcheck,whitespace,perlcritic,ruby-lint,rubocop,mvnsite'
 BRANCH_SPECIFIC_DOCKERFILE = "${env.BASEDIR}/dev-support/docker/Dockerfile"
-// Only used for master branch.
-EXCLUDE_TESTS_URL = 
'https://builds.apache.org/job/HBase-Find-Flaky-Tests/lastSuccessfulBuild/artifact/excludes/'
+// Flaky urls for different branches. Replace '-' and '.' in branch name 
by '_' because those
+// characters are not allowed in bash variable name.
+// Not excluding flakies from the nightly build for now.
+// EXCLUDE_TESTS_URL_master = 
'https://builds.apache.org/job/HBase-Find-Flaky-Tests/lastSuccessfulBuild/artifact/excludes/'
+// EXCLUDE_TESTS_URL_branch_2 = 
'https://builds.apache.org/job/HBase-Find-Flaky-Tests-branch2.0/lastSuccessfulBuild/artifact/excludes/'
   }
   parameters {
 booleanParam(name: 'USE_YETUS_PRERELEASE', defaultValue: false, 
description: '''Check to use the current HEAD of apache/yetus rather than our 
configured release.

http://git-wip-us.apache.org/repos/asf/hbase/blob/9917244b/dev-support/hbase_nightly_yetus.sh
--
diff --git a/dev-support/hbase_nightly_yetus.sh 
b/dev-support/hbase_nightly_yetus.sh
index e1175d2..4e67354 100755
--- a/dev-support/hbase_nightly_yetus.sh
+++ b/dev-support/hbase_nightly_yetus.sh
@@ -69,10 +69,13 @@ YETUS_ARGS=("--branch=${BRANCH_NAME}" "${YETUS_ARGS[@]}")
 YETUS_ARGS=("--tests-filter=${TESTS_FILTER}" "${YETUS_ARGS[@]}")
 
 # Currently, flaky list is calculated only for master branch.
-if [[ -n "${EXCLUDE_TESTS_URL}" && "${BRANCH_NAME}" == "master" ]]; then
+UNDERSCORED_BRANCH_NAME=$(echo ${BRANCH_NAME} | tr '.-' '_')
+EXCLUDE_TESTS_URL=$(eval echo "\$EXCLUDE_TESTS_URL_${UNDERSCORED_BRANCH_NAME}")
+INCLUDE_TESTS_URL=$(eval echo "\$INCLUDE_TESTS_URL_${UNDERSCORED_BRANCH_NAME}")
+if [[ -n "${EXCLUDE_TESTS_URL}" ]]; then
   YETUS_ARGS=("--exclude-tests-url=${EXCLUDE_TESTS_URL}" "${YETUS_ARGS[@]}")
 fi
-if [[ -n "${INCLUDE_TESTS_URL}" && "${BRANCH_NAME}" == "master" ]]; then
+if [[ -n "${INCLUDE_TESTS_URL}" ]]; then
   YETUS_ARGS=("--include-tests-url=${INCLUDE_TESTS_URL}" "${YETUS_ARGS[@]}")
 fi

svn commit: r24242 - /release/hbase/2.0.0-alpha4/

2018-01-16 Thread stack 
Author: stack
Date: Tue Jan 16 17:41:39 2018
New Revision: 24242

Log:
Remove alpha-4 now beta-1 has been posted for 2.0.0

Removed:
release/hbase/2.0.0-alpha4/

[hbase] Git Push Summary

2018-01-16 Thread stack 
Repository: hbase
Updated Tags:  refs/tags/rel/2.0.0-beta-1 [created] 95782531e

svn commit: r24241 - /dev/hbase/hbase-2.0.0-beta-1-RC3/ /release/hbase/hbase-2.0.0-beta-1/

2018-01-16 Thread stack 
Author: stack
Date: Tue Jan 16 17:11:13 2018
New Revision: 24241

Log:
Release 2.0.0-beta-1

Added:
release/hbase/hbase-2.0.0-beta-1/
  - copied from r24240, dev/hbase/hbase-2.0.0-beta-1-RC3/
Removed:
dev/hbase/hbase-2.0.0-beta-1-RC3/

hbase-site git commit: INFRA-10751 Empty commit

2018-01-16 Thread git-site-role 
Repository: hbase-site
Updated Branches:
  refs/heads/asf-site 7aa6ade32 -> c5e49b3be


INFRA-10751 Empty commit


Project: http://git-wip-us.apache.org/repos/asf/hbase-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase-site/commit/c5e49b3b
Tree: http://git-wip-us.apache.org/repos/asf/hbase-site/tree/c5e49b3b
Diff: http://git-wip-us.apache.org/repos/asf/hbase-site/diff/c5e49b3b

Branch: refs/heads/asf-site
Commit: c5e49b3befc9280edd29e9fd255e40c6ec353e83
Parents: 7aa6ade
Author: jenkins 
Authored: Tue Jan 16 15:31:21 2018 +
Committer: jenkins 
Committed: Tue Jan 16 15:31:21 2018 +

--

--

[7/7] hbase-site git commit: Published site at .

2018-01-16 Thread git-site-role 
Published site at .


Project: http://git-wip-us.apache.org/repos/asf/hbase-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase-site/commit/7aa6ade3
Tree: http://git-wip-us.apache.org/repos/asf/hbase-site/tree/7aa6ade3
Diff: http://git-wip-us.apache.org/repos/asf/hbase-site/diff/7aa6ade3

Branch: refs/heads/asf-site
Commit: 7aa6ade32f0c58f8b2e114a83d8ac1a7239331e7
Parents: ae658af
Author: jenkins 
Authored: Tue Jan 16 15:31:05 2018 +
Committer: jenkins 
Committed: Tue Jan 16 15:31:05 2018 +

--
 acid-semantics.html |   4 +-
 apache_hbase_reference_guide.pdf|   4 +-
 book.html   |   2 +-
 bulk-loads.html |   4 +-
 checkstyle-aggregate.html   |  46 +-
 coc.html|   4 +-
 cygwin.html |   4 +-
 dependencies.html   |   4 +-
 dependency-convergence.html |   4 +-
 dependency-info.html|   4 +-
 dependency-management.html  |   4 +-
 devapidocs/constant-values.html |   6 +-
 devapidocs/index-all.html   |   2 +
 .../hadoop/hbase/backup/package-tree.html   |   4 +-
 .../hadoop/hbase/client/package-tree.html   |  18 +-
 .../hadoop/hbase/executor/package-tree.html |   2 +-
 .../hadoop/hbase/filter/package-tree.html   |  10 +-
 .../hadoop/hbase/io/hfile/package-tree.html |   8 +-
 .../apache/hadoop/hbase/ipc/package-tree.html   |   2 +-
 .../hadoop/hbase/mapreduce/package-tree.html|   4 +-
 .../hadoop/hbase/master/package-tree.html   |   4 +-
 .../hbase/master/procedure/package-tree.html|   2 +-
 .../hadoop/hbase/monitoring/package-tree.html   |   2 +-
 .../org/apache/hadoop/hbase/package-tree.html   |  18 +-
 .../hadoop/hbase/procedure2/package-tree.html   |   4 +-
 .../hadoop/hbase/quotas/package-tree.html   |   8 +-
 .../regionserver/HStore.StoreFlusherImpl.html   |   2 +-
 .../hadoop/hbase/regionserver/HStore.html   |  60 +-
 .../hbase/regionserver/MemStoreSnapshot.html|  74 ++-
 .../hadoop/hbase/regionserver/package-tree.html |  18 +-
 .../regionserver/querymatcher/package-tree.html |   2 +-
 .../replication/regionserver/package-tree.html  |   2 +-
 .../hadoop/hbase/rest/model/package-tree.html   |   2 +-
 .../hbase/security/access/package-tree.html |   2 +-
 .../hadoop/hbase/security/package-tree.html |   2 +-
 .../hadoop/hbase/thrift/package-tree.html   |   2 +-
 .../apache/hadoop/hbase/util/package-tree.html  |   8 +-
 devapidocs/overview-tree.html   |   2 +-
 .../org/apache/hadoop/hbase/Version.html|   6 +-
 .../regionserver/HStore.StoreFlusherImpl.html   | 565 ++-
 .../hadoop/hbase/regionserver/HStore.html   | 565 ++-
 .../hbase/regionserver/MemStoreSnapshot.html| 154 ++---
 export_control.html |   4 +-
 hbase-annotations/checkstyle.html   |   4 +-
 hbase-annotations/dependencies.html |   4 +-
 hbase-annotations/dependency-convergence.html   |   4 +-
 hbase-annotations/dependency-info.html  |   4 +-
 hbase-annotations/dependency-management.html|   4 +-
 hbase-annotations/index.html|   4 +-
 hbase-annotations/integration.html  |   4 +-
 hbase-annotations/issue-tracking.html   |   4 +-
 hbase-annotations/license.html  |   4 +-
 hbase-annotations/mail-lists.html   |   4 +-
 hbase-annotations/plugin-management.html|   4 +-
 hbase-annotations/plugins.html  |   4 +-
 hbase-annotations/project-info.html |   4 +-
 hbase-annotations/project-reports.html  |   4 +-
 hbase-annotations/project-summary.html  |   4 +-
 hbase-annotations/source-repository.html|   4 +-
 hbase-annotations/team-list.html|   4 +-
 hbase-build-configuration/dependencies.html |   4 +-
 .../dependency-convergence.html |   4 +-
 hbase-build-configuration/dependency-info.html  |   4 +-
 .../dependency-management.html  |   4 +-
 .../hbase-archetypes/dependencies.html  |   4 +-
 .../dependency-convergence.html |   4 +-
 .../hbase-archetypes/dependency-info.html   |   4 +-
 .../hbase-archetypes/dependency-management.html |   4 +-
 .../hbase-archetype-builder/dependencies.html   |   4 +-
 .../dependency-convergence.html |   4 +-
 .../dependency-info.html|   4 +-
 .../dependency-management.html  |   4 +-
 .../hbase-archetype-builder/index.html  |   4 +-
 .../hbase-archetype-builder/integration.html|   4 +-

[3/7] hbase-site git commit: Published site at .

2018-01-16 Thread git-site-role 
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/7aa6ade3/hbase-build-configuration/dependencies.html
--
diff --git a/hbase-build-configuration/dependencies.html 
b/hbase-build-configuration/dependencies.html
index 1e8661e..6285b00 100644
--- a/hbase-build-configuration/dependencies.html
+++ b/hbase-build-configuration/dependencies.html
@@ -7,7 +7,7 @@
   
 
 
-
+
 
 Apache HBase - Build Configuration  Project 
Dependencies
 
@@ -330,7 +330,7 @@
 https://www.apache.org/;>The Apache Software 
Foundation.
 All rights reserved.  
 
-  Last Published: 
2018-01-15
+  Last Published: 
2018-01-16
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/7aa6ade3/hbase-build-configuration/dependency-convergence.html
--
diff --git a/hbase-build-configuration/dependency-convergence.html 
b/hbase-build-configuration/dependency-convergence.html
index ce62fa0..43eec24 100644
--- a/hbase-build-configuration/dependency-convergence.html
+++ b/hbase-build-configuration/dependency-convergence.html
@@ -7,7 +7,7 @@
   
 
 
-
+
 
 Apache HBase - Build Configuration  Reactor Dependency 
Convergence
 
@@ -912,7 +912,7 @@
 https://www.apache.org/;>The Apache Software 
Foundation.
 All rights reserved.  
 
-  Last Published: 
2018-01-15
+  Last Published: 
2018-01-16
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/7aa6ade3/hbase-build-configuration/dependency-info.html
--
diff --git a/hbase-build-configuration/dependency-info.html 
b/hbase-build-configuration/dependency-info.html
index 2fb28dc..4dd0b4b 100644
--- a/hbase-build-configuration/dependency-info.html
+++ b/hbase-build-configuration/dependency-info.html
@@ -7,7 +7,7 @@
   
 
 
-
+
 
 Apache HBase - Build Configuration  Dependency 
Information
 
@@ -148,7 +148,7 @@
 https://www.apache.org/;>The Apache Software 
Foundation.
 All rights reserved.  
 
-  Last Published: 
2018-01-15
+  Last Published: 
2018-01-16
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/7aa6ade3/hbase-build-configuration/dependency-management.html
--
diff --git a/hbase-build-configuration/dependency-management.html 
b/hbase-build-configuration/dependency-management.html
index 35d20ed..46924cc 100644
--- a/hbase-build-configuration/dependency-management.html
+++ b/hbase-build-configuration/dependency-management.html
@@ -7,7 +7,7 @@
   
 
 
-
+
 
 Apache HBase - Build Configuration  Project Dependency 
Management
 
@@ -810,7 +810,7 @@
 https://www.apache.org/;>The Apache Software 
Foundation.
 All rights reserved.  
 
-  Last Published: 
2018-01-15
+  Last Published: 
2018-01-16
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/7aa6ade3/hbase-build-configuration/hbase-archetypes/dependencies.html
--
diff --git a/hbase-build-configuration/hbase-archetypes/dependencies.html 
b/hbase-build-configuration/hbase-archetypes/dependencies.html
index 3f1b298..8e5e3b2 100644
--- a/hbase-build-configuration/hbase-archetypes/dependencies.html
+++ b/hbase-build-configuration/hbase-archetypes/dependencies.html
@@ -7,7 +7,7 @@
   
 
 
-
+
 
 Apache HBase - Archetypes  Project Dependencies
 
@@ -330,7 +330,7 @@
 https://www.apache.org/;>The Apache Software 
Foundation.
 All rights reserved.  
 
-  Last Published: 
2018-01-15
+  Last Published: 
2018-01-16
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/7aa6ade3/hbase-build-configuration/hbase-archetypes/dependency-convergence.html
--
diff --git 
a/hbase-build-configuration/hbase-archetypes/dependency-convergence.html 
b/hbase-build-configuration/hbase-archetypes/dependency-convergence.html
index 75997a0..ce847c6 100644
--- a/hbase-build-configuration/hbase-archetypes/dependency-convergence.html
+++ b/hbase-build-configuration/hbase-archetypes/dependency-convergence.html
@@ -7,7 +7,7 @@
   
 
 
-
+
 
 Apache HBase - Archetypes  Reactor Dependency 
Convergence

[5/7] hbase-site git commit: Published site at .

2018-01-16 Thread git-site-role 
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/7aa6ade3/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html
--
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html
index 31b8896..0859268 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html
@@ -2291,288 +2291,289 @@
 2283  long snapshotId = -1; // -1 means 
do not drop
 2284  if (dropMemstoreSnapshot 
 snapshot != null) {
 2285snapshotId = snapshot.getId();
-2286  }
-2287  
HStore.this.updateStorefiles(storeFiles, snapshotId);
-2288}
-2289
-2290/**
-2291 * Abort the snapshot preparation. 
Drops the snapshot if any.
-2292 * @throws IOException
-2293 */
-2294@Override
-2295public void abort() throws 
IOException {
-2296  if (snapshot != null) {
-2297
HStore.this.updateStorefiles(Collections.emptyList(), snapshot.getId());
-2298  }
-2299}
-2300  }
-2301
-2302  @Override
-2303  public boolean needsCompaction() {
-2304return 
this.storeEngine.needsCompaction(this.filesCompacting);
-2305  }
-2306
-2307  /**
-2308   * Used for tests.
-2309   * @return cache configuration for 
this Store.
-2310   */
-2311  @VisibleForTesting
-2312  public CacheConfig getCacheConfig() 
{
-2313return this.cacheConf;
-2314  }
-2315
-2316  public static final long 
FIXED_OVERHEAD =
-2317  ClassSize.align(ClassSize.OBJECT + 
(17 * ClassSize.REFERENCE) + (11 * Bytes.SIZEOF_LONG)
-2318  + (5 * Bytes.SIZEOF_INT) + 
(2 * Bytes.SIZEOF_BOOLEAN));
-2319
-2320  public static final long DEEP_OVERHEAD 
= ClassSize.align(FIXED_OVERHEAD
-2321  + ClassSize.OBJECT + 
ClassSize.REENTRANT_LOCK
-2322  + 
ClassSize.CONCURRENT_SKIPLISTMAP
-2323  + 
ClassSize.CONCURRENT_SKIPLISTMAP_ENTRY + ClassSize.OBJECT
-2324  + ScanInfo.FIXED_OVERHEAD);
-2325
-2326  @Override
-2327  public long heapSize() {
-2328MemStoreSize memstoreSize = 
this.memstore.size();
-2329return DEEP_OVERHEAD + 
memstoreSize.getHeapSize();
-2330  }
-2331
-2332  @Override
-2333  public CellComparator getComparator() 
{
-2334return comparator;
-2335  }
-2336
-2337  public ScanInfo getScanInfo() {
-2338return scanInfo;
-2339  }
-2340
-2341  /**
-2342   * Set scan info, used by test
-2343   * @param scanInfo new scan info to 
use for test
-2344   */
-2345  void setScanInfo(ScanInfo scanInfo) 
{
-2346this.scanInfo = scanInfo;
-2347  }
-2348
-2349  @Override
-2350  public boolean hasTooManyStoreFiles() 
{
-2351return getStorefilesCount()  
this.blockingFileCount;
-2352  }
-2353
-2354  @Override
-2355  public long getFlushedCellsCount() {
-2356return flushedCellsCount;
-2357  }
-2358
-2359  @Override
-2360  public long getFlushedCellsSize() {
-2361return flushedCellsSize;
-2362  }
-2363
-2364  @Override
-2365  public long getFlushedOutputFileSize() 
{
-2366return flushedOutputFileSize;
-2367  }
-2368
-2369  @Override
-2370  public long getCompactedCellsCount() 
{
-2371return compactedCellsCount;
-2372  }
-2373
-2374  @Override
-2375  public long getCompactedCellsSize() 
{
-2376return compactedCellsSize;
-2377  }
-2378
-2379  @Override
-2380  public long 
getMajorCompactedCellsCount() {
-2381return majorCompactedCellsCount;
-2382  }
-2383
-2384  @Override
-2385  public long 
getMajorCompactedCellsSize() {
-2386return majorCompactedCellsSize;
-2387  }
-2388
-2389  /**
-2390   * Returns the StoreEngine that is 
backing this concrete implementation of Store.
-2391   * @return Returns the {@link 
StoreEngine} object used internally inside this HStore object.
-2392   */
-2393  @VisibleForTesting
-2394  public StoreEngine?, ?, ?, ? 
getStoreEngine() {
-2395return this.storeEngine;
-2396  }
-2397
-2398  protected OffPeakHours 
getOffPeakHours() {
-2399return this.offPeakHours;
-2400  }
-2401
-2402  /**
-2403   * {@inheritDoc}
-2404   */
-2405  @Override
-2406  public void 
onConfigurationChange(Configuration conf) {
-2407this.conf = new 
CompoundConfiguration()
-2408.add(conf)
-2409
.addBytesMap(family.getValues());
-2410
this.storeEngine.compactionPolicy.setConf(conf);
-2411this.offPeakHours = 
OffPeakHours.getInstance(conf);
-2412  }
-2413
-2414  /**
-2415   * {@inheritDoc}
-2416   */
-2417  @Override
-2418  public void 
registerChildren(ConfigurationManager manager) {
-2419// No children to register
-2420  }
-2421
-2422  /**
-2423   * {@inheritDoc}
-2424   */
-2425  @Override
-2426  public void 
deregisterChildren(ConfigurationManager manager) {
-2427// No children to deregister
-2428  }
-2429
-2430  @Override
-2431  public double getCompactionPressure() 
{

[4/7] hbase-site git commit: Published site at .

2018-01-16 Thread git-site-role 
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/7aa6ade3/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HStore.html
--
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HStore.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HStore.html
index 31b8896..0859268 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HStore.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HStore.html
@@ -2291,288 +2291,289 @@
 2283  long snapshotId = -1; // -1 means 
do not drop
 2284  if (dropMemstoreSnapshot 
 snapshot != null) {
 2285snapshotId = snapshot.getId();
-2286  }
-2287  
HStore.this.updateStorefiles(storeFiles, snapshotId);
-2288}
-2289
-2290/**
-2291 * Abort the snapshot preparation. 
Drops the snapshot if any.
-2292 * @throws IOException
-2293 */
-2294@Override
-2295public void abort() throws 
IOException {
-2296  if (snapshot != null) {
-2297
HStore.this.updateStorefiles(Collections.emptyList(), snapshot.getId());
-2298  }
-2299}
-2300  }
-2301
-2302  @Override
-2303  public boolean needsCompaction() {
-2304return 
this.storeEngine.needsCompaction(this.filesCompacting);
-2305  }
-2306
-2307  /**
-2308   * Used for tests.
-2309   * @return cache configuration for 
this Store.
-2310   */
-2311  @VisibleForTesting
-2312  public CacheConfig getCacheConfig() 
{
-2313return this.cacheConf;
-2314  }
-2315
-2316  public static final long 
FIXED_OVERHEAD =
-2317  ClassSize.align(ClassSize.OBJECT + 
(17 * ClassSize.REFERENCE) + (11 * Bytes.SIZEOF_LONG)
-2318  + (5 * Bytes.SIZEOF_INT) + 
(2 * Bytes.SIZEOF_BOOLEAN));
-2319
-2320  public static final long DEEP_OVERHEAD 
= ClassSize.align(FIXED_OVERHEAD
-2321  + ClassSize.OBJECT + 
ClassSize.REENTRANT_LOCK
-2322  + 
ClassSize.CONCURRENT_SKIPLISTMAP
-2323  + 
ClassSize.CONCURRENT_SKIPLISTMAP_ENTRY + ClassSize.OBJECT
-2324  + ScanInfo.FIXED_OVERHEAD);
-2325
-2326  @Override
-2327  public long heapSize() {
-2328MemStoreSize memstoreSize = 
this.memstore.size();
-2329return DEEP_OVERHEAD + 
memstoreSize.getHeapSize();
-2330  }
-2331
-2332  @Override
-2333  public CellComparator getComparator() 
{
-2334return comparator;
-2335  }
-2336
-2337  public ScanInfo getScanInfo() {
-2338return scanInfo;
-2339  }
-2340
-2341  /**
-2342   * Set scan info, used by test
-2343   * @param scanInfo new scan info to 
use for test
-2344   */
-2345  void setScanInfo(ScanInfo scanInfo) 
{
-2346this.scanInfo = scanInfo;
-2347  }
-2348
-2349  @Override
-2350  public boolean hasTooManyStoreFiles() 
{
-2351return getStorefilesCount()  
this.blockingFileCount;
-2352  }
-2353
-2354  @Override
-2355  public long getFlushedCellsCount() {
-2356return flushedCellsCount;
-2357  }
-2358
-2359  @Override
-2360  public long getFlushedCellsSize() {
-2361return flushedCellsSize;
-2362  }
-2363
-2364  @Override
-2365  public long getFlushedOutputFileSize() 
{
-2366return flushedOutputFileSize;
-2367  }
-2368
-2369  @Override
-2370  public long getCompactedCellsCount() 
{
-2371return compactedCellsCount;
-2372  }
-2373
-2374  @Override
-2375  public long getCompactedCellsSize() 
{
-2376return compactedCellsSize;
-2377  }
-2378
-2379  @Override
-2380  public long 
getMajorCompactedCellsCount() {
-2381return majorCompactedCellsCount;
-2382  }
-2383
-2384  @Override
-2385  public long 
getMajorCompactedCellsSize() {
-2386return majorCompactedCellsSize;
-2387  }
-2388
-2389  /**
-2390   * Returns the StoreEngine that is 
backing this concrete implementation of Store.
-2391   * @return Returns the {@link 
StoreEngine} object used internally inside this HStore object.
-2392   */
-2393  @VisibleForTesting
-2394  public StoreEngine?, ?, ?, ? 
getStoreEngine() {
-2395return this.storeEngine;
-2396  }
-2397
-2398  protected OffPeakHours 
getOffPeakHours() {
-2399return this.offPeakHours;
-2400  }
-2401
-2402  /**
-2403   * {@inheritDoc}
-2404   */
-2405  @Override
-2406  public void 
onConfigurationChange(Configuration conf) {
-2407this.conf = new 
CompoundConfiguration()
-2408.add(conf)
-2409
.addBytesMap(family.getValues());
-2410
this.storeEngine.compactionPolicy.setConf(conf);
-2411this.offPeakHours = 
OffPeakHours.getInstance(conf);
-2412  }
-2413
-2414  /**
-2415   * {@inheritDoc}
-2416   */
-2417  @Override
-2418  public void 
registerChildren(ConfigurationManager manager) {
-2419// No children to register
-2420  }
-2421
-2422  /**
-2423   * {@inheritDoc}
-2424   */
-2425  @Override
-2426  public void 
deregisterChildren(ConfigurationManager manager) {
-2427// No children to deregister
-2428  }
-2429
-2430  @Override
-2431  public double getCompactionPressure() 
{
-2432return 
storeEngine.getStoreFileManager().getCompactionPressure();
-2433  }
-2434

[1/7] hbase-site git commit: Published site at .

2018-01-16 Thread git-site-role 
Repository: hbase-site
Updated Branches:
  refs/heads/asf-site ae658afe5 -> 7aa6ade32


http://git-wip-us.apache.org/repos/asf/hbase-site/blob/7aa6ade3/source-repository.html
--
diff --git a/source-repository.html b/source-repository.html
index 8dda278..0a2b947 100644
--- a/source-repository.html
+++ b/source-repository.html
@@ -7,7 +7,7 @@
   
 
 
-
+
 
 Apache HBase  Source Code Management
 
@@ -304,7 +304,7 @@
 https://www.apache.org/;>The Apache Software 
Foundation.
 All rights reserved.  
 
-  Last Published: 
2018-01-15
+  Last Published: 
2018-01-16
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/7aa6ade3/sponsors.html
--
diff --git a/sponsors.html b/sponsors.html
index b84c930..6b86e39 100644
--- a/sponsors.html
+++ b/sponsors.html
@@ -7,7 +7,7 @@
   
 
 
-
+
 
 Apache HBase  Apache HBase™ Sponsors
 
@@ -338,7 +338,7 @@ under the License. -->
 https://www.apache.org/;>The Apache Software 
Foundation.
 All rights reserved.  
 
-  Last Published: 
2018-01-15
+  Last Published: 
2018-01-16
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/7aa6ade3/supportingprojects.html
--
diff --git a/supportingprojects.html b/supportingprojects.html
index 7b91a61..ca1b814 100644
--- a/supportingprojects.html
+++ b/supportingprojects.html
@@ -7,7 +7,7 @@
   
 
 
-
+
 
 Apache HBase  Supporting Projects
 
@@ -525,7 +525,7 @@ under the License. -->
 https://www.apache.org/;>The Apache Software 
Foundation.
 All rights reserved.  
 
-  Last Published: 
2018-01-15
+  Last Published: 
2018-01-16
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/7aa6ade3/team-list.html
--
diff --git a/team-list.html b/team-list.html
index 94e02d0..c8491f2 100644
--- a/team-list.html
+++ b/team-list.html
@@ -7,7 +7,7 @@
   
 
 
-
+
 
 Apache HBase  Project Team
 
@@ -723,7 +723,7 @@
 https://www.apache.org/;>The Apache Software 
Foundation.
 All rights reserved.  
 
-  Last Published: 
2018-01-15
+  Last Published: 
2018-01-16

[2/7] hbase-site git commit: Published site at .

2018-01-16 Thread git-site-role 
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/7aa6ade3/hbase-build-configuration/hbase-archetypes/license.html
--
diff --git a/hbase-build-configuration/hbase-archetypes/license.html 
b/hbase-build-configuration/hbase-archetypes/license.html
index d3d3749..259b194 100644
--- a/hbase-build-configuration/hbase-archetypes/license.html
+++ b/hbase-build-configuration/hbase-archetypes/license.html
@@ -7,7 +7,7 @@
   
 
 
-
+
 
 Apache HBase - Archetypes  Project Licenses
 
@@ -326,7 +326,7 @@
 https://www.apache.org/;>The Apache Software 
Foundation.
 All rights reserved.  
 
-  Last Published: 
2018-01-15
+  Last Published: 
2018-01-16
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/7aa6ade3/hbase-build-configuration/hbase-archetypes/mail-lists.html
--
diff --git a/hbase-build-configuration/hbase-archetypes/mail-lists.html 
b/hbase-build-configuration/hbase-archetypes/mail-lists.html
index 6ad5e91..b8d40bd 100644
--- a/hbase-build-configuration/hbase-archetypes/mail-lists.html
+++ b/hbase-build-configuration/hbase-archetypes/mail-lists.html
@@ -7,7 +7,7 @@
   
 
 
-
+
 
 Apache HBase - Archetypes  Project Mailing Lists
 
@@ -176,7 +176,7 @@
 https://www.apache.org/;>The Apache Software 
Foundation.
 All rights reserved.  
 
-  Last Published: 
2018-01-15
+  Last Published: 
2018-01-16
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/7aa6ade3/hbase-build-configuration/hbase-archetypes/plugin-management.html
--
diff --git a/hbase-build-configuration/hbase-archetypes/plugin-management.html 
b/hbase-build-configuration/hbase-archetypes/plugin-management.html
index b6acd29..afa762c 100644
--- a/hbase-build-configuration/hbase-archetypes/plugin-management.html
+++ b/hbase-build-configuration/hbase-archetypes/plugin-management.html
@@ -7,7 +7,7 @@
   
 
 
-
+
 
 Apache HBase - Archetypes  Project Plugin Management
 
@@ -271,7 +271,7 @@
 https://www.apache.org/;>The Apache Software 
Foundation.
 All rights reserved.  
 
-  Last Published: 
2018-01-15
+  Last Published: 
2018-01-16
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/7aa6ade3/hbase-build-configuration/hbase-archetypes/plugins.html
--
diff --git a/hbase-build-configuration/hbase-archetypes/plugins.html 
b/hbase-build-configuration/hbase-archetypes/plugins.html
index dba8593..982b9dc 100644
--- a/hbase-build-configuration/hbase-archetypes/plugins.html
+++ b/hbase-build-configuration/hbase-archetypes/plugins.html
@@ -7,7 +7,7 @@
   
 
 
-
+
 
 Apache HBase - Archetypes  Project Plugins
 
@@ -214,7 +214,7 @@
 https://www.apache.org/;>The Apache Software 
Foundation.
 All rights reserved.  
 
-  Last Published: 
2018-01-15
+  Last Published: 
2018-01-16
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/7aa6ade3/hbase-build-configuration/hbase-archetypes/project-info.html
--
diff --git a/hbase-build-configuration/hbase-archetypes/project-info.html 
b/hbase-build-configuration/hbase-archetypes/project-info.html
index e124934..0876df6 100644
--- a/hbase-build-configuration/hbase-archetypes/project-info.html
+++ b/hbase-build-configuration/hbase-archetypes/project-info.html
@@ -7,7 +7,7 @@
   
 
 
-
+
 
 Apache HBase - Archetypes  Project Information
 
@@ -167,7 +167,7 @@
 https://www.apache.org/;>The Apache Software 
Foundation.
 All rights reserved.  
 
-  Last Published: 
2018-01-15
+  Last Published: 
2018-01-16
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/7aa6ade3/hbase-build-configuration/hbase-archetypes/project-summary.html
--
diff --git a/hbase-build-configuration/hbase-archetypes/project-summary.html 
b/hbase-build-configuration/hbase-archetypes/project-summary.html
index 63af486..8ef27b8 100644
--- a/hbase-build-configuration/hbase-archetypes/project-summary.html
+++ b/hbase-build-configuration/hbase-archetypes/project-summary.html
@@ -7,7 +7,7 @@

[6/7] hbase-site git commit: Published site at .

2018-01-16 Thread git-site-role 
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/7aa6ade3/devapidocs/org/apache/hadoop/hbase/regionserver/HStore.html
--
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/HStore.html 
b/devapidocs/org/apache/hadoop/hbase/regionserver/HStore.html
index 428b0d8..82c1efb 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/HStore.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/HStore.html
@@ -1689,7 +1689,7 @@ implements 
 
 FIXED_OVERHEAD
-public static finallong FIXED_OVERHEAD
+public static finallong FIXED_OVERHEAD
 
 
 
@@ -1698,7 +1698,7 @@ implements 
 
 DEEP_OVERHEAD
-public static finallong DEEP_OVERHEAD
+public static finallong DEEP_OVERHEAD
 
 
 
@@ -3603,7 +3603,7 @@ public staticorg.apache.hadoop.fs.Path
 
 needsCompaction
-publicbooleanneedsCompaction()
+publicbooleanneedsCompaction()
 Description copied from 
interface:Store
 See if there's too much store files in this store
 
@@ -3621,7 +3621,7 @@ public staticorg.apache.hadoop.fs.Path
 
 getCacheConfig
-publicCacheConfiggetCacheConfig()
+publicCacheConfiggetCacheConfig()
 Used for tests.
 
 Returns:
@@ -3635,7 +3635,7 @@ public staticorg.apache.hadoop.fs.Path
 
 heapSize
-publiclongheapSize()
+publiclongheapSize()
 
 Specified by:
 heapSizein
 interfaceHeapSize
@@ -3651,7 +3651,7 @@ public staticorg.apache.hadoop.fs.Path
 
 getComparator
-publicCellComparatorgetComparator()
+publicCellComparatorgetComparator()
 
 Specified by:
 getComparatorin
 interfaceStore
@@ -3664,7 +3664,7 @@ public staticorg.apache.hadoop.fs.Path
 
 getScanInfo
-publicScanInfogetScanInfo()
+publicScanInfogetScanInfo()
 
 
 
@@ -3673,7 +3673,7 @@ public staticorg.apache.hadoop.fs.Path
 
 setScanInfo
-voidsetScanInfo(ScanInfoscanInfo)
+voidsetScanInfo(ScanInfoscanInfo)
 Set scan info, used by test
 
 Parameters:
@@ -3687,7 +3687,7 @@ public staticorg.apache.hadoop.fs.Path
 
 hasTooManyStoreFiles
-publicbooleanhasTooManyStoreFiles()
+publicbooleanhasTooManyStoreFiles()
 
 Specified by:
 hasTooManyStoreFilesin
 interfaceStore
@@ -3702,7 +3702,7 @@ public staticorg.apache.hadoop.fs.Path
 
 getFlushedCellsCount
-publiclonggetFlushedCellsCount()
+publiclonggetFlushedCellsCount()
 
 Specified by:
 getFlushedCellsCountin
 interfaceStore
@@ -3717,7 +3717,7 @@ public staticorg.apache.hadoop.fs.Path
 
 getFlushedCellsSize
-publiclonggetFlushedCellsSize()
+publiclonggetFlushedCellsSize()
 
 Specified by:
 getFlushedCellsSizein
 interfaceStore
@@ -3732,7 +3732,7 @@ public staticorg.apache.hadoop.fs.Path
 
 getFlushedOutputFileSize
-publiclonggetFlushedOutputFileSize()
+publiclonggetFlushedOutputFileSize()
 
 Specified by:
 getFlushedOutputFileSizein
 interfaceStore
@@ -3747,7 +3747,7 @@ public staticorg.apache.hadoop.fs.Path
 
 getCompactedCellsCount
-publiclonggetCompactedCellsCount()
+publiclonggetCompactedCellsCount()
 
 Specified by:
 getCompactedCellsCountin
 interfaceStore
@@ -3762,7 +3762,7 @@ public staticorg.apache.hadoop.fs.Path
 
 getCompactedCellsSize
-publiclonggetCompactedCellsSize()
+publiclonggetCompactedCellsSize()
 
 Specified by:
 getCompactedCellsSizein
 interfaceStore
@@ -3777,7 +3777,7 @@ public staticorg.apache.hadoop.fs.Path
 
 getMajorCompactedCellsCount
-publiclonggetMajorCompactedCellsCount()
+publiclonggetMajorCompactedCellsCount()
 
 Specified by:
 getMajorCompactedCellsCountin
 interfaceStore
@@ -3792,7 +3792,7 @@ public staticorg.apache.hadoop.fs.Path
 
 getMajorCompactedCellsSize
-publiclonggetMajorCompactedCellsSize()
+publiclonggetMajorCompactedCellsSize()
 
 Specified by:
 getMajorCompactedCellsSizein
 interfaceStore
@@ -3807,7 +3807,7 @@ public staticorg.apache.hadoop.fs.Path
 
 getStoreEngine
-publicStoreEngine?,?,?,?getStoreEngine()
+publicStoreEngine?,?,?,?getStoreEngine()
 Returns the StoreEngine that is backing this concrete 
implementation of Store.
 
 Returns:
@@ -3821,7 +3821,7 @@ public staticorg.apache.hadoop.fs.Path
 
 getOffPeakHours
-protectedOffPeakHoursgetOffPeakHours()
+protectedOffPeakHoursgetOffPeakHours()
 
 
 
@@ -3830,7 +3830,7 @@ public staticorg.apache.hadoop.fs.Path
 
 onConfigurationChange
-publicvoidonConfigurationChange(org.apache.hadoop.conf.Configurationconf)
+publicvoidonConfigurationChange(org.apache.hadoop.conf.Configurationconf)
 This method would be called by the ConfigurationManager
  object when the Configuration object is reloaded from disk.
 
@@ -3845,7 +3845,7 @@ public staticorg.apache.hadoop.fs.Path
 
 registerChildren
-publicvoidregisterChildren(ConfigurationManagermanager)
+publicvoidregisterChildren(ConfigurationManagermanager)
 Needs to be called to register the children to the 
manager.
 
 Specified by:
@@ -3861,7 +3861,7 @@ public staticorg.apache.hadoop.fs.Path
 
 deregisterChildren
-publicvoidderegisterChildren(ConfigurationManagermanager)
+publicvoidderegisterChildren(ConfigurationManagermanager)
 Needs to be called to deregister the children from the 
manager.
 
 Specified by:
@@ -3877,7 +3877,7