You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2013/12/14 09:42:34 UTC
[50/50] [abbrv] git commit: Merge pull request #259 from
pwendell/scala-2.10
Merge pull request #259 from pwendell/scala-2.10
Migration to Scala 2.10
== Below description was written by Prashant Sharma ==
This PR migrates spark to scala 2.10.
Summary of changes apart from scala 2.10 migration:
(has no implications for user.)
1. Migrated Akka to 2.2.3.
Does not use remote death watch for it has a bug, where it tries to send message to dead node infinitely.
Uses an indestructible actorsystem which tolerates errors only on executors.
(Might be useful for user.)
4. New configuration settings introduced:
System.getProperty("spark.akka.heartbeat.pauses", "600")
System.getProperty("spark.akka.failure-detector.threshold", "300.0")
System.getProperty("spark.akka.heartbeat.interval", "1000")
Defaults for these are fairly large to only disable Failure detector that comes with akka. The reason for doing so is we have our own failure detector like mechanism in place and then this is just an overhead on top of that + it leads to a lot of false positives. But with these properties it is possible to enable them. A good use case for enabling it could be when someone wants spark to be sensitive (in a controllable manner ofc.) to GC pauses/Network lags and quickly evict executors that experienced it. More information is included in configuration.md
Once we have the SPARK-544 merged, I had like to deprecate atleast these akka properties and may be others too.
This PR is duplicate of #221(where all the discussion happened.) for that one pointed to master this one points to scala-2.10 branch.
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/97ac0601
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/97ac0601
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/97ac0601
Branch: refs/heads/master
Commit: 97ac06018206b593600594605be241d0cd706e08
Parents: d2efe13 7ac944f
Author: Patrick Wendell <pw...@gmail.com>
Authored: Sat Dec 14 00:22:45 2013 -0800
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Sat Dec 14 00:22:45 2013 -0800
----------------------------------------------------------------------
.gitignore | 1 +
README.md | 5 +-
assembly/pom.xml | 16 +-
bagel/pom.xml | 12 +-
bin/compute-classpath.cmd | 2 +-
bin/compute-classpath.sh | 2 +-
core/pom.xml | 29 +-
.../apache/spark/network/netty/FileClient.java | 2 -
.../apache/spark/network/netty/FileServer.java | 1 -
.../org/apache/spark/MapOutputTracker.scala | 29 +-
.../scala/org/apache/spark/Partitioner.scala | 8 +-
.../scala/org/apache/spark/SparkContext.scala | 77 +-
.../main/scala/org/apache/spark/SparkEnv.scala | 13 +-
.../main/scala/org/apache/spark/TaskState.scala | 3 +-
.../apache/spark/api/java/JavaDoubleRDD.scala | 9 +-
.../org/apache/spark/api/java/JavaPairRDD.scala | 63 +-
.../org/apache/spark/api/java/JavaRDD.scala | 7 +-
.../org/apache/spark/api/java/JavaRDDLike.scala | 32 +-
.../spark/api/java/JavaSparkContext.scala | 60 +-
.../java/JavaSparkContextVarargsWorkaround.java | 1 -
.../api/java/function/FlatMapFunction.scala | 4 +-
.../api/java/function/FlatMapFunction2.scala | 4 +-
.../spark/api/java/function/Function.java | 8 +-
.../spark/api/java/function/Function2.java | 8 +-
.../spark/api/java/function/Function3.java | 8 +-
.../api/java/function/PairFlatMapFunction.java | 12 +-
.../spark/api/java/function/PairFunction.java | 12 +-
.../org/apache/spark/api/python/PythonRDD.scala | 10 +-
.../spark/api/python/PythonWorkerFactory.scala | 4 +-
.../org/apache/spark/deploy/ExecutorState.scala | 3 +-
.../apache/spark/deploy/LocalSparkCluster.scala | 13 +-
.../org/apache/spark/deploy/client/Client.scala | 48 +-
.../spark/deploy/master/ApplicationState.scala | 3 +-
.../master/FileSystemPersistenceEngine.scala | 6 +-
.../org/apache/spark/deploy/master/Master.scala | 69 +-
.../spark/deploy/master/RecoveryState.scala | 4 +-
.../spark/deploy/master/WorkerState.scala | 4 +-
.../master/ZooKeeperPersistenceEngine.scala | 6 +-
.../deploy/master/ui/ApplicationPage.scala | 5 +-
.../spark/deploy/master/ui/IndexPage.scala | 4 +-
.../spark/deploy/master/ui/MasterWebUI.scala | 2 +-
.../org/apache/spark/deploy/worker/Worker.scala | 48 +-
.../spark/deploy/worker/ui/IndexPage.scala | 5 +-
.../spark/deploy/worker/ui/WorkerWebUI.scala | 13 +-
.../executor/CoarseGrainedExecutorBackend.scala | 23 +-
.../org/apache/spark/executor/Executor.scala | 2 +-
.../spark/network/ConnectionManager.scala | 8 +-
.../spark/network/ConnectionManagerTest.scala | 4 +-
.../org/apache/spark/rdd/AsyncRDDActions.scala | 3 +-
.../scala/org/apache/spark/rdd/BlockRDD.scala | 4 +-
.../org/apache/spark/rdd/CartesianRDD.scala | 3 +-
.../org/apache/spark/rdd/CheckpointRDD.scala | 14 +-
.../org/apache/spark/rdd/CoalescedRDD.scala | 3 +-
.../apache/spark/rdd/DoubleRDDFunctions.scala | 5 +-
.../scala/org/apache/spark/rdd/EmptyRDD.scala | 5 +-
.../org/apache/spark/rdd/FilteredRDD.scala | 3 +-
.../org/apache/spark/rdd/FlatMappedRDD.scala | 3 +-
.../scala/org/apache/spark/rdd/GlommedRDD.scala | 3 +-
.../scala/org/apache/spark/rdd/JdbcRDD.scala | 4 +-
.../org/apache/spark/rdd/MapPartitionsRDD.scala | 4 +-
.../scala/org/apache/spark/rdd/MappedRDD.scala | 4 +-
.../apache/spark/rdd/OrderedRDDFunctions.scala | 10 +-
.../org/apache/spark/rdd/PairRDDFunctions.scala | 33 +-
.../spark/rdd/ParallelCollectionRDD.scala | 8 +-
.../apache/spark/rdd/PartitionPruningRDD.scala | 6 +-
.../scala/org/apache/spark/rdd/PipedRDD.scala | 3 +-
.../main/scala/org/apache/spark/rdd/RDD.scala | 64 +-
.../apache/spark/rdd/RDDCheckpointData.scala | 4 +-
.../scala/org/apache/spark/rdd/SampledRDD.scala | 5 +-
.../spark/rdd/SequenceFileRDDFunctions.scala | 11 +-
.../org/apache/spark/rdd/ShuffledRDD.scala | 6 +-
.../org/apache/spark/rdd/SubtractedRDD.scala | 5 +-
.../scala/org/apache/spark/rdd/UnionRDD.scala | 7 +-
.../apache/spark/rdd/ZippedPartitionsRDD.scala | 9 +-
.../scala/org/apache/spark/rdd/ZippedRDD.scala | 6 +-
.../apache/spark/scheduler/DAGScheduler.scala | 13 +-
.../apache/spark/scheduler/SchedulingMode.scala | 2 +-
.../apache/spark/scheduler/TaskLocality.scala | 4 +-
.../scheduler/cluster/ClusterScheduler.scala | 5 +-
.../cluster/CoarseGrainedSchedulerBackend.scala | 23 +-
.../cluster/SimrSchedulerBackend.scala | 2 +-
.../cluster/SparkDeploySchedulerBackend.scala | 2 +-
.../scheduler/cluster/TaskResultGetter.scala | 4 +-
.../mesos/CoarseMesosSchedulerBackend.scala | 2 +-
.../org/apache/spark/storage/BlockManager.scala | 7 +-
.../spark/storage/BlockManagerMaster.scala | 16 +-
.../spark/storage/BlockManagerMasterActor.scala | 7 +-
.../apache/spark/storage/ThreadingTest.scala | 2 +-
.../apache/spark/ui/jobs/JobProgressUI.scala | 2 +-
.../spark/ui/storage/BlockManagerUI.scala | 2 +-
.../scala/org/apache/spark/util/AkkaUtils.scala | 79 +-
.../spark/util/IndestructibleActorSystem.scala | 68 +
.../org/apache/spark/util/MetadataCleaner.scala | 3 +-
.../apache/spark/util/TimeStampedHashMap.scala | 2 +-
.../scala/org/apache/spark/util/Utils.scala | 5 +-
.../spark/util/collection/OpenHashMap.scala | 3 +-
.../spark/util/collection/OpenHashSet.scala | 11 +-
.../collection/PrimitiveKeyOpenHashMap.scala | 7 +-
.../spark/util/collection/PrimitiveVector.scala | 4 +-
.../org/apache/spark/AccumulatorSuite.scala | 32 +-
.../org/apache/spark/CheckpointSuite.scala | 5 +-
.../org/apache/spark/DistributedSuite.scala | 3 +-
.../scala/org/apache/spark/DriverSuite.scala | 2 +-
.../apache/spark/MapOutputTrackerSuite.scala | 14 +-
.../scala/org/apache/spark/UnpersistSuite.scala | 2 +-
.../scala/org/apache/spark/rdd/RDDSuite.scala | 8 +-
.../spark/scheduler/SparkListenerSuite.scala | 2 +-
.../cluster/TaskResultGetterSuite.scala | 4 +-
.../org/apache/spark/storage/BlockIdSuite.scala | 2 +-
.../spark/storage/BlockManagerSuite.scala | 2 +-
.../scala/org/apache/spark/ui/UISuite.scala | 1 -
.../apache/spark/util/SizeEstimatorSuite.scala | 72 +-
docs/_config.yml | 2 +-
docs/_plugins/copy_api_dirs.rb | 2 +-
docs/configuration.md | 23 +-
examples/pom.xml | 26 +-
.../org/apache/spark/examples/JavaLogQuery.java | 2 +-
.../org/apache/spark/examples/JavaPageRank.java | 3 +-
.../apache/spark/examples/JavaWordCount.java | 2 +-
.../apache/spark/mllib/examples/JavaALS.java | 1 -
.../streaming/examples/ActorWordCount.scala | 7 +-
.../streaming/examples/ZeroMQWordCount.scala | 8 +-
mllib/pom.xml | 12 +-
.../spark/mllib/util/MFDataGenerator.scala | 2 +-
.../spark/mllib/clustering/JavaKMeansSuite.java | 4 +-
.../mllib/recommendation/JavaALSSuite.java | 2 -
pom.xml | 169 +-
project/SparkBuild.scala | 145 +-
pyspark | 2 +-
pyspark2.cmd | 2 +-
python/pyspark/rdd.py | 4 +-
repl-bin/pom.xml | 8 +-
repl-bin/src/deb/bin/run | 2 +-
repl/lib/scala-jline.jar | Bin 158463 -> 0 bytes
repl/pom.xml | 18 +-
.../main/scala/org/apache/spark/repl/Main.scala | 8 +-
.../org/apache/spark/repl/SparkExprTyper.scala | 109 ++
.../org/apache/spark/repl/SparkILoop.scala | 944 +++++-----
.../org/apache/spark/repl/SparkILoopInit.scala | 143 ++
.../org/apache/spark/repl/SparkIMain.scala | 1681 ++++++++++--------
.../org/apache/spark/repl/SparkISettings.scala | 63 -
.../org/apache/spark/repl/SparkImports.scala | 108 +-
.../spark/repl/SparkJLineCompletion.scala | 206 ++-
.../apache/spark/repl/SparkJLineReader.scala | 65 +-
.../apache/spark/repl/SparkMemberHandlers.scala | 109 +-
.../scala/org/apache/spark/repl/ReplSuite.scala | 178 +-
run-example | 2 +-
run-example2.cmd | 2 +-
spark-class | 4 +-
streaming/pom.xml | 22 +-
.../org/apache/spark/streaming/DStream.scala | 37 +-
.../spark/streaming/DStreamCheckpointData.scala | 6 +-
.../spark/streaming/NetworkInputTracker.scala | 2 +-
.../spark/streaming/PairDStreamFunctions.scala | 63 +-
.../spark/streaming/StreamingContext.scala | 44 +-
.../spark/streaming/api/java/JavaDStream.scala | 8 +-
.../streaming/api/java/JavaDStreamLike.scala | 79 +-
.../streaming/api/java/JavaPairDStream.scala | 93 +-
.../api/java/JavaStreamingContext.scala | 108 +-
.../dstream/ConstantInputDStream.scala | 3 +-
.../streaming/dstream/FileInputDStream.scala | 12 +-
.../streaming/dstream/FilteredDStream.scala | 3 +-
.../dstream/FlatMapValuedDStream.scala | 3 +-
.../streaming/dstream/FlatMappedDStream.scala | 3 +-
.../streaming/dstream/FlumeInputDStream.scala | 3 +-
.../streaming/dstream/ForEachDStream.scala | 3 +-
.../streaming/dstream/GlommedDStream.scala | 3 +-
.../spark/streaming/dstream/InputDStream.scala | 4 +-
.../streaming/dstream/KafkaInputDStream.scala | 23 +-
.../streaming/dstream/MQTTInputDStream.scala | 3 +-
.../dstream/MapPartitionedDStream.scala | 3 +-
.../streaming/dstream/MapValuedDStream.scala | 3 +-
.../spark/streaming/dstream/MappedDStream.scala | 3 +-
.../streaming/dstream/NetworkInputDStream.scala | 13 +-
.../dstream/PluggableInputDStream.scala | 3 +-
.../streaming/dstream/QueueInputDStream.scala | 4 +-
.../streaming/dstream/RawInputDStream.scala | 4 +-
.../dstream/ReducedWindowedDStream.scala | 9 +-
.../streaming/dstream/ShuffledDStream.scala | 3 +-
.../streaming/dstream/SocketInputDStream.scala | 6 +-
.../spark/streaming/dstream/StateDStream.scala | 4 +-
.../streaming/dstream/TransformedDStream.scala | 3 +-
.../spark/streaming/dstream/UnionDStream.scala | 5 +-
.../streaming/dstream/WindowedDStream.scala | 7 +-
.../streaming/receivers/ActorReceiver.scala | 35 +-
.../streaming/receivers/ZeroMQReceiver.scala | 13 +-
.../streaming/util/MasterFailureTest.scala | 45 +-
.../apache/spark/streaming/JavaAPISuite.java | 88 +-
.../apache/spark/streaming/JavaTestUtils.scala | 22 +-
.../spark/streaming/CheckpointSuite.scala | 36 +-
.../apache/spark/streaming/TestSuiteBase.scala | 29 +-
tools/pom.xml | 12 +-
.../tools/JavaAPICompletenessChecker.scala | 4 +-
yarn/pom.xml | 10 +-
.../spark/deploy/yarn/WorkerLauncher.scala | 17 +-
.../deploy/yarn/YarnAllocationHandler.scala | 4 +-
196 files changed, 3449 insertions(+), 2900 deletions(-)
----------------------------------------------------------------------