Merge branch 'develop' into feature/SLIDER-713_flex_via_REST
Conflicts:
slider-core/src/main/java/org/apache/slider/core/exceptions/ExceptionConverter.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/b235fbe1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/b235fbe1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/b235fbe1
Branch: refs/heads/develop
Commit: b235fbe1686ab02e18db315d3df521249addd2ba
Parents: 1501e49 22ffc64
Author: Steve Loughran <[email protected]>
Authored: Fri Feb 27 11:18:04 2015 -0800
Committer: Steve Loughran <[email protected]>
Committed: Fri Feb 27 11:18:04 2015 -0800
----------------------------------------------------------------------
app-packages/accumulo/NOTICE.txt | 2 +-
app-packages/accumulo/pom.xml | 6 +-
.../command-logger/application-pkg/pom.xml | 2 +-
.../slider-pkg/clientInstallConfig-default.json | 8 +
.../command-logger/slider-pkg/metainfo.xml | 10 +
.../slider-pkg/package/scripts/cl_client.py | 48 +++
.../slider-pkg/package/scripts/client_params.py | 29 ++
app-packages/command-logger/slider-pkg/pom.xml | 2 +-
app-packages/hbase-win/pom.xml | 5 +-
app-packages/hbase/pom.xml | 7 +-
app-packages/pom.xml | 30 +-
app-packages/storm-win/pom.xml | 4 +-
app-packages/storm/appConfig-default.json | 15 +-
.../storm/appConfig-secured-default.json | 15 +-
.../storm/clientInstallConfig-default.json | 6 +
app-packages/storm/configuration/storm-env.xml | 1 +
app-packages/storm/ganglia_metrics.json | 31 --
app-packages/storm/metainfo.xml | 18 +-
app-packages/storm/package/files/storm-slider | 63 ++++
.../storm/package/files/storm-slider.py | 370 +++++++++++++++++++
.../storm/package/scripts/client_params.py | 28 ++
app-packages/storm/package/scripts/params.py | 16 +-
app-packages/storm/package/scripts/storm.py | 5 +
.../storm/package/scripts/storm_client.py | 56 +++
.../storm/package/templates/config.yaml.j2 | 27 +-
.../package/templates/storm-slider-env.sh.j2 | 38 ++
app-packages/storm/pom.xml | 4 +-
app-packages/storm/src/assembly/storm.xml | 7 +
app-packages/storm/timeline_metrics.json | 31 ++
pom.xml | 9 +-
slider-agent/pom.xml | 2 +-
slider-agent/src/main/python/agent/main.py | 9 +-
slider-agent/src/main/python/agent/security.py | 10 +-
slider-assembly/pom.xml | 6 +-
slider-core/pom.xml | 2 +-
.../org/apache/slider/client/SliderClient.java | 66 +++-
.../apache/slider/client/SliderClientAPI.java | 14 +-
.../common/params/AbstractActionArgs.java | 4 +-
.../slider/common/params/ActionClientArgs.java | 65 ++++
.../slider/common/params/ActionPackageArgs.java | 4 +-
.../apache/slider/common/params/Arguments.java | 3 +-
.../apache/slider/common/params/ClientArgs.java | 19 +-
.../apache/slider/common/params/CommonArgs.java | 2 +-
.../slider/common/params/SliderActions.java | 3 +
.../apache/slider/common/tools/SliderUtils.java | 3 +-
.../core/exceptions/ExceptionConverter.java | 32 +-
.../core/registry/retrieve/AMWebClient.java | 5 -
.../registry/retrieve/RegistryRetriever.java | 8 +-
.../providers/AbstractClientProvider.java | 20 +
.../providers/agent/AgentClientProvider.java | 304 ++++++++++++++-
.../slider/providers/agent/AgentKeys.java | 3 +-
.../providers/agent/AgentProviderService.java | 15 +-
.../server/appmaster/SliderAppMaster.java | 4 +-
.../slider/server/appmaster/state/AppState.java | 34 +-
.../services/security/CertificateManager.java | 71 +++-
.../server/services/security/SecurityUtils.java | 41 +-
.../test_command_log/client-config.json | 7 +
.../agent/actions/TestActionPackage.groovy | 20 +-
.../slider/client/TestCommonArgParsing.groovy | 40 +-
.../view/TestClusterSpecificationBlock.groovy | 2 +-
.../web/view/TestContainerStatsBlock.groovy | 26 +-
.../appmaster/web/view/TestIndexBlock.groovy | 2 +-
.../org/apache/slider/test/KeysForTests.groovy | 2 +
.../apache/slider/test/SliderTestUtils.groovy | 17 +-
.../agent/TestAgentClientProvider2.java | 173 ++++++++-
.../security/TestCertificateManager.java | 40 +-
slider-funtest/pom.xml | 4 +-
.../funtest/framework/CommandTestBase.groovy | 21 +-
.../funtest/framework/FileUploader.groovy | 6 +-
.../lifecycle/AgentClientInstallIT.groovy | 79 ++++
.../funtest/lifecycle/AppsThroughAgentIT.groovy | 10 +-
.../clusters/remote/slider/slider-client.xml | 10 +-
72 files changed, 1827 insertions(+), 274 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b235fbe1/slider-core/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b235fbe1/slider-core/src/main/java/org/apache/slider/core/exceptions/ExceptionConverter.java
----------------------------------------------------------------------
diff --cc
slider-core/src/main/java/org/apache/slider/core/exceptions/ExceptionConverter.java
index 5dbb881,77d36a3..efec676
---
a/slider-core/src/main/java/org/apache/slider/core/exceptions/ExceptionConverter.java
+++
b/slider-core/src/main/java/org/apache/slider/core/exceptions/ExceptionConverter.java
@@@ -59,23 -76,17 +77,23 @@@ public class ExceptionConverter
if (status == HttpServletResponse.SC_UNAUTHORIZED
|| status == HttpServletResponse.SC_FORBIDDEN) {
ioe = new PathAccessDeniedException(targetURL);
- }
- if (status >= 400 && status < 500) {
+ } else if (status == HttpServletResponse.SC_BAD_REQUEST
+ || status == HttpServletResponse.SC_NOT_ACCEPTABLE
+ || status == HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE) {
+ // bad request
+ ioe = new InvalidRequestException(
+ String.format("Bad %s request: status code %d against %s",
+ verb, status, targetURL));
+ } else if (status > 400 && status < 500) {
ioe = new FileNotFoundException(targetURL);
- } else {
+ }
+ if (ioe == null) {
ioe = new PathIOException(targetURL,
- String.format("%s failed: status code %d against %s",
- verb, status, targetURL));
- }
- }
-
- if (ioe == null) {
+ verb + " " + targetURL
+ + " failed with status code : " + status
+ + ":" + exception);
+ }
+ } else {
ioe = new PathIOException(targetURL,
verb + " " + targetURL + " failed: " + exception);
}
