You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vk...@apache.org on 2017/11/30 22:59:36 UTC
[1/2] ignite git commit: IGNITE-5981 - IgniteContext starts all nodes
as clients in standalone mode
Repository: ignite
Updated Branches:
refs/heads/master 83049d7ae -> 23b106d78
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/master
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)
[2/2] ignite git commit: Merge remote-tracking branch 'origin/master'
Posted by vk...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/23b106d7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/23b106d7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/23b106d7
Branch: refs/heads/master
Commit: 23b106d78be21b36bdf79194f83e29047f171b21
Parents: a10ceaf 83049d7
Author: Valentin Kulichenko <va...@gmail.com>
Authored: Thu Nov 30 14:59:29 2017 -0800
Committer: Valentin Kulichenko <va...@gmail.com>
Committed: Thu Nov 30 14:59:29 2017 -0800
----------------------------------------------------------------------
examples/pom-standalone-lgpl.xml | 8 +-
examples/pom-standalone.xml | 8 +-
examples/pom.xml | 20 +-
modules/clients/pom.xml | 8 +-
modules/compatibility/pom.xml | 8 +
.../DummyPersistenceCompatibilityTest.java | 108 ++--
.../testframework/junits/Dependency.java | 117 +++++
.../junits/IgniteCompatibilityAbstractTest.java | 72 ++-
.../junits/IgniteCompatibilityNodeRunner.java | 110 +++-
.../testframework/util/MavenUtils.java | 30 +-
.../processors/cache/CacheGroupContext.java | 13 +
.../cache/CacheGroupMetricsMXBeanImpl.java | 250 ++++++++++
.../processors/cache/GridCacheProcessor.java | 62 ++-
.../cache/binary/BinaryMetadataTransport.java | 20 +-
.../persistence/pagemem/PageMemoryImpl.java | 2 +-
.../wal/FileWriteAheadLogManager.java | 22 +-
.../continuous/GridContinuousProcessor.java | 132 +++--
.../processors/hadoop/HadoopDefaultJobInfo.java | 15 +-
.../processors/hadoop/HadoopJobInfo.java | 7 +
.../binary/ClientBinaryTypeGetRequest.java | 4 +-
.../binary/ClientBinaryTypeGetResponse.java | 10 +-
.../processors/query/GridQueryProcessor.java | 7 +-
.../schema/SchemaIndexCacheVisitorImpl.java | 153 +++++-
.../operation/SchemaIndexCreateOperation.java | 16 +-
.../apache/ignite/internal/sql/SqlKeyword.java | 3 +
.../ignite/internal/sql/SqlParserUtils.java | 8 +-
.../sql/command/SqlCreateIndexCommand.java | 95 +++-
.../ignite/mxbean/CacheGroupMetricsMXBean.java | 134 +++++
.../cache/CacheGroupMetricsMBeanTest.java | 254 ++++++++++
.../sql/SqlParserCreateIndexSelfTest.java | 152 ++++--
.../IgniteCacheMetricsSelfTestSuite.java | 2 +
.../processors/hadoop/impl/HadoopUtils.java | 45 +-
.../impl/fs/HadoopFileSystemCacheUtils.java | 34 +-
.../hadoop/impl/proto/HadoopClientProtocol.java | 8 +-
.../processors/hadoop/impl/v2/HadoopV2Job.java | 32 +-
.../hadoop/impl/v2/HadoopV2TaskContext.java | 62 ++-
.../impl/HadoopAbstractMapReduceTest.java | 2 +-
.../hadoop/impl/HadoopGroupingTest.java | 2 +-
.../hadoop/impl/HadoopJobTrackerSelfTest.java | 4 +-
.../impl/HadoopMapReduceEmbeddedSelfTest.java | 2 +-
.../hadoop/impl/HadoopPlannerMockJob.java | 6 +
.../hadoop/impl/HadoopSortingTest.java | 4 +-
.../impl/HadoopTaskExecutionSelfTest.java | 10 +-
.../hadoop/impl/HadoopTasksV1Test.java | 2 +-
.../hadoop/impl/HadoopTasksV2Test.java | 2 +-
.../hadoop/impl/HadoopTeraSortTest.java | 2 +-
.../hadoop/impl/HadoopV2JobSelfTest.java | 2 +-
.../collections/HadoopAbstractMapTest.java | 6 +
.../HadoopExternalTaskExecutionSelfTest.java | 4 +-
modules/ignored-tests/pom.xml | 10 +-
.../query/h2/ddl/DdlStatementsProcessor.java | 6 +-
.../cache/index/AbstractSchemaSelfTest.java | 7 +-
.../DynamicIndexAbstractBasicSelfTest.java | 168 ++++++-
.../DynamicIndexAbstractConcurrentSelfTest.java | 36 +-
.../cache/index/SchemaExchangeSelfTest.java | 2 +-
.../Apache.Ignite.Core.Tests.DotNetCore.csproj | 2 +
.../Common/TestLogger.cs | 74 +++
.../Common/TestUtils.DotNetCore.cs | 46 +-
.../Apache.Ignite.Core.Tests.csproj | 2 +
.../Cache/CacheAbstractTest.cs | 26 +
.../Client/Cache/BinaryBuilderTest.cs | 118 +++++
.../Client/Cache/CacheTest.cs | 2 +-
.../Client/Cache/CacheTestKeepBinary.cs | 499 +++++++++++++++++++
.../Client/Cache/ScanQueryTest.cs | 48 ++
.../Client/ClientConnectionTest.cs | 4 +-
.../Client/ClientTestBase.cs | 43 ++
.../Log/CustomLoggerTest.cs | 7 -
.../TestUtils.Common.cs | 3 -
.../Apache.Ignite.Core.csproj | 5 +-
.../Client/Cache/ICacheClient.cs | 11 +
.../Apache.Ignite.Core/Client/IIgniteClient.cs | 9 +
.../Apache.Ignite.Core/IgniteConfiguration.cs | 7 +-
.../dotnet/Apache.Ignite.Core/Ignition.cs | 2 +-
.../Impl/Binary/BinaryObjectBuilder.cs | 5 +-
.../Impl/Binary/BinaryProcessorClient.cs | 7 +-
.../Impl/Client/Cache/CacheClient.cs | 30 +-
.../Impl/Client/ClientSocket.cs | 12 +-
.../Impl/Client/IgniteClient.cs | 7 +-
.../Apache.Ignite.Core/Impl/IgniteManager.cs | 8 +
.../Apache.Ignite.Core/Impl/IgniteUtils.cs | 242 ---------
.../dotnet/Apache.Ignite.Core/Impl/Shell.cs | 2 +
.../Impl/Unmanaged/DllLoader.cs | 176 -------
.../Impl/Unmanaged/Jni/DllLoader.cs | 210 ++++++++
.../Impl/Unmanaged/Jni/Jvm.cs | 80 +--
.../Impl/Unmanaged/Jni/JvmDll.cs | 414 +++++++++++++++
.../Impl/Unmanaged/Jni/JvmInitArgs.cs | 33 ++
.../Impl/Unmanaged/Jni/JvmOption.cs | 34 ++
.../Apache.Ignite.Core/Impl/Unmanaged/Os.cs | 6 +
modules/platforms/dotnet/Apache.Ignite.ndproj | 2 +-
modules/spring-data/pom.xml | 7 +
.../app/modules/branding/branding.service.js | 2 +-
.../frontend/app/primitives/ui-grid/index.scss | 1 +
modules/web-console/frontend/views/index.pug | 2 +-
.../web-console/frontend/views/sql/sql.tpl.pug | 10 +-
94 files changed, 3542 insertions(+), 964 deletions(-)
----------------------------------------------------------------------