You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by yhuai <gi...@git.apache.org> on 2016/04/27 22:47:10 UTC
[GitHub] spark pull request: [SPARK-13023][PROJECT INFRA][BRANCH-1.6] Fix h...
GitHub user yhuai opened a pull request:
https://github.com/apache/spark/pull/12743
[SPARK-13023][PROJECT INFRA][BRANCH-1.6] Fix handling of root module in modules_to_test()
This is a 1.6 branch backport of SPARK-13023 based on @JoshRosen's https://github.com/apache/spark/commit/41f0c85f9be264103c066935e743f59caf0fe268.
There's a minor bug in how we handle the `root` module in the `modules_to_test()` function in `dev/run-tests.py`: since `root` now depends on `build` (since every test needs to run on any build test), we now need to check for the presence of root in `modules_to_test` instead of `changed_modules`.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/yhuai/spark 1.6build
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/spark/pull/12743.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #12743
----
commit 237fd74527ae52fb62a04efc409b955f9fad41ca
Author: Yin Huai <yh...@databricks.com>
Date: 2016-04-27T20:45:27Z
[SPARK-13023][PROJECT INFRA][BRANCH-1.6] Fix handling of root module in modules_to_test()
This is a 1.6 branch backport of SPARK-13023.
There's a minor bug in how we handle the `root` module in the `modules_to_test()` function in `dev/run-tests.py`: since `root` now depends on `build` (since every test needs to run on any build test), we now need to check for the presence of root in `modules_to_test` instead of `changed_modules`.
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] spark pull request: [SPARK-13023][PROJECT INFRA][BRANCH-1.6] Fix h...
Posted by AmplabJenkins <gi...@git.apache.org>.
Github user AmplabJenkins commented on the pull request:
https://github.com/apache/spark/pull/12743#issuecomment-215254728
Merged build finished. Test PASSed.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] spark pull request #12743: [SPARK-13023][PROJECT INFRA][BRANCH-1.6] Fix hand...
Posted by HyukjinKwon <gi...@git.apache.org>.
Github user HyukjinKwon commented on a diff in the pull request:
https://github.com/apache/spark/pull/12743#discussion_r68047315
--- Diff: dev/run-tests.py ---
@@ -101,21 +101,21 @@ def determine_modules_to_test(changed_modules):
>>> sorted(x.name for x in determine_modules_to_test([modules.root]))
['root']
+ >>> [x.name for x in determine_modules_to_test([modules.build])]
+ ['root']
>>> sorted(x.name for x in determine_modules_to_test([modules.graphx]))
['examples', 'graphx']
>>> x = sorted(x.name for x in determine_modules_to_test([modules.sql]))
>>> x # doctest: +NORMALIZE_WHITESPACE
['examples', 'hive-thriftserver', 'mllib', 'pyspark-ml', \
'pyspark-mllib', 'pyspark-sql', 'sparkr', 'sql']
"""
- # If we're going to have to run all of the tests, then we can just short-circuit
- # and return 'root'. No module depends on root, so if it appears then it will be
- # in changed_modules.
- if modules.root in changed_modules:
- return [modules.root]
modules_to_test = set()
for module in changed_modules:
modules_to_test = modules_to_test.union(determine_modules_to_test(module.dependent_modules))
+ # If we need to run all of the tests, then we should short-circuit and return 'root'
+ if modules.root in modules_to_test:
+ return [modules.root]
--- End diff --
Hi @yhuai and @JoshRosen, I realised that https://github.com/apache/spark/pull/13806 is being failed due to this one.
In the case of my PR, it corrects two files in `sql` and `core`. Since it seems fixing `core` modules triggers all tests by `determine_modules_for_files`.
So, `changed_modules` becomes as below:
```
['root', 'sql']
```
and `dependent_modules` becaomes as below:
```
['pyspark-mllib', 'pyspark-ml', 'hive-thriftserver', 'sparkr', 'mllib', 'examples', 'pyspark-sql']
```
Now, `modules_to_test` does not include `root`, this checking is skipped but
Both `changed_modules` and `modules_to_test` are being merged below.
This ends up with failing with the message below (e.g. https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/60990/consoleFull):
```
Error: unrecognized module 'root'. Supported modules: pyspark-core, pyspark-sql, pyspark-streaming, pyspark-ml, pyspark-mllib
```
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] spark pull request: [SPARK-13023][PROJECT INFRA][BRANCH-1.6] Fix h...
Posted by SparkQA <gi...@git.apache.org>.
Github user SparkQA commented on the pull request:
https://github.com/apache/spark/pull/12743#issuecomment-215254564
**[Test build #57172 has finished](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/57172/consoleFull)** for PR 12743 at commit [`237fd74`](https://github.com/apache/spark/commit/237fd74527ae52fb62a04efc409b955f9fad41ca).
* This patch passes all tests.
* This patch merges cleanly.
* This patch adds no public classes.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] spark pull request #12743: [SPARK-13023][PROJECT INFRA][BRANCH-1.6] Fix hand...
Posted by HyukjinKwon <gi...@git.apache.org>.
Github user HyukjinKwon commented on a diff in the pull request:
https://github.com/apache/spark/pull/12743#discussion_r68048827
--- Diff: dev/run-tests.py ---
@@ -101,21 +101,21 @@ def determine_modules_to_test(changed_modules):
>>> sorted(x.name for x in determine_modules_to_test([modules.root]))
['root']
+ >>> [x.name for x in determine_modules_to_test([modules.build])]
+ ['root']
>>> sorted(x.name for x in determine_modules_to_test([modules.graphx]))
['examples', 'graphx']
>>> x = sorted(x.name for x in determine_modules_to_test([modules.sql]))
>>> x # doctest: +NORMALIZE_WHITESPACE
['examples', 'hive-thriftserver', 'mllib', 'pyspark-ml', \
'pyspark-mllib', 'pyspark-sql', 'sparkr', 'sql']
"""
- # If we're going to have to run all of the tests, then we can just short-circuit
- # and return 'root'. No module depends on root, so if it appears then it will be
- # in changed_modules.
- if modules.root in changed_modules:
- return [modules.root]
modules_to_test = set()
for module in changed_modules:
modules_to_test = modules_to_test.union(determine_modules_to_test(module.dependent_modules))
+ # If we need to run all of the tests, then we should short-circuit and return 'root'
+ if modules.root in modules_to_test:
+ return [modules.root]
--- End diff --
It seems okay for branch-2.0 and master as `root` is being checked after merging both `chaned_modules` and `modules_to_test`. https://github.com/apache/spark/blob/master/dev/run-tests.py#L119-L122
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] spark pull request: [SPARK-13023][PROJECT INFRA][BRANCH-1.6] Fix h...
Posted by yhuai <gi...@git.apache.org>.
Github user yhuai closed the pull request at:
https://github.com/apache/spark/pull/12743
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] spark pull request #12743: [SPARK-13023][PROJECT INFRA][BRANCH-1.6] Fix hand...
Posted by HyukjinKwon <gi...@git.apache.org>.
Github user HyukjinKwon commented on a diff in the pull request:
https://github.com/apache/spark/pull/12743#discussion_r68047514
--- Diff: dev/run-tests.py ---
@@ -101,21 +101,21 @@ def determine_modules_to_test(changed_modules):
>>> sorted(x.name for x in determine_modules_to_test([modules.root]))
['root']
+ >>> [x.name for x in determine_modules_to_test([modules.build])]
+ ['root']
>>> sorted(x.name for x in determine_modules_to_test([modules.graphx]))
['examples', 'graphx']
>>> x = sorted(x.name for x in determine_modules_to_test([modules.sql]))
>>> x # doctest: +NORMALIZE_WHITESPACE
['examples', 'hive-thriftserver', 'mllib', 'pyspark-ml', \
'pyspark-mllib', 'pyspark-sql', 'sparkr', 'sql']
"""
- # If we're going to have to run all of the tests, then we can just short-circuit
- # and return 'root'. No module depends on root, so if it appears then it will be
- # in changed_modules.
- if modules.root in changed_modules:
- return [modules.root]
modules_to_test = set()
for module in changed_modules:
modules_to_test = modules_to_test.union(determine_modules_to_test(module.dependent_modules))
+ # If we need to run all of the tests, then we should short-circuit and return 'root'
+ if modules.root in modules_to_test:
+ return [modules.root]
--- End diff --
FYI, this seems okay in master branch and 2.0 because https://github.com/apache/spark/pull/10885 PR introduces a sort but it seems not merging both `changed_modules` and `modules_to_test` anymore.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] spark pull request: [SPARK-13023][PROJECT INFRA][BRANCH-1.6] Fix h...
Posted by yhuai <gi...@git.apache.org>.
Github user yhuai commented on the pull request:
https://github.com/apache/spark/pull/12743#issuecomment-215263726
Thanks. Merging to branch 1.6.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] spark pull request: [SPARK-13023][PROJECT INFRA][BRANCH-1.6] Fix h...
Posted by AmplabJenkins <gi...@git.apache.org>.
Github user AmplabJenkins commented on the pull request:
https://github.com/apache/spark/pull/12743#issuecomment-215254730
Test PASSed.
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder/57172/
Test PASSed.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] spark pull request: [SPARK-13023][PROJECT INFRA][BRANCH-1.6] Fix h...
Posted by SparkQA <gi...@git.apache.org>.
Github user SparkQA commented on the pull request:
https://github.com/apache/spark/pull/12743#issuecomment-215225558
**[Test build #57172 has started](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/57172/consoleFull)** for PR 12743 at commit [`237fd74`](https://github.com/apache/spark/commit/237fd74527ae52fb62a04efc409b955f9fad41ca).
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] spark pull request: [SPARK-13023][PROJECT INFRA][BRANCH-1.6] Fix h...
Posted by JoshRosen <gi...@git.apache.org>.
Github user JoshRosen commented on the pull request:
https://github.com/apache/spark/pull/12743#issuecomment-215224611
LGTM pending Jenkins.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org