AmatyaAvadhanula commented on code in PR #16162:
URL: https://github.com/apache/druid/pull/16162#discussion_r1579401083
##########
server/src/main/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderator.java:
##########
@@ -1098,37 +1109,59 @@ SinkSchemaAnnouncer getSinkSchemaAnnouncer()
/**
* Unannounces the given base segment and all its upgraded versions.
*/
- private void unannounceAllVersionsOfSegment(DataSegment baseSegment) throws
IOException
+ private void unannounceAllVersionsOfSegment(DataSegment baseSegment, Sink
sink)
{
- segmentAnnouncer.unannounceSegment(baseSegment);
+ synchronized (sink) {
+ final SegmentIdWithShardSpec baseId =
SegmentIdWithShardSpec.fromDataSegment(baseSegment);
+ if (!baseSegmentToUpgradedSegments.containsKey(baseId)) {
+ return;
+ }
- final Set<SegmentIdWithShardSpec> upgradedVersionsOfSegment
- = baseSegmentToUpgradedVersions.remove(baseSegment.getId());
- if (upgradedVersionsOfSegment == null ||
upgradedVersionsOfSegment.isEmpty()) {
- return;
+ final List<SegmentIdWithShardSpec> upgradedVersionsOfSegment
+ = ImmutableList.copyOf(baseSegmentToUpgradedSegments.get(baseId));
+
+ for (SegmentIdWithShardSpec newId : upgradedVersionsOfSegment) {
+ final DataSegment newSegment = new DataSegment(
+ newId.getDataSource(),
+ newId.getInterval(),
+ newId.getVersion(),
+ baseSegment.getLoadSpec(),
+ baseSegment.getDimensions(),
+ baseSegment.getMetrics(),
+ newId.getShardSpec(),
+ baseSegment.getBinaryVersion(),
+ baseSegment.getSize()
+ );
+ unannounceSegment(newSegment);
+ }
}
+ }
- for (SegmentIdWithShardSpec newId : upgradedVersionsOfSegment) {
- final DataSegment newSegment = new DataSegment(
- newId.getDataSource(),
- newId.getInterval(),
- newId.getVersion(),
- baseSegment.getLoadSpec(),
- baseSegment.getDimensions(),
- baseSegment.getMetrics(),
- newId.getShardSpec(),
- baseSegment.getBinaryVersion(),
- baseSegment.getSize()
- );
- segmentAnnouncer.unannounceSegment(newSegment);
+ private void unannounceSegment(DataSegment segment)
+ {
+ try {
+ segmentAnnouncer.unannounceSegment(segment);
+ }
+ catch (Exception e) {
+ log.makeAlert(e, "Failed to unannounce segment[%s]",
schema.getDataSource())
+ .addData("identifier", segment.getId().toString())
+ .emit();
+ }
+ SegmentIdWithShardSpec id =
SegmentIdWithShardSpec.fromDataSegment(segment);
+ SegmentIdWithShardSpec baseId = upgradedSegmentToBaseSegment.remove(id);
+ if (baseId == null) {
+ return;
+ }
+ baseSegmentToUpgradedSegments.get(baseId).remove(id);
+ if (baseSegmentToUpgradedSegments.get(baseId).isEmpty()) {
+ baseSegmentToUpgradedSegments.remove(baseId);
}
}
- public void registerNewVersionOfPendingSegment(
- SegmentIdWithShardSpec basePendingSegment,
- SegmentIdWithShardSpec newSegmentVersion
- ) throws IOException
+ public void registerNewVersionOfPendingSegment(PendingSegmentRecord
pendingSegmentRecord) throws IOException
{
+ SegmentIdWithShardSpec basePendingSegment =
idToPendingSegment.get(pendingSegmentRecord.getUpgradedFromSegmentId());
+ SegmentIdWithShardSpec newSegmentVersion = pendingSegmentRecord.getId();
Review Comment:
Done. Renamed the method as well
##########
server/src/main/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderator.java:
##########
@@ -1396,12 +1429,50 @@ private Object bootstrapSinksFromDisk()
return committed.getMetadata();
}
+ /**
+ * Update the state of the appenderator when adding a sink.
+ *
+ * @param identifier sink identifier
+ * @param sink sink to be added
+ */
+ private void addSink(SegmentIdWithShardSpec identifier, Sink sink)
+ {
+ sinks.put(identifier, sink);
+ // Asoociate the base segment of a sink with its string identifier
+ // Needed to get the base segment using upgradedFromSegmentId of a pending
segment
+ idToPendingSegment.put(identifier.asSegmentId().toString(), identifier);
+
+ // The base segment is associated with itself in the maps to maintain all
the upgraded ids of a sink.
+ baseSegmentToUpgradedSegments.put(identifier, new HashSet<>());
+ baseSegmentToUpgradedSegments.get(identifier).add(identifier);
+ upgradedSegmentToBaseSegment.put(identifier, identifier);
Review Comment:
It's not anymore.
--
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]
