Skip to content

Commit 2d39b39

Browse files
foxishRobert Kruszewski
authored andcommitted
[SPARK-18662] Move resource managers to separate directory
## What changes were proposed in this pull request? * Moves yarn and mesos scheduler backends to resource-managers/ sub-directory (in preparation for https://issues.apache.org/jira/browse/SPARK-18278) * Corresponding change in top-level pom.xml. Ref: apache#16061 (comment) ## How was this patch tested? * Manual tests /cc rxin Author: Anirudh <[email protected]> Closes apache#16092 from foxish/fix-scheduler-structure-2.
1 parent 219425a commit 2d39b39

File tree

81 files changed

+6
-6
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+6
-6
lines changed

dev/sparktestsupport/modules.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ def __hash__(self):
469469
name="yarn",
470470
dependencies=[],
471471
source_file_regexes=[
472-
"yarn/",
472+
"resource-managers/yarn/",
473473
"common/network-yarn/",
474474
],
475475
build_profile_flags=["-Pyarn"],
@@ -485,7 +485,7 @@ def __hash__(self):
485485
mesos = Module(
486486
name="mesos",
487487
dependencies=[],
488-
source_file_regexes=["mesos/"],
488+
source_file_regexes=["resource-managers/mesos/"],
489489
build_profile_flags=["-Pmesos"],
490490
sbt_test_goals=["mesos/test"]
491491
)

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2591,15 +2591,15 @@
25912591
<profile>
25922592
<id>yarn</id>
25932593
<modules>
2594-
<module>yarn</module>
2594+
<module>resource-managers/yarn</module>
25952595
<module>common/network-yarn</module>
25962596
</modules>
25972597
</profile>
25982598

25992599
<profile>
26002600
<id>mesos</id>
26012601
<modules>
2602-
<module>mesos</module>
2602+
<module>resource-managers/mesos</module>
26032603
</modules>
26042604
</profile>
26052605

mesos/pom.xml renamed to resource-managers/mesos/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<groupId>org.apache.spark</groupId>
2222
<artifactId>spark-parent_2.11</artifactId>
2323
<version>2.2.0-SNAPSHOT</version>
24-
<relativePath>../pom.xml</relativePath>
24+
<relativePath>../../pom.xml</relativePath>
2525
</parent>
2626

2727
<artifactId>spark-mesos_2.11</artifactId>

0 commit comments

Comments
 (0)