-
Notifications
You must be signed in to change notification settings - Fork 3.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Delayed message delivery implementation #4062
Merged
Merged
Changes from 12 commits
Commits
Show all changes
24 commits
Select commit
Hold shift + click to select a range
3290126
Delayed message delivery implementation
merlimat b54c438
Fixed compilation
merlimat d5e1ebc
Allow to configure the delayed tracker implementation
merlimat 52832fe
Use int64 for timestamp
merlimat e249fcc
Merge remote-tracking branch 'apache/master' into delayed-delivery
merlimat 31db950
Address comments
merlimat ab584c1
More tests for TripleLongPriorityQueue
merlimat ed16288
Removing useless sync block that causes deadlock with consumer close
merlimat d0752ec
Merge remote-tracking branch 'apache/master' into delayed-delivery
merlimat 88a787b
Fixed merge conflict
merlimat c4e4fa8
Avoid new list when passing entries to consumer
merlimat 1bbb032
Fixed test. Since entries are evicted from cache, they might be resen…
merlimat af47030
Merge remote-tracking branch 'apache/master' into delayed-delivery
merlimat 8180c83
Fixed context message builder
merlimat e99e199
Merge remote-tracking branch 'apache/master' into delayed-delivery
merlimat 640b4bd
Fixed triggering writePromise when last entry was nullified
merlimat 3f35fb2
Merge remote-tracking branch 'apache/master' into delayed-delivery
merlimat dcfa102
Moved entries filtering from consumer to dispatcher
merlimat 7159782
Merge branch 'refactor-filtering' into delayed-delivery
merlimat b3d99b7
Merge remote-tracking branch 'apache/master' into delayed-delivery
merlimat e36a44c
Added Javadocs
merlimat 7cad297
Merge remote-tracking branch 'apache/master' into delayed-delivery
merlimat 17578a4
Merge remote-tracking branch 'apache/master' into delayed-delivery
merlimat b10712a
Reduced synchronized scope to minimum
merlimat File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
67 changes: 67 additions & 0 deletions
67
pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/DelayedDeliveryTracker.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,67 @@ | ||
/** | ||
* 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.pulsar.broker.delayed; | ||
|
||
import com.google.common.annotations.Beta; | ||
|
||
import java.util.Set; | ||
|
||
import org.apache.bookkeeper.mledger.impl.PositionImpl; | ||
|
||
/** | ||
* Represent the tracker for the delayed delivery of messages for a particular subscription. | ||
* | ||
* Note: this interface is still being refined and some breaking changes might be introduced. | ||
*/ | ||
@Beta | ||
public interface DelayedDeliveryTracker extends AutoCloseable { | ||
|
||
/** | ||
* Add a message to the tracker | ||
* | ||
* @param ledgerId | ||
* the ledgerId | ||
* @param entryId | ||
* the entryId | ||
* @param deliveryAt | ||
* the absolute timestamp at which the message should be tracked | ||
* @return true if the message was added to the tracker or false if it should be delivered immediately | ||
*/ | ||
boolean addMessage(long ledgerId, long entryId, long deliveryAt); | ||
|
||
/** | ||
* Return true if there's at least a message that is scheduled to be delivered already | ||
*/ | ||
boolean hasMessageAvailable(); | ||
|
||
/** | ||
* @return the number of delayed messages being tracked | ||
*/ | ||
long getNumberOfDelayedMessages(); | ||
|
||
/** | ||
* Get a set of position of messages that have already reached the delivery time | ||
*/ | ||
Set<PositionImpl> getScheduledMessages(int maxMessages); | ||
|
||
/** | ||
* Close the subscription tracker and release all resources. | ||
*/ | ||
void close(); | ||
} |
55 changes: 55 additions & 0 deletions
55
...-broker/src/main/java/org/apache/pulsar/broker/delayed/DelayedDeliveryTrackerFactory.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
/** | ||
* 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.pulsar.broker.delayed; | ||
|
||
import com.google.common.annotations.Beta; | ||
|
||
import java.io.IOException; | ||
|
||
import org.apache.pulsar.broker.ServiceConfiguration; | ||
import org.apache.pulsar.broker.service.persistent.PersistentDispatcherMultipleConsumers; | ||
|
||
/** | ||
* Factory of InMemoryDelayedDeliveryTracker objects. This is the entry point for implementations. | ||
* | ||
* Note: this interface is still being refined and some breaking changes might be introduced. | ||
*/ | ||
@Beta | ||
public interface DelayedDeliveryTrackerFactory extends AutoCloseable { | ||
/** | ||
* Initialize the factory implementation from the broker service configuration | ||
* | ||
* @param config | ||
* the broker service config object | ||
*/ | ||
void initialize(ServiceConfiguration config) throws IOException; | ||
|
||
/** | ||
* Create a new tracker instance. | ||
* | ||
* @param dispatcher | ||
* a multi-consumer dispatcher instance | ||
*/ | ||
DelayedDeliveryTracker newTracker(PersistentDispatcherMultipleConsumers dispatcher); | ||
|
||
/** | ||
* Close the factory and release all the resources | ||
*/ | ||
void close() throws IOException; | ||
} |
48 changes: 48 additions & 0 deletions
48
...r-broker/src/main/java/org/apache/pulsar/broker/delayed/DelayedDeliveryTrackerLoader.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
/** | ||
* 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.pulsar.broker.delayed; | ||
|
||
import static com.google.common.base.Preconditions.checkArgument; | ||
|
||
import java.io.IOException; | ||
|
||
import lombok.experimental.UtilityClass; | ||
|
||
import org.apache.pulsar.broker.ServiceConfiguration; | ||
|
||
@UtilityClass | ||
public class DelayedDeliveryTrackerLoader { | ||
public static DelayedDeliveryTrackerFactory loadDelayedDeliveryTrackerFactory(ServiceConfiguration conf) | ||
throws IOException { | ||
// try { | ||
merlimat marked this conversation as resolved.
Show resolved
Hide resolved
|
||
Class<?> factoryClass; | ||
try { | ||
factoryClass = Class.forName(conf.getDelayedDeliveryTrackerFactoryClassName()); | ||
Object obj = factoryClass.newInstance(); | ||
checkArgument(obj instanceof DelayedDeliveryTrackerFactory, | ||
"The factory has to be an instance of " + DelayedDeliveryTrackerFactory.class.getName()); | ||
|
||
DelayedDeliveryTrackerFactory factory = (DelayedDeliveryTrackerFactory) obj; | ||
factory.initialize(conf); | ||
return factory; | ||
} catch (Exception e) { | ||
throw new IOException(e); | ||
} | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nit: I think since we are adding a new interface in this PR. It might be worth considering using NarClassLoader to load the class. So people can implement the DelayedDeliveryTracker in a Nar package.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Using Nar will bring more "overhead" in the sense that we now need to have new maven module, place the nar somewhere in the distribution and have duplication of dependencies (eg: if the tracker wants to use BK).
I'd defer this until we really need it. My expectation would be here to have multiple implementation of tracker, all living within the same codebase. If that proves not true, we can always change at later time.