Skip to content

Commit 789a8b7

Browse files
committed
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.
1 parent 08603f0 commit 789a8b7

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ public void testOnConfigurationChange() throws Exception {
298298

299299
FileSystem fs = TEST_UTIL.getDFSCluster().getFileSystem();
300300
LogCleaner cleaner = new LogCleaner(3000, server, conf, fs, OLD_WALS_DIR, POOL);
301-
assertEquals(LogCleaner.DEFAULT_OLD_WALS_CLEANER_THREAD_SIZE, cleaner.getSizeOfCleaners());
301+
int size = cleaner.getSizeOfCleaners();
302302
assertEquals(LogCleaner.DEFAULT_OLD_WALS_CLEANER_THREAD_TIMEOUT_MSEC,
303303
cleaner.getCleanerThreadTimeoutMsec());
304304
// Create dir and files for test
@@ -313,10 +313,10 @@ public void testOnConfigurationChange() throws Exception {
313313
// change size of cleaners dynamically
314314
int sizeToChange = 4;
315315
long threadTimeoutToChange = 30 * 1000L;
316-
conf.setInt(LogCleaner.OLD_WALS_CLEANER_THREAD_SIZE, sizeToChange);
316+
conf.setInt(LogCleaner.OLD_WALS_CLEANER_THREAD_SIZE, size + sizeToChange);
317317
conf.setLong(LogCleaner.OLD_WALS_CLEANER_THREAD_TIMEOUT_MSEC, threadTimeoutToChange);
318318
cleaner.onConfigurationChange(conf);
319-
assertEquals(sizeToChange, cleaner.getSizeOfCleaners());
319+
assertEquals(sizeToChange + size, cleaner.getSizeOfCleaners());
320320
assertEquals(threadTimeoutToChange, cleaner.getCleanerThreadTimeoutMsec());
321321
// Stop chore
322322
thread.join();

0 commit comments

Comments
 (0)