diff options
| author | Saisai Shao <saisai.shao@intel.com> | 2015-02-23 11:27:27 +0000 |
|---|---|---|
| committer | Sean Owen <sowen@cloudera.com> | 2015-02-23 11:27:35 +0000 |
| commit | 67b7f792908a3dd6b6453249f3ecf65dd51a6ba5 (patch) | |
| tree | 42be83ea44a68e2e6004a6cbe0a4c14cc1141d95 /python | |
| parent | f172387dd6e89d2f24dd507ce8327fb4a496f957 (diff) | |
| download | spark-67b7f792908a3dd6b6453249f3ecf65dd51a6ba5.tar.gz spark-67b7f792908a3dd6b6453249f3ecf65dd51a6ba5.tar.bz2 spark-67b7f792908a3dd6b6453249f3ecf65dd51a6ba5.zip | |
[SPARK-5943][Streaming] Update the test to use new API to reduce the warning
Author: Saisai Shao <saisai.shao@intel.com>
Closes #4722 from jerryshao/SPARK-5943 and squashes the following commits:
1b01233 [Saisai Shao] Update the test to use new API to reduce the warning
(cherry picked from commit 757b14b862a1d39c1bad7b321dae1a3ea8338fbb)
Signed-off-by: Sean Owen <sowen@cloudera.com>
Diffstat (limited to 'python')
| -rw-r--r-- | python/pyspark/streaming/context.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/python/pyspark/streaming/context.py b/python/pyspark/streaming/context.py index b06ab65037..2c73083c9f 100644 --- a/python/pyspark/streaming/context.py +++ b/python/pyspark/streaming/context.py @@ -189,7 +189,7 @@ class StreamingContext(object): if timeout is None: self._jssc.awaitTermination() else: - self._jssc.awaitTermination(int(timeout * 1000)) + self._jssc.awaitTerminationOrTimeout(int(timeout * 1000)) def awaitTerminationOrTimeout(self, timeout): """ |