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/06/30 17:37:33 UTC
[44/50] [abbrv] git commit: SLIDER-176. Container request after
failure is failing to allocate replacement container
SLIDER-176. Container request after failure is failing to allocate replacement container
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/ea251f16
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/ea251f16
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/ea251f16
Branch: refs/heads/feature/SLIDER-151_Implement_full_slider_API_in_REST_and_switch_client_to_it
Commit: ea251f165bf322c4cd86c6d84483169b07b6fba5
Parents: 78a1364
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Thu Jun 26 13:41:26 2014 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Thu Jun 26 13:41:31 2014 -0700
----------------------------------------------------------------------
.../appmaster/state/OutstandingRequest.java | 2 +-
.../app_packages/test_command_log/metainfo.xml | 62 ++++++++++----------
2 files changed, 31 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/ea251f16/slider-core/src/main/java/org/apache/slider/server/appmaster/state/OutstandingRequest.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/OutstandingRequest.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/OutstandingRequest.java
index 45dd9d1..7d3e427 100644
--- a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/OutstandingRequest.java
+++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/OutstandingRequest.java
@@ -108,7 +108,7 @@ public final class OutstandingRequest {
if (node != null) {
hosts = new String[1];
hosts[0] = node.hostname;
- relaxLocality = false;
+ relaxLocality = true;
locationSpecified = true;
// tell the node it is in play
node.getOrCreate(roleId);
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/ea251f16/slider-core/src/test/app_packages/test_command_log/metainfo.xml
----------------------------------------------------------------------
diff --git a/slider-core/src/test/app_packages/test_command_log/metainfo.xml b/slider-core/src/test/app_packages/test_command_log/metainfo.xml
index f5fde30..845ad93 100644
--- a/slider-core/src/test/app_packages/test_command_log/metainfo.xml
+++ b/slider-core/src/test/app_packages/test_command_log/metainfo.xml
@@ -17,38 +17,36 @@
-->
<metainfo>
<schemaVersion>2.0</schemaVersion>
- <services>
- <service>
- <name>TEST_COMMAND_LOG</name>
- <comment>
- When started it creates a new log file and stores all commands in the
- log file. When stopped it renames the file.
- </comment>
- <version>0.1.0</version>
- <components>
- <component>
- <name>COMMAND_LOGGER</name>
- <category>MASTER</category>
- <commandScript>
- <script>scripts/cl.py</script>
- <scriptType>PYTHON</scriptType>
- <timeout>600</timeout>
- </commandScript>
- </component>
- </components>
+ <application>
+ <name>TEST_COMMAND_LOG</name>
+ <comment>
+ When started it creates a new log file and stores all commands in the
+ log file. When stopped it renames the file.
+ </comment>
+ <version>0.1.0</version>
+ <components>
+ <component>
+ <name>COMMAND_LOGGER</name>
+ <category>MASTER</category>
+ <commandScript>
+ <script>scripts/cl.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
+ </component>
+ </components>
- <osSpecifics>
- <osSpecific>
- <osType>any</osType>
- <packages>
- <package>
- <type>tarball</type>
- <name>files/command_log.tar.gz</name>
- </package>
- </packages>
- </osSpecific>
- </osSpecifics>
+ <osSpecifics>
+ <osSpecific>
+ <osType>any</osType>
+ <packages>
+ <package>
+ <type>tarball</type>
+ <name>files/command_log.tar.gz</name>
+ </package>
+ </packages>
+ </osSpecific>
+ </osSpecifics>
- </service>
- </services>
+ </application>
</metainfo>