xinyuiscool commented on code in PR #1616: URL: https://github.com/apache/samza/pull/1616#discussion_r926976861
########## samza-api/src/main/java/org/apache/samza/system/DrainMessage.java: ########## @@ -0,0 +1,69 @@ +/* + * 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.samza.system; + +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * The DrainMessage is a control message that is sent out to next stage + * once the task has consumed to the end of a bounded stream. + */ +public class DrainMessage extends ControlMessage { + private final String deploymentId; Review Comment: As discussed offline, let's make it consistent with the current Samza term which is "runId". ########## samza-core/src/main/java/org/apache/samza/container/RunLoop.java: ########## @@ -805,6 +877,52 @@ private boolean checkEndOfStream() { return processingSspSet.isEmpty(); } + private boolean shouldDrain() { + if (endOfStream) { + return false; + } + + if (!pendingEnvelopeQueue.isEmpty()) { + PendingEnvelope pendingEnvelope = pendingEnvelopeQueue.peek(); + IncomingMessageEnvelope envelope = pendingEnvelope.envelope; + + if (envelope.isDrain()) { + final DrainMessage message = (DrainMessage) envelope.getMessage(); + if (!message.getDeploymentId().equals(deploymentId)) { + // Removing the drain message from the pending queue as it doesn't match with the current deploymentId + // Removing it will ensure that it is not picked up by process() + pendingEnvelopeQueue.remove(); + } else { + if (elasticityFactor <= 1) { + SystemStreamPartition ssp = envelope.getSystemStreamPartition(); + processingSspSetToDrain.remove(ssp); + } else { + // if envelope contains drain message, + // the ssp of envelope should be removed from task's processing set irresp of keyBucket + SystemStreamPartition sspOfEnvelope = envelope.getSystemStreamPartition(); + Optional<SystemStreamPartition> ssp = processingSspSetToDrain.stream() + .filter(sspInSet -> sspInSet.getSystemStream().equals(sspOfEnvelope.getSystemStream()) + && sspInSet.getPartition().equals(sspOfEnvelope.getPartition())) + .findFirst(); + ssp.ifPresent(processingSspSetToDrain::remove); + } + + if (!hasIntermediateStreams) { Review Comment: Is this condition strong enough? Seems to me that we want to check whether this drain message is coming from an input stream v.s. intermediate stream? The task might consume both input stream and intermediate stream partitions. ########## samza-core/src/main/java/org/apache/samza/container/RunLoop.java: ########## @@ -805,6 +877,52 @@ private boolean checkEndOfStream() { return processingSspSet.isEmpty(); } + private boolean shouldDrain() { + if (endOfStream) { + return false; + } + + if (!pendingEnvelopeQueue.isEmpty()) { + PendingEnvelope pendingEnvelope = pendingEnvelopeQueue.peek(); + IncomingMessageEnvelope envelope = pendingEnvelope.envelope; + + if (envelope.isDrain()) { + final DrainMessage message = (DrainMessage) envelope.getMessage(); + if (!message.getDeploymentId().equals(deploymentId)) { + // Removing the drain message from the pending queue as it doesn't match with the current deploymentId + // Removing it will ensure that it is not picked up by process() + pendingEnvelopeQueue.remove(); + } else { + if (elasticityFactor <= 1) { + SystemStreamPartition ssp = envelope.getSystemStreamPartition(); + processingSspSetToDrain.remove(ssp); + } else { + // if envelope contains drain message, Review Comment: Maybe a little bit more explaination here about the log to handle elasticity. Seems this feature is making things much complex. -- 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...@samza.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
