Use LMDB queues
This commit is contained in:
parent
abf9f28484
commit
a8510ed336
10
pom.xml
10
pom.xml
@ -77,7 +77,13 @@
|
||||
<dependency>
|
||||
<groupId>it.cavallium</groupId>
|
||||
<artifactId>filequeue</artifactId>
|
||||
<version>3.0.2</version>
|
||||
<version>3.1.2</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>org.ow2.asm</groupId>
|
||||
<artifactId>asm</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.projectreactor</groupId>
|
||||
@ -134,7 +140,7 @@
|
||||
<dependency>
|
||||
<groupId>org.ow2.asm</groupId>
|
||||
<artifactId>asm</artifactId>
|
||||
<version>9.3</version>
|
||||
<version>9.4</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.projectreactor</groupId>
|
||||
|
@ -143,7 +143,14 @@ public class AtomixReactiveApi implements ReactiveApi {
|
||||
return loadSessions.<Void>then(Mono.fromRunnable(() -> {
|
||||
if (sharedTdlibServers != null) {
|
||||
requestsSub = sharedTdlibServers.requests()
|
||||
.doOnNext(req -> localSessions.get(req.data().userId()).handleRequest(req.data()))
|
||||
.doOnNext(req -> {
|
||||
var publisher = localSessions.get(req.data().userId());
|
||||
if (publisher != null) {
|
||||
publisher.handleRequest(req.data());
|
||||
} else {
|
||||
LOG.error("Dropped request because no session is found: {}", req);
|
||||
}
|
||||
})
|
||||
.subscribeOn(Schedulers.parallel())
|
||||
.subscribe(n -> {}, ex -> LOG.error("Requests channel broke unexpectedly", ex));
|
||||
}
|
||||
|
@ -3,8 +3,10 @@ package it.tdlight.reactiveapi;
|
||||
import static it.tdlight.reactiveapi.AuthPhase.LOGGED_IN;
|
||||
import static it.tdlight.reactiveapi.AuthPhase.LOGGED_OUT;
|
||||
import static it.tdlight.reactiveapi.Event.SERIAL_VERSION;
|
||||
import static it.tdlight.reactiveapi.rsocket.FileQueueUtils.convert;
|
||||
import static java.util.Objects.requireNonNull;
|
||||
|
||||
import it.cavallium.filequeue.QueueConsumer;
|
||||
import it.tdlight.common.Init;
|
||||
import it.tdlight.common.ReactiveTelegramClient;
|
||||
import it.tdlight.common.Response;
|
||||
@ -43,6 +45,7 @@ import java.io.DataOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
import java.time.Duration;
|
||||
import java.time.Instant;
|
||||
import java.util.ArrayList;
|
||||
@ -65,6 +68,7 @@ import reactor.core.publisher.FluxSink.OverflowStrategy;
|
||||
import reactor.core.publisher.Mono;
|
||||
import reactor.core.publisher.Sinks.EmitFailureHandler;
|
||||
import reactor.core.publisher.Sinks.Many;
|
||||
import reactor.core.scheduler.Scheduler.Worker;
|
||||
import reactor.core.scheduler.Schedulers;
|
||||
|
||||
public abstract class ReactiveApiPublisher {
|
||||
@ -112,6 +116,7 @@ public abstract class ReactiveApiPublisher {
|
||||
} catch (Throwable ex) {
|
||||
LOG.error("Failed to initialize client {}", userId, ex);
|
||||
sink.error(ex);
|
||||
return;
|
||||
}
|
||||
rawTelegramClient.setListener(t -> {
|
||||
if (!sink.isCancelled()) {
|
||||
@ -120,10 +125,8 @@ public abstract class ReactiveApiPublisher {
|
||||
}
|
||||
});
|
||||
sink.onCancel(rawTelegramClient::cancel);
|
||||
sink.onDispose(() -> {
|
||||
rawTelegramClient.dispose();
|
||||
});
|
||||
}, OverflowStrategy.ERROR).doOnNext(next -> bufferedUpdates.increment());
|
||||
sink.onDispose(rawTelegramClient::dispose);
|
||||
}, OverflowStrategy.BUFFER).doOnNext(next -> bufferedUpdates.increment());
|
||||
|
||||
|
||||
Stats.STATS.add(this);
|
||||
@ -176,12 +179,7 @@ public abstract class ReactiveApiPublisher {
|
||||
.<TDLibBoundResultingEvent<?>>map(s -> ((TDLibBoundResultingEvent<?>) s))
|
||||
|
||||
// Buffer requests to avoid halting the event loop
|
||||
.transform(ReactorUtils.onBackpressureBuffer(path,
|
||||
"tdlib-bound-events",
|
||||
false,
|
||||
new TdlibBoundResultingEventSerializer(),
|
||||
new TdlibBoundResultingEventDeserializer()
|
||||
))
|
||||
.onBackpressureBuffer()
|
||||
|
||||
// Send requests to tdlib
|
||||
.flatMap(req -> Mono
|
||||
@ -225,7 +223,7 @@ public abstract class ReactiveApiPublisher {
|
||||
|
||||
// Buffer requests to avoid halting the event loop
|
||||
.doOnNext(clientBoundEvent -> clientBoundEvents.increment())
|
||||
.transform(ReactorUtils.onBackpressureBufferSubscribe(path,
|
||||
.transform(ReactorUtils.onBackpressureBufferSubscribe(Paths.get(""),
|
||||
"client-bound-resulting-events",
|
||||
false,
|
||||
new ClientBoundEventSerializer(),
|
||||
@ -243,12 +241,7 @@ public abstract class ReactiveApiPublisher {
|
||||
.cast(ClusterBoundResultingEvent.class)
|
||||
|
||||
// Buffer requests to avoid halting the event loop
|
||||
.as(ReactorUtils.onBackpressureBuffer(path,
|
||||
"cluster-bound-events",
|
||||
false,
|
||||
new ClusterBoundResultingEventSerializer(),
|
||||
new ClusterBoundResultingEventDeserializer()
|
||||
))
|
||||
.onBackpressureBuffer()
|
||||
|
||||
// Send events to the cluster
|
||||
.subscribeOn(Schedulers.parallel())
|
||||
|
@ -1,6 +1,7 @@
|
||||
package it.tdlight.reactiveapi;
|
||||
|
||||
import it.cavallium.filequeue.DiskQueueToConsumer;
|
||||
import it.cavallium.filequeue.IQueueToConsumer;
|
||||
import it.cavallium.filequeue.LMDBQueueToConsumer;
|
||||
import it.tdlight.reactiveapi.rsocket.FileQueueUtils;
|
||||
import java.io.IOException;
|
||||
import java.io.UncheckedIOException;
|
||||
@ -166,19 +167,15 @@ public class ReactorUtils {
|
||||
Deserializer<T> deserializer) {
|
||||
return flux -> {
|
||||
AtomicReference<FluxSink<T>> ref = new AtomicReference<>();
|
||||
DiskQueueToConsumer<T> queue;
|
||||
try {
|
||||
var queuePath = path.resolve(".tdlib-queue");
|
||||
if (Files.notExists(queuePath)) {
|
||||
Files.createDirectories(queuePath);
|
||||
}
|
||||
queue = new DiskQueueToConsumer<>(queuePath.resolve(name + ".tape2"),
|
||||
IQueueToConsumer<T> queue = new LMDBQueueToConsumer<>(queuePath,
|
||||
name,
|
||||
!persistent,
|
||||
FileQueueUtils.convert(serializer),
|
||||
FileQueueUtils.convert(deserializer),
|
||||
signal -> {
|
||||
var sink = ref.get();
|
||||
if (sink != null && sink.requestedFromDownstream() > 0) {
|
||||
if (sink != null && !sink.isCancelled() && sink.requestedFromDownstream() > 0) {
|
||||
if (signal != null) {
|
||||
sink.next(signal);
|
||||
}
|
||||
@ -188,15 +185,12 @@ public class ReactorUtils {
|
||||
}
|
||||
}
|
||||
);
|
||||
} catch (IOException ex) {
|
||||
throw new UncheckedIOException(ex);
|
||||
}
|
||||
var disposable = flux
|
||||
.subscribeOn(Schedulers.parallel())
|
||||
.publishOn(Schedulers.boundedElastic())
|
||||
.subscribe(queue::add);
|
||||
queue.startQueue();
|
||||
return Flux.<T>create(sink -> {
|
||||
return Flux.create(sink -> {
|
||||
sink.onDispose(() -> {
|
||||
disposable.dispose();
|
||||
queue.close();
|
||||
@ -213,12 +207,9 @@ public class ReactorUtils {
|
||||
Serializer<T> serializer,
|
||||
Deserializer<T> deserializer) {
|
||||
return flux -> Flux.<T>create(sink -> {
|
||||
try {
|
||||
var queuePath = path.resolve(".tdlib-queue");
|
||||
if (Files.notExists(queuePath)) {
|
||||
Files.createDirectories(queuePath);
|
||||
}
|
||||
var queue = new DiskQueueToConsumer<>(queuePath.resolve(name + ".tape2"),
|
||||
var queue = new LMDBQueueToConsumer<>(queuePath,
|
||||
name,
|
||||
!persistent,
|
||||
FileQueueUtils.convert(serializer),
|
||||
FileQueueUtils.convert(deserializer),
|
||||
@ -237,7 +228,7 @@ public class ReactorUtils {
|
||||
flux
|
||||
.subscribeOn(Schedulers.parallel())
|
||||
.publishOn(Schedulers.boundedElastic())
|
||||
.subscribe(new CoreSubscriber<T>() {
|
||||
.subscribe(new CoreSubscriber<>() {
|
||||
@Override
|
||||
public void onSubscribe(@NotNull Subscription s) {
|
||||
sink.onCancel(s::cancel);
|
||||
@ -261,10 +252,7 @@ public class ReactorUtils {
|
||||
}
|
||||
});
|
||||
queue.startQueue();
|
||||
} catch (IOException ex) {
|
||||
sink.error(ex);
|
||||
}
|
||||
}).subscribeOn(Schedulers.boundedElastic());
|
||||
}, OverflowStrategy.ERROR).subscribeOn(Schedulers.boundedElastic());
|
||||
}
|
||||
|
||||
private static class WaitingSink<T> implements FluxSink<T> {
|
||||
|
Loading…
Reference in New Issue
Block a user