[1/2] git commit: SLIDER-159 TestLongLivedProcess.testEcho failing
Repository: incubator-slider
Updated Branches:
refs/heads/develop 5bb80a42b - 0151b9f53
SLIDER-159 TestLongLivedProcess.testEcho failing
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/e9ddcf0b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/e9ddcf0b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/e9ddcf0b
Branch: refs/heads/develop
Commit: e9ddcf0b13beb6aea3822ee0164f6f46f40676f2
Parents: 5bb80a4
Author: Steve Loughran ste...@apache.org
Authored: Wed Jul 2 13:23:54 2014 +0100
Committer: Steve Loughran ste...@apache.org
Committed: Wed Jul 2 13:23:54 2014 +0100
--
.../services/workflow/ForkedProcessService.java | 22 +-
.../services/workflow/LongLivedProcess.java | 31
.../services/workflow/TestLongLivedProcess.java | 5 ++--
3 files changed, 35 insertions(+), 23 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e9ddcf0b/slider-core/src/main/java/org/apache/slider/server/services/workflow/ForkedProcessService.java
--
diff --git
a/slider-core/src/main/java/org/apache/slider/server/services/workflow/ForkedProcessService.java
b/slider-core/src/main/java/org/apache/slider/server/services/workflow/ForkedProcessService.java
index ee68aa4..ccce6cb 100644
---
a/slider-core/src/main/java/org/apache/slider/server/services/workflow/ForkedProcessService.java
+++
b/slider-core/src/main/java/org/apache/slider/server/services/workflow/ForkedProcessService.java
@@ -279,27 +279,7 @@ public class ForkedProcessService extends
AbstractWorkflowExecutorService implem
if (process == null) {
return new LinkedListString();
}
-long start = System.currentTimeMillis();
-while (System.currentTimeMillis() - start = duration) {
- boolean finished;
- if (finalOutput) {
-// final flag means block until all data is done
-finished = process.isFinalOutputProcessed();
- } else {
-// there is some output
-finished = !process.isRecentOutputEmpty();
- }
- if (finished) {
-break;
- }
- try {
-Thread.sleep(100);
- } catch (InterruptedException ie) {
-Thread.currentThread().interrupt();
-break;
- }
-}
-return process.getRecentOutput();
+return process.getRecentOutput(finalOutput, duration);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e9ddcf0b/slider-core/src/main/java/org/apache/slider/server/services/workflow/LongLivedProcess.java
--
diff --git
a/slider-core/src/main/java/org/apache/slider/server/services/workflow/LongLivedProcess.java
b/slider-core/src/main/java/org/apache/slider/server/services/workflow/LongLivedProcess.java
index d9ddecb..05a1c50 100644
---
a/slider-core/src/main/java/org/apache/slider/server/services/workflow/LongLivedProcess.java
+++
b/slider-core/src/main/java/org/apache/slider/server/services/workflow/LongLivedProcess.java
@@ -357,6 +357,37 @@ public class LongLivedProcess implements Runnable {
}
/**
+ * Get the recent output from the process, or [] if not defined
+ *
+ * @param finalOutput flag to indicate wait for the final output of the
process
+ * @param duration the duration, in ms,
+ * ro wait for recent output to become non-empty
+ * @return a possibly empty list
+ */
+ public ListString getRecentOutput(boolean finalOutput, int duration) {
+long start = System.currentTimeMillis();
+while (System.currentTimeMillis() - start = duration) {
+ boolean finishedOutput;
+ if (finalOutput) {
+// final flag means block until all data is done
+finishedOutput = isFinalOutputProcessed();
+ } else {
+// there is some output
+finishedOutput = !isRecentOutputEmpty();
+ }
+ if (finishedOutput) {
+break;
+ }
+ try {
+Thread.sleep(100);
+ } catch (InterruptedException ie) {
+Thread.currentThread().interrupt();
+break;
+ }
+}
+return getRecentOutput();
+ }
+ /**
* add the recent line to the list of recent lines; deleting
* an earlier on if the limit is reached.
*
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e9ddcf0b/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestLongLivedProcess.java
--
diff --git
a/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestLongLivedProcess.java
b/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestLongLivedProcess.java
index c8a0719..668bcca
[2/2] git commit: SLIDER-200 double mvn install failing as rat rejects hbase/target/rat.txt
SLIDER-200 double mvn install failing as rat rejects hbase/target/rat.txt Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/0151b9f5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/0151b9f5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/0151b9f5 Branch: refs/heads/develop Commit: 0151b9f53cdc46e39d80709c8090308f53bbfd3b Parents: e9ddcf0 Author: Steve Loughran ste...@apache.org Authored: Wed Jul 2 13:30:26 2014 +0100 Committer: Steve Loughran ste...@apache.org Committed: Wed Jul 2 13:30:26 2014 +0100 -- pom.xml | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0151b9f5/pom.xml -- diff --git a/pom.xml b/pom.xml index 460fb0d..0076561 100644 --- a/pom.xml +++ b/pom.xml @@ -300,6 +300,7 @@ exclude**/httpfs-signature.secret/exclude exclude**/dfs.exclude/exclude exclude**/*.iml/exclude +exclude**/rat.txt/exclude excludeDISCLAIMER/exclude /excludes /configuration
git commit: SLIDER-201 jenkins windows support - fail fast on HADOOP-10775
Repository: incubator-slider
Updated Branches:
refs/heads/develop 0151b9f53 - a6cbab17b
SLIDER-201 jenkins windows support - fail fast on HADOOP-10775
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/a6cbab17
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/a6cbab17
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/a6cbab17
Branch: refs/heads/develop
Commit: a6cbab17bf591d7b0a6f908ea291c6b4c549bd6d
Parents: 0151b9f
Author: Steve Loughran ste...@apache.org
Authored: Wed Jul 2 15:37:54 2014 +0100
Committer: Steve Loughran ste...@apache.org
Committed: Wed Jul 2 15:37:54 2014 +0100
--
.../org/apache/slider/test/YarnMiniClusterTestBase.groovy | 9 +
1 file changed, 9 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/a6cbab17/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 e5715b1..a5c8710 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
@@ -28,6 +28,7 @@ import org.apache.hadoop.fs.FileUtil
import org.apache.hadoop.fs.Path
import org.apache.hadoop.hdfs.MiniDFSCluster
import org.apache.hadoop.service.ServiceOperations
+import org.apache.hadoop.util.Shell
import org.apache.hadoop.yarn.api.records.ApplicationReport
import org.apache.hadoop.yarn.api.records.YarnApplicationState
import org.apache.hadoop.yarn.conf.YarnConfiguration
@@ -48,7 +49,9 @@ import org.apache.slider.core.main.ServiceLauncher
import org.apache.slider.core.main.ServiceLauncherBaseTest
import org.apache.slider.server.appmaster.SliderAppMaster
import org.junit.After
+import org.junit.Assert
import org.junit.Before
+import org.junit.BeforeClass
import org.junit.Rule
import org.junit.rules.TestName
import org.junit.rules.Timeout
@@ -126,6 +129,12 @@ public abstract class YarnMiniClusterTestBase extends
ServiceLauncherBaseTest {
KEY_TEST_TIMEOUT,
DEFAULT_TEST_TIMEOUT_SECONDS * 1000)
)
+ @BeforeClass
+ public void checkWindowsSupport() {
+if (Shell.WINDOWS) {
+ Assert.assertNotNull(winutils.exe not found, Shell.WINUTILS)
+}
+ }
@Rule
git commit: SLIDER-201 jenkins windows support - fail fast wasnt static
Repository: incubator-slider
Updated Branches:
refs/heads/develop a6cbab17b - 6d96ba956
SLIDER-201 jenkins windows support - fail fast wasnt static
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/6d96ba95
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/6d96ba95
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/6d96ba95
Branch: refs/heads/develop
Commit: 6d96ba95659c2f47771eebbc1c632c89c3ee173f
Parents: a6cbab1
Author: Steve Loughran ste...@apache.org
Authored: Wed Jul 2 16:37:31 2014 +0100
Committer: Steve Loughran ste...@apache.org
Committed: Wed Jul 2 16:37:31 2014 +0100
--
.../groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/6d96ba95/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 a5c8710..80a83a4 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
@@ -130,9 +130,9 @@ public abstract class YarnMiniClusterTestBase extends
ServiceLauncherBaseTest {
DEFAULT_TEST_TIMEOUT_SECONDS * 1000)
)
@BeforeClass
- public void checkWindowsSupport() {
+ public static void checkWindowsSupport() {
if (Shell.WINDOWS) {
- Assert.assertNotNull(winutils.exe not found, Shell.WINUTILS)
+ assertNotNull(winutils.exe not found, Shell.WINUTILS)
}
}
git commit: SLIDER-34 re-enable disabled test to verify that YARN-2065 fixes the problem
Repository: incubator-slider
Updated Branches:
refs/heads/feature/SLIDER-34_AM_Restart_not_working [created] cdbed7d7e
SLIDER-34 re-enable disabled test to verify that YARN-2065 fixes the problem
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/cdbed7d7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/cdbed7d7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/cdbed7d7
Branch: refs/heads/feature/SLIDER-34_AM_Restart_not_working
Commit: cdbed7d7efcbbb132124aacd4bf69178e0274be2
Parents: 6d96ba9
Author: Steve Loughran ste...@apache.org
Authored: Wed Jul 2 16:50:21 2014 +0100
Committer: Steve Loughran ste...@apache.org
Committed: Wed Jul 2 16:50:21 2014 +0100
--
.../providers/hbase/minicluster/failures/TestKilledHBaseAM.groovy | 1 -
1 file changed, 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/cdbed7d7/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/failures/TestKilledHBaseAM.groovy
--
diff --git
a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/failures/TestKilledHBaseAM.groovy
b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/failures/TestKilledHBaseAM.groovy
index 2237c5d..2c1ff57 100644
---
a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/failures/TestKilledHBaseAM.groovy
+++
b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/failures/TestKilledHBaseAM.groovy
@@ -47,7 +47,6 @@ class TestKilledHBaseAM extends HBaseMiniClusterTestBase {
@Test
public void testKilledHBaseAM() throws Throwable {
-skip(SLIDER-66: AM Restart Failing -YARN issues)
String clustername = test_killed_hbase_am
int regionServerCount = 1
[26/26] git commit: SLIDER-151 adding actions
SLIDER-151 adding actions
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/621a981c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/621a981c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/621a981c
Branch:
refs/heads/feature/SLIDER-151_Implement_full_slider_API_in_REST_and_switch_client_to_it
Commit: 621a981cb185f76917b8c612b4062200208caa45
Parents: fe513d2
Author: Steve Loughran ste...@apache.org
Authored: Fri Jun 20 16:08:08 2014 -0700
Committer: Steve Loughran ste...@apache.org
Committed: Wed Jul 2 17:00:06 2014 +0100
--
.../web/rest/management/ManagementResource.java | 43 ++--
1 file changed, 40 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/621a981c/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/management/ManagementResource.java
--
diff --git
a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/management/ManagementResource.java
b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/management/ManagementResource.java
index 02199cf..8a6b928 100644
---
a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/management/ManagementResource.java
+++
b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/management/ManagementResource.java
@@ -29,6 +29,7 @@ import org.slf4j.LoggerFactory;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.GET;
+import javax.ws.rs.*;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
@@ -46,6 +47,8 @@ import java.net.URL;
public class ManagementResource extends AbstractSliderResource {
protected static final Logger log =
LoggerFactory.getLogger(ManagementResource.class);
+ public static final String CONFIG = config;
+ public static final String APP_UNDER_MANAGEMENT = /app;
public ManagementResource(WebAppApi slider) {
super(slider);
@@ -80,9 +83,9 @@ public class ManagementResource extends
AbstractSliderResource {
}
@GET
- @Path(/app/configurations/{config})
+ @Path(APP_UNDER_MANAGEMENT+/configurations/{config})
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
- public ConfTreeResource getConfTreeResource(@PathParam(config) String
config,
+ public ConfTreeResource getConfTreeResource(@PathParam(CONFIG) String config,
@Context UriInfo uriInfo,
@Context HttpServletResponse
res) {
init(res);
@@ -90,11 +93,45 @@ public class ManagementResource extends
AbstractSliderResource {
ResourceFactory.createAggregateConfResource(getAggregateConf(),
uriInfo.getBaseUriBuilder()
.path(RestPaths.SLIDER_CONTEXT_ROOT)
- .path(RestPaths.MANAGEMENT + /app));
+ .path(RestPaths.MANAGEMENT + APP_UNDER_MANAGEMENT));
return aggregateConf.getConfTree(config);
}
protected AggregateConf getAggregateConf() {
return slider.getAppState().getInstanceDefinitionSnapshot();
}
+
+ @POST
+ @Path(actions/flex)
+public void actionFlex() {
+ }
+
+ @POST
+ @Path(actions/stop)
+public void actionStop() {
+ }
+
+
+ @POST
+ @Path(actions/test/suicide)
+public void actionSuicide() {
+ }
+
+ @POST
+ @Path(actions/test/kill-container)
+public void actionKillContainer() {
+ }
+
+
+ @GET
+ @Path(containers+/components +/{name})
+ public void actionListContainers() {
+ }
+
+ @GET
+ @Path(containers+/components +/{name})
+ public void actionListContainersbyComponent() {
+ }
+
+
}
[10/26] git commit: SLIDER-171: connectivity tests to verify state of funtest client config
SLIDER-171: connectivity tests to verify state of funtest client config
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/fb73dbca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/fb73dbca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/fb73dbca
Branch:
refs/heads/feature/SLIDER-151_Implement_full_slider_API_in_REST_and_switch_client_to_it
Commit: fb73dbca80cd87c2880d7e46325a67c507f58ee0
Parents: a6a4680
Author: Steve Loughran ste...@apache.org
Authored: Tue Jul 1 20:08:54 2014 +0100
Committer: Steve Loughran ste...@apache.org
Committed: Tue Jul 1 20:08:54 2014 +0100
--
.../slider/client/SliderYarnClientImpl.java | 3 +-
.../funtest/framework/CommandTestBase.groovy| 4 +-
.../basic/TestClusterConnectivity.groovy| 96
.../clusters/c6401/slider/slider-client.xml | 14 ++-
.../clusters/morzine/slider/slider-client.xml | 29 --
5 files changed, 132 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/fb73dbca/slider-core/src/main/java/org/apache/slider/client/SliderYarnClientImpl.java
--
diff --git
a/slider-core/src/main/java/org/apache/slider/client/SliderYarnClientImpl.java
b/slider-core/src/main/java/org/apache/slider/client/SliderYarnClientImpl.java
index 0c83e0c..e7b492b 100644
---
a/slider-core/src/main/java/org/apache/slider/client/SliderYarnClientImpl.java
+++
b/slider-core/src/main/java/org/apache/slider/client/SliderYarnClientImpl.java
@@ -19,6 +19,7 @@
package org.apache.slider.client;
import com.google.common.annotations.VisibleForTesting;
+import org.apache.commons.lang.StringUtils;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.yarn.api.ApplicationClientProtocol;
import org.apache.hadoop.yarn.api.protocolrecords.KillApplicationRequest;
@@ -74,7 +75,7 @@ public class SliderYarnClientImpl extends YarnClientImpl {
ListApplicationReport allApps = getApplications(types);
ListApplicationReport results = new ArrayList();
for (ApplicationReport report : allApps) {
- if (user == null || user.equals(report.getUser())) {
+ if (StringUtils.isEmpty(user) || user.equals(report.getUser())) {
results.add(report);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/fb73dbca/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy
--
diff --git
a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy
b/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy
index 61ae804..08d352a 100644
---
a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy
+++
b/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy
@@ -103,15 +103,13 @@ abstract class CommandTestBase extends SliderTestUtils {
log.debug(Security enabled)
SliderUtils.forceLogin()
} else {
- log.info Security off, making cluster dirs broadly accessible
+ log.info Security is off
}
SliderShell.confDir = SLIDER_CONF_DIRECTORY
SliderShell.script = SLIDER_SCRIPT
log.info(Test using ${HadoopFS.getDefaultUri(SLIDER_CONFIG)} +
and YARN RM @
${SLIDER_CONFIG.get(YarnConfiguration.RM_ADDRESS)})
-// now patch the settings with the path of the conf direcotry
-
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/fb73dbca/slider-funtest/src/test/groovy/org/apache/slider/funtest/basic/TestClusterConnectivity.groovy
--
diff --git
a/slider-funtest/src/test/groovy/org/apache/slider/funtest/basic/TestClusterConnectivity.groovy
b/slider-funtest/src/test/groovy/org/apache/slider/funtest/basic/TestClusterConnectivity.groovy
new file mode 100644
index 000..cf9cc9d
--- /dev/null
+++
b/slider-funtest/src/test/groovy/org/apache/slider/funtest/basic/TestClusterConnectivity.groovy
@@ -0,0 +1,96 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ *
[23/26] git commit: SLIDER-201 jenkins windows support - fail fast wasnt static
SLIDER-201 jenkins windows support - fail fast wasnt static
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/6d96ba95
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/6d96ba95
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/6d96ba95
Branch:
refs/heads/feature/SLIDER-151_Implement_full_slider_API_in_REST_and_switch_client_to_it
Commit: 6d96ba95659c2f47771eebbc1c632c89c3ee173f
Parents: a6cbab1
Author: Steve Loughran ste...@apache.org
Authored: Wed Jul 2 16:37:31 2014 +0100
Committer: Steve Loughran ste...@apache.org
Committed: Wed Jul 2 16:37:31 2014 +0100
--
.../groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/6d96ba95/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 a5c8710..80a83a4 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
@@ -130,9 +130,9 @@ public abstract class YarnMiniClusterTestBase extends
ServiceLauncherBaseTest {
DEFAULT_TEST_TIMEOUT_SECONDS * 1000)
)
@BeforeClass
- public void checkWindowsSupport() {
+ public static void checkWindowsSupport() {
if (Shell.WINDOWS) {
- Assert.assertNotNull(winutils.exe not found, Shell.WINUTILS)
+ assertNotNull(winutils.exe not found, Shell.WINUTILS)
}
}
[15/26] git commit: SLIDER-171 changes to setting up java command and classpath needed to work with cross-platform client
SLIDER-171 changes to setting up java command and classpath needed to work with
cross-platform client
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/853a9790
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/853a9790
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/853a9790
Branch:
refs/heads/feature/SLIDER-151_Implement_full_slider_API_in_REST_and_switch_client_to_it
Commit: 853a979006d5a08734a63ff80ce9c15ab577d61e
Parents: abb3d01
Author: Steve Loughran ste...@apache.org
Authored: Tue Jul 1 21:09:51 2014 +0100
Committer: Steve Loughran ste...@apache.org
Committed: Tue Jul 1 21:09:51 2014 +0100
--
.../apache/slider/common/tools/SliderUtils.java | 2 +-
.../core/launch/ClasspathConstructor.java | 4 +--
.../core/launch/JavaCommandLineBuilder.java | 2 +-
.../funtest/framework/FileUploader.groovy | 30 ++--
.../lifecycle/TestAgentClusterLifecycle.groovy | 3 +-
5 files changed, 28 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/853a9790/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java
--
diff --git
a/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java
b/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java
index 5479b54..62e61c9 100644
--- a/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java
+++ b/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java
@@ -1146,7 +1146,7 @@ public final class SliderUtils {
// and nothing else
classpath.appendAll(classpath.javaVMClasspath());
} else {
- classpath.addLibDir(./ + libdir);
+ classpath.addLibDir(libdir);
if (sliderConfDir != null) {
classpath.addClassDirectory(sliderConfDir);
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/853a9790/slider-core/src/main/java/org/apache/slider/core/launch/ClasspathConstructor.java
--
diff --git
a/slider-core/src/main/java/org/apache/slider/core/launch/ClasspathConstructor.java
b/slider-core/src/main/java/org/apache/slider/core/launch/ClasspathConstructor.java
index ee4c4d1..ca325d1 100644
---
a/slider-core/src/main/java/org/apache/slider/core/launch/ClasspathConstructor.java
+++
b/slider-core/src/main/java/org/apache/slider/core/launch/ClasspathConstructor.java
@@ -38,8 +38,8 @@ import java.util.List;
*/
public class ClasspathConstructor {
- // public static final String CLASS_PATH_SEPARATOR =
ApplicationConstants.CLASS_PATH_SEPARATOR;
- public static final String CLASS_PATH_SEPARATOR = File.pathSeparator;
+public static final String CLASS_PATH_SEPARATOR =
ApplicationConstants.CLASS_PATH_SEPARATOR;
+// public static final String CLASS_PATH_SEPARATOR = File.pathSeparator;
private final ListString pathElements = new ArrayList();
public ClasspathConstructor() {
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/853a9790/slider-core/src/main/java/org/apache/slider/core/launch/JavaCommandLineBuilder.java
--
diff --git
a/slider-core/src/main/java/org/apache/slider/core/launch/JavaCommandLineBuilder.java
b/slider-core/src/main/java/org/apache/slider/core/launch/JavaCommandLineBuilder.java
index e8b6eb1..7b60461 100644
---
a/slider-core/src/main/java/org/apache/slider/core/launch/JavaCommandLineBuilder.java
+++
b/slider-core/src/main/java/org/apache/slider/core/launch/JavaCommandLineBuilder.java
@@ -38,7 +38,7 @@ public class JavaCommandLineBuilder extends
CommandLineBuilder {
* @return the path to the Java binary
*/
protected String getJavaBinary() {
-return ApplicationConstants.Environment.JAVA_HOME.$() + /bin/java;
+return ApplicationConstants.Environment.JAVA_HOME.$$() + /bin/java;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/853a9790/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/FileUploader.groovy
--
diff --git
a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/FileUploader.groovy
b/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/FileUploader.groovy
index 2dc85be..921adbf 100644
---
a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/FileUploader.groovy
+++
b/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/FileUploader.groovy
@@ -18,6 +18,7 @@
package org.apache.slider.funtest.framework
+import groovy.transform.CompileStatic
import
[03/26] git commit: Merge branch 'feature/SLIDER-162_test_runner_to_bootstrap_clean_HDFS_cluster_for_test_runs' into develop
Merge branch 'feature/SLIDER-162_test_runner_to_bootstrap_clean_HDFS_cluster_for_test_runs' 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/3fb598fb Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/3fb598fb Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/3fb598fb Branch: refs/heads/feature/SLIDER-151_Implement_full_slider_API_in_REST_and_switch_client_to_it Commit: 3fb598fba45b08b1d1d13124bf3ce5a0b2c77bb5 Parents: 0ad4fb4 1bdf134 Author: Steve Loughran ste...@apache.org Authored: Mon Jun 30 16:36:17 2014 +0100 Committer: Steve Loughran ste...@apache.org Committed: Mon Jun 30 16:36:17 2014 +0100 -- .../funtest/framework/AgentUploads.groovy | 13 ++--- .../funtest/framework/FileUploader.groovy | 51 +--- .../lifecycle/AgentCommandTestBase.groovy | 10 +++- 3 files changed, 57 insertions(+), 17 deletions(-) --
[07/26] git commit: SLIDER-159: jenkins testEcho intermittently failing
SLIDER-159: jenkins testEcho intermittently failing
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/9a54a0b8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/9a54a0b8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/9a54a0b8
Branch:
refs/heads/feature/SLIDER-151_Implement_full_slider_API_in_REST_and_switch_client_to_it
Commit: 9a54a0b8d3e6d5f5f706407dfe4ba432419b90d2
Parents: 8fe71f0
Author: Steve Loughran ste...@apache.org
Authored: Tue Jul 1 16:19:58 2014 +0100
Committer: Steve Loughran ste...@apache.org
Committed: Tue Jul 1 16:19:58 2014 +0100
--
.../services/workflow/ForkedProcessService.java | 14 --
1 file changed, 8 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9a54a0b8/slider-core/src/main/java/org/apache/slider/server/services/workflow/ForkedProcessService.java
--
diff --git
a/slider-core/src/main/java/org/apache/slider/server/services/workflow/ForkedProcessService.java
b/slider-core/src/main/java/org/apache/slider/server/services/workflow/ForkedProcessService.java
index 7e73005..ee68aa4 100644
---
a/slider-core/src/main/java/org/apache/slider/server/services/workflow/ForkedProcessService.java
+++
b/slider-core/src/main/java/org/apache/slider/server/services/workflow/ForkedProcessService.java
@@ -281,12 +281,15 @@ public class ForkedProcessService extends
AbstractWorkflowExecutorService implem
}
long start = System.currentTimeMillis();
while (System.currentTimeMillis() - start = duration) {
- if (finalOutput process.isFinalOutputProcessed()) {
-//end of stream, break
-break;
- }
- if (!process.isRecentOutputEmpty()) {
+ boolean finished;
+ if (finalOutput) {
+// final flag means block until all data is done
+finished = process.isFinalOutputProcessed();
+ } else {
// there is some output
+finished = !process.isRecentOutputEmpty();
+ }
+ if (finished) {
break;
}
try {
@@ -299,5 +302,4 @@ public class ForkedProcessService extends
AbstractWorkflowExecutorService implem
return process.getRecentOutput();
}
-
}
[22/26] git commit: SLIDER-201 jenkins windows support - fail fast on HADOOP-10775
SLIDER-201 jenkins windows support - fail fast on HADOOP-10775
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/a6cbab17
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/a6cbab17
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/a6cbab17
Branch:
refs/heads/feature/SLIDER-151_Implement_full_slider_API_in_REST_and_switch_client_to_it
Commit: a6cbab17bf591d7b0a6f908ea291c6b4c549bd6d
Parents: 0151b9f
Author: Steve Loughran ste...@apache.org
Authored: Wed Jul 2 15:37:54 2014 +0100
Committer: Steve Loughran ste...@apache.org
Committed: Wed Jul 2 15:37:54 2014 +0100
--
.../org/apache/slider/test/YarnMiniClusterTestBase.groovy | 9 +
1 file changed, 9 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/a6cbab17/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 e5715b1..a5c8710 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
@@ -28,6 +28,7 @@ import org.apache.hadoop.fs.FileUtil
import org.apache.hadoop.fs.Path
import org.apache.hadoop.hdfs.MiniDFSCluster
import org.apache.hadoop.service.ServiceOperations
+import org.apache.hadoop.util.Shell
import org.apache.hadoop.yarn.api.records.ApplicationReport
import org.apache.hadoop.yarn.api.records.YarnApplicationState
import org.apache.hadoop.yarn.conf.YarnConfiguration
@@ -48,7 +49,9 @@ import org.apache.slider.core.main.ServiceLauncher
import org.apache.slider.core.main.ServiceLauncherBaseTest
import org.apache.slider.server.appmaster.SliderAppMaster
import org.junit.After
+import org.junit.Assert
import org.junit.Before
+import org.junit.BeforeClass
import org.junit.Rule
import org.junit.rules.TestName
import org.junit.rules.Timeout
@@ -126,6 +129,12 @@ public abstract class YarnMiniClusterTestBase extends
ServiceLauncherBaseTest {
KEY_TEST_TIMEOUT,
DEFAULT_TEST_TIMEOUT_SECONDS * 1000)
)
+ @BeforeClass
+ public void checkWindowsSupport() {
+if (Shell.WINDOWS) {
+ Assert.assertNotNull(winutils.exe not found, Shell.WINUTILS)
+}
+ }
@Rule
[13/26] git commit: SLIDER-190. Add projects to create command logger package as well as Slider app package
SLIDER-190. Add projects to create command logger package as well as Slider app package Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/e879109a Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/e879109a Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/e879109a Branch: refs/heads/feature/SLIDER-151_Implement_full_slider_API_in_REST_and_switch_client_to_it Commit: e879109a45f255d63e3d32d5f8bb6d40a26e38e9 Parents: f53db87 Author: Sumit Mohanty smoha...@hortonworks.com Authored: Mon Jun 30 19:47:04 2014 -0700 Committer: Sumit Mohanty smoha...@hortonworks.com Committed: Tue Jul 1 12:56:33 2014 -0700 -- app-packages/command-logger/README.txt | 22 .../command-logger/application-pkg/pom.xml | 83 ++ .../src/command_logger/README.txt | 18 .../src/command_logger/operations.log | 24 + .../src/packages/tarball/all.xml| 35 ++ .../command-logger/slider-pkg/appConfig.json| 27 + .../slider-pkg/configuration/cl-site.xml| 34 ++ .../command-logger/slider-pkg/metainfo.xml | 52 + .../slider-pkg/package/scripts/cl.py| 89 +++ .../slider-pkg/package/scripts/params.py| 31 ++ .../package/templates/operations.log.j2 | 22 app-packages/command-logger/slider-pkg/pom.xml | 107 +++ .../command-logger/slider-pkg/resources.json| 15 +++ .../slider-pkg/src/assembly/command-logger.xml | 78 ++ app-packages/hbase/appConfig.json | 4 +- pom.xml | 2 + 16 files changed, 641 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e879109a/app-packages/command-logger/README.txt -- diff --git a/app-packages/command-logger/README.txt b/app-packages/command-logger/README.txt new file mode 100644 index 000..56a8a33 --- /dev/null +++ b/app-packages/command-logger/README.txt @@ -0,0 +1,22 @@ +!--- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the License); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an AS IS BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +-- +Command logger is a test application used by Slider for functional tests. + +Like any typical Slider Application, there is a native application package +in the form of a tarball that is created by project under application_pkg and +there is a project under slider_pkg to create the Slider Application Package +that is consumed by Slider. http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e879109a/app-packages/command-logger/application-pkg/pom.xml -- diff --git a/app-packages/command-logger/application-pkg/pom.xml b/app-packages/command-logger/application-pkg/pom.xml new file mode 100644 index 000..7da7259 --- /dev/null +++ b/app-packages/command-logger/application-pkg/pom.xml @@ -0,0 +1,83 @@ +?xml version=1.0? +project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd; + !-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the License); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an AS IS BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +-- + parent +
[01/26] git commit: SLIDER-162: home dir created by hdfs if user lacks permissions (and hdfs can be impersonated)
Repository: incubator-slider
Updated Branches:
refs/heads/feature/SLIDER-151_Implement_full_slider_API_in_REST_and_switch_client_to_it
81a85495d - 621a981cb (forced update)
SLIDER-162: home dir created by hdfs if user lacks permissions (and hdfs can be
impersonated)
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/e3c5d9d8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/e3c5d9d8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/e3c5d9d8
Branch:
refs/heads/feature/SLIDER-151_Implement_full_slider_API_in_REST_and_switch_client_to_it
Commit: e3c5d9d8e7198e3a30027a412b9348926900c14a
Parents: 9619c33
Author: Steve Loughran ste...@apache.org
Authored: Mon Jun 30 16:14:15 2014 +0100
Committer: Steve Loughran ste...@apache.org
Committed: Mon Jun 30 16:14:15 2014 +0100
--
.../funtest/framework/AgentUploads.groovy | 13 ++---
.../funtest/framework/FileUploader.groovy | 51 +---
.../lifecycle/AgentCommandTestBase.groovy | 10 +++-
3 files changed, 57 insertions(+), 17 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e3c5d9d8/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/AgentUploads.groovy
--
diff --git
a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/AgentUploads.groovy
b/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/AgentUploads.groovy
index 3570183..2cec5c2 100644
---
a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/AgentUploads.groovy
+++
b/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/AgentUploads.groovy
@@ -27,11 +27,9 @@ import org.apache.hadoop.fs.FileSystem as HadoopFS
@Slf4j
class AgentUploads implements FuntestProperties {
final Configuration conf
- private final FileUploader uploader
- private final HadoopFS clusterFS
- private final Path homeDir
-
-
+ public final FileUploader uploader
+ public final HadoopFS clusterFS
+ public final Path homeDir
AgentUploads(Configuration conf) {
this.conf = conf
@@ -52,6 +50,8 @@ class AgentUploads implements FuntestProperties {
homeDir,
AGENT_TAR_FILENAME)
+//create the home dir or fail
+uploader.mkHomeDir()
// Upload the agent tarball
uploader.copyIfOutOfDate(localAgentTar, agentTarballPath, force)
@@ -59,10 +59,7 @@ class AgentUploads implements FuntestProperties {
// Upload the agent.ini
def agentIniPath = new Path(homeDir, AGENT_INI)
uploader.copyIfOutOfDate(localAgentIni, agentIniPath, force)
-
return [agentTarballPath, agentIniPath]
-
-
}
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e3c5d9d8/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/FileUploader.groovy
--
diff --git
a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/FileUploader.groovy
b/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/FileUploader.groovy
index 4f61730..2dc85be 100644
---
a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/FileUploader.groovy
+++
b/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/FileUploader.groovy
@@ -20,12 +20,14 @@ package org.apache.slider.funtest.framework
import groovy.util.logging.Slf4j
import org.apache.hadoop.conf.Configuration
+import org.apache.hadoop.fs.FileSystem as HadoopFS
import org.apache.hadoop.fs.FileUtil
import org.apache.hadoop.fs.Path
import org.apache.hadoop.fs.permission.FsPermission
import org.apache.hadoop.security.AccessControlException
import org.apache.hadoop.security.UserGroupInformation
-import org.apache.hadoop.fs.FileSystem as HadoopFS
+
+@SuppressWarnings(GroovyOctalInteger)
@Slf4j
class FileUploader {
final Configuration conf
@@ -60,18 +62,20 @@ class FileUploader {
}
if (toCopy) {
log.info(Copying $src to $destPath)
+ def dir = destPath.getParent()
try {
fs.delete(destPath, true)
-fs.mkdirs(destPath.getParent(), FsPermission.dirDefault)
+fs.mkdirs(dir, FsPermission.dirDefault)
return FileUtil.copy(src, fs, destPath, false, conf)
} catch (AccessControlException ace) {
-log.error(No write access to test user home directory. +
+log.error(No write access to destination directory $dir +
Ensure home directory exists and has correct permissions. +
ace, ace)
throw ace
}
} else {
- log.debug(Skipping copy as the destination $destPath considered up to
date)
+ log.debug(
+ Skipping copy as the
[04/26] git commit: SLIDER-173 Container requests for the same role should utilize different nodes - give higher priority to requests with location specified
SLIDER-173 Container requests for the same role should utilize different nodes
- give higher priority to requests with location specified
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/2449f6f3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/2449f6f3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/2449f6f3
Branch:
refs/heads/feature/SLIDER-151_Implement_full_slider_API_in_REST_and_switch_client_to_it
Commit: 2449f6f35bee3220d05f9b386487d44439c9a3cc
Parents: 3fb598f
Author: tedyu yuzhih...@gmail.com
Authored: Mon Jun 30 09:43:31 2014 -0700
Committer: tedyu yuzhih...@gmail.com
Committed: Mon Jun 30 09:43:31 2014 -0700
--
.../slider/server/appmaster/state/ContainerPriority.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/2449f6f3/slider-core/src/main/java/org/apache/slider/server/appmaster/state/ContainerPriority.java
--
diff --git
a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/ContainerPriority.java
b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/ContainerPriority.java
index 56a5af2..369a932 100644
---
a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/ContainerPriority.java
+++
b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/ContainerPriority.java
@@ -38,11 +38,11 @@ import org.apache.hadoop.yarn.util.Records;
public final class ContainerPriority {
// bit that represents whether location is specified
- static final int LOCATION = 1 30;
+ static final int NOLOCATION = 1 30;
public static int buildPriority(int role,
boolean locationSpecified) {
-int location = locationSpecified ? LOCATION : 0;
+int location = locationSpecified ? 0 : NOLOCATION;
return role | location;
}
@@ -57,7 +57,7 @@ public final class ContainerPriority {
public static int extractRole(int priority) {
-return priority = LOCATION ? priority^LOCATION : priority;
+return priority = NOLOCATION ? priority^NOLOCATION : priority;
}
/**
[02/26] git commit: Merge branch 'develop' into feature/SLIDER-162_test_runner_to_bootstrap_clean_HDFS_cluster_for_test_runs
Merge branch 'develop' into feature/SLIDER-162_test_runner_to_bootstrap_clean_HDFS_cluster_for_test_runs Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/1bdf134a Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/1bdf134a Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/1bdf134a Branch: refs/heads/feature/SLIDER-151_Implement_full_slider_API_in_REST_and_switch_client_to_it Commit: 1bdf134af5dd9fdb8186c848df8806324296f9cc Parents: e3c5d9d 0ad4fb4 Author: Steve Loughran ste...@apache.org Authored: Mon Jun 30 16:18:14 2014 +0100 Committer: Steve Loughran ste...@apache.org Committed: Mon Jun 30 16:18:14 2014 +0100 -- LICENSE | 423 +++ LICENSE.txt | 423 --- NOTICE | 5 + NOTICE.txt | 5 - app-packages/accumulo/metainfo.xml | 238 +-- app-packages/hbase/metainfo.xml | 168 app-packages/storm-v0_91/metainfo.xml | 229 +- slider-assembly/src/main/scripts/slider.py | 107 +++-- .../providers/agent/AgentClientProvider.java| 29 +- .../slider/providers/agent/AgentKeys.java | 1 - .../providers/agent/AgentProviderService.java | 53 +-- .../agent/application/metadata/Application.java | 121 ++ .../agent/application/metadata/Metainfo.java| 17 +- .../application/metadata/MetainfoParser.java| 10 +- .../agent/application/metadata/Service.java | 121 -- .../appmaster/state/ContainerPriority.java | 8 +- .../appmaster/state/OutstandingRequest.java | 7 +- .../server/appmaster/state/RoleHistory.java | 8 + .../app_packages/test_command_log/metainfo.xml | 62 ++- .../agent/AgentMiniClusterTestBase.groovy | 41 +- .../slider/providers/agent/AgentTestBase.groovy | 44 +- .../agent/TestAgentAMManagementWS.groovy| 3 +- .../slider/providers/agent/TestAgentEcho.groovy | 6 +- .../providers/agent/TestBuildBasicAgent.groovy | 78 ++-- .../curator/TestRegistryRestResources.groovy| 3 +- .../model/appstate/TestMockRMOperations.groovy | 2 +- .../publisher/TestPublisherRestResources.groovy | 3 +- .../slider/common/tools/TestSliderUtils.java| 23 +- .../agent/TestAgentClientProvider.java | 40 +- .../agent/TestAgentProviderService.java | 61 ++- .../metadata/MetainfoParserTest.java| 15 +- .../org/apache/slider/tools/TestUtility.java| 71 slider-core/src/test/python/appdef_1.zip| Bin 972 - 0 bytes slider-core/src/test/python/metainfo.xml| 68 ++- .../org/apache/slider/common/tools/test.zip | Bin 1273 - 0 bytes .../slider/common/tools/test/metainfo.txt | 16 + .../slider/common/tools/test/metainfo.xml | 95 + .../slider/common/tools/test/someOtherFile.txt | 16 + .../slider/common/tools/test/someOtherFile.xml | 16 + .../agent/application/metadata/metainfo.xml | 136 +++--- .../slider/providers/hbase/HBaseRoles.java | 3 +- 41 files changed, 1543 insertions(+), 1232 deletions(-) --
[20/26] git commit: SLIDER-159 TestLongLivedProcess.testEcho failing
SLIDER-159 TestLongLivedProcess.testEcho failing
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/e9ddcf0b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/e9ddcf0b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/e9ddcf0b
Branch:
refs/heads/feature/SLIDER-151_Implement_full_slider_API_in_REST_and_switch_client_to_it
Commit: e9ddcf0b13beb6aea3822ee0164f6f46f40676f2
Parents: 5bb80a4
Author: Steve Loughran ste...@apache.org
Authored: Wed Jul 2 13:23:54 2014 +0100
Committer: Steve Loughran ste...@apache.org
Committed: Wed Jul 2 13:23:54 2014 +0100
--
.../services/workflow/ForkedProcessService.java | 22 +-
.../services/workflow/LongLivedProcess.java | 31
.../services/workflow/TestLongLivedProcess.java | 5 ++--
3 files changed, 35 insertions(+), 23 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e9ddcf0b/slider-core/src/main/java/org/apache/slider/server/services/workflow/ForkedProcessService.java
--
diff --git
a/slider-core/src/main/java/org/apache/slider/server/services/workflow/ForkedProcessService.java
b/slider-core/src/main/java/org/apache/slider/server/services/workflow/ForkedProcessService.java
index ee68aa4..ccce6cb 100644
---
a/slider-core/src/main/java/org/apache/slider/server/services/workflow/ForkedProcessService.java
+++
b/slider-core/src/main/java/org/apache/slider/server/services/workflow/ForkedProcessService.java
@@ -279,27 +279,7 @@ public class ForkedProcessService extends
AbstractWorkflowExecutorService implem
if (process == null) {
return new LinkedListString();
}
-long start = System.currentTimeMillis();
-while (System.currentTimeMillis() - start = duration) {
- boolean finished;
- if (finalOutput) {
-// final flag means block until all data is done
-finished = process.isFinalOutputProcessed();
- } else {
-// there is some output
-finished = !process.isRecentOutputEmpty();
- }
- if (finished) {
-break;
- }
- try {
-Thread.sleep(100);
- } catch (InterruptedException ie) {
-Thread.currentThread().interrupt();
-break;
- }
-}
-return process.getRecentOutput();
+return process.getRecentOutput(finalOutput, duration);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e9ddcf0b/slider-core/src/main/java/org/apache/slider/server/services/workflow/LongLivedProcess.java
--
diff --git
a/slider-core/src/main/java/org/apache/slider/server/services/workflow/LongLivedProcess.java
b/slider-core/src/main/java/org/apache/slider/server/services/workflow/LongLivedProcess.java
index d9ddecb..05a1c50 100644
---
a/slider-core/src/main/java/org/apache/slider/server/services/workflow/LongLivedProcess.java
+++
b/slider-core/src/main/java/org/apache/slider/server/services/workflow/LongLivedProcess.java
@@ -357,6 +357,37 @@ public class LongLivedProcess implements Runnable {
}
/**
+ * Get the recent output from the process, or [] if not defined
+ *
+ * @param finalOutput flag to indicate wait for the final output of the
process
+ * @param duration the duration, in ms,
+ * ro wait for recent output to become non-empty
+ * @return a possibly empty list
+ */
+ public ListString getRecentOutput(boolean finalOutput, int duration) {
+long start = System.currentTimeMillis();
+while (System.currentTimeMillis() - start = duration) {
+ boolean finishedOutput;
+ if (finalOutput) {
+// final flag means block until all data is done
+finishedOutput = isFinalOutputProcessed();
+ } else {
+// there is some output
+finishedOutput = !isRecentOutputEmpty();
+ }
+ if (finishedOutput) {
+break;
+ }
+ try {
+Thread.sleep(100);
+ } catch (InterruptedException ie) {
+Thread.currentThread().interrupt();
+break;
+ }
+}
+return getRecentOutput();
+ }
+ /**
* add the recent line to the list of recent lines; deleting
* an earlier on if the limit is reached.
*
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e9ddcf0b/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestLongLivedProcess.java
--
diff --git
a/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestLongLivedProcess.java
b/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestLongLivedProcess.java
index c8a0719..668bcca 100644
---
[21/26] git commit: SLIDER-200 double mvn install failing as rat rejects hbase/target/rat.txt
SLIDER-200 double mvn install failing as rat rejects hbase/target/rat.txt Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/0151b9f5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/0151b9f5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/0151b9f5 Branch: refs/heads/feature/SLIDER-151_Implement_full_slider_API_in_REST_and_switch_client_to_it Commit: 0151b9f53cdc46e39d80709c8090308f53bbfd3b Parents: e9ddcf0 Author: Steve Loughran ste...@apache.org Authored: Wed Jul 2 13:30:26 2014 +0100 Committer: Steve Loughran ste...@apache.org Committed: Wed Jul 2 13:30:26 2014 +0100 -- pom.xml | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0151b9f5/pom.xml -- diff --git a/pom.xml b/pom.xml index 460fb0d..0076561 100644 --- a/pom.xml +++ b/pom.xml @@ -300,6 +300,7 @@ exclude**/httpfs-signature.secret/exclude exclude**/dfs.exclude/exclude exclude**/*.iml/exclude +exclude**/rat.txt/exclude excludeDISCLAIMER/exclude /excludes /configuration
git commit: SLIDER-3 fix typo in listRegisteredInstances() method
Repository: incubator-slider
Updated Branches:
refs/heads/develop 6d96ba956 - 7823d3a20
SLIDER-3 fix typo in listRegisteredInstances() method
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/7823d3a2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/7823d3a2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/7823d3a2
Branch: refs/heads/develop
Commit: 7823d3a20d1e496d20e5a6c0fcd77d1322d63a49
Parents: 6d96ba9
Author: Steve Loughran ste...@apache.org
Authored: Wed Jul 2 17:02:48 2014 +0100
Committer: Steve Loughran ste...@apache.org
Committed: Wed Jul 2 17:02:48 2014 +0100
--
.../src/main/java/org/apache/slider/client/SliderClient.java | 2 +-
.../apache/slider/agent/standalone/TestStandaloneAgentAM.groovy| 2 +-
.../apache/slider/agent/standalone/TestStandaloneRegistryAM.groovy | 2 +-
.../providers/hbase/minicluster/live/TestTwoLiveClusters.groovy| 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7823d3a2/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
--
diff --git
a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
index a337533..c35a60a 100644
--- a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
+++ b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
@@ -2192,7 +2192,7 @@ public class SliderClient extends
AbstractSliderLaunchedService implements RunSe
* @throws IOException
* @throws YarnException
*/
- public ListString listRegistedSliderInstances() throws
+ public ListString listRegisteredSliderInstances() throws
IOException,
YarnException {
try {
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7823d3a2/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 d700fea..bce24e6 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
@@ -101,7 +101,7 @@ class TestStandaloneAgentAM extends
AgentMiniClusterTestBase {
dumpRegistryServiceTypes(names)
describe service registry instance IDs
-def instanceIds = client.listRegistedSliderInstances()
+def instanceIds = client.listRegisteredSliderInstances()
log.info(number of instanceIds: ${instanceIds.size()})
instanceIds.each { String it - log.info(it) }
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7823d3a2/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneRegistryAM.groovy
--
diff --git
a/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneRegistryAM.groovy
b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneRegistryAM.groovy
index 7639375..cb55624 100644
---
a/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneRegistryAM.groovy
+++
b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneRegistryAM.groovy
@@ -117,7 +117,7 @@ class TestStandaloneRegistryAM extends
AgentMiniClusterTestBase {
def serviceTypes = registryService.serviceTypes;
dumpRegistryServiceTypes(serviceTypes)
-ListString instanceIds = client.listRegistedSliderInstances()
+ListString instanceIds = client.listRegisteredSliderInstances()
dumpRegistryInstanceIDs(instanceIds)
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7823d3a2/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestTwoLiveClusters.groovy
--
diff --git
a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestTwoLiveClusters.groovy
b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestTwoLiveClusters.groovy
index a58f99a..0140030 100644
---
a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestTwoLiveClusters.groovy
+++
[17/26] git commit: SLIDER-171: mark up some methods as clearly not for use x-platform, but only for local setup of miniclusters
SLIDER-171: mark up some methods as clearly not for use x-platform, but only
for local setup of miniclusters
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/613dbec8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/613dbec8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/613dbec8
Branch:
refs/heads/feature/SLIDER-151_Implement_full_slider_API_in_REST_and_switch_client_to_it
Commit: 613dbec829810edff005c9b8aee00eba8f8bc1b8
Parents: 0317c41
Author: Steve Loughran ste...@apache.org
Authored: Tue Jul 1 21:44:35 2014 +0100
Committer: Steve Loughran ste...@apache.org
Committed: Tue Jul 1 21:44:35 2014 +0100
--
.../org/apache/slider/common/tools/SliderUtils.java | 2 +-
.../slider/core/launch/ClasspathConstructor.java| 16 +---
2 files changed, 14 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/613dbec8/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java
--
diff --git
a/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java
b/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java
index 62e61c9..7c89321 100644
--- a/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java
+++ b/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java
@@ -1144,7 +1144,7 @@ public final class SliderUtils {
if (usingMiniMRCluster) {
// for mini cluster we pass down the java CP properties
// and nothing else
- classpath.appendAll(classpath.javaVMClasspath());
+ classpath.appendAll(classpath.localJVMClasspath());
} else {
classpath.addLibDir(libdir);
if (sliderConfDir != null) {
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/613dbec8/slider-core/src/main/java/org/apache/slider/core/launch/ClasspathConstructor.java
--
diff --git
a/slider-core/src/main/java/org/apache/slider/core/launch/ClasspathConstructor.java
b/slider-core/src/main/java/org/apache/slider/core/launch/ClasspathConstructor.java
index ca325d1..5b74c03 100644
---
a/slider-core/src/main/java/org/apache/slider/core/launch/ClasspathConstructor.java
+++
b/slider-core/src/main/java/org/apache/slider/core/launch/ClasspathConstructor.java
@@ -123,12 +123,12 @@ public class ClasspathConstructor {
public void addRemoteClasspathEnvVar() {
-append(ApplicationConstants.Environment.CLASSPATH.$());
+append(ApplicationConstants.Environment.CLASSPATH.$$());
}
public void insertRemoteClasspathEnvVar() {
-append(ApplicationConstants.Environment.CLASSPATH.$());
+append(ApplicationConstants.Environment.CLASSPATH.$$());
}
@@ -152,12 +152,22 @@ public class ClasspathConstructor {
return dir;
}
+ /**
+ * Split a classpath. This uses the local path separator so MUST NOT
+ * be used to work with remote classpaths
+ * @param localpath local path
+ * @return a splite
+ */
public CollectionString splitClasspath(String localpath) {
String separator = System.getProperty(path.separator);
return StringUtils.getStringCollection(localpath, separator);
}
- public CollectionString javaVMClasspath() {
+ /**
+ * Get the local JVM classpath split up
+ * @return the list of entries on the JVM classpath env var
+ */
+ public CollectionString localJVMClasspath() {
return splitClasspath(System.getProperty(java.class.path));
}
[18/26] git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-slider into develop
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-slider 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/e4723f5e Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/e4723f5e Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/e4723f5e Branch: refs/heads/feature/SLIDER-151_Implement_full_slider_API_in_REST_and_switch_client_to_it Commit: e4723f5e538d15c39320c3651d6bf4c400c59400 Parents: 613dbec be94df3 Author: Steve Loughran ste...@apache.org Authored: Tue Jul 1 21:44:44 2014 +0100 Committer: Steve Loughran ste...@apache.org Committed: Tue Jul 1 21:44:44 2014 +0100 -- app-packages/command-logger/README.txt | 22 .../command-logger/application-pkg/README.txt | 24 .../command-logger/application-pkg/pom.xml | 83 + .../src/command_logger/README.txt | 18 +++ .../src/command_logger/operations.log | 24 .../src/packages/tarball/all.xml| 35 ++ .../command-logger/slider-pkg/appConfig.json| 27 .../slider-pkg/configuration/cl-site.xml| 34 ++ .../command-logger/slider-pkg/metainfo.xml | 52 .../slider-pkg/package/scripts/cl.py| 89 ++ .../slider-pkg/package/scripts/params.py| 31 + .../package/templates/operations.log.j2 | 22 app-packages/command-logger/slider-pkg/pom.xml | 122 +++ .../command-logger/slider-pkg/resources.json| 15 +++ .../slider-pkg/src/assembly/command-logger.xml | 78 app-packages/hbase/README.txt | 2 +- app-packages/hbase/appConfig.json | 4 +- pom.xml | 2 + .../test_command_log/appConfig.json | 6 +- .../test_command_log/appConfig_fast_no_reg.json | 6 +- .../test_command_log/appConfig_no_hb.json | 6 +- .../test_command_log/configuration/cl-site.xml | 34 -- .../app_packages/test_command_log/metainfo.xml | 52 .../package/files/command_log_10.tar| Bin 2560 - 0 bytes .../test_command_log/package/scripts/cl.py | 89 -- .../test_command_log/package/scripts/params.py | 31 - .../package/templates/operations.log.j2 | 22 slider-funtest/pom.xml | 52 +++- .../lifecycle/AgentCommandTestBase.groovy | 21 +--- 29 files changed, 747 insertions(+), 256 deletions(-) --
