SLIDER-353 killJavaProcesses doesn't work on windows ... skip when reached, and swallowed on teardown
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/87ff4d80 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/87ff4d80 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/87ff4d80 Branch: refs/heads/develop Commit: 87ff4d80cad1e7b1badaad6e0a5c04961e633430 Parents: 8b43def Author: Steve Loughran <ste...@apache.org> Authored: Fri Aug 22 17:05:09 2014 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Fri Aug 22 17:05:09 2014 +0100 ---------------------------------------------------------------------- .../org/apache/slider/test/YarnMiniClusterTestBase.groovy | 4 +++- .../slider/providers/accumulo/AccumuloTestBase.groovy | 7 ++++++- .../hbase/minicluster/HBaseMiniClusterTestBase.groovy | 9 +++++++-- 3 files changed, 16 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/87ff4d80/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy b/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy index b6f863b..09c56a5 100644 --- a/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy @@ -64,7 +64,7 @@ import static org.apache.slider.common.SliderXMLConfKeysForTesting.*; * Base class for mini cluster tests -creates a field for the * mini yarn cluster */ -@CompileStatic +//@CompileStatic @Slf4j public abstract class YarnMiniClusterTestBase extends ServiceLauncherBaseTest { /** @@ -327,6 +327,8 @@ public abstract class YarnMiniClusterTestBase extends ServiceLauncherBaseTest { */ public void killJavaProcesses(String grepString, int signal) { + assume(!Shell.WINDOWS, "failed to kill -$signal $grepString - no windows support ") + GString bashCommand = "jps -l| grep ${grepString} | awk '{print \$1}' | xargs kill $signal" log.info("Bash command = $bashCommand" ) Process bash = ["bash", "-c", bashCommand].execute() http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/87ff4d80/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/AccumuloTestBase.groovy ---------------------------------------------------------------------- diff --git a/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/AccumuloTestBase.groovy b/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/AccumuloTestBase.groovy index bf35207..93b2798 100644 --- a/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/AccumuloTestBase.groovy +++ b/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/AccumuloTestBase.groovy @@ -27,6 +27,7 @@ import org.apache.slider.api.ClusterDescription import org.apache.slider.api.ResourceKeys import org.apache.slider.client.SliderClient import org.apache.slider.test.YarnZKMiniClusterTestBase +import org.junit.internal.AssumptionViolatedException import static org.apache.slider.common.SliderXMLConfKeysForTesting.* import static org.apache.slider.providers.accumulo.AccumuloKeys.* @@ -71,7 +72,11 @@ public abstract class AccumuloTestBase extends YarnZKMiniClusterTestBase { void teardown() { super.teardown(); if (teardownKillall) { - killAllAccumuloProcesses(); + try { + killAllAccumuloProcesses(); + } catch (AssumptionViolatedException e) { + log.info e.toString(); + } } } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/87ff4d80/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/HBaseMiniClusterTestBase.groovy ---------------------------------------------------------------------- diff --git a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/HBaseMiniClusterTestBase.groovy b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/HBaseMiniClusterTestBase.groovy index 6a69e17..10de9ac 100644 --- a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/HBaseMiniClusterTestBase.groovy +++ b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/HBaseMiniClusterTestBase.groovy @@ -30,6 +30,7 @@ import org.apache.slider.client.SliderClient import org.apache.slider.core.main.ServiceLauncher import org.apache.slider.providers.hbase.HBaseTestUtils import org.apache.slider.test.YarnZKMiniClusterTestBase +import org.junit.internal.AssumptionViolatedException import static org.apache.slider.common.params.Arguments.* import static org.apache.slider.test.SliderTestUtils.* @@ -76,8 +77,12 @@ public abstract class HBaseMiniClusterTestBase extends YarnZKMiniClusterTestBase void teardown() { super.teardown(); if (teardownKillall) { - killAllRegionServers(); - killAllMasterServers(); + try { + killAllRegionServers(); + killAllMasterServers(); + } catch (AssumptionViolatedException e) { + log.info e.toString(); + } } }
