[HOTFIX] Fix CI build failure on branch-0.6 #2262
Conversation
|
@Leemoonsoo Ready to review. Please help. |
|
@hammertank Hi, thanks for the contribution but do you or your team use zeppelin 0.6.x? |
|
@jongyoul Yes, we are using 0.6.2. At the time we started our project, it is the latest released version. |
|
@hammertank Thanks for letting me know. LGTM for your changes. BTW, new version of Zeppelin has better features. Why don't you use it? |
|
Merging it if there's no more discussion |
|
@jongyoul currently, our project is using zeppelin as a restful webservice to execute spark code. zeppelin-0.6.2 has got everything we need. We'll consider to upgrade zeppelin in the next version of our own project. Thank you for your suggestion. :) |
|
@hammertank Good to know. Thanks. |
|
Thanks @hammertank for the contribution. @hammertank Could you cherry-pick necessary commits and keep author information? |
### What is this PR for? This PR fix flaky test [ZEPPELIN-1455](https://issues.apache.org/jira/browse/ZEPPELIN-1455). According to http://doc.scalatest.org/1.8/org/scalatest/concurrent/Eventually.html, default timeout of eventually is 150millisecond. Set enough timeout for the test. ### What type of PR is it? Hot Fix ### Todos * [x] - increase timeout ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-1455 ### Questions: * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: Lee moon soo <moon@apache.org> Closes apache#1920 from Leemoonsoo/ZEPPELIN-1455 and squashes the following commits: 13a993d [Lee moon soo] Increase tolerance of eventually (cherry picked from commit 99c21c4)
### What is this PR for? `IMain.interpret` changes current thread's context classloader. It may cause different issues and definitely is the reason of [ZEPPELIN-1738](https://issues.apache.org/jira/browse/ZEPPELIN-1738) test failures. It's a known scala bug. See https://issues.scala-lang.org/browse/SI-9587 As a workaround we need to save and restore context classloader manually ### What type of PR is it? Bug Fix ### What is the Jira issue? [ZEPPELIN-1972](https://issues.apache.org/jira/browse/ZEPPELIN-1972) ### How should this be tested? Run ignite interpreter test and ignite sql interpreter test in the same thread ``` mvn test -pl ignite -am -Pscala-2.11 -Dtest=org.apache.zeppelin.ignite.IgniteInterpreterTest#testInterpret,org.apache.zeppelin.ignite.IgniteSqlInterpreterTest#testSql -DfailIfNoTests=false ``` ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Igor Drozdov <igor_drozdov@epam.com> Closes apache#1911 from DrIgor/ZEPPELIN-1972 and squashes the following commits: 35c5abd [Igor Drozdov] Preserve context classloader (cherry picked from commit 859d175)
|
@Leemoonsoo Updated commits' original author info. Please review again. |
|
LGTM and merge to branch-0.6 if no further comment! |
### What is this PR for? Fix CI build failure on branch-0.6. ### What type of PR is it? Hot Fix ### Todos - Modified [.travis.yml](https://github.com/apache/zeppelin/blob/branch-0.6/.travis.yml) according to #1774 - Merged PR #1920 #1911 - Update spark version and hadoop version in [.travis.yml](https://github.com/apache/zeppelin/blob/branch-0.6/.travis.yml) since older spark version below 1.6.2 can not be downloaded from remote server any more. ### What is the Jira issue? No related Jira issue ### How should this be tested? See if CI becomes green ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Igor Drozdov <igor_drozdov@epam.com> Author: Lee moon soo <moon@apache.org> Author: z0621 <zhouyf0621@dtdream.com> Closes #2262 from hammertank/HOTFIX and squashes the following commits: 380432c [z0621] [HOTFIX] Fix CI build failure on branch-0.6 f1c8041 [Igor Drozdov] [ZEPPELIN-1972] Preserve context classloader 4ae3adb [Lee moon soo] [ZEPPELIN-1455] Fix flaky test: AbstractAngularElemTest
|
Merged to branch-0.6. |
|
@Leemoonsoo maybe only PR merged into master branch can be closed automatically. |
4 participants
What is this PR for?
Fix CI build failure on branch-0.6.
What type of PR is it?
Hot Fix
Todos
What is the Jira issue?
No related Jira issue
How should this be tested?
See if CI becomes green
Questions: