Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-25740 - Backport HBASE-25629 to branch-1 (#3130) 

Signed-off-by Reid Chan <reidchan@apache.org>
This commit is contained in:
Geoffrey Jacoby 2021-04-07 00:47:47 -07:00 committed by GitHub
parent b231dd620f
commit c9d03c446d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CurrentHourProvider.java
View File

@ -24,7 +24,10 @@ import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
@InterfaceAudience.Private @InterfaceAudience.Private
public class CurrentHourProvider { public class CurrentHourProvider {
private CurrentHourProvider() { throw new AssertionError(); }
private CurrentHourProvider() {
throw new AssertionError();
}
private static final class Tick { private static final class Tick {
final int currentHour; final int currentHour;
@ -36,7 +39,7 @@ public class CurrentHourProvider {
} }
} }
static Tick nextTick() { private static Tick nextTick() {
Calendar calendar = new GregorianCalendar(); Calendar calendar = new GregorianCalendar();
calendar.setTimeInMillis(EnvironmentEdgeManager.currentTime()); calendar.setTimeInMillis(EnvironmentEdgeManager.currentTime());
int currentHour = calendar.get(Calendar.HOUR_OF_DAY); int currentHour = calendar.get(Calendar.HOUR_OF_DAY);
@ -51,15 +54,20 @@ public class CurrentHourProvider {
calendar.set(Calendar.MILLISECOND, 0); calendar.set(Calendar.MILLISECOND, 0);
} }
static volatile Tick tick = nextTick(); private static volatile Tick tick = nextTick();
public static int getCurrentHour() { public static int getCurrentHour() {
Tick tick = CurrentHourProvider.tick; Tick tick = CurrentHourProvider.tick;
if (EnvironmentEdgeManager.currentTime() < tick.expirationTimeInMillis) { if (EnvironmentEdgeManager.currentTime() < tick.expirationTimeInMillis) {
return tick.currentHour; return tick.currentHour;
} }
tick = nextTick();
CurrentHourProvider.tick = tick = nextTick(); CurrentHourProvider.tick = tick;
return tick.currentHour; return tick.currentHour;
} }
//RestrictedApi - only to be called for tests
static void advanceTick() {
tick = nextTick();
}
} }

32
hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestCurrentHourProvider.java
View File

@ -19,7 +19,9 @@ package org.apache.hadoop.hbase.regionserver.compactions;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import com.google.common.collect.Lists;
import java.util.Date; import java.util.Date;
import java.util.List;
import java.util.TimeZone; import java.util.TimeZone;
import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.testclassification.RegionServerTests;
import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.testclassification.SmallTests;
@ -31,20 +33,20 @@ import org.junit.experimental.categories.Category;
@Category({RegionServerTests.class, SmallTests.class}) @Category({RegionServerTests.class, SmallTests.class})
public class TestCurrentHourProvider { public class TestCurrentHourProvider {
private static final List<String> ZONE_IDS = Lists.newArrayList("UTC", "US/Pacific", "Etc/GMT+8");
/** /**
* In timezone GMT+08:00, the unix time of 2020-08-20 11:52:41 is 1597895561000 * In timezone GMT+08:00, the unix time of 2020-08-20 11:52:41 is 1597895561000 and the unix time
* and the unix time of 2020-08-20 15:04:00 is 1597907081000, * of 2020-08-20 15:04:00 is 1597907081000, by calculating the delta time to get expected time in
* by calculating the delta time to get expected time in current timezone, * current timezone, then we can get special hour no matter which timezone it runs.
* then we can get special hour no matter which timezone it runs. * <p/>
* * In addition, we should consider the Daylight Saving Time. If in DaylightTime, we need reduce
* In addition, we should consider the Daylight Saving Time. * one hour.
* 1. If in DaylightTime, we need reduce one hour.
* 2. If in DaylightTime and timezone is "Antarctica/Troll", we need reduce two hours.
*/ */
@Test @Test
public void testWithEnvironmentEdge() { public void testWithEnvironmentEdge() {
// test for all available zoneID // test for all available zoneID
for (String zoneID : TimeZone.getAvailableIDs()) { for (String zoneID : ZONE_IDS) {
TimeZone timezone = TimeZone.getTimeZone(zoneID); TimeZone timezone = TimeZone.getTimeZone(zoneID);
TimeZone.setDefault(timezone); TimeZone.setDefault(timezone);
@ -57,12 +59,10 @@ public class TestCurrentHourProvider {
return timeFor11; return timeFor11;
} }
}); });
CurrentHourProvider.tick = CurrentHourProvider.nextTick(); CurrentHourProvider.advanceTick();
int hour11 = CurrentHourProvider.getCurrentHour(); int hour11 = CurrentHourProvider.getCurrentHour();
if (TimeZone.getDefault().inDaylightTime(new Date(timeFor11))) { if (TimeZone.getDefault().inDaylightTime(new Date(timeFor11))) {
hour11 = "Antarctica/Troll".equals(zoneID) ? hour11 = CurrentHourProvider.getCurrentHour() - 1;
CurrentHourProvider.getCurrentHour() - 2 :
CurrentHourProvider.getCurrentHour() - 1;
} }
assertEquals(11, hour11); assertEquals(11, hour11);
@ -75,12 +75,10 @@ public class TestCurrentHourProvider {
return timeFor15; return timeFor15;
} }
}); });
CurrentHourProvider.tick = CurrentHourProvider.nextTick(); CurrentHourProvider.advanceTick();
int hour15 = CurrentHourProvider.getCurrentHour(); int hour15 = CurrentHourProvider.getCurrentHour();
if (TimeZone.getDefault().inDaylightTime(new Date(timeFor15))) { if (TimeZone.getDefault().inDaylightTime(new Date(timeFor15))) {
hour15 = "Antarctica/Troll".equals(zoneID) ? hour15 = CurrentHourProvider.getCurrentHour() - 1;
CurrentHourProvider.getCurrentHour() - 2 :
CurrentHourProvider.getCurrentHour() - 1;
} }
assertEquals(15, hour15); assertEquals(15, hour15);
} }