Skip to content

Conversation

beliefer
Copy link
Contributor

@beliefer beliefer commented Feb 21, 2020

What changes were proposed in this pull request?

1.Add version information to the configuration of Deploy.
2.Update the docs of Deploy.

I sorted out some information show below.

Item name Since version JIRA ID Commit ID Note
spark.deploy.recoveryMode 0.8.1 None d66c01f#diff-29dffdccd5a7f4c8b496c293e87c8668
spark.deploy.recoveryMode.factory 1.2.0 SPARK-1830 deefd9d#diff-29dffdccd5a7f4c8b496c293e87c8668 This configuration appears in branch-1.3, but the version number in the pom.xml file corresponding to the commit is 1.2.0-SNAPSHOT
spark.deploy.recoveryDirectory 0.8.1 None d66c01f#diff-29dffdccd5a7f4c8b496c293e87c8668
spark.deploy.zookeeper.url 0.8.1 None d66c01f#diff-4457313ca662a1cd60197122d924585c
spark.deploy.zookeeper.dir 0.8.1 None d66c01f#diff-a84228cb45c7d5bd93305a1f5bf720b6
spark.deploy.retainedApplications 0.8.0 None 46eecd1#diff-29dffdccd5a7f4c8b496c293e87c8668
spark.deploy.retainedDrivers 1.1.0 None 7446f5f#diff-29dffdccd5a7f4c8b496c293e87c8668
spark.dead.worker.persistence 0.8.0 None 46eecd1#diff-29dffdccd5a7f4c8b496c293e87c8668
spark.deploy.maxExecutorRetries 1.6.3 SPARK-16956 ace458f#diff-29dffdccd5a7f4c8b496c293e87c8668
spark.deploy.spreadOut 0.6.1 None bb2b9ff#diff-0e7ae91819fc8f7b47b0f97be7116325
spark.deploy.defaultCores 0.9.0 None d8bcc8e#diff-29dffdccd5a7f4c8b496c293e87c8668

Why are the changes needed?

Supplemental configuration version information.

Does this PR introduce any user-facing change?

No

How was this patch tested?

Exists UT

@beliefer
Copy link
Contributor Author

beliefer commented Feb 21, 2020

cc @HyukjinKwon I think we should also add version info for other modules.

@SparkQA
Copy link

SparkQA commented Feb 21, 2020

Test build #118791 has finished for PR 27668 at commit 2eec92e.

  • This patch fails to generate documentation.
  • This patch merges cleanly.
  • This patch adds no public classes.

@beliefer
Copy link
Contributor Author

retest this please

@SparkQA
Copy link

SparkQA commented Feb 21, 2020

Test build #118795 has finished for PR 27668 at commit 2eec92e.

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

@beliefer beliefer changed the title [WIP][SPARK-30887][CORE][DOC] Add version information to the configuration of Deploy [SPARK-30887][CORE][DOC] Add version information to the configuration of Deploy Feb 22, 2020
@SparkQA
Copy link

SparkQA commented Feb 22, 2020

Test build #118806 has finished for PR 27668 at commit 4e7ff54.

  • This patch fails Spark unit tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@beliefer
Copy link
Contributor Author

beliefer commented Feb 22, 2020

@HyukjinKwon spark.deploy.recoveryMode.factory appears in branch-1.3, but the version number in the pom.xml file corresponding to the commit is 1.2.0-SNAPSHOT. Is the since version of this configuration 1.2.0 or 1.3.0?

@SparkQA
Copy link

SparkQA commented Feb 22, 2020

Test build #118810 has finished for PR 27668 at commit ee3cdd2.

  • This patch fails Spark unit tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@SparkQA
Copy link

SparkQA commented Feb 22, 2020

Test build #118811 has finished for PR 27668 at commit bd6416b.

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

Copy link
Member

@HyukjinKwon HyukjinKwon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can remove the commit logs in the comments at the codes (sorry I meant to add a Github comment on this PR for reviewers). Looks fine to me. I will take a close look and merge if it's not merged in few days.


private[spark] object Deploy {
val RECOVERY_MODE = ConfigBuilder("spark.deploy.recoveryMode")
.version("0.8.1")
Copy link
Contributor Author

@beliefer beliefer Feb 24, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No JIRA ID, commit ID: d66c01f

.createWithDefault("NONE")

val RECOVERY_MODE_FACTORY = ConfigBuilder("spark.deploy.recoveryMode.factory")
.version("1.2.0")
Copy link
Contributor Author

@beliefer beliefer Feb 24, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SPARK-1830 commit ID: deefd9d
This configuration appears in branch-1.3, but the version number in the pom.xml file corresponding to the commit is 1.2.0-SNAPSHOT

.createWithDefault("")

val RECOVERY_DIRECTORY = ConfigBuilder("spark.deploy.recoveryDirectory")
.version("0.8.1")
Copy link
Contributor Author

@beliefer beliefer Feb 24, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No JIRA ID, commit ID: d66c01f

val ZOOKEEPER_URL = ConfigBuilder("spark.deploy.zookeeper.url")
.doc(s"When `${RECOVERY_MODE.key}` is set to ZOOKEEPER, this " +
"configuration is used to set the zookeeper URL to connect to.")
.version("0.8.1")
Copy link
Contributor Author

@beliefer beliefer Feb 24, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No JIRA ID, commit ID: d66c01f

.createOptional

val ZOOKEEPER_DIRECTORY = ConfigBuilder("spark.deploy.zookeeper.dir")
.version("0.8.1")
Copy link
Contributor Author

@beliefer beliefer Feb 24, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No JIRA ID, commit ID: d66c01f

.createOptional

val RETAINED_APPLICATIONS = ConfigBuilder("spark.deploy.retainedApplications")
.version("0.8.0")
Copy link
Contributor Author

@beliefer beliefer Feb 24, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No JIRA ID, commit ID: 46eecd1

.createWithDefault(200)

val RETAINED_DRIVERS = ConfigBuilder("spark.deploy.retainedDrivers")
.version("1.1.0")
Copy link
Contributor Author

@beliefer beliefer Feb 24, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No JIRA ID, commit ID: 7446f5f

.createWithDefault(200)

val REAPER_ITERATIONS = ConfigBuilder("spark.dead.worker.persistence")
.version("0.8.0")
Copy link
Contributor Author

@beliefer beliefer Feb 24, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No JIRA ID, commit ID: 46eecd1

.createWithDefault(15)

val MAX_EXECUTOR_RETRIES = ConfigBuilder("spark.deploy.maxExecutorRetries")
.version("1.6.3")
Copy link
Contributor Author

@beliefer beliefer Feb 24, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SPARK-16956, commit ID: ace458f

.createWithDefault(10)

val SPREAD_OUT_APPS = ConfigBuilder("spark.deploy.spreadOut")
.version("0.6.1")
Copy link
Contributor Author

@beliefer beliefer Feb 24, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No JIRA ID, commit ID: bb2b9ff

.createWithDefault(true)

val DEFAULT_CORES = ConfigBuilder("spark.deploy.defaultCores")
.version("0.9.0")
Copy link
Contributor Author

@beliefer beliefer Feb 24, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No JIRA ID, commit ID: d8bcc8e

@beliefer
Copy link
Contributor Author

@HyukjinKwon I have removed the comments and add GitHub comments for each item.

@SparkQA
Copy link

SparkQA commented Feb 24, 2020

Test build #118843 has finished for PR 27668 at commit 5891872.

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

@HyukjinKwon
Copy link
Member

Merged to master.

@beliefer
Copy link
Contributor Author

@HyukjinKwon Thanks for your help! @srowen Thanks for your review.

HyukjinKwon pushed a commit that referenced this pull request Apr 5, 2020
… of Deploy

### What changes were proposed in this pull request?
1.Add version information to the configuration of `Deploy`.
2.Update the docs of `Deploy`.

I sorted out some information show below.

Item name | Since version | JIRA ID | Commit ID | Note
-- | -- | -- | -- | --
spark.deploy.recoveryMode | 0.8.1 | None | d66c01f#diff-29dffdccd5a7f4c8b496c293e87c8668 |
spark.deploy.recoveryMode.factory | 1.2.0 | SPARK-1830 |		deefd9d#diff-29dffdccd5a7f4c8b496c293e87c8668 | This configuration appears in branch-1.3, but the version number in the pom.xml file corresponding to the commit is 1.2.0-SNAPSHOT
spark.deploy.recoveryDirectory | 0.8.1 | None |			d66c01f#diff-29dffdccd5a7f4c8b496c293e87c8668 |
spark.deploy.zookeeper.url | 0.8.1 | None |			d66c01f#diff-4457313ca662a1cd60197122d924585c |
spark.deploy.zookeeper.dir | 0.8.1 | None | d66c01f#diff-a84228cb45c7d5bd93305a1f5bf720b6 |
spark.deploy.retainedApplications | 0.8.0 | None | 46eecd1#diff-29dffdccd5a7f4c8b496c293e87c8668 |
spark.deploy.retainedDrivers | 1.1.0 | None | 7446f5f#diff-29dffdccd5a7f4c8b496c293e87c8668 |
spark.dead.worker.persistence | 0.8.0 | None | 46eecd1#diff-29dffdccd5a7f4c8b496c293e87c8668 |
spark.deploy.maxExecutorRetries | 1.6.3 | SPARK-16956 | ace458f#diff-29dffdccd5a7f4c8b496c293e87c8668 |
spark.deploy.spreadOut | 0.6.1 | None | bb2b9ff#diff-0e7ae91819fc8f7b47b0f97be7116325 |
spark.deploy.defaultCores | 0.9.0 | None | d8bcc8e#diff-29dffdccd5a7f4c8b496c293e87c8668 |

### Why are the changes needed?
Supplemental configuration version information.

### Does this PR introduce any user-facing change?
No

### How was this patch tested?
Exists UT

Closes #27668 from beliefer/add-version-to-deploy-config.

Authored-by: beliefer <beliefer@163.com>
Signed-off-by: HyukjinKwon <gurwls223@apache.org>
sjincho pushed a commit to sjincho/spark that referenced this pull request Apr 15, 2020
… of Deploy

### What changes were proposed in this pull request?
1.Add version information to the configuration of `Deploy`.
2.Update the docs of `Deploy`.

I sorted out some information show below.

Item name | Since version | JIRA ID | Commit ID | Note
-- | -- | -- | -- | --
spark.deploy.recoveryMode | 0.8.1 | None | d66c01f#diff-29dffdccd5a7f4c8b496c293e87c8668 |
spark.deploy.recoveryMode.factory | 1.2.0 | SPARK-1830 |		deefd9d#diff-29dffdccd5a7f4c8b496c293e87c8668 | This configuration appears in branch-1.3, but the version number in the pom.xml file corresponding to the commit is 1.2.0-SNAPSHOT
spark.deploy.recoveryDirectory | 0.8.1 | None |			d66c01f#diff-29dffdccd5a7f4c8b496c293e87c8668 |
spark.deploy.zookeeper.url | 0.8.1 | None |			d66c01f#diff-4457313ca662a1cd60197122d924585c |
spark.deploy.zookeeper.dir | 0.8.1 | None | d66c01f#diff-a84228cb45c7d5bd93305a1f5bf720b6 |
spark.deploy.retainedApplications | 0.8.0 | None | 46eecd1#diff-29dffdccd5a7f4c8b496c293e87c8668 |
spark.deploy.retainedDrivers | 1.1.0 | None | 7446f5f#diff-29dffdccd5a7f4c8b496c293e87c8668 |
spark.dead.worker.persistence | 0.8.0 | None | 46eecd1#diff-29dffdccd5a7f4c8b496c293e87c8668 |
spark.deploy.maxExecutorRetries | 1.6.3 | SPARK-16956 | ace458f#diff-29dffdccd5a7f4c8b496c293e87c8668 |
spark.deploy.spreadOut | 0.6.1 | None | bb2b9ff#diff-0e7ae91819fc8f7b47b0f97be7116325 |
spark.deploy.defaultCores | 0.9.0 | None | d8bcc8e#diff-29dffdccd5a7f4c8b496c293e87c8668 |

### Why are the changes needed?
Supplemental configuration version information.

### Does this PR introduce any user-facing change?
No

### How was this patch tested?
Exists UT

Closes apache#27668 from beliefer/add-version-to-deploy-config.

Authored-by: beliefer <beliefer@163.com>
Signed-off-by: HyukjinKwon <gurwls223@apache.org>
@beliefer beliefer deleted the add-version-to-deploy-config branch April 23, 2024 06:38
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.

4 participants