You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2020/03/12 03:33:43 UTC
[hbase] branch branch-2 updated: HBASE-23956 Use less resources
running tests (#1266) Addendum: This test was depending on hard-coded
number for log cleaners; the parent patch made them less in test context.
This is an automated email from the ASF dual-hosted git repository.
stack pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new 789a8b7 HBASE-23956 Use less resources running tests (#1266) Addendum: This test was depending on hard-coded number for log cleaners; the parent patch made them less in test context.
789a8b7 is described below
commit 789a8b7c44bd8ba8e45c2cd8e83f0bbc09e2c550
Author: stack <st...@apache.org>
AuthorDate: Wed Mar 11 20:33:00 2020 -0700
HBASE-23956 Use less resources running tests (#1266)
Addendum: This test was depending on hard-coded number for
log cleaners; the parent patch made them less in test context.
---
.../org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.java
index a9af0dd..b3d78fc 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.java
@@ -298,7 +298,7 @@ public class TestLogsCleaner {
FileSystem fs = TEST_UTIL.getDFSCluster().getFileSystem();
LogCleaner cleaner = new LogCleaner(3000, server, conf, fs, OLD_WALS_DIR, POOL);
- assertEquals(LogCleaner.DEFAULT_OLD_WALS_CLEANER_THREAD_SIZE, cleaner.getSizeOfCleaners());
+ int size = cleaner.getSizeOfCleaners();
assertEquals(LogCleaner.DEFAULT_OLD_WALS_CLEANER_THREAD_TIMEOUT_MSEC,
cleaner.getCleanerThreadTimeoutMsec());
// Create dir and files for test
@@ -313,10 +313,10 @@ public class TestLogsCleaner {
// change size of cleaners dynamically
int sizeToChange = 4;
long threadTimeoutToChange = 30 * 1000L;
- conf.setInt(LogCleaner.OLD_WALS_CLEANER_THREAD_SIZE, sizeToChange);
+ conf.setInt(LogCleaner.OLD_WALS_CLEANER_THREAD_SIZE, size + sizeToChange);
conf.setLong(LogCleaner.OLD_WALS_CLEANER_THREAD_TIMEOUT_MSEC, threadTimeoutToChange);
cleaner.onConfigurationChange(conf);
- assertEquals(sizeToChange, cleaner.getSizeOfCleaners());
+ assertEquals(sizeToChange + size, cleaner.getSizeOfCleaners());
assertEquals(threadTimeoutToChange, cleaner.getCleanerThreadTimeoutMsec());
// Stop chore
thread.join();