Skip to content

Conversation

beliefer
Copy link
Contributor

@beliefer beliefer commented Apr 5, 2020

What changes were proposed in this pull request?

This PR is related to #27668, #27708, #27704, #27674, #27734, #27751, #27745, #27783, #27806 and used to spark3.0.

Why are the changes needed?

Supplemental configuration version information.

Does this PR introduce any user-facing change?

'No'.

How was this patch tested?

Jenkins test.

@HyukjinKwon
Copy link
Member

HyukjinKwon commented Apr 5, 2020

I picked/verified each commit related to this PR manually to branch-3.0.

@beliefer, do you mean keep the commit logs in your PR so that I can manually cherry-pick the commits from your PR to branch-3.0?

Also, it would be nice if we mention the difference against the master. For example, I found three differences:

ebcff67#diff-8b4ea8f3b0cc1e7ce7e943de1abbb165R66
ebcff67#diff-8b4ea8f3b0cc1e7ce7e943de1abbb165R72
ebcff67#diff-b2fc8d6ab7ac5735085e2d6cfacb95daR88

@HyukjinKwon HyukjinKwon closed this Apr 5, 2020
@SparkQA
Copy link

SparkQA commented Apr 5, 2020

Test build #120825 has finished for PR 28124 at commit 9fc3624.

  • This patch passes all tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@beliefer
Copy link
Contributor Author

beliefer commented Apr 5, 2020

@HyukjinKwon Because the three config not exists in branch-3.0, so I not mention them. I want you merge this PR that has resolved these issue or conflict. I think this PR will make you work easier.

@beliefer
Copy link
Contributor Author

beliefer commented Apr 5, 2020

@HyukjinKwon I found you pick these change from master, but you forgot branch-3.0/core/src/main/scala/org/apache/spark/internal/config/Status.scala.

@HyukjinKwon
Copy link
Member

HyukjinKwon commented Apr 6, 2020

Thanks @beliefer for double checking, I will fix it.
For clarification, I would like to keep the commit log similarly in branch-3.0 too, instead of one big PR in branch-3.0 alone - this matters about management point. If we happen to revert one PR, we can simple revert the corresponding commits from both master and branch-3.0 directly instead of manually resolving conflicts in branch-3.0 alone due to the one big PR.

We usually open each PR for each backport; however, I asked to open fewer PRs that contains multiple commits because there are too many to backport, and most of them are directly able to backport.

I meant to open a PR, for example, as below:

Title:
[SPARK-30887][SPARK-30888][SPARK-30889][SPARK-30891][SPARK-30908][SPARK-30909][SPARK-30910][SPARK-30911][SPARK-30912][SPARK-30913][SPARK-30914][3.0] Add version information to the configuration of Deploy, History, NetWork, Worker, Tests, R, Python, Status, Kryo, UI

Commits in this PR:

Conflict-resolved 7911de9
Conflict-resolved 776e21a
Conflict-resolved c285750
...

And then, I backport each conflict-resolved commit, in your PR, manually from your PR to branch-3.0.

@HyukjinKwon
Copy link
Member

@HyukjinKwon I found you pick these change from master, but you forgot branch-3.0/core/src/main/scala/org/apache/spark/internal/config/Status.scala.

Seems like you forgot to mention #27848 :). I will port it back too.

@HyukjinKwon
Copy link
Member

#27848 seems dependent on #27847 due to a couple of changes such as bd2b3f9#diff-76e731333fb756df3bff5ddb3b731c46R519.

I ported back both #27847 and #27848

@beliefer
Copy link
Contributor Author

beliefer commented Apr 6, 2020

@HyukjinKwon I get your mean. I will follows your suggestion and add corresponding commits info.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants