jackjlli commented on a change in pull request #8242:
URL: https://github.com/apache/pinot/pull/8242#discussion_r814149767
##########
File path:
pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManager.java
##########
@@ -2963,6 +2961,19 @@ public String startReplaceSegments(String
tableNameWithType, List<String> segmen
return segmentLineageEntryId;
}
+ // TODO: Add more conflict checks over segmentsTo later.
+ private static boolean isConflicted(List<String> segmentsFrom, LineageEntry
lineageEntry, TableConfig tableConfig) {
+ if (isRefreshTable(tableConfig)) {
+ return CollectionUtils.isEqualCollection(segmentsFrom,
lineageEntry.getSegmentsFrom());
+ }
+ // For APPEND table, skip conflict checks if segmentsFrom is empty.
Review comment:
Add TODO here saying for APPEND table, if the new segments from 2 batch
jobs are overlapping, then we should reject either one of the batch jobs.
##########
File path:
pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManagerTest.java
##########
@@ -885,6 +913,33 @@ private void testSegmentReplacementForRefresh()
Assert.assertEquals(new
HashSet<>(ControllerTestUtils.getHelixResourceManager()
.getSegmentsFor(OFFLINE_SEGMENTS_REPLACE_TEST_REFRESH_TABLE_NAME,
true)),
new HashSet<>(Arrays.asList("s12", "s13", "s14")));
+
+ // Check empty segmentsFrom reverts previous lineage with empty
segmentsFrom
+ // Start a new segment replacement with empty segmentsFrom.
+ segmentsFrom = new ArrayList<>();
+ segmentsTo = Arrays.asList("s15", "s16");
+ String lineageEntryId5 = ControllerTestUtils.getHelixResourceManager()
+
.startReplaceSegments(OFFLINE_SEGMENTS_REPLACE_TEST_REFRESH_TABLE_NAME,
segmentsFrom, segmentsTo, false);
+ segmentLineage = SegmentLineageAccessHelper
+ .getSegmentLineage(ControllerTestUtils.getPropertyStore(),
OFFLINE_SEGMENTS_REPLACE_TEST_REFRESH_TABLE_NAME);
+
Assert.assertEquals(segmentLineage.getLineageEntry(lineageEntryId5).getSegmentsFrom(),
segmentsFrom);
+
Assert.assertEquals(segmentLineage.getLineageEntry(lineageEntryId5).getSegmentsTo(),
segmentsTo);
+
Assert.assertEquals(segmentLineage.getLineageEntry(lineageEntryId5).getState(),
LineageEntryState.IN_PROGRESS);
+
+ // Upload partial data
+
ControllerTestUtils.getHelixResourceManager().addNewSegment(OFFLINE_SEGMENTS_REPLACE_TEST_REFRESH_TABLE_NAME,
+
SegmentMetadataMockUtils.mockSegmentMetadata(OFFLINE_SEGMENTS_REPLACE_TEST_REFRESH_TABLE_NAME,
"s15"),
+ "downloadUrl");
+
+ // Start another new segment replacement with empty segmentsFrom,
+ // and check that previous lineages with empty segmentsFrom are reverted.
+ segmentsTo = Arrays.asList("s17", "s18");
+ String lineageEntryId6 = ControllerTestUtils.getHelixResourceManager()
+
.startReplaceSegments(OFFLINE_SEGMENTS_REPLACE_TEST_REFRESH_TABLE_NAME,
segmentsFrom, segmentsTo, true);
+ segmentLineage = SegmentLineageAccessHelper
+ .getSegmentLineage(ControllerTestUtils.getPropertyStore(),
OFFLINE_SEGMENTS_REPLACE_TEST_REFRESH_TABLE_NAME);
+
Assert.assertEquals(segmentLineage.getLineageEntry(lineageEntryId5).getState(),
LineageEntryState.REVERTED);
+
Assert.assertEquals(segmentLineage.getLineageEntry(lineageEntryId6).getState(),
LineageEntryState.IN_PROGRESS);
Review comment:
I suggest invoking an end call at the end in case more tests need to be
added in the future.
--
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.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
