Commit graph

14096 commits

Author SHA1 Message Date
Konrad Malawski
5cc9eb2a88 Merge pull request #15478 from kanerogers/patch-1
Add import for TestProbe
2014-07-07 15:48:56 +02:00
Konrad Malawski
e9d828c702 Merge pull request #15505 from ktoso/fix-typo-ktoso
=doc fix typo found in #15504 in the java version of docs
2014-07-07 00:12:15 +02:00
Konrad 'ktoso' Malawski
d7aa8fa9da =doc fix typo found in #15504 in the java version of docs 2014-07-07 00:11:13 +02:00
Konrad Malawski
017ee15705 Merge pull request #15504 from tsabirgaliev/patch-2
=doc fixed minor typo
2014-07-07 00:09:06 +02:00
Tair Sabirgaliev
a919fd1942 =doc fixed minor typo 2014-07-07 03:54:53 +06:00
Heiko Seeberger
7f92d2747e Merge pull request #15494 from hseeberger/wip-15493
=pro #15493 Upgrade to Mockito 1.9.5
2014-07-04 12:14:18 +02:00
Patrik Nordwall
40a8692ea8 Merge pull request #15486 from whiter4bbit/master
RecoveryCompleted handled by receiveRecover
2014-07-04 12:04:37 +02:00
Heiko Seeberger
ea13e6d869 Upgrade to Mockito 1.9.5 (closes #15493) 2014-07-04 09:45:35 +02:00
Pavel Zalunin
f730b60bd9 =doc,sam RecoveryCompleted handled by receiveRecover typo 2014-07-03 13:58:14 +03:00
Kane Rogers
e62610bbd7 Add import for TestProbe
The example for TestProbe doesn't seem to work very well without the TestProbe class imported. :-(
2014-07-02 12:55:48 +10:00
Patrik Nordwall
5608abdb9a Merge pull request #15476 from akka/wip-15472-15440-picks-master-patriknw
#15472 #15440 picks to master (for validation)
2014-06-30 14:35:42 +02:00
Patrik Nordwall
57dece5165 =per #15472 Flush instead of unstash when PersistentActor restarts
* When using the Processor batching buffer for persistAsync and defer
  the events were unstashed by Processor.aroundPreRestart and
  thereby were received as commands after restart
* Instead we must flush this buffer when using PersistentActor

(cherry picked from commit 627ce2fc85739e221524ec48725362ef7c0566ea)
2014-06-30 13:19:15 +02:00
Patrik Nordwall
a188099f91 =con #15440 Add invariant checks to ClusterSharding state
* I suspect that the issue #15440 happens because of replay of events
  in wrong order (ShardHomeAllocated received before ShardRegionRegistered)
  by the hbase journal
* This does not fix that issue, but the additional invariant checks and
  debug statements  would perhaps make it easier for us to diagnose such
  issues
* These changes also ensures that the allocation strategy does not return
  the wrong thing.
* It also tightens a possible error if a region is terminated while a
  rebalance is in progress

(cherry picked from commit d07b9db4958236d580b8bfb8f92461969ff88cbc)
2014-06-30 13:19:00 +02:00
Patrik Nordwall
68a5675220 Merge pull request #15468 from akka/wip-various-pick-master-patriknw
Persistence cherry picks to master (for validation)
2014-06-29 19:35:10 +02:00
Patrik Nordwall
9a4425ed19 =per Fix minor doc issues
(cherry picked from commit 45c07e1f2f131e70a03b82803f11fd390572ccba)
2014-06-28 17:33:08 +02:00
Patrik Nordwall
bc2aeaf0d3 =per #15441 Remove persistent stream in docs and sample
We must first release akka-stream with dependency to akka 2.3.4
and it should be maintained in the akka-release-dev branch

(cherry picked from commit a97a067701cfc527b235707882e72326277415f3)

Conflicts:
	akka-samples/akka-sample-persistence-scala/build.sbt
	akka-samples/akka-sample-persistence-scala/src/main/scala/sample/persistence/StreamExample.scala
2014-06-28 17:24:25 +02:00
Patrik Nordwall
8eec3f92d3 =per #15457 Correlate persistAsync handlers with journal messages
We have assumed that the handlers can be popped when replies come back from journal, but if messages to journal are in flight when the actor is restarted the handlers does not match up with journal replies.

This solution ignores journal replies that were emitted by an old PersistentActor instance
by passing an uid with the journal messages. This means that the handler will not be
invoked for such messages.

(cherry picked from commit 7ebaaab669c9e467a1ffb4d9ed8b6500e1801a7c)

Conflicts:
	akka-persistence/src/main/scala/akka/persistence/JournalProtocol.scala
	akka-persistence/src/main/scala/akka/persistence/Processor.scala
	akka-persistence/src/main/scala/akka/persistence/journal/AsyncWriteJournal.scala
2014-06-28 17:21:55 +02:00
Patrik Nordwall
33c7f6bb4f !per Change for journal plugin compatibility
* A few more adjustments, found when verifying source compatibility of a few
  journal plugins
* Note that PersistentId will be removed with deleteMessage and we should
  not break plugins because of that
* Add missing section of at-least-once delivery in migration guide

(cherry picked from commit 6727eac6d07280d277968e2e25db44e02be3b102)

Conflicts:
	akka-persistence/src/main/scala/akka/persistence/JournalProtocol.scala
	akka-persistence/src/main/scala/akka/persistence/Persistent.scala
	akka-persistence/src/main/scala/akka/persistence/Snapshot.scala
	akka-persistence/src/main/scala/akka/persistence/journal/AsyncWriteProxy.scala
2014-06-28 17:11:06 +02:00
Patrik Nordwall
f6aa491ef0 !per Additional deprecations and cleanup
(cherry picked from commit 98619647e372121fb3c2072a0eab20de4148f7d9)

Conflicts:
	akka-persistence/src/main/scala/akka/persistence/JournalProtocol.scala
	akka-persistence/src/main/scala/akka/persistence/snapshot/SnapshotStore.scala
2014-06-28 16:07:08 +02:00
Patrik Nordwall
33027999da !per #15427 Deprecate deleteMessage and writeConfirmations in journal plugin api
(cherry picked from commit 4c271b6b092989ebde26fcd135e6ad56f797a763)
2014-06-28 15:59:58 +02:00
Patrik Nordwall
07e67b90ea !per #15428 Deprecate deleteMessage
(cherry picked from commit 4973d0b37d635a0a2c9a94c2898da988e4f14fc7)
2014-06-28 15:59:33 +02:00
Patrik Nordwall
018e0c33b5 Merge pull request #15465 from akka/wip-15284-throws-annotation-master-patriknw
+act #15284 Add throws TimeoutException to Inbox.receive
2014-06-27 14:56:23 +02:00
Patrik Nordwall
a60f828819 Merge pull request #15464 from akka/wip-13965-15361-master-patriknw
#13965 #15361 cherry picks to master (for validation)
2014-06-27 14:27:53 +02:00
Patrik Nordwall
f8d0929dc0 Merge pull request #15463 from akka/wip-15459-persistAsync-batching-master-patriknw
=per #15459 Use full batching for persistAsync and defer (for validation)
2014-06-27 14:26:54 +02:00
Patrik Nordwall
c11de95dd7 Merge pull request #15414 from akka/wip-13942-LoggingReceive-optimization-patriknw
=act #13942 Avoid allocations in LoggingReceived when disabled
2014-06-27 12:37:38 +02:00
Patrik Nordwall
3a94510869 +act #15284 Add throws TimeoutException to Inbox.receive
(cherry picked from commit ab19cc8a527f1a01a8180c2b199affcb47e5b1d2)
2014-06-27 12:29:11 +02:00
Patrik Nordwall
4e645bde23 =doc #13965 Fix wrong code sample for BalancingPool
(cherry picked from commit 24ce0605ac954d516a52d9ce14624414c1c79933)
2014-06-27 12:22:16 +02:00
Patrik Nordwall
7616a41733 =act #15361 Require non-abstract actor class (earlier)
* It was detected previously as well when trying to find constructor,
  but with a perhaps confusing error message

(cherry picked from commit 15e964b13e91962474c7907787c37121aae8fd4e)
2014-06-27 12:21:53 +02:00
Patrik Nordwall
b667e6c37a =per #15459 Use full batching for persistAsync and defer
(cherry picked from commit 20ac844b4f3999d0261f1a08957c2c2a8367c672)

Conflicts:
	akka-bench-jmh/src/main/scala/akka/persistence/PersistenceActorDeferBenchmark.scala
2014-06-27 12:18:56 +02:00
Patrik Nordwall
d225149a96 Merge pull request #15461 from akka/wip-15327-reliable-redelivery-master-patriknw
+per #15327 Add AtLeastOnceDelivery trait (for validation)
2014-06-27 09:36:57 +02:00
Patrik Nordwall
32ca608c97 +per #15327 Add AtLeastOnceDelivery trait
* also remove final of around methods, and let deliver send when not recoveryRunning

(cherry picked from commit 312b0d107a179accaf135f64ed9c3b78f3e351d1)
2014-06-26 22:58:46 +02:00
Patrik Nordwall
4ad346afd4 Merge pull request #15456 from akka/wip-15436-abstract-persistenceId-master-patriknw
!per #15436 make persistenceId abstract in NEW classes (for validation)
2014-06-26 17:46:43 +02:00
Konrad 'ktoso' Malawski
b1d1d87111 !per #15436 make persistenceId abstract in NEW classes
(cherry picked from commit de3249f7f4b859c3caa232e579d9a3bae7406803)

Conflicts:
	akka-samples/akka-sample-persistence-scala/src/main/scala/sample/persistence/PersistentActorExample.scala
2014-06-26 16:29:30 +02:00
Patrik Nordwall
43952af7ea Merge pull request #15450 from akka/wip-15424-master-patriknw
+per #15424 Added PersistentView, deprecated View (for validation)
2014-06-26 11:37:07 +02:00
Konrad 'ktoso' Malawski
3fd240384c +per #15424 Added PersistentView, deprecated View
A PersistentView works the same way as View did previously, except:

* it requires an `peristenceId` (no default is provided)
* messages given to `receive` are NOT wrapped in Persistent()

akka-streams not touched, will update them afterwards on different branch

Also solves #15436 by making persistentId in PersistentView abstract.

(cherry picked from commit dcafaf788236fe6d018388dd55d5bf9650ded696)

Conflicts:
	akka-docs/rst/java/lambda-persistence.rst
	akka-docs/rst/java/persistence.rst
	akka-docs/rst/scala/persistence.rst
	akka-persistence/src/main/scala/akka/persistence/Persistent.scala
	akka-persistence/src/main/scala/akka/persistence/View.scala
2014-06-26 10:10:09 +02:00
Patrik Nordwall
2203968adb Merge pull request #15444 from akka/wip-15429-persistence-docs-master-patriknw
=per #15429 Rewrite persistence documentation and samples (for validation)
2014-06-25 16:53:17 +02:00
Patrik Nordwall
d6ffdf521c =per #15429 Rewrite persistence documentation and samples for 2.3.4 changes
(cherry picked from commit 02351e32f110a8c4a249f0f3f84bae5898d1a836)

Conflicts:
	akka-samples/akka-sample-persistence-java-lambda/tutorial/index.html
	akka-samples/akka-sample-persistence-java/tutorial/index.html
	akka-samples/akka-sample-persistence-scala/build.sbt
	akka-samples/akka-sample-persistence-scala/src/main/scala/sample/persistence/ConversationRecoveryExample.scala
	akka-samples/akka-sample-persistence-scala/src/main/scala/sample/persistence/PersistentActorExample.scala
	akka-samples/akka-sample-persistence-scala/src/main/scala/sample/persistence/ProcessorChannelExample.scala
	akka-samples/akka-sample-persistence-scala/src/main/scala/sample/persistence/ProcessorChannelRemoteExample.scala
	akka-samples/akka-sample-persistence-scala/src/main/scala/sample/persistence/SnapshotExample.scala
	akka-samples/akka-sample-persistence-scala/src/main/scala/sample/persistence/StreamExample.scala
	akka-samples/akka-sample-persistence-scala/tutorial/index.html
2014-06-25 15:37:35 +02:00
Martin Krasser
062d304b73 +per,+str #15035 Reactive-stream producers for persistent messages written by akka-persistence processors
(cherry picked from commit 5dc62400e4f2f9d7afe5efe93fc8bef5b9d226c0)

Conflicts:
	akka-docs/rst/scala/code/docs/persistence/PersistenceDocSpec.scala
	project/AkkaBuild.scala
2014-06-25 15:07:50 +02:00
Patrik Nordwall
e22711107b Merge pull request #15430 from spray/w/add-japi-Option-getOrElse
+act #15383 add strict japi.Option.getOrElse to simplify working with options from Java
2014-06-25 14:00:02 +02:00
Konrad Malawski
887c30b916 Merge pull request #15435 from ktoso/port-deprecations-channel-ktoso
!per #15230 deprecate Channel and PersistentChannel (for Validation)
2014-06-24 20:37:24 +02:00
Konrad 'ktoso' Malawski
242473bae8 =per #15230 deprecate Channel and PersistentChannel
Conflicts:
	akka-persistence/src/main/scala/akka/persistence/Channel.scala
	akka-persistence/src/main/scala/akka/persistence/PersistentChannel.scala
	akka-persistence/src/test/scala/akka/persistence/serialization/SerializerSpec.scala
2014-06-24 20:37:01 +02:00
Konrad Malawski
50bf83cc17 Merge pull request #15434 from ktoso/port-persistenceId-ktoso
!per #15230 rename processorId => persistentId (for validation)
2014-06-24 19:33:29 +02:00
Konrad 'ktoso' Malawski
4bb321a83a !per #15230 rename processorId => persistentId
* This is NOT binary compatible, we're in an *experimental* module.
* disabled binary compat checks for package akka.persistence
* Source compatibility is retained, but users should migrate do the new
  method name ASAP.
* Plugin APIs were migrated in a way that allows the old plugins to
  compile agains 2.3.4 without having to change anything. Hopefuly this
  will help authors migrate to 2.3.4 sooner. This is only source level compatible, not binary compatible.
* added deprecation warnings on all processorId methods and provided bridges where possible
* for users, the migration should be painless, they can still override
  the old method, and it'll work. But we encourage them to move to
  persistenceId; All delegation code will have to be removed afterwards ofc.

Conflicts:
	akka-persistence/src/main/scala/akka/persistence/Channel.scala
	akka-persistence/src/main/scala/akka/persistence/JournalProtocol.scala
	akka-persistence/src/main/scala/akka/persistence/Persistent.scala
	akka-persistence/src/main/scala/akka/persistence/PersistentChannel.scala
	akka-persistence/src/main/scala/akka/persistence/Processor.scala
	akka-persistence/src/main/scala/akka/persistence/Snapshot.scala
	akka-persistence/src/main/scala/akka/persistence/journal/AsyncWriteProxy.scala
	akka-persistence/src/main/scala/akka/persistence/journal/inmem/InmemJournal.scala
	akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbKey.scala
	akka-persistence/src/main/scala/akka/persistence/snapshot/SnapshotStore.scala
	akka-persistence/src/test/scala/akka/persistence/serialization/SerializerSpec.scala
	project/AkkaBuild.scala
2014-06-24 17:05:18 +02:00
Johannes Rudolph
657afbd859 +act #15383 add strict japi.Option.getOrElse to simplify working with options from Java 2014-06-24 13:29:16 +02:00
Konrad Malawski
c8406e3466 Merge pull request #15416 from mkubala/missing-sender-parens-mkubala
=act,clu,con,doc,per,rem,sam #15114 append missing parens at sender invocations
2014-06-24 11:37:43 +02:00
Patrik Nordwall
e51ccf8c57 Merge pull request #15421 from akka/wip-13992-identify-wildcards-master-patriknw
+act #13992 Improve identify replies of wildcard selections (for validation)
2014-06-23 15:03:00 +02:00
Patrik Nordwall
0fd9198f5d +act #13992 Improve identify replies of wildcard selections
(cherry picked from commit 4747b18d66fafb5699168288b09b7f39da5c2e4e)

Conflicts:
	akka-actor/src/main/scala/akka/actor/ActorSelection.scala
	project/AkkaBuild.scala
2014-06-23 12:19:03 +02:00
Patrik Nordwall
f6e25fe773 =act #13942 Avoid allocations in LoggingReceived when disabled 2014-06-23 11:44:10 +02:00
Marcin Kubala
f4793a399f =act,clu,con,doc,per,rem,sam #15114 append missing parens at Actor.sender() invocations 2014-06-20 23:05:51 +02:00
Konrad 'ktoso' Malawski
67784dbdae =tes #15132 remove not needed lazy val 2014-06-20 16:54:53 +02:00