Commit graph

10402 commits

Author SHA1 Message Date
Patrik Nordwall
2cd38e2004 Merge branch 'master' into wip-2263-gossip-unreachable-patriknw
Conflicts:
	akka-cluster/src/main/scala/akka/cluster/Cluster.scala
2012-06-25 20:59:50 +02:00
Patrik Nordwall
97bf8c4bb5 Cleanup of comments, see #2263 2012-06-25 20:46:48 +02:00
patriknw
58dcff2d7e Merge pull request #556 from akka/wip-2219-seed-nodes-patriknw
Reintroduce 'seed' nodes, see #2219
2012-06-25 11:42:57 -07:00
Patrik Nordwall
20fc0c42a2 Merge branch 'master' into wip-2219-seed-nodes-patriknw
Conflicts:
	akka-cluster/src/main/scala/akka/cluster/AccrualFailureDetector.scala
	akka-cluster/src/main/scala/akka/cluster/ClusterSettings.scala
2012-06-25 20:40:06 +02:00
Patrik Nordwall
738565883b Add join-seed-node-timeout config, see #2219 2012-06-25 20:20:11 +02:00
Jonas Bonér
5f1016c57b Merged with master 2012-06-25 17:27:05 +02:00
Björn Antonsson
de7a14ee01 Merge branch 'master' into wip-2230-race-in-test-conductor-shutdown-ban 2012-06-25 15:56:25 +02:00
Patrik Nordwall
66bcca8a91 Shorter gossip interval still needed 2012-06-25 15:46:30 +02:00
Patrik Nordwall
cba64403a7 Don't gossip to unreachable, see #2263
* Also, ignore gossip from unreachable, see #2264
* Update gossip protocol in cluster doc
2012-06-25 15:23:15 +02:00
Björn Antonsson
e2037e254b Merge branch 'master' into wip-2230-race-in-test-conductor-shutdown-ban 2012-06-25 14:40:12 +02:00
viktorklang
32604bb3d8 Merge pull request #558 from akka/wip-2260-new-kid-must-be-watchable-√
#2260 - making sure that Terminated deregisters the watch from the kid a...
2012-06-25 03:28:53 -07:00
Viktor Klang
c402d5e809 Switching to our embedded Murmur hash 2012-06-25 12:24:35 +02:00
Viktor Klang
29377e0b41 #2260 - making sure that Terminated deregisters the watch from the kid and then propagates it to the normal receive 2012-06-25 12:12:30 +02:00
Viktor Klang
ed1078718a Merge branch 'master' of github.com:akka/akka 2012-06-25 11:43:39 +02:00
Viktor Klang
cc48643467 Upgrading Netty to 3.5.1-Final 2012-06-25 11:41:40 +02:00
Roland
785bda6663 add simple script for priming the REPL 2012-06-25 11:40:04 +02:00
Viktor Klang
1500be10e6 Merge branch 'master' of github.com:akka/akka 2012-06-25 11:33:58 +02:00
Viktor Klang
382a96a189 Rewriting the polling for 0mq so that we can discern EAGAIN from empty poll 2012-06-25 11:31:27 +02:00
Roland
508b108afc Merge branch 'master' of github.com:akka/akka 2012-06-25 11:27:22 +02:00
Roland
c63481cda4 fix up one last test, see #2031 2012-06-25 11:20:51 +02:00
Roland
3c15dcdfb8 Merge branch 'wip-2031-sync-actorOf-3.0-∂π'
Some tests fail ATM, but I prefer not to hide semantic fixes within
merge commits.
2012-06-25 11:12:08 +02:00
Viktor Klang
f8f0ec1746 Merge branch 'master' of github.com:akka/akka 2012-06-25 11:02:45 +02:00
Roland
1400ea605b clarify system.actorOf special semantics section, see #2031 2012-06-25 10:49:49 +02:00
Viktor Klang
a0ddb37745 Attempt to deal with race between sending and receving multi-framed messages 2012-06-25 10:32:21 +02:00
patriknw
555998b2c1 Merge pull request #553 from akka/wip-2249-heartbeats-after-join-patriknw
Start sending heartbeats immediately when joining, see #2249
2012-06-25 01:26:18 -07:00
patriknw
24e49b1024 Merge pull request #551 from akka/wip-2250-singleton-cluster-merge-patriknw
Avoid gossip merge when singleton cluster, see #2250
2012-06-25 01:25:14 -07:00
Patrik Nordwall
e817b10a93 Remove fixme 2012-06-25 08:34:30 +02:00
Patrik Nordwall
526820bdb7 Fix failing TransitionSpec, failed due to wrong test, see #2259 2012-06-25 08:32:55 +02:00
Jonas Bonér
5fe9dcaf4e Cleaned up stuff around file-based mailbox 2012-06-24 14:43:46 +02:00
Björn Antonsson
9710cceacb Changes based on review. See #2230 2012-06-21 16:10:04 +02:00
Björn Antonsson
4e49b2c843 Make MultiNodeSpec shut down the conductor after other nodes. See #2230 2012-06-21 13:17:05 +02:00
Patrik Nordwall
91268365c1 Temporary ignore, see #2259 2012-06-21 12:30:26 +02:00
Patrik Nordwall
42078e7083 Reintroduce 'seed' nodes, see #2219
* Implement the join to seed nodes process
  When a new node is started started it sends a message to all
  seed nodes and then sends join command to the one that answers
  first.
* Configuration of seed-nodes and auto-join
* New JoinSeedNodeSpec that verifies the auto join to seed nodes
* In tests seed nodes are configured by overriding seedNodes
  function, since addresses are not known before start
* Deputy nodes are the live members of the seed nodes (not sure if
  that will be the final solution, see ticket 2252
* Updated cluster.rst with latest info about deputy and seed nodes
2012-06-21 11:05:02 +02:00
Patrik Nordwall
a7c8d7da10 Remove unnecessary clock param in one of AccrualFailureDetector's constructors 2012-06-21 11:05:02 +02:00
viktorklang
980cc8ec54 Merge pull request #555 from dev10/wip-rename-ssl-rng
Renamed AESCounterRNG classes to be a bit more self-explanatory
2012-06-21 01:15:34 -07:00
Peter Badenhorst
8fbe09cf13 Merge branch 'wip-rename-ssl-rng' of github.com:dev10/akka into wip-rename-ssl-rng 2012-06-21 09:40:50 +02:00
Peter Badenhorst
5b36334003 Renamed AESCounterRNG classes to be a bit more self-explanatory
Added some comments
2012-06-21 09:32:05 +02:00
Peter Badenhorst
26d56f1540 Renamed AESCounterRNG classes to be a bit more self-explanatory
Added some comments
2012-06-20 19:06:12 +02:00
Viktor Klang
07293f2584 When the Cipher changes were reverted, this also got reverted, so fixing it 2012-06-20 16:41:17 +02:00
Viktor Klang
8414063afe Revert "Somehow the code for the fast and the secure was flipped"
This reverts commit 95419ba82f.
2012-06-20 16:40:29 +02:00
Viktor Klang
3b771c1590 Formatting 2012-06-20 16:21:48 +02:00
viktorklang
7700b04bfb Merge pull request #554 from akka/wip-ssl-unbroken-√
Wip ssl unbroken √
2012-06-20 07:03:29 -07:00
Viktor Klang
f2a857046d Using softer language and warning about using 0 threads for the execution handler 2012-06-20 15:59:52 +02:00
Viktor Klang
3f86abaac8 Review reformatting 2012-06-20 15:50:22 +02:00
Viktor Klang
ebcdb5d017 Removing SSL debug residue 2012-06-20 15:45:50 +02:00
Viktor Klang
cb4831d52e Rearchitecting the reconnection semantics since we need to handle the ssl handshake there as well 2012-06-20 15:19:24 +02:00
Viktor Klang
6be3acacec I think we have a winner 2012-06-20 15:01:14 +02:00
Viktor Klang
8fcffcab00 Doing a roundtrip before issuing the wave of messages 2012-06-20 14:43:11 +02:00
Viktor Klang
28ee78bfd5 Adding support for being able to _not_ use ExecutionHandler by setting the poolsize to 0 2012-06-20 14:29:41 +02:00
Viktor Klang
7b792a7b93 Merge branch 'master' into wip-ssl-unbroken-√ 2012-06-20 14:15:16 +02:00