Skip to content

Commit

Permalink
HBASE-24898 Use EnvironmentEdge.currentTime() instead of System.curre…
Browse files Browse the repository at this point in the history
…ntTimeMillis() in CurrentHourProvider

Closes #2272

Co-authored-by: Viraj Jasani <[email protected]>

Signed-off-by: Nick Dimiduk <[email protected]>
Signed-off-by: Duo Zhang <[email protected]>
Signed-off-by: Viraj Jasani <[email protected]>
  • Loading branch information
bsglz authored and virajjasani committed Aug 22, 2020
1 parent c2e0cf9 commit e7fdf58
Show file tree
Hide file tree
Showing 2 changed files with 69 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.util.GregorianCalendar;

import org.apache.hadoop.hbase.classification.InterfaceAudience;
import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;

@InterfaceAudience.Private
public class CurrentHourProvider {
Expand All @@ -38,6 +39,7 @@ private static final class Tick {

private static Tick nextTick() {
Calendar calendar = new GregorianCalendar();
calendar.setTimeInMillis(EnvironmentEdgeManager.currentTime());
int currentHour = calendar.get(Calendar.HOUR_OF_DAY);
moveToNextHour(calendar);
return new Tick(currentHour, calendar.getTimeInMillis());
Expand All @@ -54,7 +56,7 @@ private static void moveToNextHour(Calendar calendar) {

public static int getCurrentHour() {
Tick tick = CurrentHourProvider.tick;
if(System.currentTimeMillis() < tick.expirationTimeInMillis) {
if (EnvironmentEdgeManager.currentTime() < tick.expirationTimeInMillis) {
return tick.currentHour;
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.hadoop.hbase.regionserver.compactions;

import static org.junit.Assert.assertEquals;

import java.util.TimeZone;
import org.apache.hadoop.hbase.testclassification.RegionServerTests;
import org.apache.hadoop.hbase.testclassification.SmallTests;
import org.apache.hadoop.hbase.util.EnvironmentEdge;
import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@Category({RegionServerTests.class, SmallTests.class})
public class TestCurrentHourProvider {
private static final Logger LOG = LoggerFactory.getLogger(TestCurrentHourProvider.class);

/**
* In timezone GMT+08:00, the unix time of 2020-08-20 11:52:41 is 1597895561000
* and the unix time of 2020-08-20 15:04:00 is 1597907081000,
* by calculating the delta time to get expected time in current timezone,
* then we can get special hour no matter which timezone it runs.
*/
@Test
public void testWithEnvironmentEdge() {
// set a time represent hour 11
long deltaFor11 = TimeZone.getDefault().getRawOffset() - 28800000;
final long timeFor11 = 1597895561000L - deltaFor11;
EnvironmentEdgeManager.injectEdge(new EnvironmentEdge() {
@Override
public long currentTime() {
return timeFor11;
}
});
assertEquals(11, CurrentHourProvider.getCurrentHour());

// set a time represent hour 15
long deltaFor15 = TimeZone.getDefault().getRawOffset() - 28800000;
final long timeFor15 = 1597907081000L - deltaFor15;
EnvironmentEdgeManager.injectEdge(new EnvironmentEdge() {
@Override
public long currentTime() {
return timeFor15;
}
});
assertEquals(15, CurrentHourProvider.getCurrentHour());
}
}

0 comments on commit e7fdf58

Please sign in to comment.