Skip to content

HBASE-27492 support through all day offPeak to cover all the usage scenario #4890

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −3
Open

HBASE-27492 support through all day offPeak to cover all the usage scenario #4890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...e-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/OffPeakHours.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public static OffPeakHours getInstance(Configuration conf) {

/**
* @param startHour inclusive
* @param endHour exclusive
* @param endHour inclusive
*/
public static OffPeakHours getInstance(int startHour, int endHour) {
if (startHour == -1 && endHour == -1) {
Expand Down Expand Up @@ -84,7 +84,7 @@ private static class OffPeakHoursImpl extends OffPeakHours {

/**
* @param startHour inclusive
* @param endHour exclusive
* @param endHour inclusive
*/
OffPeakHoursImpl(int startHour, int endHour) {
this.startHour = startHour;
Expand All @@ -99,7 +99,7 @@ public boolean isOffPeakHour() {
@Override
public boolean isOffPeakHour(int targetHour) {
if (startHour <= endHour) {
return startHour <= targetHour && targetHour < endHour;
return startHour <= targetHour && targetHour <= endHour;
}
return targetHour < endHour || startHour <= targetHour;
}
Expand Down
14 changes: 14 additions & 0 deletions ...rver/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestOffPeakHours.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ public static void setUpClass() {
private int hourPlusOne;
private int hourMinusOne;
private int hourMinusTwo;
private int hourAllDayStart;
private int hourAllDayEnd;
private Configuration conf;

@Before
Expand All @@ -57,6 +59,8 @@ public void setUp() {
hourPlusOne = ((hourOfDay + 1) % 24);
hourMinusOne = ((hourOfDay - 1 + 24) % 24);
hourMinusTwo = ((hourOfDay - 2 + 24) % 24);
hourAllDayStart = 0;
hourAllDayEnd = 23;
conf = testUtil.getConfiguration();
}

Expand All @@ -82,4 +86,14 @@ public void testSetPeakHourOutsideCurrentSelection() {
OffPeakHours target = OffPeakHours.getInstance(conf);
assertFalse(target.isOffPeakHour(hourOfDay));
}

@Test
public void testSetPeakHourAllDay() {
conf.setLong(CompactionConfiguration.HBASE_HSTORE_OFFPEAK_START_HOUR, hourAllDayStart);
conf.setLong(CompactionConfiguration.HBASE_HSTORE_OFFPEAK_END_HOUR, hourAllDayEnd);
OffPeakHours target = OffPeakHours.getInstance(conf);
assertTrue(target.isOffPeakHour(hourAllDayStart));
assertTrue(target.isOffPeakHour(hourOfDay));
assertTrue(target.isOffPeakHour(hourAllDayEnd));
}
}