jchen21 commented on a change in pull request #6042:
URL: https://github.com/apache/geode/pull/6042#discussion_r583929315
##########
File path:
geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
##########
@@ -117,35 +118,74 @@ public void
testTombstoneGcMessagesBetweenPersistentAndNonPersistentRegion() {
});
}
+
@Test
- public void testGetOldestTombstoneTimeReplicate() {
+ public void
testWhenAnOutOfRangeTimeStampIsSeenWeExpireItInReplicateTombstoneSweeper() {
VM server1 = VM.getVM(0);
VM server2 = VM.getVM(1);
+ final int FAR_INTO_THE_FUTURE = 1000000; // 1 million millis into the
future
+ final int count = 10;
server1.invoke(() -> {
- createCacheAndRegion(REPLICATE_PERSISTENT);
- region.put("K1", "V1");
- region.put("K2", "V2");
+ createCacheAndRegion(RegionShortcut.REPLICATE_PERSISTENT);
+ for (int i = 0; i < count; i++) {
+ region.put("K" + i, "V" + i);
+ }
});
- server2.invoke(() -> createCacheAndRegion(REPLICATE));
+ server2.invoke(() -> createCacheAndRegion(RegionShortcut.REPLICATE));
server1.invoke(() -> {
+ TombstoneService.TombstoneSweeper tombstoneSweeper =
+ ((InternalCache)
cache).getTombstoneService().getSweeper((LocalRegion) region);
+
+ RegionEntry regionEntry = ((LocalRegion) region).getRegionEntry("K0");
+ VersionTag<?> versionTag = regionEntry.getVersionStamp().asVersionTag();
+ versionTag.setVersionTimeStamp(System.currentTimeMillis() +
FAR_INTO_THE_FUTURE);
+
+ TombstoneService.Tombstone modifiedTombstone =
+ new TombstoneService.Tombstone(regionEntry, (LocalRegion) region,
+ versionTag);
+ tombstoneSweeper.tombstones.add(modifiedTombstone);
+ tombstoneSweeper.checkOldestUnexpired(System.currentTimeMillis());
// Send tombstone gc message to vm1.
- region.destroy("K1");
+ assertThat(tombstoneSweeper.getOldestTombstoneTime()).isEqualTo(0);
+ });
+ }
+ @Test
+ public void testGetOldestTombstoneTimeForReplicateTombstoneSweeper() {
+ VM server1 = VM.getVM(0);
+ VM server2 = VM.getVM(1);
+ final int count = 10;
+ server1.invoke(() -> {
+ createCacheAndRegion(RegionShortcut.REPLICATE_PERSISTENT);
+ for (int i = 0; i < count; i++) {
+ region.put("K" + i, "V" + i);
+ }
+ });
+
+ server2.invoke(() -> createCacheAndRegion(RegionShortcut.REPLICATE));
+
+ server1.invoke(() -> {
TombstoneService.TombstoneSweeper tombstoneSweeper =
((InternalCache)
cache).getTombstoneService().getSweeper((LocalRegion) region);
+ // Send tombstone gc message to vm1.
+ for (int i = 0; i < count; i++) {
+ region.destroy("K" + i);
+ assertThat(
Review comment:
For DUnit test, `cacheTimeMillis()` is returns the same value as
`System.currentTimeMillis()`. To validate an unexpired tombstone, besides
asserting getOldestTombstoneTime() + REPLICATE_TOMBSTONE_TIMEOUT_DEFAULT - now
> 0, there is also another condition msUntilTombstoneExpires < EXPIRY_TIME, as
suggested in your code change in `hasExpired()`. Anyway, what I have suggested
are for improvements.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
