-
Notifications
You must be signed in to change notification settings - Fork 593
HDDS-5456. Inject a Clock into Replication Manager to allow timeouts to be tested #2425
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
81 changes: 81 additions & 0 deletions
81
hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/MonotonicClock.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| /* | ||
| * 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.ozone.common; | ||
|
|
||
| import org.apache.hadoop.util.Time; | ||
|
|
||
| import java.time.Clock; | ||
| import java.time.Instant; | ||
| import java.time.ZoneId; | ||
|
|
||
| /** | ||
| * This is a class which implements the Clock interface. It is a copy of the | ||
| * Java Clock.SystemClock only it uses MonotonicNow (nanotime) rather than | ||
| * System.currentTimeMills. | ||
| */ | ||
|
|
||
| public final class MonotonicClock extends Clock { | ||
|
|
||
| private final ZoneId zoneId; | ||
|
|
||
| public MonotonicClock(ZoneId zone) { | ||
| this.zoneId = zone; | ||
| } | ||
|
|
||
| @Override | ||
| public ZoneId getZone() { | ||
| return zoneId; | ||
| } | ||
|
|
||
| @Override | ||
| public Clock withZone(ZoneId zone) { | ||
| if (zone.equals(this.zoneId)) { // intentional NPE | ||
| return this; | ||
| } | ||
| return new MonotonicClock(zone); | ||
| } | ||
|
|
||
| @Override | ||
| public long millis() { | ||
| return Time.monotonicNow(); | ||
| } | ||
|
|
||
| @Override | ||
| public Instant instant() { | ||
| return Instant.ofEpochMilli(millis()); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object obj) { | ||
| if (obj instanceof MonotonicClock) { | ||
| return zoneId.equals(((MonotonicClock) obj).zoneId); | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return zoneId.hashCode() + 1; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return "MonotonicClock[" + zoneId + "]"; | ||
| } | ||
|
|
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
76 changes: 76 additions & 0 deletions
76
hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/TestClock.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| /* | ||
| * 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.ozone.test; | ||
|
|
||
| import java.time.Clock; | ||
| import java.time.Instant; | ||
| import java.time.ZoneId; | ||
| import java.time.temporal.TemporalAmount; | ||
|
|
||
| /** | ||
| * An implementation of Clock which allows the time to be set to an instant and | ||
| * moved forward and back. Intended for use only in tests. | ||
| */ | ||
|
|
||
| public class TestClock extends Clock { | ||
|
|
||
| private Instant instant; | ||
| private final ZoneId zoneId; | ||
|
|
||
| public TestClock(Instant instant, ZoneId zone) { | ||
| this.instant = instant; | ||
| this.zoneId = zone; | ||
| } | ||
|
|
||
| @Override | ||
| public ZoneId getZone() { | ||
| return zoneId; | ||
| } | ||
|
|
||
| @Override | ||
| public Clock withZone(ZoneId zone) { | ||
| return new TestClock(Instant.now(), zone); | ||
| } | ||
|
|
||
| @Override | ||
| public Instant instant() { | ||
| return instant; | ||
| } | ||
|
|
||
| public void fastForward(long millis) { | ||
| set(instant().plusMillis(millis)); | ||
| } | ||
|
|
||
| public void fastForward(TemporalAmount temporalAmount) { | ||
| set(instant().plus(temporalAmount)); | ||
| } | ||
|
|
||
| public void rewind(long millis) { | ||
| set(instant().minusMillis(millis)); | ||
| } | ||
|
|
||
| public void rewind(TemporalAmount temporalAmount) { | ||
| set(instant().minus(temporalAmount)); | ||
| } | ||
|
|
||
| public void set(Instant newInstant) { | ||
| this.instant = newInstant; | ||
| } | ||
|
|
||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
MonotonicClockshould befinalorequalsshould check class equality instead ofinstanceof. Otherwise equality of instances of a subclass andMonotonicClockwould not be symmetric.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for pointing this out. I will make it final to avoid this problem. I basically copied this code from the Java SystemClock class, and it was a final class, so that explains why this code is that way.