arjunashok commented on code in PR #17:
URL: 
https://github.com/apache/cassandra-analytics/pull/17#discussion_r1409995629


##########
cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/RecordWriter.java:
##########
@@ -136,35 +185,122 @@ public StreamResult write(Iterator<Tuple2<DecoratedKey, 
Object[]>> sourceIterato
         }
     }
 
+    private Map<Range<BigInteger>, List<RingInstance>> 
taskTokenRangeMapping(TokenRangeMapping<RingInstance> tokenRange,
+                                                                             
Range<BigInteger> taskTokenRange)
+    {
+        return tokenRange.getSubRanges(taskTokenRange).asMapOfRanges();
+    }
+
+    private Set<RingInstance> instancesFromMapping(Map<Range<BigInteger>, 
List<RingInstance>> mapping)
+    {
+        return mapping.values()
+                      .stream()
+                      .flatMap(Collection::stream)
+                      .collect(Collectors.toSet());
+    }
+
+    /**
+     * Creates a new session if we have the current token range intersecting 
the ranges from write replica-set.
+     * If we do find the need to split a range into sub-ranges, we create the 
corresponding session for the sub-range
+     * if the token from the row data belongs to the range.
+     */
+    private StreamSession maybeCreateStreamSession(TaskContext taskContext,
+                                                   StreamSession streamSession,
+                                                   Tuple2<DecoratedKey, 
Object[]> rowData,
+                                                   Set<Range<BigInteger>> 
newRanges,
+                                                   
ReplicaAwareFailureHandler<RingInstance> failureHandler) throws IOException
+    {
+        BigInteger token = rowData._1().getToken();
+        Range<BigInteger> tokenRange = getTokenRange(taskContext);
+
+        Preconditions.checkState(tokenRange.contains(token),
+                                 String.format("Received Token %s outside of 
expected range %s", token, tokenRange));
+
+        // token range for this partition is not among the write-replica-set 
ranges
+        if (!newRanges.contains(tokenRange))
+        {
+            Set<Range<BigInteger>> subRanges = 
getIntersectingSubRanges(newRanges, tokenRange);
+            // We have split ranges - likely resulting from pending nodes
+            if (subRanges.size() > 1)
+            {
+                // Create session using sub-range that contains the token from 
current row
+                Range<BigInteger> matchingRange = subRanges.stream().filter(r 
-> r.contains(token)).findFirst().get();
+                Preconditions.checkState(matchingRange != null,
+                                         String.format("Received Token %s 
outside of expected range %s", token, matchingRange));
+
+                if (streamSession != null && streamSession.getTokenRange() == 
matchingRange)
+                {
+                    return streamSession;
+                }
+                else
+                {
+                    LOGGER.debug(String.format("[{}] Creating stream session 
for range: %s", matchingRange), taskContext.partitionId());
+                    if (streamSession != null && batchSize != 0)
+                    {
+                        finalizeSSTable(streamSession, 
taskContext.partitionId(), sstableWriter, batchNumber, batchSize);
+                        sstableWriter = null;
+                        batchSize = 0;
+                    }
+                    return new StreamSession(writerContext, 
getStreamId(taskContext), matchingRange, failureHandler);
+                }
+            }
+        }
+
+        return (streamSession != null) ? streamSession : 
createStreamSession(taskContext);
+    }
+
+    /**
+     * Get ranges from the set that intersect and/or overlap with the provided 
token range
+     */
+    private Set<Range<BigInteger>> 
getIntersectingSubRanges(Set<Range<BigInteger>> ranges, Range<BigInteger> 
tokenRange)
+    {
+        return ranges.stream()
+                     .filter(r -> r.isConnected(tokenRange) && 
!r.intersection(tokenRange).isEmpty())
+                     .collect(Collectors.toSet());
+    }
+
+    private boolean 
haveTokenRangeMappingsChanged(TokenRangeMapping<RingInstance> startTaskMapping, 
TaskContext taskContext)
+    {
+        Range<BigInteger> taskTokenRange = getTokenRange(taskContext);
+        // Get the uncached, current view of the ring to compare with initial 
ring
+        TokenRangeMapping<RingInstance> endTaskMapping = 
writerContext.cluster().getTokenRangeMapping(false);
+        Map<Range<BigInteger>, List<RingInstance>> startMapping = 
taskTokenRangeMapping(startTaskMapping, taskTokenRange);
+        Map<Range<BigInteger>, List<RingInstance>> endMapping = 
taskTokenRangeMapping(endTaskMapping, taskTokenRange);
+
+        return !(startMapping.keySet().equals(endMapping.keySet()) &&
+               
instancesFromMapping(startMapping).equals(instancesFromMapping(endMapping)));

Review Comment:
   Thanks for the input.
   
   We're checking if either the token-ranges or the set of instances differ 
between the start and end of the task to determine if it should fail the task 
(and retry).
   
   In your example, if the the node is joining at the beginning of the task and 
has completed joining before the task ends, the above condition is still good 
as nothing would have changed and it would return `false`.
   
   It is in the alternate case i.e. when the transitioning nodes appear during 
task execution that we want to detect and fail-fast.



-- 
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: commits-unsubscr...@cassandra.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

Reply via email to