From 0a5a3021996d7208952e597c2b9a65de6f2122f9 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 5 Dec 2018 11:10:42 +0100 Subject: [PATCH] Require FiniteDuration in Actor props All callers are using FiniteDuration and we really do not want to have an infinite receive timeout. Require FiniteDuration to be specified. Change-Id: Ia4664dd2a1fea76ee4c42641ef132d6d47c78385 Signed-off-by: Robert Varga --- .../controller/cluster/raft/GetSnapshotReplyActor.java | 8 ++++---- .../shardmanager/ShardManagerGetSnapshotReplyActor.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/GetSnapshotReplyActor.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/GetSnapshotReplyActor.java index 0e8847c259..a533168bb2 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/GetSnapshotReplyActor.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/GetSnapshotReplyActor.java @@ -21,7 +21,7 @@ import org.opendaylight.controller.cluster.raft.persisted.ServerConfigurationPay import org.opendaylight.controller.cluster.raft.persisted.Snapshot; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import scala.concurrent.duration.Duration; +import scala.concurrent.duration.FiniteDuration; /** * Temporary actor used to receive a CaptureSnapshotReply message and return a GetSnapshotReply instance. @@ -66,7 +66,7 @@ class GetSnapshotReplyActor extends UntypedAbstractActor { } public static Props props(final CaptureSnapshot captureSnapshot, final ElectionTerm electionTerm, - final ActorRef replyToActor, final Duration receiveTimeout, final String id, + final ActorRef replyToActor, final FiniteDuration receiveTimeout, final String id, final ServerConfigurationPayload updatedPeerInfo) { return Props.create(GetSnapshotReplyActor.class, new Params(captureSnapshot, electionTerm, replyToActor, receiveTimeout, id, updatedPeerInfo)); @@ -76,12 +76,12 @@ class GetSnapshotReplyActor extends UntypedAbstractActor { final CaptureSnapshot captureSnapshot; final ActorRef replyToActor; final ElectionTerm electionTerm; - final Duration receiveTimeout; + final FiniteDuration receiveTimeout; final String id; final ServerConfigurationPayload peerInformation; Params(final CaptureSnapshot captureSnapshot, final ElectionTerm electionTerm, final ActorRef replyToActor, - final Duration receiveTimeout, final String id, final ServerConfigurationPayload peerInfo) { + final FiniteDuration receiveTimeout, final String id, final ServerConfigurationPayload peerInfo) { this.captureSnapshot = Preconditions.checkNotNull(captureSnapshot); this.electionTerm = Preconditions.checkNotNull(electionTerm); this.replyToActor = Preconditions.checkNotNull(replyToActor); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerGetSnapshotReplyActor.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerGetSnapshotReplyActor.java index ed384fd2c7..42ed9d09d8 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerGetSnapshotReplyActor.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerGetSnapshotReplyActor.java @@ -26,7 +26,7 @@ import org.opendaylight.controller.cluster.datastore.persisted.ShardManagerSnaps import org.opendaylight.controller.cluster.raft.client.messages.GetSnapshotReply; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import scala.concurrent.duration.Duration; +import scala.concurrent.duration.FiniteDuration; /** * Temporary actor used by the ShardManager to compile GetSnapshot replies from the Shard actors and return @@ -90,7 +90,7 @@ final class ShardManagerGetSnapshotReplyActor extends UntypedAbstractActor { public static Props props(final Collection shardNames, final String datastoreType, final ShardManagerSnapshot shardManagerSnapshot, final ActorRef replyToActor, final String id, - final Duration receiveTimeout) { + final FiniteDuration receiveTimeout) { return Props.create(ShardManagerGetSnapshotReplyActor.class, new Params(shardNames, datastoreType, shardManagerSnapshot, replyToActor, id, receiveTimeout)); } @@ -101,11 +101,11 @@ final class ShardManagerGetSnapshotReplyActor extends UntypedAbstractActor { final ShardManagerSnapshot shardManagerSnapshot; final ActorRef replyToActor; final String id; - final Duration receiveTimeout; + final FiniteDuration receiveTimeout; Params(final Collection shardNames, final String datastoreType, final ShardManagerSnapshot shardManagerSnapshot, final ActorRef replyToActor, final String id, - final Duration receiveTimeout) { + final FiniteDuration receiveTimeout) { this.shardNames = shardNames; this.datastoreType = datastoreType; this.shardManagerSnapshot = shardManagerSnapshot; -- 2.36.6