You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2016/07/16 23:07:27 UTC
hbase git commit: HBASE-16235 Addendum uses hfile count of 20
(ChiaPing)
Repository: hbase
Updated Branches:
refs/heads/master 60847a2d7 -> 9bc7ecfb9
HBASE-16235 Addendum uses hfile count of 20 (ChiaPing)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/9bc7ecfb
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/9bc7ecfb
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/9bc7ecfb
Branch: refs/heads/master
Commit: 9bc7ecfb9dec6bfe14a12b6d3bfd11392d7752b8
Parents: 60847a2
Author: tedyu <yu...@gmail.com>
Authored: Sat Jul 16 16:07:11 2016 -0700
Committer: tedyu <yu...@gmail.com>
Committed: Sat Jul 16 16:07:11 2016 -0700
----------------------------------------------------------------------
.../master/cleaner/TestSnapshotFromMaster.java | 20 ++++----------------
1 file changed, 4 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/9bc7ecfb/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestSnapshotFromMaster.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestSnapshotFromMaster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestSnapshotFromMaster.java
index 4232e17..1cc9eda 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestSnapshotFromMaster.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestSnapshotFromMaster.java
@@ -278,21 +278,9 @@ public class TestSnapshotFromMaster {
* should be retained, while those that are not in a snapshot should be deleted.
* @throws Exception on failure
*/
- @Test(timeout = 600000)
+ @Test(timeout = 300000)
public void testSnapshotHFileArchiving() throws Exception {
- int[] hfileCount = new int[]{10, 15, 20};
- for (int count : hfileCount) {
- LOG.info("testSnapshotHFileArchiving with " + count + " hfiles");
- testSnapshotHFileArchiving(count);
- }
- }
-
- /**
- * It will put data and flush until there are enough hfiles.
- * @param hfileCount
- * @throws Exception
- */
- private void testSnapshotHFileArchiving(int hfileCount) throws Exception {
+ int hfileCount = 20;
Admin admin = UTIL.getHBaseAdmin();
// make sure we don't fail on listing snapshots
SnapshotTestingUtils.assertNoSnapshots(admin);
@@ -412,8 +400,8 @@ public class TestSnapshotFromMaster {
* @throws IOException on expected failure
*/
private final Collection<String> getHFiles(Path dir, FileSystem fs, TableName tableName) throws IOException {
- Path tableArchive = FSUtils.getTableDir(dir, tableName);
- return SnapshotTestingUtils.listHFileNames(fs, tableArchive);
+ Path tableDir = FSUtils.getTableDir(dir, tableName);
+ return SnapshotTestingUtils.listHFileNames(fs, tableDir);
}
/**