apache · foxish · Dec 1, 2016 · Dec 1, 2016 · vanzin · Dec 6, 2016
diff --git a/dev/sparktestsupport/modules.py b/dev/sparktestsupport/modules.py
@@ -469,7 +469,7 @@ def __hash__(self):
     name="yarn",
     dependencies=[],
     source_file_regexes=[
-        "yarn/",
+        "resource-managers/yarn/",
         "common/network-yarn/",
     ],
     build_profile_flags=["-Pyarn"],
@@ -485,7 +485,7 @@ def __hash__(self):
 mesos = Module(
     name="mesos",
     dependencies=[],
-    source_file_regexes=["mesos/"],
+    source_file_regexes=["resource-managers/mesos/"],
     build_profile_flags=["-Pmesos"],
     sbt_test_goals=["mesos/test"]
 )

diff --git a/pom.xml b/pom.xml
@@ -2580,15 +2580,15 @@
     <profile>
       <id>yarn</id>
       <modules>
-        <module>yarn</module>
+        <module>resource-managers/yarn</module>
         <module>common/network-yarn</module>
       </modules>
     </profile>
 
     <profile>
       <id>mesos</id>
       <modules>
-        <module>mesos</module>
+        <module>resource-managers/mesos</module>
       </modules>
     </profile>
 

diff --git a/mesos/pom.xml → resource-managers/mesos/pom.xml b/mesos/pom.xml → resource-managers/mesos/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.spark</groupId>
     <artifactId>spark-parent_2.11</artifactId>
     <version>2.2.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <artifactId>spark-mesos_2.11</artifactId>

diff --git a/...he.spark.scheduler.ExternalClusterManager → ...he.spark.scheduler.ExternalClusterManager b/...he.spark.scheduler.ExternalClusterManager → ...he.spark.scheduler.ExternalClusterManager
diff --git a/...deploy/mesos/MesosClusterDispatcher.scala → ...deploy/mesos/MesosClusterDispatcher.scala b/...deploy/mesos/MesosClusterDispatcher.scala → ...deploy/mesos/MesosClusterDispatcher.scala
diff --git a/...sos/MesosClusterDispatcherArguments.scala → ...sos/MesosClusterDispatcherArguments.scala b/...sos/MesosClusterDispatcherArguments.scala → ...sos/MesosClusterDispatcherArguments.scala
diff --git a/...deploy/mesos/MesosDriverDescription.scala → ...deploy/mesos/MesosDriverDescription.scala b/...deploy/mesos/MesosDriverDescription.scala → ...deploy/mesos/MesosDriverDescription.scala
diff --git a/...y/mesos/MesosExternalShuffleService.scala → ...y/mesos/MesosExternalShuffleService.scala b/...y/mesos/MesosExternalShuffleService.scala → ...y/mesos/MesosExternalShuffleService.scala
diff --git a/...rg/apache/spark/deploy/mesos/config.scala → ...rg/apache/spark/deploy/mesos/config.scala b/...rg/apache/spark/deploy/mesos/config.scala → ...rg/apache/spark/deploy/mesos/config.scala
diff --git a/...he/spark/deploy/mesos/ui/DriverPage.scala → ...he/spark/deploy/mesos/ui/DriverPage.scala b/...he/spark/deploy/mesos/ui/DriverPage.scala → ...he/spark/deploy/mesos/ui/DriverPage.scala
diff --git a/...rk/deploy/mesos/ui/MesosClusterPage.scala → ...rk/deploy/mesos/ui/MesosClusterPage.scala b/...rk/deploy/mesos/ui/MesosClusterPage.scala → ...rk/deploy/mesos/ui/MesosClusterPage.scala
diff --git a/...park/deploy/mesos/ui/MesosClusterUI.scala → ...park/deploy/mesos/ui/MesosClusterUI.scala b/...park/deploy/mesos/ui/MesosClusterUI.scala → ...park/deploy/mesos/ui/MesosClusterUI.scala
diff --git a/...k/deploy/rest/mesos/MesosRestServer.scala → ...k/deploy/rest/mesos/MesosRestServer.scala b/...k/deploy/rest/mesos/MesosRestServer.scala → ...k/deploy/rest/mesos/MesosRestServer.scala
diff --git a/...spark/executor/MesosExecutorBackend.scala → ...spark/executor/MesosExecutorBackend.scala b/...spark/executor/MesosExecutorBackend.scala → ...spark/executor/MesosExecutorBackend.scala
diff --git a/...r/cluster/mesos/MesosClusterManager.scala → ...r/cluster/mesos/MesosClusterManager.scala b/...r/cluster/mesos/MesosClusterManager.scala → ...r/cluster/mesos/MesosClusterManager.scala
diff --git a/...mesos/MesosClusterPersistenceEngine.scala → ...mesos/MesosClusterPersistenceEngine.scala b/...mesos/MesosClusterPersistenceEngine.scala → ...mesos/MesosClusterPersistenceEngine.scala
diff --git a/...cluster/mesos/MesosClusterScheduler.scala → ...cluster/mesos/MesosClusterScheduler.scala b/...cluster/mesos/MesosClusterScheduler.scala → ...cluster/mesos/MesosClusterScheduler.scala
diff --git a/...r/mesos/MesosClusterSchedulerSource.scala → ...r/mesos/MesosClusterSchedulerSource.scala b/...r/mesos/MesosClusterSchedulerSource.scala → ...r/mesos/MesosClusterSchedulerSource.scala
diff --git a/.../MesosCoarseGrainedSchedulerBackend.scala → .../MesosCoarseGrainedSchedulerBackend.scala b/.../MesosCoarseGrainedSchedulerBackend.scala → .../MesosCoarseGrainedSchedulerBackend.scala
diff --git a/...os/MesosFineGrainedSchedulerBackend.scala → ...os/MesosFineGrainedSchedulerBackend.scala b/...os/MesosFineGrainedSchedulerBackend.scala → ...os/MesosFineGrainedSchedulerBackend.scala
diff --git a/...ter/mesos/MesosSchedulerBackendUtil.scala → ...ter/mesos/MesosSchedulerBackendUtil.scala b/...ter/mesos/MesosSchedulerBackendUtil.scala → ...ter/mesos/MesosSchedulerBackendUtil.scala
diff --git a/...r/cluster/mesos/MesosSchedulerUtils.scala → ...r/cluster/mesos/MesosSchedulerUtils.scala b/...r/cluster/mesos/MesosSchedulerUtils.scala → ...r/cluster/mesos/MesosSchedulerUtils.scala
diff --git a/...r/cluster/mesos/MesosTaskLaunchData.scala → ...r/cluster/mesos/MesosTaskLaunchData.scala b/...r/cluster/mesos/MesosTaskLaunchData.scala → ...r/cluster/mesos/MesosTaskLaunchData.scala
diff --git a/...esosClusterDispatcherArgumentsSuite.scala → ...esosClusterDispatcherArgumentsSuite.scala b/...esosClusterDispatcherArgumentsSuite.scala → ...esosClusterDispatcherArgumentsSuite.scala
diff --git a/...y/mesos/MesosClusterDispatcherSuite.scala → ...y/mesos/MesosClusterDispatcherSuite.scala b/...y/mesos/MesosClusterDispatcherSuite.scala → ...y/mesos/MesosClusterDispatcherSuite.scala
diff --git a/...ster/mesos/MesosClusterManagerSuite.scala → ...ster/mesos/MesosClusterManagerSuite.scala b/...ster/mesos/MesosClusterManagerSuite.scala → ...ster/mesos/MesosClusterManagerSuite.scala
diff --git a/...er/mesos/MesosClusterSchedulerSuite.scala → ...er/mesos/MesosClusterSchedulerSuite.scala b/...er/mesos/MesosClusterSchedulerSuite.scala → ...er/mesos/MesosClusterSchedulerSuite.scala
diff --git a/...sCoarseGrainedSchedulerBackendSuite.scala → ...sCoarseGrainedSchedulerBackendSuite.scala b/...sCoarseGrainedSchedulerBackendSuite.scala → ...sCoarseGrainedSchedulerBackendSuite.scala
diff --git a/...sosFineGrainedSchedulerBackendSuite.scala → ...sosFineGrainedSchedulerBackendSuite.scala b/...sosFineGrainedSchedulerBackendSuite.scala → ...sosFineGrainedSchedulerBackendSuite.scala
diff --git a/...ster/mesos/MesosSchedulerUtilsSuite.scala → ...ster/mesos/MesosSchedulerUtilsSuite.scala b/...ster/mesos/MesosSchedulerUtilsSuite.scala → ...ster/mesos/MesosSchedulerUtilsSuite.scala
diff --git a/...ster/mesos/MesosTaskLaunchDataSuite.scala → ...ster/mesos/MesosTaskLaunchDataSuite.scala b/...ster/mesos/MesosTaskLaunchDataSuite.scala → ...ster/mesos/MesosTaskLaunchDataSuite.scala
diff --git a/...spark/scheduler/cluster/mesos/Utils.scala → ...spark/scheduler/cluster/mesos/Utils.scala b/...spark/scheduler/cluster/mesos/Utils.scala → ...spark/scheduler/cluster/mesos/Utils.scala
diff --git a/yarn/pom.xml → resource-managers/yarn/pom.xml b/yarn/pom.xml → resource-managers/yarn/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.spark</groupId>
     <artifactId>spark-parent_2.11</artifactId>
     <version>2.2.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <artifactId>spark-yarn_2.11</artifactId>

diff --git a/...y.yarn.security.ServiceCredentialProvider → ...y.yarn.security.ServiceCredentialProvider b/...y.yarn.security.ServiceCredentialProvider → ...y.yarn.security.ServiceCredentialProvider
diff --git a/...he.spark.scheduler.ExternalClusterManager → ...he.spark.scheduler.ExternalClusterManager b/...he.spark.scheduler.ExternalClusterManager → ...he.spark.scheduler.ExternalClusterManager
diff --git a/...spark/deploy/yarn/ApplicationMaster.scala → ...spark/deploy/yarn/ApplicationMaster.scala b/...spark/deploy/yarn/ApplicationMaster.scala → ...spark/deploy/yarn/ApplicationMaster.scala
diff --git a/...loy/yarn/ApplicationMasterArguments.scala → ...loy/yarn/ApplicationMasterArguments.scala b/...loy/yarn/ApplicationMasterArguments.scala → ...loy/yarn/ApplicationMasterArguments.scala
diff --git a/...org/apache/spark/deploy/yarn/Client.scala → ...org/apache/spark/deploy/yarn/Client.scala b/...org/apache/spark/deploy/yarn/Client.scala → ...org/apache/spark/deploy/yarn/Client.scala
diff --git a/...e/spark/deploy/yarn/ClientArguments.scala → ...e/spark/deploy/yarn/ClientArguments.scala b/...e/spark/deploy/yarn/ClientArguments.scala → ...e/spark/deploy/yarn/ClientArguments.scala
diff --git a/.../yarn/ClientDistributedCacheManager.scala → .../yarn/ClientDistributedCacheManager.scala b/.../yarn/ClientDistributedCacheManager.scala → .../yarn/ClientDistributedCacheManager.scala
diff --git a/.../spark/deploy/yarn/ExecutorRunnable.scala → .../spark/deploy/yarn/ExecutorRunnable.scala b/.../spark/deploy/yarn/ExecutorRunnable.scala → .../spark/deploy/yarn/ExecutorRunnable.scala
diff --git a/...PreferredContainerPlacementStrategy.scala → ...PreferredContainerPlacementStrategy.scala b/...PreferredContainerPlacementStrategy.scala → ...PreferredContainerPlacementStrategy.scala
diff --git a/...che/spark/deploy/yarn/YarnAllocator.scala → ...che/spark/deploy/yarn/YarnAllocator.scala b/...che/spark/deploy/yarn/YarnAllocator.scala → ...che/spark/deploy/yarn/YarnAllocator.scala
diff --git a/...ache/spark/deploy/yarn/YarnRMClient.scala → ...ache/spark/deploy/yarn/YarnRMClient.scala b/...ache/spark/deploy/yarn/YarnRMClient.scala → ...ache/spark/deploy/yarn/YarnRMClient.scala
diff --git a/...ark/deploy/yarn/YarnSparkHadoopUtil.scala → ...ark/deploy/yarn/YarnSparkHadoopUtil.scala b/...ark/deploy/yarn/YarnSparkHadoopUtil.scala → ...ark/deploy/yarn/YarnSparkHadoopUtil.scala
diff --git a/...org/apache/spark/deploy/yarn/config.scala → ...org/apache/spark/deploy/yarn/config.scala b/...org/apache/spark/deploy/yarn/config.scala → ...org/apache/spark/deploy/yarn/config.scala
diff --git a/...y/yarn/security/AMCredentialRenewer.scala → ...y/yarn/security/AMCredentialRenewer.scala b/...y/yarn/security/AMCredentialRenewer.scala → ...y/yarn/security/AMCredentialRenewer.scala
diff --git a/...urity/ConfigurableCredentialManager.scala → ...urity/ConfigurableCredentialManager.scala b/...urity/ConfigurableCredentialManager.scala → ...urity/ConfigurableCredentialManager.scala
diff --git a/...loy/yarn/security/CredentialUpdater.scala → ...loy/yarn/security/CredentialUpdater.scala b/...loy/yarn/security/CredentialUpdater.scala → ...loy/yarn/security/CredentialUpdater.scala
diff --git a/...rn/security/HBaseCredentialProvider.scala → ...rn/security/HBaseCredentialProvider.scala b/...rn/security/HBaseCredentialProvider.scala → ...rn/security/HBaseCredentialProvider.scala
diff --git a/...arn/security/HDFSCredentialProvider.scala → ...arn/security/HDFSCredentialProvider.scala b/...arn/security/HDFSCredentialProvider.scala → ...arn/security/HDFSCredentialProvider.scala
diff --git a/...arn/security/HiveCredentialProvider.scala → ...arn/security/HiveCredentialProvider.scala b/...arn/security/HiveCredentialProvider.scala → ...arn/security/HiveCredentialProvider.scala
diff --git a/.../security/ServiceCredentialProvider.scala → .../security/ServiceCredentialProvider.scala b/.../security/ServiceCredentialProvider.scala → .../security/ServiceCredentialProvider.scala
diff --git a/...rk/launcher/YarnCommandBuilderUtils.scala → ...rk/launcher/YarnCommandBuilderUtils.scala b/...rk/launcher/YarnCommandBuilderUtils.scala → ...rk/launcher/YarnCommandBuilderUtils.scala
diff --git a/...r/cluster/SchedulerExtensionService.scala → ...r/cluster/SchedulerExtensionService.scala b/...r/cluster/SchedulerExtensionService.scala → ...r/cluster/SchedulerExtensionService.scala
diff --git a/.../cluster/YarnClientSchedulerBackend.scala → .../cluster/YarnClientSchedulerBackend.scala b/.../cluster/YarnClientSchedulerBackend.scala → .../cluster/YarnClientSchedulerBackend.scala
diff --git a/...cheduler/cluster/YarnClusterManager.scala → ...cheduler/cluster/YarnClusterManager.scala b/...cheduler/cluster/YarnClusterManager.scala → ...cheduler/cluster/YarnClusterManager.scala
diff --git a/...eduler/cluster/YarnClusterScheduler.scala → ...eduler/cluster/YarnClusterScheduler.scala b/...eduler/cluster/YarnClusterScheduler.scala → ...eduler/cluster/YarnClusterScheduler.scala
diff --git a/...cluster/YarnClusterSchedulerBackend.scala → ...cluster/YarnClusterSchedulerBackend.scala b/...cluster/YarnClusterSchedulerBackend.scala → ...cluster/YarnClusterSchedulerBackend.scala
diff --git a/...ark/scheduler/cluster/YarnScheduler.scala → ...ark/scheduler/cluster/YarnScheduler.scala b/...ark/scheduler/cluster/YarnScheduler.scala → ...ark/scheduler/cluster/YarnScheduler.scala
diff --git a/...eduler/cluster/YarnSchedulerBackend.scala → ...eduler/cluster/YarnSchedulerBackend.scala b/...eduler/cluster/YarnSchedulerBackend.scala → ...eduler/cluster/YarnSchedulerBackend.scala
diff --git a/...y.yarn.security.ServiceCredentialProvider → ...y.yarn.security.ServiceCredentialProvider b/...y.yarn.security.ServiceCredentialProvider → ...y.yarn.security.ServiceCredentialProvider
diff --git a/yarn/src/test/resources/log4j.properties → .../yarn/src/test/resources/log4j.properties b/yarn/src/test/resources/log4j.properties → .../yarn/src/test/resources/log4j.properties
diff --git a/...rk/deploy/yarn/BaseYarnClusterSuite.scala → ...rk/deploy/yarn/BaseYarnClusterSuite.scala b/...rk/deploy/yarn/BaseYarnClusterSuite.scala → ...rk/deploy/yarn/BaseYarnClusterSuite.scala
diff --git a/.../ClientDistributedCacheManagerSuite.scala → .../ClientDistributedCacheManagerSuite.scala b/.../ClientDistributedCacheManagerSuite.scala → .../ClientDistributedCacheManagerSuite.scala
diff --git a/...pache/spark/deploy/yarn/ClientSuite.scala → ...pache/spark/deploy/yarn/ClientSuite.scala b/...pache/spark/deploy/yarn/ClientSuite.scala → ...pache/spark/deploy/yarn/ClientSuite.scala
diff --git a/...arn/ContainerPlacementStrategySuite.scala → ...arn/ContainerPlacementStrategySuite.scala b/...arn/ContainerPlacementStrategySuite.scala → ...arn/ContainerPlacementStrategySuite.scala
diff --git a/...park/deploy/yarn/YarnAllocatorSuite.scala → ...park/deploy/yarn/YarnAllocatorSuite.scala b/...park/deploy/yarn/YarnAllocatorSuite.scala → ...park/deploy/yarn/YarnAllocatorSuite.scala
diff --git a/.../spark/deploy/yarn/YarnClusterSuite.scala → .../spark/deploy/yarn/YarnClusterSuite.scala b/.../spark/deploy/yarn/YarnClusterSuite.scala → .../spark/deploy/yarn/YarnClusterSuite.scala
diff --git a/...oy/yarn/YarnShuffleIntegrationSuite.scala → ...oy/yarn/YarnShuffleIntegrationSuite.scala b/...oy/yarn/YarnShuffleIntegrationSuite.scala → ...oy/yarn/YarnShuffleIntegrationSuite.scala
diff --git a/...eploy/yarn/YarnSparkHadoopUtilSuite.scala → ...eploy/yarn/YarnSparkHadoopUtilSuite.scala b/...eploy/yarn/YarnSparkHadoopUtilSuite.scala → ...eploy/yarn/YarnSparkHadoopUtilSuite.scala
diff --git a/.../ConfigurableCredentialManagerSuite.scala → .../ConfigurableCredentialManagerSuite.scala b/.../ConfigurableCredentialManagerSuite.scala → .../ConfigurableCredentialManagerSuite.scala
diff --git a/...ecurity/HDFSCredentialProviderSuite.scala → ...ecurity/HDFSCredentialProviderSuite.scala b/...ecurity/HDFSCredentialProviderSuite.scala → ...ecurity/HDFSCredentialProviderSuite.scala
diff --git a/...spark/launcher/TestClasspathBuilder.scala → ...spark/launcher/TestClasspathBuilder.scala b/...spark/launcher/TestClasspathBuilder.scala → ...spark/launcher/TestClasspathBuilder.scala
diff --git a/...network/shuffle/ShuffleTestAccessor.scala → ...network/shuffle/ShuffleTestAccessor.scala b/...network/shuffle/ShuffleTestAccessor.scala → ...network/shuffle/ShuffleTestAccessor.scala
diff --git a/...etwork/yarn/YarnShuffleServiceSuite.scala → ...etwork/yarn/YarnShuffleServiceSuite.scala b/...etwork/yarn/YarnShuffleServiceSuite.scala → ...etwork/yarn/YarnShuffleServiceSuite.scala
diff --git a/...spark/network/yarn/YarnTestAccessor.scala → ...spark/network/yarn/YarnTestAccessor.scala b/...spark/network/yarn/YarnTestAccessor.scala → ...spark/network/yarn/YarnTestAccessor.scala
diff --git a/...er/ExtensionServiceIntegrationSuite.scala → ...er/ExtensionServiceIntegrationSuite.scala b/...er/ExtensionServiceIntegrationSuite.scala → ...er/ExtensionServiceIntegrationSuite.scala
diff --git a/...uler/cluster/SimpleExtensionService.scala → ...uler/cluster/SimpleExtensionService.scala b/...uler/cluster/SimpleExtensionService.scala → ...uler/cluster/SimpleExtensionService.scala
diff --git a/...er/cluster/StubApplicationAttemptId.scala → ...er/cluster/StubApplicationAttemptId.scala b/...er/cluster/StubApplicationAttemptId.scala → ...er/cluster/StubApplicationAttemptId.scala
diff --git a/...scheduler/cluster/StubApplicationId.scala → ...scheduler/cluster/StubApplicationId.scala b/...scheduler/cluster/StubApplicationId.scala → ...scheduler/cluster/StubApplicationId.scala