You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/07/16 10:49:07 UTC
[09/50] [abbrv] incubator-ignite git commit: #YARN Code cleanup.
#YARN Code cleanup.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8879c2a8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8879c2a8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8879c2a8
Branch: refs/heads/ignite-901
Commit: 8879c2a812eb05dd9500dc25be6a07bee2bfa983
Parents: 78ab7aa
Author: nikolay tikhonov <nt...@gridgain.com>
Authored: Wed Jun 10 17:40:06 2015 +0300
Committer: nikolay tikhonov <nt...@gridgain.com>
Committed: Wed Jun 10 17:40:06 2015 +0300
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/yarn/ApplicationMaster.java | 2 +-
modules/yarn/src/main/resources/ignite-default-config.xml | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8879c2a8/modules/yarn/src/main/java/org/apache/ignite/yarn/ApplicationMaster.java
----------------------------------------------------------------------
diff --git a/modules/yarn/src/main/java/org/apache/ignite/yarn/ApplicationMaster.java b/modules/yarn/src/main/java/org/apache/ignite/yarn/ApplicationMaster.java
index a784340..bdc6f9a 100644
--- a/modules/yarn/src/main/java/org/apache/ignite/yarn/ApplicationMaster.java
+++ b/modules/yarn/src/main/java/org/apache/ignite/yarn/ApplicationMaster.java
@@ -189,7 +189,7 @@ public class ApplicationMaster implements AMRMClientAsync.CallbackHandler {
for (ContainerStatus status : statuses) {
containers.remove(status.getContainerId());
- log.log(Level.INFO, "Container stopped. Container id: {0}. State: {1}.",
+ log.log(Level.INFO, "Container completed. Container id: {0}. State: {1}.",
new Object[]{status.getContainerId(), status.getState()});
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8879c2a8/modules/yarn/src/main/resources/ignite-default-config.xml
----------------------------------------------------------------------
diff --git a/modules/yarn/src/main/resources/ignite-default-config.xml b/modules/yarn/src/main/resources/ignite-default-config.xml
index 96bb669..2f26398 100644
--- a/modules/yarn/src/main/resources/ignite-default-config.xml
+++ b/modules/yarn/src/main/resources/ignite-default-config.xml
@@ -25,8 +25,10 @@
<property name="discoverySpi">
<bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">
<property name="ipFinder">
- <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder"/>
+ <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"/>
</property>
+
+ <property name="joinTimeout" value="60000"/>
</bean>
</property>
</bean>