Commit graph

9033 commits

Author SHA1 Message Date
Jonas Bonér
f855ff2add Fixed misc stuff after review.
Signed-off-by: Jonas Bonér <jonas@jonasboner.com>
2012-02-04 17:50:11 +01:00
Jonas Bonér
ff62a1cf2a Removed unnecessary config options.
Signed-off-by: Jonas Bonér <jonas@jonasboner.com>
2012-02-03 18:10:50 +01:00
Jonas Bonér
6abc3b33e3 Fixed bug in ScatterGatherFirstCompletedRouterSpec.
Signed-off-by: Jonas Bonér <jonas@jonasboner.com>
2012-02-03 18:09:13 +01:00
Jonas Bonér
c01ed6b436 Switched to ThreadLocalRandom.
Signed-off-by: Jonas Bonér <jonas@jonasboner.com>
2012-02-03 18:08:43 +01:00
Jonas Bonér
2ec15db091 Merge branch 'master' into wip-fix-multi-jvm-test-jboner 2012-02-03 16:38:28 +01:00
Jonas Bonér
2ea6e97a41 Merge branch 'master' of github.com:jboner/akka 2012-02-03 16:31:56 +01:00
Jonas Bonér
a221722c41 Fixed minor typos in the futures docs.
Signed-off-by: Jonas Bonér <jonas@jonasboner.com>
2012-02-03 16:31:31 +01:00
Roland Kuhn
c7de179276 Merge pull request #298 from jboner/wip-1783-latest-HOCON-∂π
Viktor said: “just push!”
2012-02-03 06:37:29 -08:00
Roland Kuhn
4ded156bd0 Merge pull request #299 from jboner/wip-1782-timing-in-test-for-all-of-us
Wip 1782 timing in test for all of us
2012-02-03 06:36:15 -08:00
Viktor Klang
1e4d643183 Merge branch 'master' of github.com:jboner/akka 2012-02-03 15:30:11 +01:00
Viktor Klang
df67b92f63 Embedding ThreadLocalRandom from jsr166y 2012-02-03 15:29:58 +01:00
Roland Kuhn
3a5c20e228 Merge pull request #296 from jboner/wip-1779-slf4j-docs-∂π
update docs for SLF4J, see #1779
2012-02-03 06:03:38 -08:00
Roland
1758a50789 update to Havoc’s latest config lib from the serializable branch 2012-02-03 15:02:21 +01:00
Jonas Bonér
278658e031 Merge branch 'wip-fix-multi-jvm-test-jboner' of github.com:jboner/akka into wip-fix-multi-jvm-test-jboner 2012-02-03 15:00:55 +01:00
Viktor Klang
3267ce51a0 Merge branch 'master' of github.com:jboner/akka 2012-02-03 15:00:38 +01:00
Jonas Bonér
ec7772b786 Fixes bug in RandomRouter.
Fixes an interesting "bug" in RandomRouter. Tests failed on my 12 core Linux box. After some investigation I found that it hanged randomly inside the SecureRandom seed generator.

[JVM-Node4] "main" prio=10 tid=0x0000000001701000 nid=0x1942 runnable [0x00007fee631dc000]
[JVM-Node4]    java.lang.Thread.State: RUNNABLE
[JVM-Node4]   at java.io.FileInputStream.readBytes(Native Method)
[JVM-Node4]   at java.io.FileInputStream.read(FileInputStream.java:236)
[JVM-Node4]   at sun.security.provider.SeedGenerator$URLSeedGenerator.getSeedBytes(SeedGenerator.java:509)
[JVM-Node4]   at sun.security.provider.SeedGenerator.generateSeed(SeedGenerator.java:135)
[JVM-Node4]   at sun.security.provider.SecureRandom.engineGenerateSeed(SecureRandom.java:131)
[JVM-Node4]   at sun.security.provider.SecureRandom.engineNextBytes(SecureRandom.java:188)
[JVM-Node4]   - locked <0x00000007c3d84130> (a sun.security.provider.SecureRandom)
[JVM-Node4]   at java.security.SecureRandom.nextBytes(SecureRandom.java:450)
[JVM-Node4]   - locked <0x00000007c3d843d0> (a java.security.SecureRandom)
[JVM-Node4]   at java.security.SecureRandom.next(SecureRandom.java:472)
[JVM-Node4]   at java.util.Random.nextInt(Random.java:272)
[JVM-Node4]   at akka.routing.RandomLike$class.getNext$2(Routing.scala:466)

Puzzled at first I Googled the problem and found this bug report: http://bugs.sun.com/view_bug.do?bug_id=6521844

In short it is designed to block on /dev/random (on Linux) when the entropy pool is empty until some "environmental noise is gathered".

From the Linux manual:
"Hanging at generateSeed is not a bug, since that's what was designed:
    When the entropy pool is empty, reads from /dev/random will block until
    additional environmental noise is gathered.
    (Source: Linux Programmer's Manual, section 4)"

Fix was to switch to java.util.Random.

Fun one

Signed-off-by: Jonas Bonér <jonas@jonasboner.com>
2012-02-03 14:56:50 +01:00
Roland
93a506db5f fix SchedulerSpec, this time for real. 2012-02-03 14:52:10 +01:00
Roland
035a1d28a0 fix SchedulerSpec and ActorTimeoutSpec 2012-02-03 14:45:58 +01:00
patriknw
370e2d9818 Merge pull request #282 from jboner/wip-1310-err2-patriknw
Second stab at revised error handling. See #1310
2012-02-03 05:07:06 -08:00
Viktor Klang
22530b51e0 Adding more Scaladoc to Await and Awaitable 2012-02-03 13:59:38 +01:00
Patrik Nordwall
09e13e271b Merge branch 'master' into wip-1310-err2-patriknw
Conflicts:
	akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala
	akka-cluster/src/main/scala/akka/cluster/Cluster.scala
	akka-cluster/src/main/scala/akka/cluster/TransactionLog.scala
	akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
2012-02-03 13:57:28 +01:00
Viktor Klang
fc144cf204 ScalaDoc can be stupid 2012-02-03 13:49:07 +01:00
Roland Kuhn
f62b50a41b add missing parens 2012-02-03 11:44:36 +01:00
Roland Kuhn
8090769730 change “Class[_]” into proper Java raw generics 2012-02-03 11:42:59 +01:00
Viktor Klang
30af127207 Merge branch 'master' of github.com:jboner/akka 2012-02-03 11:18:34 +01:00
Patrik Nordwall
eb4fc53051 Added cause to LogEventException and ajdusted logging in Future. See #1310 2012-02-03 11:15:42 +01:00
Roland
b57c9e8f5e update docs for SLF4J, see #1779 2012-02-03 10:47:56 +01:00
Patrik Nordwall
44b5ff056a Added reportFailure for logging in ExecutionContext. See #1310 2012-02-03 10:37:31 +01:00
Viktor Klang
96412ba1ad Adding ExecutionContext docs for futures, and adding a Java-friendly ExecutionContexts object 2012-02-03 10:35:05 +01:00
Roland
e5003c9795 use correct logSource in ActorLogging trait, fixes #1780 2012-02-03 10:11:03 +01:00
Roland Kuhn
f121e33231 Merge pull request #292 from jboner/wip-1644-programmatic-deploy-∂π
make it possible to programmatically deploy (e.g. remotely), see #1644
2012-02-03 00:54:51 -08:00
Roland
45140b465e Merge remote-tracking branch 'origin/master' into wip-1644-programmatic-deploy-∂π 2012-02-03 09:49:04 +01:00
Roland
c699c3d32d include review comments
- rename NoScope -> NoScopeGiven
- add scaladoc for scopes
- add some return types
2012-02-03 09:43:23 +01:00
Viktor Klang
8193e61aee Renaming tryRecover to recoverWith as in SIP14, adding parameter to foreach 2012-02-03 09:25:56 +01:00
Roland
76bba1f530 remote deploy docs & provider.getExternalAddressFor (see #1765) 2012-02-03 09:16:18 +01:00
Roland
d8fa7578e1 move RemoteServerStarted message to NettyRemoteTransport, fixes #1771
- also make port=0 (auto) for two remote tests (config&deployer)
- also fix remote-sample conf files to configure “netty” section
2012-02-02 11:46:52 +01:00
Viktor Klang
d43d41d100 Merge branch 'master' of github.com:jboner/akka 2012-02-02 09:23:01 +01:00
Viktor Klang
c201d28fbb #1773 bites the dust 2012-02-02 09:22:26 +01:00
Jonas Bonér
7bb49d4a90 Refactored multi-jvm tests to use other ports than regular remote testing, also the ability to configure a specific port range for each test.
Signed-off-by: Jonas Bonér <jonas@jonasboner.com>
2012-02-02 09:03:50 +01:00
Patrik Nordwall
11b30fc188 Fixed config in akka-sample-remote. See #1766 2012-02-01 20:59:04 +01:00
viktorklang
1e347bab11 Merge pull request #293 from jboner/wip-1757-idlestatehandler-√
Ripping out ReadTimeout and adding Idle timeout and fixing issues with c...
2012-02-01 09:26:45 -08:00
Patrik Nordwall
5033647176 Fixed things from review. See #1310 2012-02-01 17:38:12 +01:00
Viktor Klang
d0d391b1dc Renaming NettyRemoteSupport to NettyRemoteTransport everywhere 2012-02-01 16:34:20 +01:00
Viktor Klang
e58d0d9940 Switching to an orchestrated teardown on READ_TIMEOUT 2012-02-01 16:20:51 +01:00
Viktor Klang
9421f37f96 Ripping out ReadTimeout and adding Idle timeout and fixing issues with configured port on top of that 2012-02-01 16:06:30 +01:00
Jonas Bonér
34dc791034 Refactored multi-jvm tests to use other ports than regular remote testing, also the ability to configure a specific port range for each test.
Signed-off-by: Jonas Bonér <jonas@jonasboner.com>
2012-02-01 15:48:01 +01:00
Jonas Bonér
0a7e37910e Added stack trace to the logging of remote client/server errors. Added helper methods to make a string representation of stack trace to AkkaException object.
Signed-off-by: Jonas Bonér <jonas@jonasboner.com>
2012-02-01 15:46:40 +01:00
Roland
10974acfe8 make it possible to programmatically deploy (e.g. remotely), see #1644
- add Deploy to Props, which is used as the basis (overridden by
  configuration)
- utilize general mechanism .withFallback (introduced on Deploy,
  RouterConfig and Scope)
- actually pass Props over the wire when deploying remotely in order to
  retain settings (this was an oversight before)
- write tests for the new functionality
2012-02-01 15:19:51 +01:00
viktorklang
d8d0f4486f Merge pull request #284 from jboner/wip-1735-fix-pipe-to-√
Removing pipeTo from akka.actor, renamed pipeTo(f,a) to pipe(f,a)
2012-02-01 05:57:44 -08:00
Viktor Klang
009a1afe89 Making createAsker private, adding docs for 'to', changing Java API to be symmetric to Java 2012-02-01 14:54:54 +01:00