diff options
| author | Mosharaf Chowdhury <mosharaf@mosharaf-ubuntu.(none)> | 2010-11-06 16:54:55 -0700 |
|---|---|---|
| committer | Mosharaf Chowdhury <mosharaf@mosharaf-ubuntu.(none)> | 2010-11-06 16:54:55 -0700 |
| commit | c37c74919f31ec69e359786bc70d40b7d7319e22 (patch) | |
| tree | 14848dee9783eb41d781f16a9c65bc47315544d6 | |
| parent | 878d157ce3f3b625b009ca53cf53c2f2481d2698 (diff) | |
| download | spark-c37c74919f31ec69e359786bc70d40b7d7319e22.tar.gz spark-c37c74919f31ec69e359786bc70d40b7d7319e22.tar.bz2 spark-c37c74919f31ec69e359786bc70d40b7d7319e22.zip | |
Bug fix + minor changes
| -rw-r--r-- | conf/java-opts | 2 | ||||
| -rw-r--r-- | src/scala/spark/Broadcast.scala | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/conf/java-opts b/conf/java-opts index c3c7a9c0e3..60b564d73b 100644 --- a/conf/java-opts +++ b/conf/java-opts @@ -1 +1 @@ --Dspark.broadcast.MasterHostAddress=127.0.0.1 -Dspark.broadcast.MasterTrackerPort=11111 -Dspark.broadcast.BlockSize=256 -Dspark.broadcast.MaxRetryCount=2 -Dspark.broadcast.TrackerSocketTimeout=50000 -Dspark.broadcast.ServerSocketTimout=10000 -Dspark.broadcast.MaxChatTime=500 +-Dspark.broadcast.MasterHostAddress=127.0.0.1 -Dspark.broadcast.MasterTrackerPort=11111 -Dspark.broadcast.BlockSize=256 -Dspark.broadcast.MaxRetryCount=2 -Dspark.broadcast.TrackerSocketTimeout=50000 -Dspark.broadcast.ServerSocketTimeout=10000 -Dspark.broadcast.MaxChatTime=500 diff --git a/src/scala/spark/Broadcast.scala b/src/scala/spark/Broadcast.scala index 62b34d29a3..0a49514933 100644 --- a/src/scala/spark/Broadcast.scala +++ b/src/scala/spark/Broadcast.scala @@ -669,7 +669,7 @@ extends BroadcastRecipe with Logging { } } if (clientSocket != null) { - logInfo ("Guide:Accepted new client connection:" + clientSocket) + logInfo ("Guide: Accepted new client connection:" + clientSocket) try { threadPool.execute (new GuideSingleRequest (clientSocket)) } catch { @@ -824,7 +824,7 @@ extends BroadcastRecipe with Logging { } } if (clientSocket != null) { - logInfo ("Serve:Accepted new client connection:" + clientSocket) + logInfo ("Serve: Accepted new client connection:" + clientSocket) try { threadPool.execute (new ServeSingleRequest (clientSocket)) } catch { @@ -1000,7 +1000,7 @@ extends BroadcastRecipe with Logging { @serializable case class SourceInfo (val hostAddress: String, val listenPort: Int, val totalBlocks: Int, val totalBytes: Int) - extends Logging { +extends Logging { var currentLeechers = 0 var receptionFailed = false @@ -1164,7 +1164,7 @@ extends Logging { trackMV = new TrackMultipleValues trackMV.setDaemon (true) trackMV.start - logInfo ("TrackMultipleValues started") + logInfo ("TrackMultipleValues started...") } initialized = true |