From 54fe81eb5641ce1a92419585709dd978e68a73ca Mon Sep 17 00:00:00 2001 From: Guanghao Zhang Date: Fri, 21 Aug 2020 12:41:20 +0800 Subject: [PATCH] HBASE-24912 Enlarge MemstoreFlusherChore/CompactionChecker period for unit test (#2285) Signed-off-by: stack --- .../src/test/resources/hbase-site.xml | 9 ++++++++- hbase-backup/src/test/resources/hbase-site.xml | 9 ++++++++- hbase-client/src/test/resources/hbase-site.xml | 9 ++++++++- .../src/test/resources/hbase-site.xml | 9 ++++++++- .../src/test/resources/hbase-site.xml | 9 ++++++++- .../src/test/resources/hbase-site.xml | 16 ++++++++-------- .../src/test/resources/hbase-site.xml | 9 ++++++++- hbase-rest/src/test/resources/hbase-site.xml | 10 +++++++++- hbase-server/src/test/resources/hbase-site.xml | 8 ++++++++ hbase-shell/src/test/resources/hbase-site.xml | 9 ++++++++- hbase-thrift/src/test/resources/hbase-site.xml | 18 +++++------------- 11 files changed, 86 insertions(+), 29 deletions(-) diff --git a/hbase-asyncfs/src/test/resources/hbase-site.xml b/hbase-asyncfs/src/test/resources/hbase-site.xml index c938f285234..72d6e1e1ac9 100644 --- a/hbase-asyncfs/src/test/resources/hbase-site.xml +++ b/hbase-asyncfs/src/test/resources/hbase-site.xml @@ -31,12 +31,19 @@ hbase.server.thread.wakefrequency - 1000 100 Time to sleep in between searches for work (in milliseconds). Used as sleep interval by service threads such as hbase:meta scanner and log roller. + + hbase.regionserver.compaction.check.period + 1000 + + + hbase.regionserver.flush.check.period + 1000 + hbase.defaults.for.version.skip true diff --git a/hbase-backup/src/test/resources/hbase-site.xml b/hbase-backup/src/test/resources/hbase-site.xml index 3a2b0520de8..c20d4bc970c 100644 --- a/hbase-backup/src/test/resources/hbase-site.xml +++ b/hbase-backup/src/test/resources/hbase-site.xml @@ -31,12 +31,19 @@ hbase.server.thread.wakefrequency - 1000 100 Time to sleep in between searches for work (in milliseconds). Used as sleep interval by service threads such as hbase:meta scanner and log roller. + + hbase.regionserver.compaction.check.period + 1000 + + + hbase.regionserver.flush.check.period + 1000 + hbase.defaults.for.version.skip true diff --git a/hbase-client/src/test/resources/hbase-site.xml b/hbase-client/src/test/resources/hbase-site.xml index 3a2b0520de8..c20d4bc970c 100644 --- a/hbase-client/src/test/resources/hbase-site.xml +++ b/hbase-client/src/test/resources/hbase-site.xml @@ -31,12 +31,19 @@ hbase.server.thread.wakefrequency - 1000 100 Time to sleep in between searches for work (in milliseconds). Used as sleep interval by service threads such as hbase:meta scanner and log roller. + + hbase.regionserver.compaction.check.period + 1000 + + + hbase.regionserver.flush.check.period + 1000 + hbase.defaults.for.version.skip true diff --git a/hbase-endpoint/src/test/resources/hbase-site.xml b/hbase-endpoint/src/test/resources/hbase-site.xml index 3a2b0520de8..c20d4bc970c 100644 --- a/hbase-endpoint/src/test/resources/hbase-site.xml +++ b/hbase-endpoint/src/test/resources/hbase-site.xml @@ -31,12 +31,19 @@ hbase.server.thread.wakefrequency - 1000 100 Time to sleep in between searches for work (in milliseconds). Used as sleep interval by service threads such as hbase:meta scanner and log roller. + + hbase.regionserver.compaction.check.period + 1000 + + + hbase.regionserver.flush.check.period + 1000 + hbase.defaults.for.version.skip true diff --git a/hbase-examples/src/test/resources/hbase-site.xml b/hbase-examples/src/test/resources/hbase-site.xml index 6d6f4bf3c09..d2b7fd43583 100644 --- a/hbase-examples/src/test/resources/hbase-site.xml +++ b/hbase-examples/src/test/resources/hbase-site.xml @@ -31,12 +31,19 @@ hbase.server.thread.wakefrequency - 1000 100 Time to sleep in between searches for work (in milliseconds). Used as sleep interval by service threads such as hbase:meta scanner and log roller. + + hbase.regionserver.compaction.check.period + 1000 + + + hbase.regionserver.flush.check.period + 1000 + hbase.defaults.for.version.skip true diff --git a/hbase-mapreduce/src/test/resources/hbase-site.xml b/hbase-mapreduce/src/test/resources/hbase-site.xml index a2aee0cc199..e5c9eca6c40 100644 --- a/hbase-mapreduce/src/test/resources/hbase-site.xml +++ b/hbase-mapreduce/src/test/resources/hbase-site.xml @@ -31,12 +31,19 @@ hbase.server.thread.wakefrequency - 1000 100 Time to sleep in between searches for work (in milliseconds). Used as sleep interval by service threads such as hbase:meta scanner and log roller. + + hbase.regionserver.compaction.check.period + 1000 + + + hbase.regionserver.flush.check.period + 1000 + hbase.regionserver.msginterval 1000 @@ -49,13 +56,6 @@ hbase.defaults.for.version.skip true - - hbase.server.thread.wakefrequency - 1000 - Time to sleep in between searches for work (in milliseconds). - Used as sleep interval by service threads such as hbase:meta scanner and log roller. - - hbase.master.event.waiting.time 50 diff --git a/hbase-procedure/src/test/resources/hbase-site.xml b/hbase-procedure/src/test/resources/hbase-site.xml index c938f285234..72d6e1e1ac9 100644 --- a/hbase-procedure/src/test/resources/hbase-site.xml +++ b/hbase-procedure/src/test/resources/hbase-site.xml @@ -31,12 +31,19 @@ hbase.server.thread.wakefrequency - 1000 100 Time to sleep in between searches for work (in milliseconds). Used as sleep interval by service threads such as hbase:meta scanner and log roller. + + hbase.regionserver.compaction.check.period + 1000 + + + hbase.regionserver.flush.check.period + 1000 + hbase.defaults.for.version.skip true diff --git a/hbase-rest/src/test/resources/hbase-site.xml b/hbase-rest/src/test/resources/hbase-site.xml index 2bd3ee45a42..e278e8329e5 100644 --- a/hbase-rest/src/test/resources/hbase-site.xml +++ b/hbase-rest/src/test/resources/hbase-site.xml @@ -35,11 +35,19 @@ hbase.server.thread.wakefrequency - 1000 + 100 Time to sleep in between searches for work (in milliseconds). Used as sleep interval by service threads such as hbase:meta scanner and log roller. + + hbase.regionserver.compaction.check.period + 1000 + + + hbase.regionserver.flush.check.period + 1000 + hbase.master.event.waiting.time 50 diff --git a/hbase-server/src/test/resources/hbase-site.xml b/hbase-server/src/test/resources/hbase-site.xml index a317376e77c..5e64bfcd907 100644 --- a/hbase-server/src/test/resources/hbase-site.xml +++ b/hbase-server/src/test/resources/hbase-site.xml @@ -29,6 +29,14 @@ tests to be responsive. + + hbase.regionserver.compaction.check.period + 1000 + + + hbase.regionserver.flush.check.period + 1000 + hbase.defaults.for.version.skip true diff --git a/hbase-shell/src/test/resources/hbase-site.xml b/hbase-shell/src/test/resources/hbase-site.xml index 3a2b0520de8..c20d4bc970c 100644 --- a/hbase-shell/src/test/resources/hbase-site.xml +++ b/hbase-shell/src/test/resources/hbase-site.xml @@ -31,12 +31,19 @@ hbase.server.thread.wakefrequency - 1000 100 Time to sleep in between searches for work (in milliseconds). Used as sleep interval by service threads such as hbase:meta scanner and log roller. + + hbase.regionserver.compaction.check.period + 1000 + + + hbase.regionserver.flush.check.period + 1000 + hbase.defaults.for.version.skip true diff --git a/hbase-thrift/src/test/resources/hbase-site.xml b/hbase-thrift/src/test/resources/hbase-site.xml index a1e89ce70be..ccc55aa53d6 100644 --- a/hbase-thrift/src/test/resources/hbase-site.xml +++ b/hbase-thrift/src/test/resources/hbase-site.xml @@ -31,31 +31,23 @@ hbase.server.thread.wakefrequency - 1000 100 Time to sleep in between searches for work (in milliseconds). Used as sleep interval by service threads such as hbase:meta scanner and log roller. - hbase.regionserver.msginterval + hbase.regionserver.compaction.check.period + 1000 + + + hbase.regionserver.flush.check.period 1000 - Interval between messages from the RegionServer to HMaster - in milliseconds. Default is 15. Set this value low if you want unit - tests to be responsive. - hbase.defaults.for.version.skip true - - hbase.server.thread.wakefrequency - 1000 - Time to sleep in between searches for work (in milliseconds). - Used as sleep interval by service threads such as hbase:meta scanner and log roller. - - hbase.master.event.waiting.time 50