From 7d4559d927eca1246ec50b39bcce75b80280633c Mon Sep 17 00:00:00 2001 From: AndyJiang99 <20528968+AndyJiang99@users.noreply.github.com> Date: Tue, 7 Feb 2023 13:27:27 -0800 Subject: [PATCH 1/2] Refactor YarnServiceIT to YarnServiceTest --- .../yarn/{YarnServiceTest.java => YarnServiceIT.java} | 8 ++++---- .../gobblin/yarn/YarnServiceTestWithExpiration.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) rename gobblin-yarn/src/test/java/org/apache/gobblin/yarn/{YarnServiceTest.java => YarnServiceIT.java} (98%) diff --git a/gobblin-yarn/src/test/java/org/apache/gobblin/yarn/YarnServiceTest.java b/gobblin-yarn/src/test/java/org/apache/gobblin/yarn/YarnServiceIT.java similarity index 98% rename from gobblin-yarn/src/test/java/org/apache/gobblin/yarn/YarnServiceTest.java rename to gobblin-yarn/src/test/java/org/apache/gobblin/yarn/YarnServiceIT.java index e143a4b35ab..1586d7f2d24 100644 --- a/gobblin-yarn/src/test/java/org/apache/gobblin/yarn/YarnServiceTest.java +++ b/gobblin-yarn/src/test/java/org/apache/gobblin/yarn/YarnServiceIT.java @@ -78,8 +78,8 @@ * Tests for {@link YarnService}. */ @Test(groups = {"gobblin.yarn", "disabledOnCI"}, singleThreaded=true) -public class YarnServiceTest { - final Logger LOG = LoggerFactory.getLogger(YarnServiceTest.class); +public class YarnServiceIT { + final Logger LOG = LoggerFactory.getLogger(YarnServiceIT.class); private YarnClient yarnClient; private MiniYARNCluster yarnCluster; @@ -134,8 +134,8 @@ public void setUp() throws Exception { this.yarnClient.init(this.clusterConf); this.yarnClient.start(); - URL url = YarnServiceTest.class.getClassLoader() - .getResource(YarnServiceTest.class.getSimpleName() + ".conf"); + URL url = YarnServiceIT.class.getClassLoader() + .getResource(YarnServiceIT.class.getSimpleName() + ".conf"); Assert.assertNotNull(url, "Could not find resource " + url); this.config = ConfigFactory.parseURL(url).resolve(); diff --git a/gobblin-yarn/src/test/java/org/apache/gobblin/yarn/YarnServiceTestWithExpiration.java b/gobblin-yarn/src/test/java/org/apache/gobblin/yarn/YarnServiceTestWithExpiration.java index 1041cc31bde..f87f96c6f0d 100644 --- a/gobblin-yarn/src/test/java/org/apache/gobblin/yarn/YarnServiceTestWithExpiration.java +++ b/gobblin-yarn/src/test/java/org/apache/gobblin/yarn/YarnServiceTestWithExpiration.java @@ -66,7 +66,7 @@ */ @Test(groups = {"gobblin.yarn", "disabledOnCI"}) public class YarnServiceTestWithExpiration { - final Logger LOG = LoggerFactory.getLogger(YarnServiceTest.class); + final Logger LOG = LoggerFactory.getLogger(YarnServiceIT.class); private YarnClient yarnClient; private MiniYARNCluster yarnCluster; @@ -122,8 +122,8 @@ public void setUp() throws Exception { this.yarnClient.init(this.clusterConf); this.yarnClient.start(); - URL url = YarnServiceTest.class.getClassLoader() - .getResource(YarnServiceTest.class.getSimpleName() + ".conf"); + URL url = YarnServiceIT.class.getClassLoader() + .getResource(YarnServiceIT.class.getSimpleName() + ".conf"); Assert.assertNotNull(url, "Could not find resource " + url); this.config = ConfigFactory.parseURL(url).resolve(); @@ -215,7 +215,7 @@ public boolean apply(Void input) { } - private static class TestExpiredYarnService extends YarnServiceTest.TestYarnService { + private static class TestExpiredYarnService extends YarnServiceIT.TestYarnService { public HashSet startErrorContainers = new HashSet<>(); public HashSet completedContainers = new HashSet<>(); public TestExpiredYarnService(Config config, String applicationName, String applicationId, YarnConfiguration yarnConfiguration, From 4309c2bb807a5b9edb5db6c00c1baf5096835ab6 Mon Sep 17 00:00:00 2001 From: AndyJiang99 <20528968+AndyJiang99@users.noreply.github.com> Date: Tue, 7 Feb 2023 13:44:37 -0800 Subject: [PATCH 2/2] Refactor additional files --- .../test/java/org/apache/gobblin/yarn/YarnServiceIT.java | 2 +- .../apache/gobblin/yarn/YarnServiceTestWithExpiration.java | 2 +- .../resources/{YarnServiceTest.conf => YarnServiceIT.conf} | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) rename gobblin-yarn/src/test/resources/{YarnServiceTest.conf => YarnServiceIT.conf} (95%) diff --git a/gobblin-yarn/src/test/java/org/apache/gobblin/yarn/YarnServiceIT.java b/gobblin-yarn/src/test/java/org/apache/gobblin/yarn/YarnServiceIT.java index 1586d7f2d24..2f444305342 100644 --- a/gobblin-yarn/src/test/java/org/apache/gobblin/yarn/YarnServiceIT.java +++ b/gobblin-yarn/src/test/java/org/apache/gobblin/yarn/YarnServiceIT.java @@ -88,7 +88,7 @@ public class YarnServiceIT { private YarnConfiguration clusterConf; private ApplicationId applicationId; private ApplicationAttemptId applicationAttemptId; - private final EventBus eventBus = new EventBus("YarnServiceTest"); + private final EventBus eventBus = new EventBus("YarnServiceIT"); private final Closer closer = Closer.create(); diff --git a/gobblin-yarn/src/test/java/org/apache/gobblin/yarn/YarnServiceTestWithExpiration.java b/gobblin-yarn/src/test/java/org/apache/gobblin/yarn/YarnServiceTestWithExpiration.java index f87f96c6f0d..f043d1471f7 100644 --- a/gobblin-yarn/src/test/java/org/apache/gobblin/yarn/YarnServiceTestWithExpiration.java +++ b/gobblin-yarn/src/test/java/org/apache/gobblin/yarn/YarnServiceTestWithExpiration.java @@ -75,7 +75,7 @@ public class YarnServiceTestWithExpiration { private YarnConfiguration clusterConf; private ApplicationId applicationId; private ApplicationAttemptId applicationAttemptId; - private final EventBus eventBus = new EventBus("YarnServiceTest"); + private final EventBus eventBus = new EventBus("YarnServiceIT"); private final Closer closer = Closer.create(); diff --git a/gobblin-yarn/src/test/resources/YarnServiceTest.conf b/gobblin-yarn/src/test/resources/YarnServiceIT.conf similarity index 95% rename from gobblin-yarn/src/test/resources/YarnServiceTest.conf rename to gobblin-yarn/src/test/resources/YarnServiceIT.conf index 73ecf85cd48..83ac38698fa 100644 --- a/gobblin-yarn/src/test/resources/YarnServiceTest.conf +++ b/gobblin-yarn/src/test/resources/YarnServiceIT.conf @@ -16,10 +16,10 @@ # # Yarn/Helix configuration properties -gobblin.cluster.helix.cluster.name=YarnServiceTest +gobblin.cluster.helix.cluster.name=YarnServiceIT gobblin.cluster.helixInstanceTags=GobblinKafkaStreaming -gobblin.yarn.app.name=YarnServiceTest -gobblin.yarn.work.dir=YarnServiceTest +gobblin.yarn.app.name=YarnServiceIT +gobblin.yarn.work.dir=YarnServiceIT gobblin.yarn.lib.jars.dir="build/gobblin-yarn/libs" gobblin.yarn.conf.dir="gobblin-yarn/src/test/resources"