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 2017/12/01 08:22:55 UTC
[6/9] ignite git commit: IGNITE-5981 - IgniteContext starts all nodes
as clients in standalone mode
IGNITE-5981 - IgniteContext starts all nodes as clients in standalone mode
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a10ceaf4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a10ceaf4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a10ceaf4
Branch: refs/heads/ignite-zk
Commit: a10ceaf4d41b24775adf7e726053535ca0ea7233
Parents: 5e7a556
Author: Valentin Kulichenko <va...@gmail.com>
Authored: Thu Nov 30 14:59:17 2017 -0800
Committer: Valentin Kulichenko <va...@gmail.com>
Committed: Thu Nov 30 14:59:17 2017 -0800
----------------------------------------------------------------------
modules/core/src/test/config/spark/spark-config.xml | 8 +++-----
.../scala/org/apache/ignite/spark/IgniteContext.scala | 6 +++---
.../org/apache/ignite/testsuites/IgniteRDDTestSuite.java | 2 +-
.../scala/org/apache/ignite/spark/IgniteRDDSpec.scala | 11 +++++++----
4 files changed, 14 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/a10ceaf4/modules/core/src/test/config/spark/spark-config.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/spark/spark-config.xml b/modules/core/src/test/config/spark/spark-config.xml
index 4b7ffe1..2af4bef 100644
--- a/modules/core/src/test/config/spark/spark-config.xml
+++ b/modules/core/src/test/config/spark/spark-config.xml
@@ -23,6 +23,8 @@
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration">
+ <property name="clientMode" value="true"/>
+
<property name="localHost" value="127.0.0.1"/>
<property name="discoverySpi">
@@ -31,11 +33,7 @@
<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">
<property name="addresses">
<list>
- <value>127.0.0.1:47500</value>
- <value>127.0.0.1:47501</value>
- <value>127.0.0.1:47502</value>
- <value>127.0.0.1:47503</value>
- <value>127.0.0.1:47504</value>
+ <value>127.0.0.1:47500..47504</value>
</list>
</property>
</bean>
http://git-wip-us.apache.org/repos/asf/ignite/blob/a10ceaf4/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteContext.scala
----------------------------------------------------------------------
diff --git a/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteContext.scala b/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteContext.scala
index 68ada45..b62e4d8 100644
--- a/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteContext.scala
+++ b/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteContext.scala
@@ -66,9 +66,9 @@ class IgniteContext(
def this(
sc: SparkContext,
springUrl: String,
- client: Boolean
+ standalone: Boolean
) {
- this(sc, () ⇒ IgnitionEx.loadConfiguration(springUrl).get1(), client)
+ this(sc, () ⇒ IgnitionEx.loadConfiguration(springUrl).get1(), standalone)
}
/**
@@ -137,7 +137,7 @@ class IgniteContext(
val igniteCfg = cfgClo()
// check if called from driver
- if (sparkContext != null) igniteCfg.setClientMode(true)
+ if (standalone || sparkContext != null) igniteCfg.setClientMode(true)
try {
Ignition.getOrStart(igniteCfg)
http://git-wip-us.apache.org/repos/asf/ignite/blob/a10ceaf4/modules/spark/src/test/java/org/apache/ignite/testsuites/IgniteRDDTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/spark/src/test/java/org/apache/ignite/testsuites/IgniteRDDTestSuite.java b/modules/spark/src/test/java/org/apache/ignite/testsuites/IgniteRDDTestSuite.java
index a4177f0..9d6227b 100644
--- a/modules/spark/src/test/java/org/apache/ignite/testsuites/IgniteRDDTestSuite.java
+++ b/modules/spark/src/test/java/org/apache/ignite/testsuites/IgniteRDDTestSuite.java
@@ -37,4 +37,4 @@ public class IgniteRDDTestSuite extends TestSuite {
return suite;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a10ceaf4/modules/spark/src/test/scala/org/apache/ignite/spark/IgniteRDDSpec.scala
----------------------------------------------------------------------
diff --git a/modules/spark/src/test/scala/org/apache/ignite/spark/IgniteRDDSpec.scala b/modules/spark/src/test/scala/org/apache/ignite/spark/IgniteRDDSpec.scala
index b2936ed..5f05f7a 100644
--- a/modules/spark/src/test/scala/org/apache/ignite/spark/IgniteRDDSpec.scala
+++ b/modules/spark/src/test/scala/org/apache/ignite/spark/IgniteRDDSpec.scala
@@ -350,9 +350,6 @@ case class WithObjectField(
* Constants and utility methods.
*/
object IgniteRDDSpec {
- /** IP finder for the test. */
- val IP_FINDER = new TcpDiscoveryVmIpFinder(true)
-
/** Cache name for the pairs (String, Entity). */
val ENTITY_CACHE_NAME = "entity"
@@ -384,9 +381,15 @@ object IgniteRDDSpec {
def configuration(igniteInstanceName: String, client: Boolean): IgniteConfiguration = {
val cfg = new IgniteConfiguration
+ cfg.setLocalHost("127.0.0.1")
+
val discoSpi = new TcpDiscoverySpi
- discoSpi.setIpFinder(IgniteRDDSpec.IP_FINDER)
+ val ipFinder = new TcpDiscoveryVmIpFinder()
+
+ ipFinder.setAddresses(List("127.0.0.1:47500..47504"))
+
+ discoSpi.setIpFinder(ipFinder)
cfg.setDiscoverySpi(discoSpi)