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/06/17 17:23:22 UTC
incubator-ignite git commit: # ignite-1010: Implemented.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-1010 [created] e0298fce6
# ignite-1010: Implemented.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e0298fce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e0298fce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e0298fce
Branch: refs/heads/ignite-1010
Commit: e0298fce6048004cc173fea78d14d1ea8a4d565a
Parents: 5218210
Author: ashutak <as...@gridgain.com>
Authored: Wed Jun 17 18:23:18 2015 +0300
Committer: ashutak <as...@gridgain.com>
Committed: Wed Jun 17 18:23:18 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/examples/ExamplesUtils.java | 17 -----------------
.../examples/servicegrid/ServicesExample.java | 3 ---
.../streaming/StreamTransformerExample.java | 3 ---
.../examples/streaming/StreamVisitorExample.java | 3 ---
.../examples/streaming/wordcount/QueryWords.java | 3 ---
.../examples/streaming/wordcount/StreamWords.java | 3 ---
.../socket/WordsSocketStreamerServer.java | 6 ------
.../java8/streaming/StreamTransformerExample.java | 3 ---
.../java8/streaming/StreamVisitorExample.java | 3 ---
.../ignite/spi/discovery/tcp/ClientImpl.java | 8 ++++----
.../spi/discovery/tcp/TcpDiscoverySpiMBean.java | 2 +-
11 files changed, 5 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e0298fce/examples/src/main/java/org/apache/ignite/examples/ExamplesUtils.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/ExamplesUtils.java b/examples/src/main/java/org/apache/ignite/examples/ExamplesUtils.java
index abc2578..3dcab7b 100644
--- a/examples/src/main/java/org/apache/ignite/examples/ExamplesUtils.java
+++ b/examples/src/main/java/org/apache/ignite/examples/ExamplesUtils.java
@@ -17,7 +17,6 @@
package org.apache.ignite.examples;
-import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
import java.net.*;
@@ -80,22 +79,6 @@ public class ExamplesUtils {
}
/**
- * Checks if cluster has server nodes.
- *
- * @param ignite Ignite instance.
- * @return {@code True} if cluster has server nodes, {@code false} otherwise.
- */
- public static boolean hasServerNodes(Ignite ignite) {
- if (ignite.cluster().forServers().nodes().isEmpty()) {
- System.err.println("Server nodes not found (start data nodes with ExampleNodeStartup class)");
-
- return false;
- }
-
- return true;
- }
-
- /**
* Convenience method for printing query results.
*
* @param res Query results.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e0298fce/examples/src/main/java/org/apache/ignite/examples/servicegrid/ServicesExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/servicegrid/ServicesExample.java b/examples/src/main/java/org/apache/ignite/examples/servicegrid/ServicesExample.java
index 1a10211..427605d 100644
--- a/examples/src/main/java/org/apache/ignite/examples/servicegrid/ServicesExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/servicegrid/ServicesExample.java
@@ -48,9 +48,6 @@ public class ServicesExample {
Ignition.setClientMode(true);
try (Ignite ignite = Ignition.start("examples/config/example-ignite.xml")) {
- if (!ExamplesUtils.hasServerNodes(ignite))
- return;
-
// Deploy services only on server nodes.
IgniteServices svcs = ignite.services(ignite.cluster().forServers());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e0298fce/examples/src/main/java/org/apache/ignite/examples/streaming/StreamTransformerExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamTransformerExample.java b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamTransformerExample.java
index 966fce2..6842334 100644
--- a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamTransformerExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamTransformerExample.java
@@ -46,9 +46,6 @@ public class StreamTransformerExample {
Ignition.setClientMode(true);
try (Ignite ignite = Ignition.start("examples/config/example-ignite.xml")) {
- if (!ExamplesUtils.hasServerNodes(ignite))
- return;
-
CacheConfiguration<Integer, Long> cfg = new CacheConfiguration<>("randomNumbers");
// Index key and value.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e0298fce/examples/src/main/java/org/apache/ignite/examples/streaming/StreamVisitorExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamVisitorExample.java b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamVisitorExample.java
index baae5af..f3a4bec 100644
--- a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamVisitorExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamVisitorExample.java
@@ -50,9 +50,6 @@ public class StreamVisitorExample {
Ignition.setClientMode(true);
try (Ignite ignite = Ignition.start("examples/config/example-ignite.xml")) {
- if (!ExamplesUtils.hasServerNodes(ignite))
- return;
-
// Financial instrument cache configuration.
CacheConfiguration<String, Instrument> instCfg = new CacheConfiguration<>("instCache");
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e0298fce/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/QueryWords.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/QueryWords.java b/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/QueryWords.java
index 58c6ef2..bd0f0d6 100644
--- a/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/QueryWords.java
+++ b/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/QueryWords.java
@@ -45,9 +45,6 @@ public class QueryWords {
Ignition.setClientMode(true);
try (Ignite ignite = Ignition.start("examples/config/example-ignite.xml")) {
- if (!ExamplesUtils.hasServerNodes(ignite))
- return;
-
// The cache is configured with sliding window holding 1 second of the streaming data.
IgniteCache<AffinityUuid, String> stmCache = ignite.getOrCreateCache(CacheConfig.wordCache());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e0298fce/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/StreamWords.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/StreamWords.java b/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/StreamWords.java
index 6024c4b..d48c7c6 100644
--- a/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/StreamWords.java
+++ b/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/StreamWords.java
@@ -44,9 +44,6 @@ public class StreamWords {
Ignition.setClientMode(true);
try (Ignite ignite = Ignition.start("examples/config/example-ignite.xml")) {
- if (!ExamplesUtils.hasServerNodes(ignite))
- return;
-
// The cache is configured with sliding window holding 1 second of the streaming data.
IgniteCache<AffinityUuid, String> stmCache = ignite.getOrCreateCache(CacheConfig.wordCache());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e0298fce/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/socket/WordsSocketStreamerServer.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/socket/WordsSocketStreamerServer.java b/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/socket/WordsSocketStreamerServer.java
index 9e68096..7bc7f81 100644
--- a/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/socket/WordsSocketStreamerServer.java
+++ b/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/socket/WordsSocketStreamerServer.java
@@ -64,12 +64,6 @@ public class WordsSocketStreamerServer {
Ignite ignite = Ignition.start("examples/config/example-ignite.xml");
- if (!ExamplesUtils.hasServerNodes(ignite)) {
- ignite.close();
-
- return;
- }
-
// The cache is configured with sliding window holding 1 second of the streaming data.
IgniteCache<AffinityUuid, String> stmCache = ignite.getOrCreateCache(CacheConfig.wordCache());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e0298fce/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/StreamTransformerExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/StreamTransformerExample.java b/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/StreamTransformerExample.java
index f66f9ea..d54ac0c 100644
--- a/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/StreamTransformerExample.java
+++ b/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/StreamTransformerExample.java
@@ -47,9 +47,6 @@ public class StreamTransformerExample {
Ignition.setClientMode(true);
try (Ignite ignite = Ignition.start("examples/config/example-ignite.xml")) {
- if (!ExamplesUtils.hasServerNodes(ignite))
- return;
-
CacheConfiguration<Integer, Long> cfg = new CacheConfiguration<>("randomNumbers");
// Index key and value.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e0298fce/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/StreamVisitorExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/StreamVisitorExample.java b/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/StreamVisitorExample.java
index 3e161dd..42f68f0 100644
--- a/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/StreamVisitorExample.java
+++ b/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/StreamVisitorExample.java
@@ -52,9 +52,6 @@ public class StreamVisitorExample {
Ignition.setClientMode(true);
try (Ignite ignite = Ignition.start("examples/config/example-ignite.xml")) {
- if (!ExamplesUtils.hasServerNodes(ignite))
- return;
-
// Market data cache with default configuration.
CacheConfiguration<String, Double> mktDataCfg = new CacheConfiguration<>("marketTicks");
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e0298fce/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
index fef6f4f..b11db6c 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
@@ -5,9 +5,9 @@
* 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.
@@ -425,8 +425,8 @@ class ClientImpl extends TcpDiscoveryImpl {
if (timeout > 0 && (U.currentTimeMillis() - startTime) > timeout)
return null;
- U.warn(log, "Failed to connect to any address from IP finder (will retry to join topology " +
- "in 2000ms): " + addrs0);
+ U.quietAndWarn(log, "Client node cannot find server nodes. Failed to connect to any address from " +
+ "IP finder (will retry to join topology in 2000ms): " + addrs0);
Thread.sleep(2000);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e0298fce/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiMBean.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiMBean.java
index f338fab..94bec98 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiMBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiMBean.java
@@ -262,7 +262,7 @@ public interface TcpDiscoverySpiMBean extends IgniteSpiManagementMBean {
/**
* Gets join timeout.
*
- * @return Join timeout.
+ * @return Join timeout (in millisecondes).
*/
@MXBeanDescription("Join timeout.")
public long getJoinTimeout();