aboutsummaryrefslogtreecommitdiff
path: root/streaming
Commit message (Collapse)AuthorAgeFilesLines
* Miscellaneous fixes from code review.Matei Zaharia2014-01-013-6/+6
| | | | | | Also replaced SparkConf.getOrElse with just a "get" that takes a default value, and added getInt, getLong, etc to make code that uses this simpler later on.
* Merge remote-tracking branch 'apache/master' into conf2Matei Zaharia2014-01-017-14/+0
|\ | | | | | | | | | | | | Conflicts: core/src/main/scala/org/apache/spark/SparkContext.scala core/src/main/scala/org/apache/spark/metrics/MetricsSystem.scala core/src/main/scala/org/apache/spark/storage/BlockManagerMasterActor.scala
| * Merge remote-tracking branch 'apache-github/master' into log4j-fix-2Patrick Wendell2014-01-017-142/+220
| |\ | | | | | | | | | | | | Conflicts: streaming/src/main/scala/org/apache/spark/streaming/scheduler/JobGenerator.scala
| * | Removing initLogging entirelyPatrick Wendell2013-12-307-13/+0
| | |
* | | Fix two compile errors introduced in mergeMatei Zaharia2013-12-312-2/+2
| | |
* | | Merge remote-tracking branch 'apache/master' into conf2Matei Zaharia2013-12-317-141/+221
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: core/src/main/scala/org/apache/spark/rdd/CheckpointRDD.scala streaming/src/main/scala/org/apache/spark/streaming/Checkpoint.scala streaming/src/main/scala/org/apache/spark/streaming/scheduler/JobGenerator.scala
| * | Fixed comments and long lines based on comments on PR 289.Tathagata Das2013-12-313-9/+17
| | |
| * | Minor changes in comments and strings to address comments in PR 289.Tathagata Das2013-12-271-8/+6
| | |
| * | Added warning if filestream adds files with no data in them (file RDDs have ↵Tathagata Das2013-12-261-0/+7
| | | | | | | | | | | | 0 partitions).
| * | Changed file stream to not catch any exceptions related to finding new files ↵Tathagata Das2013-12-261-19/+11
| | | | | | | | | | | | (FileNotFound exception is still caught and ignored).
| * | Removed slack time in file stream and added better handling of exceptions ↵Tathagata Das2013-12-263-50/+21
| | | | | | | | | | | | due to failures due FileNotFound exceptions.
| * | Fixed Python API for sc.setCheckpointDir. Also other fixes based on ↵Tathagata Das2013-12-242-8/+9
| | | | | | | | | | | | Reynold's comments on PR 289.
| * | Minor formatting fixes.Tathagata Das2013-12-233-9/+13
| | |
| * | Updated testsuites to work with the slack time of file stream.Tathagata Das2013-12-233-2/+22
| | |
| * | Merge branch 'scheduler-update' into filestream-fixTathagata Das2013-12-233-4/+26
| |\|
| * | Fixed bug in file stream that prevented some files from being readTathagata Das2013-12-231-9/+12
| | | | | | | | | | | | correctly.
| * | Updated CheckpointWriter and FileInputDStream to be robust against failed ↵Tathagata Das2013-12-223-35/+78
| | | | | | | | | | | | FileSystem objects. Refactored JobGenerator to use actor so that all updating of DStream's metadata is single threaded.
| * | Merge branch 'scheduler-update' into filestream-fixTathagata Das2013-12-222-1/+6
| |\ \
| * \ \ Merge branch 'scheduler-update' into filestream-fixTathagata Das2013-12-1957-620/+1009
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: core/src/main/scala/org/apache/spark/rdd/CheckpointRDD.scala streaming/src/main/scala/org/apache/spark/streaming/StreamingContext.scala streaming/src/main/scala/org/apache/spark/streaming/dstream/FileInputDStream.scala streaming/src/main/scala/org/apache/spark/streaming/scheduler/JobGenerator.scala streaming/src/test/scala/org/apache/spark/streaming/CheckpointSuite.scala
| * | | | Fixed multiple file stream and checkpointing bugs.Tathagata Das2013-12-115-74/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Made file stream more robust to transient failures. - Changed Spark.setCheckpointDir API to not have the second 'useExisting' parameter. Spark will always create a unique directory for checkpointing underneath the directory provide to the funtion. - Fixed bug wrt local relative paths as checkpoint directory. - Made DStream and RDD checkpointing use SparkContext.hadoopConfiguration, so that more HDFS compatible filesystems are supported for checkpointing.
* | | | | Fix a few settings that were being read as system properties after mergeMatei Zaharia2013-12-291-2/+2
| | | | |
* | | | | Merge remote-tracking branch 'origin/master' into conf2Matei Zaharia2013-12-2923-203/+583
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: core/src/main/scala/org/apache/spark/SparkContext.scala core/src/main/scala/org/apache/spark/scheduler/DAGScheduler.scala core/src/main/scala/org/apache/spark/scheduler/TaskSchedulerImpl.scala core/src/main/scala/org/apache/spark/scheduler/cluster/ClusterTaskSetManager.scala core/src/main/scala/org/apache/spark/scheduler/local/LocalScheduler.scala core/src/main/scala/org/apache/spark/util/MetadataCleaner.scala core/src/test/scala/org/apache/spark/scheduler/TaskResultGetterSuite.scala core/src/test/scala/org/apache/spark/scheduler/TaskSetManagerSuite.scala new-yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala streaming/src/main/scala/org/apache/spark/streaming/Checkpoint.scala streaming/src/main/scala/org/apache/spark/streaming/api/java/JavaStreamingContext.scala streaming/src/main/scala/org/apache/spark/streaming/scheduler/JobGenerator.scala streaming/src/test/scala/org/apache/spark/streaming/BasicOperationsSuite.scala streaming/src/test/scala/org/apache/spark/streaming/CheckpointSuite.scala streaming/src/test/scala/org/apache/spark/streaming/InputStreamsSuite.scala streaming/src/test/scala/org/apache/spark/streaming/TestSuiteBase.scala streaming/src/test/scala/org/apache/spark/streaming/WindowOperationsSuite.scala
| * | | | Minor change for PR 277.Tathagata Das2013-12-231-1/+1
| | | | |
| * | | | Minor formatting fixes.Tathagata Das2013-12-231-5/+4
| | | | |
| * | | | Added comments to BatchInfo and JobSet, based on Patrick's comment on PR 277.Tathagata Das2013-12-232-3/+26
| | |_|/ | |/| |
| * | | Minor updated based on comments on PR 277.Tathagata Das2013-12-202-1/+6
| | |/ | |/|
| * | Minor changes.Tathagata Das2013-12-189-32/+36
| | |
| * | Merge branch 'apache-master' into scheduler-updateTathagata Das2013-12-1842-406/+458
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: streaming/src/main/scala/org/apache/spark/streaming/StreamingContext.scala streaming/src/main/scala/org/apache/spark/streaming/dstream/ForEachDStream.scala
| * | | Added StatsReportListener to generate processing time statistics across ↵Tathagata Das2013-12-182-2/+45
| | | | | | | | | | | | | | | | multiple batches.
| * | | Refactored streaming scheduler and added listener interface.Tathagata Das2013-12-1222-195/+496
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Refactored Scheduler + JobManager to JobGenerator + JobScheduler and added JobSet for cleaner code. Moved scheduler related code to streaming.scheduler package. - Added StreamingListener trait (similar to SparkListener) to enable gathering to streaming stats like processing times and delays. StreamingContext.addListener() to added listeners. - Deduped some code in streaming tests by modifying TestSuiteBase, and added StreamingListenerSuite.
* | | Fix other failing testsMatei Zaharia2013-12-284-18/+22
| | |
* | | Add a StreamingContext constructor that takes a conf objectMatei Zaharia2013-12-281-1/+20
| | |
* | | Fix CheckpointSuite test failuresMatei Zaharia2013-12-281-4/+3
| | |
* | | Fix test failures due to setting / clearing clock type in StreamingMatei Zaharia2013-12-284-10/+14
| | |
* | | Various fixes to configuration codeMatei Zaharia2013-12-288-37/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Got rid of global SparkContext.globalConf - Pass SparkConf to serializers and compression codecs - Made SparkConf public instead of private[spark] - Improved API of SparkContext and SparkConf - Switched executor environment vars to be passed through SparkConf - Fixed some places that were still using system properties - Fixed some tests, though others are still failing This still fails several tests in core, repl and streaming, likely due to properties not being set or cleared correctly (some of the tests run fine in isolation).
* | | spark-544, introducing SparkConf and related configuration overhaul.Prashant Sharma2013-12-257-25/+27
| |/ |/|
* | Use scala.binary.version in POMsMark Hamstra2013-12-151-7/+7
| |
* | Merge branch 'master' into akka-bug-fixPrashant Sharma2013-12-111-8/+1
|\| | | | | | | | | | | | | | | | | | | Conflicts: core/pom.xml core/src/main/scala/org/apache/spark/scheduler/DAGScheduler.scala pom.xml project/SparkBuild.scala streaming/pom.xml yarn/src/main/scala/org/apache/spark/deploy/yarn/YarnAllocationHandler.scala
| * Fix pom.xml for maven buildRaymond Liu2013-12-031-8/+1
| |
* | Style fixes and addressed review comments at #221Prashant Sharma2013-12-102-10/+10
| |
* | Incorporated Patrick's feedback comment on #211 and made maven ↵Prashant Sharma2013-12-071-1/+1
| | | | | | | | build/dep-resolution atleast a bit faster.
* | Merge branch 'master' of github.com:apache/incubator-spark into scala-2.10-tempPrashant Sharma2013-11-215-11/+12
|\| | | | | | | | | | | Conflicts: core/src/main/scala/org/apache/spark/util/collection/PrimitiveVector.scala streaming/src/main/scala/org/apache/spark/streaming/api/java/JavaStreamingContext.scala
| * Another set of changes to remove unnecessary semicolon (;) from Scala code.Henry Saputra2013-11-191-1/+3
| | | | | | | | Passed the sbt/sbt compile and test
| * Remove the semicolons at the end of Scala code to make it more pure Scala code.Henry Saputra2013-11-195-10/+9
| | | | | | | | | | | | | | Also remove unused imports as I found them along the way. Remove return statements when returning value in the Scala code. Passing compile and tests.
* | Merge branch 'scala210-master' of github.com:colorant/incubator-spark into ↵Prashant Sharma2013-11-2132-295/+1500
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | scala-2.10 Conflicts: core/src/main/scala/org/apache/spark/deploy/client/Client.scala core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala core/src/main/scala/org/apache/spark/executor/CoarseGrainedExecutorBackend.scala core/src/test/scala/org/apache/spark/MapOutputTrackerSuite.scala
| * | Various merge correctionsAaron Davidson2013-11-145-63/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've diff'd this patch against my own -- since they were both created independently, this means that two sets of eyes have gone over all the merge conflicts that were created, so I'm feeling significantly more confident in the resulting PR. @rxin has looked at the changes to the repl and is resoundingly confident that they are correct.
| * | Merge branch 'master' into scala-2.10Raymond Liu2013-11-142-7/+80
| |\|
| | * Made block generator thread safe to fix Kafka bug.Tathagata Das2013-11-122-7/+80
| | |
| * | Merge branch 'master' into scala-2.10Raymond Liu2013-11-1331-228/+1421
| |\|
| | * Merge branch 'apache-master' into transformTathagata Das2013-10-259-15/+180
| | |\