You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2014/11/08 22:56:21 UTC
[1/6] incubator-slider git commit: SLIDER-622 jenkins failing on
windows
Repository: incubator-slider
Updated Branches:
refs/heads/develop e74e7fe08 -> db16e03d4
SLIDER-622 jenkins failing on windows
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/0dea0dc3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/0dea0dc3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/0dea0dc3
Branch: refs/heads/develop
Commit: 0dea0dc3a806c9ecea1bea33bcb30fdf1885d0b3
Parents: b181630
Author: Steve Loughran <st...@apache.org>
Authored: Fri Nov 7 19:53:05 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Fri Nov 7 19:53:05 2014 +0000
----------------------------------------------------------------------
.../slider/agent/standalone/TestStandaloneAgentAM.groovy | 9 ++++++---
.../slider/providers/agent/TestAgentAMManagementWS.groovy | 4 ++--
.../server/appmaster/TestDelayInContainerLaunch.groovy | 4 ++--
.../groovy/org/apache/slider/test/SliderTestBase.groovy | 5 +----
.../groovy/org/apache/slider/test/SliderTestUtils.groovy | 3 ++-
5 files changed, 13 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0dea0dc3/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentAM.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentAM.groovy b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentAM.groovy
index f04583e..ce726f9 100644
--- a/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentAM.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentAM.groovy
@@ -165,8 +165,11 @@ class TestStandaloneAgentAM extends AgentMiniClusterTestBase {
clustername)
assert instance3.yarnApplicationState >= YarnApplicationState.FINISHED
+ // destroy it
+ client.actionDestroy(clustername)
+
//create another AM, this time with a port range
- setSliderClientClassName(TestSliderClient.name)
+ sliderClientClassName = ExtendedSliderClient.name
try {
launcher = createStandaloneAM(clustername, true, true)
client = launcher.service
@@ -180,12 +183,12 @@ class TestStandaloneAgentAM extends AgentMiniClusterTestBase {
assert 0 == clusterActionFreeze(client, clustername)
} finally {
- setSliderClientClassName(SliderClient.name)
+ sliderClientClassName = DEFAULT_SLIDER_CLIENT
}
}
- static class TestSliderClient extends SliderClient {
+ static class ExtendedSliderClient extends SliderClient {
@Override
protected void persistInstanceDefinition(boolean overwrite,
Path appconfdir,
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0dea0dc3/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentAMManagementWS.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentAMManagementWS.groovy b/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentAMManagementWS.groovy
index 7434c4e..887ca89 100644
--- a/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentAMManagementWS.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentAMManagementWS.groovy
@@ -124,7 +124,7 @@ class TestAgentAMManagementWS extends AgentTestBase {
assert agt_ver_path.exists()
assert agt_conf_path.exists()
try {
- setSliderClientClassName(TestSliderClient.name)
+ sliderClientClassName = TestSliderClient.name
ServiceLauncher<SliderClient> launcher = buildAgentCluster(clustername,
roles,
[
@@ -174,7 +174,7 @@ class TestAgentAMManagementWS extends AgentTestBase {
//TODO: assert failure as actual agent is not started. This test only starts the AM.
assert RegistrationStatus.FAILED == response.getResponseStatus();
} finally {
- setSliderClientClassName(SliderClient.name)
+ sliderClientClassName = DEFAULT_SLIDER_CLIENT
}
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0dea0dc3/slider-core/src/test/groovy/org/apache/slider/server/appmaster/TestDelayInContainerLaunch.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/TestDelayInContainerLaunch.groovy b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/TestDelayInContainerLaunch.groovy
index 973d3af..f32b843 100644
--- a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/TestDelayInContainerLaunch.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/TestDelayInContainerLaunch.groovy
@@ -100,7 +100,7 @@ class TestDelayInContainerLaunch extends AgentTestBase {
long delay = 30
TestDelayingSliderClient.delay = delay
- setSliderClientClassName(TestDelayingSliderClient.name)
+ sliderClientClassName = TestDelayingSliderClient
try {
ServiceLauncher<SliderClient> launcher = buildAgentCluster(clustername,
roles,
@@ -134,7 +134,7 @@ class TestDelayInContainerLaunch extends AgentTestBase {
assert duration/1000 >= delay
} finally {
- setSliderClientClassName(SliderClient.name)
+ sliderClientClassName = DEFAULT_SLIDER_CLIENT
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0dea0dc3/slider-core/src/test/groovy/org/apache/slider/test/SliderTestBase.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/test/SliderTestBase.groovy b/slider-core/src/test/groovy/org/apache/slider/test/SliderTestBase.groovy
index afb07d8..e0798a4 100644
--- a/slider-core/src/test/groovy/org/apache/slider/test/SliderTestBase.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/test/SliderTestBase.groovy
@@ -27,7 +27,6 @@ import org.junit.BeforeClass
import org.junit.Rule
import org.junit.rules.TestName
-//import java.nio.file.Files
/**
* Base class for unit tests as well as ones starting mini clusters
@@ -54,10 +53,8 @@ public abstract class SliderTestBase extends SliderTestUtils {
@Before
public void setup() {
+ sliderClientClassName = DEFAULT_SLIDER_CLIENT
FileUtil.fullyDelete(new File(SliderXMLConfKeysForTesting.TEST_SECURITY_DIR))
}
-
-
-
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0dea0dc3/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy b/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy
index 3b1d022..e67145e 100644
--- a/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy
@@ -64,7 +64,8 @@ import static Arguments.ARG_OPTION
@Slf4j
@CompileStatic
class SliderTestUtils extends Assert {
- static String sliderClientClassName = SliderClient.class.name
+ public static final String DEFAULT_SLIDER_CLIENT = SliderClient.class.name
+ static String sliderClientClassName = DEFAULT_SLIDER_CLIENT
public static void describe(String s) {
log.info("");
[5/6] incubator-slider git commit: SLIDER-622 jenkins failing on
windows - naming/CNFE problems
Posted by st...@apache.org.
SLIDER-622 jenkins failing on windows - naming/CNFE problems
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/6c7d59f5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/6c7d59f5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/6c7d59f5
Branch: refs/heads/develop
Commit: 6c7d59f5ddd18243ef799a4459ea8ad46704df6f
Parents: a04ce5f
Author: Steve Loughran <st...@apache.org>
Authored: Fri Nov 7 21:34:14 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Fri Nov 7 21:34:14 2014 +0000
----------------------------------------------------------------------
.../server/appmaster/TestDelayInContainerLaunch.groovy | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/6c7d59f5/slider-core/src/test/groovy/org/apache/slider/server/appmaster/TestDelayInContainerLaunch.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/TestDelayInContainerLaunch.groovy b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/TestDelayInContainerLaunch.groovy
index 5e6226e..26a2c95 100644
--- a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/TestDelayInContainerLaunch.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/TestDelayInContainerLaunch.groovy
@@ -18,21 +18,16 @@
package org.apache.slider.server.appmaster
-import groovy.transform.CompileStatic
import groovy.util.logging.Slf4j
import org.apache.hadoop.fs.Path
-import org.apache.hadoop.yarn.api.records.ApplicationId
-import org.apache.hadoop.yarn.api.records.ApplicationReport
import org.apache.hadoop.yarn.conf.YarnConfiguration
import org.apache.hadoop.yarn.exceptions.YarnException
import org.apache.slider.api.ClusterDescription
import org.apache.slider.api.ResourceKeys
import org.apache.slider.client.SliderClient
-import org.apache.slider.common.SliderExitCodes
import org.apache.slider.common.params.ActionKillContainerArgs
import org.apache.slider.core.build.InstanceBuilder
import org.apache.slider.core.conf.AggregateConf
-import org.apache.slider.core.exceptions.BadClusterStateException
import org.apache.slider.core.exceptions.SliderException
import org.apache.slider.core.launch.LaunchedApplication
import org.apache.slider.core.main.ServiceLauncher
@@ -99,8 +94,8 @@ class TestDelayInContainerLaunch extends AgentTestBase {
];
long delay = 30
- TestDelayingSliderClient.delay = delay
- sliderClientClassName = TestDelayingSliderClient.name
+ DelayingSliderClient.delay = delay
+ sliderClientClassName = DelayingSliderClient.name
try {
ServiceLauncher<SliderClient> launcher = buildAgentCluster(clustername,
roles,
@@ -140,7 +135,9 @@ class TestDelayInContainerLaunch extends AgentTestBase {
}
- static class TestDelayingSliderClient extends SliderClient {
+ static class DelayingSliderClient extends SliderClient {
+
+
static long delay
@Override
protected void persistInstanceDefinition(boolean overwrite,
[2/6] incubator-slider git commit: SLIDER-622 jenkins failing on
windows
Posted by st...@apache.org.
SLIDER-622 jenkins failing on windows
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/3e6cf34f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/3e6cf34f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/3e6cf34f
Branch: refs/heads/develop
Commit: 3e6cf34f69a31fde456b744e1530f5646d69de8f
Parents: 0dea0dc
Author: Steve Loughran <st...@apache.org>
Authored: Fri Nov 7 20:29:58 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Fri Nov 7 20:29:58 2014 +0000
----------------------------------------------------------------------
.../standalone/TestStandaloneAgentAM.groovy | 45 ++++++++------------
1 file changed, 18 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/3e6cf34f/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentAM.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentAM.groovy b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentAM.groovy
index ce726f9..b525ea6 100644
--- a/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentAM.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentAM.groovy
@@ -37,25 +37,37 @@ import org.apache.slider.core.launch.LaunchedApplication
import org.apache.slider.core.main.LauncherExitCodes
import org.apache.slider.core.main.ServiceLauncher
import org.apache.slider.core.persist.LockAcquireFailedException
+import org.junit.After
import org.junit.Test
@CompileStatic
@Slf4j
class TestStandaloneAgentAM extends AgentMiniClusterTestBase {
+ @After
+ def clientname() {
+ sliderClientClassName = DEFAULT_SLIDER_CLIENT
+ }
+
@Test
public void testStandaloneAgentAM() throws Throwable {
describe "create a standalone AM then perform actions on it"
-
+ sliderClientClassName = ExtendedSliderClient.name
//launch fake master
String clustername = createMiniCluster("", configuration, 1, true)
+
+
ServiceLauncher<SliderClient> launcher =
createStandaloneAM(clustername, true, false)
SliderClient client = launcher.service
addToTeardown(client);
ApplicationReport report = waitForClusterLive(client)
+ URI uri = new URI(report.originalTrackingUrl)
+ assert uri.port in [60000, 60001, 60002, 60003]
+ assert report.rpcPort in [60000, 60001, 60002, 60003]
+
logReport(report)
List<ApplicationReport> apps = client.applications;
@@ -82,8 +94,6 @@ class TestStandaloneAgentAM extends AgentMiniClusterTestBase {
assert nodes[0].role == SliderKeys.COMPONENT_AM
-
-
String username = client.username
def serviceRegistryClient = client.yarnAppListClient
describe("list of all applications")
@@ -168,23 +178,6 @@ class TestStandaloneAgentAM extends AgentMiniClusterTestBase {
// destroy it
client.actionDestroy(clustername)
- //create another AM, this time with a port range
- sliderClientClassName = ExtendedSliderClient.name
- try {
- launcher = createStandaloneAM(clustername, true, true)
- client = launcher.service
- i2AppID = client.applicationId
-
- reportFor = client.getApplicationReport(i2AppID)
- URI uri = new URI(reportFor.originalTrackingUrl)
- assert uri.port in [60000, 60001, 60002, 60003]
- assert reportFor.rpcPort in [60000, 60001, 60002, 60003]
-
- assert 0 == clusterActionFreeze(client, clustername)
-
- } finally {
- sliderClientClassName = DEFAULT_SLIDER_CLIENT
- }
}
@@ -194,10 +187,9 @@ class TestStandaloneAgentAM extends AgentMiniClusterTestBase {
Path appconfdir,
InstanceBuilder builder)
throws IOException, SliderException, LockAcquireFailedException {
- AggregateConf conf = builder.getInstanceDescription()
- conf.getAppConfOperations().getGlobalOptions().put(
- SliderKeys.KEY_ALLOWED_PORT_RANGE,
- "60000-60003")
+ AggregateConf conf = builder.instanceDescription
+ conf.appConfOperations.
+ globalOptions[SliderKeys.KEY_ALLOWED_PORT_RANGE]= "60000-60003"
super.persistInstanceDefinition(overwrite, appconfdir, builder)
}
@@ -207,9 +199,8 @@ class TestStandaloneAgentAM extends AgentMiniClusterTestBase {
AggregateConf instanceDefinition,
boolean debugAM)
throws YarnException, IOException {
- instanceDefinition.getAppConfOperations().getGlobalOptions().put(
- SliderKeys.KEY_ALLOWED_PORT_RANGE,
- "60000-60003")
+ instanceDefinition.appConfOperations.
+ globalOptions[SliderKeys.KEY_ALLOWED_PORT_RANGE] ="60000-60003"
return super.launchApplication(clustername, clusterDirectory, instanceDefinition, debugAM)
}
}
[4/6] incubator-slider git commit: SLIDER-622 jenkins failing on
windows - fix regression
Posted by st...@apache.org.
SLIDER-622 jenkins failing on windows - fix regression
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/a04ce5fd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/a04ce5fd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/a04ce5fd
Branch: refs/heads/develop
Commit: a04ce5fd43e205925890424bfb33f0b6edf0c3cd
Parents: 727a755
Author: Steve Loughran <st...@apache.org>
Authored: Fri Nov 7 21:28:24 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Fri Nov 7 21:28:24 2014 +0000
----------------------------------------------------------------------
.../slider/server/appmaster/TestDelayInContainerLaunch.groovy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/a04ce5fd/slider-core/src/test/groovy/org/apache/slider/server/appmaster/TestDelayInContainerLaunch.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/TestDelayInContainerLaunch.groovy b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/TestDelayInContainerLaunch.groovy
index f32b843..5e6226e 100644
--- a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/TestDelayInContainerLaunch.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/TestDelayInContainerLaunch.groovy
@@ -100,7 +100,7 @@ class TestDelayInContainerLaunch extends AgentTestBase {
long delay = 30
TestDelayingSliderClient.delay = delay
- sliderClientClassName = TestDelayingSliderClient
+ sliderClientClassName = TestDelayingSliderClient.name
try {
ServiceLauncher<SliderClient> launcher = buildAgentCluster(clustername,
roles,
[6/6] incubator-slider git commit: Merge branch
'feature/SLIDER-622-jenkins-windows' into develop
Posted by st...@apache.org.
Merge branch 'feature/SLIDER-622-jenkins-windows' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/db16e03d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/db16e03d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/db16e03d
Branch: refs/heads/develop
Commit: db16e03d445e9583d0811e9b87ca6ef67b5dd900
Parents: e74e7fe 6c7d59f
Author: Steve Loughran <st...@apache.org>
Authored: Sat Nov 8 21:56:06 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Sat Nov 8 21:56:06 2014 +0000
----------------------------------------------------------------------
.../standalone/TestStandaloneAgentAM.groovy | 50 +++++++++-----------
.../agent/TestAgentAMManagementWS.groovy | 4 +-
.../appmaster/TestDelayInContainerLaunch.groovy | 15 +++---
.../apache/slider/test/SliderTestBase.groovy | 5 +-
.../apache/slider/test/SliderTestUtils.groovy | 3 +-
5 files changed, 33 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
[3/6] incubator-slider git commit: SLIDER-622 jenkins failing on
windows
Posted by st...@apache.org.
SLIDER-622 jenkins failing on windows
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/727a7554
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/727a7554
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/727a7554
Branch: refs/heads/develop
Commit: 727a7554a28caf50df53d40f4d65ac56ba3bb9cf
Parents: 3e6cf34
Author: Steve Loughran <st...@apache.org>
Authored: Fri Nov 7 20:45:59 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Fri Nov 7 20:45:59 2014 +0000
----------------------------------------------------------------------
.../apache/slider/agent/standalone/TestStandaloneAgentAM.groovy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/727a7554/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentAM.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentAM.groovy b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentAM.groovy
index b525ea6..7987661 100644
--- a/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentAM.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentAM.groovy
@@ -45,7 +45,7 @@ import org.junit.Test
class TestStandaloneAgentAM extends AgentMiniClusterTestBase {
@After
- def clientname() {
+ void fixclientname() {
sliderClientClassName = DEFAULT_SLIDER_CLIENT
}