From c1152a0b42d14873d27d60cc505c8af3fd89887a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Bone=CC=81r?= <jonas@jonasboner.com>
Date: Thu, 27 Oct 2011 15:14:15 +0200
Subject: [PATCH] Fixed minor stuff in Gossiper after code review feedback.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jonas Bonér <jonas@jonasboner.com>
---
 .../src/main/scala/akka/remote/Gossiper.scala | 25 ++++++++-----------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/akka-remote/src/main/scala/akka/remote/Gossiper.scala b/akka-remote/src/main/scala/akka/remote/Gossiper.scala
index 73e975ad91..95adec1edf 100644
--- a/akka-remote/src/main/scala/akka/remote/Gossiper.scala
+++ b/akka-remote/src/main/scala/akka/remote/Gossiper.scala
@@ -14,7 +14,7 @@ import akka.remote.RemoteProtocol.RemoteSystemDaemonMessageType._
 import java.net.InetSocketAddress
 import java.util.concurrent.atomic.AtomicReference
 import java.util.concurrent.TimeUnit
-import java.util.Random
+import java.security.SecureRandom
 import System.{ currentTimeMillis ⇒ newTimestamp }
 
 import scala.collection.immutable.Map
@@ -112,8 +112,8 @@ class Gossiper(remote: Remote) {
   private val address = new InetSocketAddress(app.hostname, app.port)
   private val nodeFingerprint = address.##
 
-  private val random = new Random(newTimestamp)
-  private val initalDelayForGossip = 5 seconds // FIXME make configurablev
+  private val random = SecureRandom.getInstance("SHA1PRNG")
+  private val initalDelayForGossip = 5 seconds // FIXME make configurable
   private val gossipFrequency = 1 seconds // FIXME make configurable
   private val timeUnit = {
     assert(gossipFrequency.unit == initalDelayForGossip.unit)
@@ -216,14 +216,12 @@ class Gossiper(remote: Remote) {
       if (random.nextDouble() < probability) gossipTo(oldUnavailableNodes)
     }
 
-    if (!gossipedToSeed || oldAvailableNodesSize < 1) {
-      // 3. gossip to a seed for facilitating partition healing
-      if (seeds.head != address) {
-        if (oldAvailableNodesSize == 0) gossipTo(seeds)
-        else {
-          val probability = 1.0 / oldAvailableNodesSize + oldUnavailableNodesSize
-          if (random.nextDouble() <= probability) gossipTo(seeds)
-        }
+    // 3. gossip to a seed for facilitating partition healing
+    if ((!gossipedToSeed || oldAvailableNodesSize < 1) && (seeds.head != address)) {
+      if (oldAvailableNodesSize == 0) gossipTo(seeds)
+      else {
+        val probability = 1.0 / oldAvailableNodesSize + oldUnavailableNodesSize
+        if (random.nextDouble() <= probability) gossipTo(seeds)
       }
     }
   }
@@ -247,17 +245,14 @@ class Gossiper(remote: Remote) {
 
         case Some(Failure(cause)) ⇒
           app.eventHandler.error(cause, this, cause.toString)
-          throw cause
 
         case None ⇒
           val error = new RemoteException("Gossip to [%s] timed out".format(connection.address))
           app.eventHandler.error(error, this, error.toString)
-          throw error
       }
     } catch {
       case e: Exception ⇒
         app.eventHandler.error(e, this, "Could not gossip to [%s] due to: %s".format(connection.address, e.toString))
-        throw e
     }
 
     seeds exists (peer == _)
@@ -274,7 +269,7 @@ class Gossiper(remote: Remote) {
 
     val oldAvailableNodes = oldGossip.availableNodes
     val oldUnavailableNodes = oldGossip.unavailableNodes
-    val newlyDetectedUnavailableNodes = oldAvailableNodes filter (!failureDetector.isAvailable(_))
+    val newlyDetectedUnavailableNodes = oldAvailableNodes filterNot failureDetector.isAvailable
 
     if (!newlyDetectedUnavailableNodes.isEmpty) { // we have newly detected nodes marked as unavailable
       val newAvailableNodes = oldAvailableNodes diff newlyDetectedUnavailableNodes