raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 11

Use delta in direct write also, #22188

Browse source 
* Follow up on the causal delivery of deltas.
* The first implementation used full state for the direct
  Write messages, i.e. updates with WriteConsistency != LocalWrite
* This is an optimization so that delatas are tried first and if
  they can't be applied it falls back to full state.
* For simultanious updates the messages may be reordered because we
  create separate WriteAggregator actor and such, but normally they
  will be sent in order so the deltas will typically be received in
  order, otherwise we fall back to retrying with full state in the
  second round in the WriteAggregator.
This commit is contained in:
Patrik Nordwall 2017-02-23 12:12:29 +01:00
parent b2759ab56a
commit 233e784154
9 changed files with 365 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

26
akka-distributed-data/src/test/scala/akka/cluster/ddata/DeltaPropagationSelectorSpec.scala
View file

@ -19,7 +19,7 @@ object DeltaPropagationSelectorSpec {
override val allNodes: Vector[Address]) extends DeltaPropagationSelector {
override val gossipIntervalDivisor = 5
override def createDeltaPropagation(deltas: Map[KeyId, (ReplicatedData, Long, Long)]): DeltaPropagation =
DeltaPropagation(selfUniqueAddress, deltas.mapValues {
DeltaPropagation(selfUniqueAddress, false, deltas.mapValues {
case (d, fromSeqNr, toSeqNr) ⇒ Delta(DataEnvelope(d), fromSeqNr, toSeqNr)
})
}
@ -50,7 +50,7 @@ class DeltaPropagationSelectorSpec extends WordSpec with Matchers with TypeCheck
selector.cleanupDeltaEntries()
selector.hasDeltaEntries("A") should ===(true)
selector.hasDeltaEntries("B") should ===(true)
val expected = DeltaPropagation(selfUniqueAddress, Map(
val expected = DeltaPropagation(selfUniqueAddress, false, Map(
"A" → Delta(DataEnvelope(deltaA), 1L, 1L),
"B" → Delta(DataEnvelope(deltaB), 1L, 1L)))
selector.collectPropagations() should ===(Map(nodes(0) → expected))
@ -64,7 +64,7 @@ class DeltaPropagationSelectorSpec extends WordSpec with Matchers with TypeCheck
val selector = new TestSelector(selfUniqueAddress, nodes.take(3))
selector.update("A", deltaA)
selector.update("B", deltaB)
val expected = DeltaPropagation(selfUniqueAddress, Map(
val expected = DeltaPropagation(selfUniqueAddress, false, Map(
"A" → Delta(DataEnvelope(deltaA), 1L, 1L),
"B" → Delta(DataEnvelope(deltaB), 1L, 1L)))
selector.collectPropagations() should ===(Map(nodes(0) → expected, nodes(1) → expected))
@ -82,17 +82,17 @@ class DeltaPropagationSelectorSpec extends WordSpec with Matchers with TypeCheck
val selector = new TestSelector(selfUniqueAddress, nodes.take(3))
selector.update("A", deltaA)
selector.update("B", deltaB)
val expected1 = DeltaPropagation(selfUniqueAddress, Map(
val expected1 = DeltaPropagation(selfUniqueAddress, false, Map(
"A" → Delta(DataEnvelope(deltaA), 1L, 1L),
"B" → Delta(DataEnvelope(deltaB), 1L, 1L)))
selector.collectPropagations() should ===(Map(nodes(0) → expected1, nodes(1) → expected1))
// new update before previous was propagated to all nodes
selector.update("C", deltaC)
val expected2 = DeltaPropagation(selfUniqueAddress, Map(
val expected2 = DeltaPropagation(selfUniqueAddress, false, Map(
"A" → Delta(DataEnvelope(deltaA), 1L, 1L),
"B" → Delta(DataEnvelope(deltaB), 1L, 1L),
"C" → Delta(DataEnvelope(deltaC), 1L, 1L)))
val expected3 = DeltaPropagation(selfUniqueAddress, Map(
val expected3 = DeltaPropagation(selfUniqueAddress, false, Map(
"C" → Delta(DataEnvelope(deltaC), 1L, 1L)))
selector.collectPropagations() should ===(Map(nodes(2) → expected2, nodes(0) → expected3))
selector.cleanupDeltaEntries()
@ -114,12 +114,12 @@ class DeltaPropagationSelectorSpec extends WordSpec with Matchers with TypeCheck
selector.currentVersion("A") should ===(1L)
selector.update("A", delta2)
selector.currentVersion("A") should ===(2L)
val expected1 = DeltaPropagation(selfUniqueAddress, Map(
val expected1 = DeltaPropagation(selfUniqueAddress, false, Map(
"A" → Delta(DataEnvelope(delta1.merge(delta2)), 1L, 2L)))
selector.collectPropagations() should ===(Map(nodes(0) → expected1))
selector.update("A", delta3)
selector.currentVersion("A") should ===(3L)
val expected2 = DeltaPropagation(selfUniqueAddress, Map(
val expected2 = DeltaPropagation(selfUniqueAddress, false, Map(
"A" → Delta(DataEnvelope(delta3), 3L, 3L)))
selector.collectPropagations() should ===(Map(nodes(0) → expected2))
selector.collectPropagations() should ===(Map.empty[Address, DeltaPropagation])
@ -133,25 +133,25 @@ class DeltaPropagationSelectorSpec extends WordSpec with Matchers with TypeCheck
override def nodesSliceSize(allNodesSize: Int): Int = 1
}
selector.update("A", delta1)
val expected1 = DeltaPropagation(selfUniqueAddress, Map(
val expected1 = DeltaPropagation(selfUniqueAddress, false, Map(
"A" → Delta(DataEnvelope(delta1), 1L, 1L)))
selector.collectPropagations() should ===(Map(nodes(0) → expected1))
selector.update("A", delta2)
val expected2 = DeltaPropagation(selfUniqueAddress, Map(
val expected2 = DeltaPropagation(selfUniqueAddress, false, Map(
"A" → Delta(DataEnvelope(delta1.merge(delta2)), 1L, 2L)))
selector.collectPropagations() should ===(Map(nodes(1) → expected2))
selector.update("A", delta3)
val expected3 = DeltaPropagation(selfUniqueAddress, Map(
val expected3 = DeltaPropagation(selfUniqueAddress, false, Map(
"A" → Delta(DataEnvelope(delta1.merge(delta2).merge(delta3)), 1L, 3L)))
selector.collectPropagations() should ===(Map(nodes(2) → expected3))
val expected4 = DeltaPropagation(selfUniqueAddress, Map(
val expected4 = DeltaPropagation(selfUniqueAddress, false, Map(
"A" → Delta(DataEnvelope(delta2.merge(delta3)), 2L, 3L)))
selector.collectPropagations() should ===(Map(nodes(0) → expected4))
val expected5 = DeltaPropagation(selfUniqueAddress, Map(
val expected5 = DeltaPropagation(selfUniqueAddress, false, Map(
"A" → Delta(DataEnvelope(delta3), 3L, 3L)))
selector.collectPropagations() should ===(Map(nodes(1) → expected5))