You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2017/03/02 11:30:38 UTC
[01/50] [abbrv] ignite git commit: Merge branch 'master' into
ignite-2.0
Repository: ignite
Updated Branches:
refs/heads/ignite-4565-ddl fcadf67cf -> 796c933ac
Merge branch 'master' into ignite-2.0
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2f574701
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2f574701
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2f574701
Branch: refs/heads/ignite-4565-ddl
Commit: 2f574701995ef644bb8066a0bd99a5985adcb154
Parents: 2e421c2 262a341
Author: devozerov <vo...@gridgain.com>
Authored: Mon Feb 13 14:28:41 2017 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Mon Feb 13 14:28:41 2017 +0300
----------------------------------------------------------------------
NOTICE | 2 +-
assembly/NOTICE_FABRIC | 2 +-
assembly/NOTICE_HADOOP | 2 +-
modules/core/src/main/java/META-INF/NOTICE | 2 +-
.../apache/ignite/IgniteSystemProperties.java | 3 +
.../org/apache/ignite/cache/QueryEntity.java | 21 +
.../org/apache/ignite/cache/query/SqlQuery.java | 25 +
.../internal/GridEventConsumeHandler.java | 5 +
.../ignite/internal/GridKernalContext.java | 1 +
.../ignite/internal/GridKernalContextImpl.java | 1 +
.../internal/GridMessageListenHandler.java | 5 +
.../internal/GridPerformanceSuggestions.java | 92 ----
.../apache/ignite/internal/IgniteKernal.java | 9 +
.../ignite/internal/IgniteVersionUtils.java | 2 +-
.../processors/cache/EntryGetResult.java | 65 +++
.../processors/cache/GridCacheAdapter.java | 125 +++--
.../processors/cache/GridCacheContext.java | 4 +-
.../processors/cache/GridCacheEntryEx.java | 42 +-
.../processors/cache/GridCacheMapEntry.java | 140 +++++-
.../processors/cache/GridCacheProcessor.java | 2 +-
.../processors/cache/GridCacheUtils.java | 3 +
.../processors/cache/IgniteCacheProxy.java | 3 +
.../processors/cache/ReaderArguments.java | 74 +++
.../distributed/dht/GridDhtCacheAdapter.java | 9 +-
.../cache/distributed/dht/GridDhtGetFuture.java | 83 ++--
.../distributed/dht/GridDhtGetSingleFuture.java | 75 ++-
.../dht/GridPartitionedGetFuture.java | 10 +-
.../dht/GridPartitionedSingleGetFuture.java | 10 +-
.../dht/atomic/GridDhtAtomicCache.java | 12 +-
.../dht/colocated/GridDhtColocatedCache.java | 10 +-
.../distributed/near/GridNearGetFuture.java | 19 +-
.../local/atomic/GridLocalAtomicCache.java | 11 +-
.../cache/query/GridCacheQueryManager.java | 83 +++-
.../continuous/CacheContinuousQueryHandler.java | 97 +++-
.../cache/transactions/IgniteTxHandler.java | 2 +-
.../transactions/IgniteTxLocalAdapter.java | 65 +--
.../continuous/GridContinuousHandler.java | 5 +
.../continuous/GridContinuousProcessor.java | 3 +
.../internal/processors/job/GridJobWorker.java | 4 +
.../processors/query/GridQueryIndexing.java | 4 +-
.../processors/query/GridQueryProcessor.java | 88 ++--
.../query/GridQueryTypeDescriptor.java | 7 +
.../suggestions/GridPerformanceSuggestions.java | 105 ++++
.../JvmConfigurationSuggestions.java | 104 ++++
.../suggestions/OsConfigurationSuggestions.java | 127 +++++
.../internal/suggestions/package-info.java | 21 +
.../ignite/internal/util/IgniteUtils.java | 14 +
.../communication/tcp/TcpCommunicationSpi.java | 16 +
.../ignite/spi/discovery/tcp/ClientImpl.java | 90 +++-
.../ignite/spi/discovery/tcp/ServerImpl.java | 63 ++-
.../messages/TcpDiscoveryAbstractMessage.java | 21 +
modules/core/src/test/config/log4j-test.xml | 6 +
.../internal/GridContinuousTaskSelfTest.java | 79 +++
.../cache/CacheConcurrentReadThroughTest.java | 184 +++++++
.../processors/cache/GridCacheTestEntryEx.java | 30 +-
...CacheAtomicReferenceApiSelfAbstractTest.java | 60 ++-
...idCacheAtomicStampedApiSelfAbstractTest.java | 59 +++
.../GridCacheQueueApiSelfAbstractTest.java | 58 +++
.../GridCacheSetAbstractSelfTest.java | 53 +++
.../IgniteAtomicLongApiAbstractSelfTest.java | 27 ++
.../IgniteCountDownLatchAbstractSelfTest.java | 43 ++
.../IgniteLockAbstractSelfTest.java | 54 ++-
.../IgniteSemaphoreAbstractSelfTest.java | 52 +-
.../near/GridNearCacheStoreUpdateTest.java | 466 ++++++++++++++++++
.../GridNearOffheapCacheStoreUpdateTest.java | 35 ++
.../cache/query/IndexingSpiQuerySelfTest.java | 69 ++-
.../IndexingSpiQueryWithH2IndexingSelfTest.java | 36 ++
.../ClientReconnectContinuousQueryTest.java | 201 ++++++++
.../tcp/TcpCommunicationSpiDropNodesTest.java | 322 +++++++++++++
.../TcpCommunicationSpiFaultyClientTest.java | 265 +++++++++++
.../startup/GridRandomCommandLineLoader.java | 2 +-
.../ignite/testframework/GridTestNode.java | 1 +
.../testframework/junits/GridAbstractTest.java | 2 +
.../testsuites/IgniteCacheTestSuite2.java | 7 +
.../IgniteSpiCommunicationSelfTestSuite.java | 5 +
.../IgniteSpiDiscoverySelfTestSuite.java | 2 +-
.../processors/query/h2/IgniteH2Indexing.java | 30 +-
...CacheScanPartitionQueryFallbackSelfTest.java | 2 +-
.../cache/IgniteCacheAbstractQuerySelfTest.java | 294 ++++++++++++
.../cache/QueryEntityCaseMismatchTest.java | 107 +++++
.../IgniteCachePartitionedQuerySelfTest.java | 85 ++++
.../h2/GridIndexingSpiAbstractSelfTest.java | 29 +-
.../IgniteCacheQuerySelfTestSuite.java | 2 +
.../IgniteCacheQuerySelfTestSuite3.java | 2 +
.../Properties/AssemblyInfo.cs | 2 +-
.../Apache.Ignite.AspNet.nuspec | 2 +-
.../Properties/AssemblyInfo.cs | 2 +-
.../Properties/AssemblyInfo.cs | 2 +-
.../Properties/AssemblyInfo.cs | 2 +-
.../Properties/AssemblyInfo.cs | 2 +-
.../Cache/Query/CacheLinqTest.cs | 96 ++++
.../Cache/Store/CacheStoreTest.cs | 30 +-
.../Properties/AssemblyInfo.cs | 2 +-
.../Apache.Ignite.Core.Schema.nuspec | 2 +-
.../Apache.Ignite.Core.nuspec | 2 +-
.../Properties/AssemblyInfo.cs | 2 +-
.../Apache.Ignite.EntityFramework.nuspec | 2 +-
.../Apache.Ignite.Linq.nuspec | 2 +-
.../Impl/CacheQueryExpressionVisitor.cs | 127 ++++-
.../Impl/CacheQueryModelVisitor.cs | 3 +
.../Properties/AssemblyInfo.cs | 2 +-
.../Apache.Ignite.Log4Net.nuspec | 2 +-
.../Properties/AssemblyInfo.cs | 2 +-
.../Apache.Ignite.NLog.nuspec | 2 +-
.../Properties/AssemblyInfo.cs | 2 +-
.../Apache.Ignite/Properties/AssemblyInfo.cs | 2 +-
.../Properties/AssemblyInfo.cs | 2 +-
modules/scalar-2.10/pom.xml | 2 +-
modules/scalar/pom.xml | 2 +-
modules/web-console/backend/app/agent.js | 34 ++
modules/web-console/backend/app/browser.js | 26 +
.../app/modules/branding/branding.provider.js | 2 +-
modules/web-console/frontend/package.json | 2 +-
.../ignite/console/agent/AgentLauncher.java | 203 ++++----
.../apache/ignite/console/agent/AgentUtils.java | 80 ++++
.../console/agent/handlers/AbstractHandler.java | 110 -----
.../agent/handlers/AbstractListener.java | 104 ++++
.../console/agent/handlers/DatabaseHandler.java | 298 ------------
.../agent/handlers/DatabaseListener.java | 316 ++++++++++++
.../console/agent/handlers/RestHandler.java | 276 -----------
.../console/agent/handlers/RestListener.java | 280 +++++++++++
.../ignite/console/demo/AgentClusterDemo.java | 475 +------------------
.../ignite/console/demo/AgentDemoUtils.java | 79 +++
.../demo/service/DemoCachesLoadService.java | 456 ++++++++++++++++++
.../service/DemoRandomCacheLoadService.java | 120 +++++
.../service/DemoServiceClusterSingleton.java | 41 ++
.../demo/service/DemoServiceKeyAffinity.java | 41 ++
.../service/DemoServiceMultipleInstances.java | 41 ++
.../demo/service/DemoServiceNodeSingleton.java | 41 ++
modules/yardstick/DEVNOTES-standalone.txt | 15 +
modules/yardstick/DEVNOTES.txt | 20 +-
modules/yardstick/README.txt | 119 +++--
.../config/benchmark-sample.properties | 62 +++
modules/yardstick/pom.xml | 4 +-
.../cache/IgnitePutValue8Benchmark.java | 42 ++
parent/pom.xml | 2 +-
pom.xml | 1 +
137 files changed, 6215 insertions(+), 1830 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f574701/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f574701/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f574701/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f574701/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f574701/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f574701/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
index 0888be3,e274485..0ec10b4
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
@@@ -152,7 -152,13 +152,10 @@@ public class GridCacheUtils
/** Atomics system cache name. */
public static final String ATOMICS_CACHE_NAME = "ignite-atomics-sys-cache";
- /** Marshaller system cache name. */
- public static final String MARSH_CACHE_NAME = "ignite-marshaller-sys-cache";
-
/** */
+ public static final String CONTINUOUS_QRY_LOG_CATEGORY = "org.apache.ignite.continuous.query";
+
+ /** */
public static final String CACHE_MSG_LOG_CATEGORY = "org.apache.ignite.cache.msg";
/** */
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f574701/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f574701/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f574701/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f574701/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f574701/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
index ddc7687,4c89a7c..4c89a7c
mode 100755,100644..100755
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f574701/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f574701/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f574701/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f574701/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f574701/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
----------------------------------------------------------------------
diff --cc modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
index ed3d1e8,386b8fd..3ef331f
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
@@@ -242,8 -242,8 +243,9 @@@ public class IgniteCacheQuerySelfTestSu
suite.addTestSuite(CacheOffheapBatchIndexingSingleTypeTest.class);
suite.addTestSuite(CacheSqlQueryValueCopySelfTest.class);
suite.addTestSuite(IgniteCacheQueryCacheDestroySelfTest.class);
+ suite.addTestSuite(IgniteSqlQueryDedicatedPoolTest.class);
suite.addTestSuite(IgniteSqlEntryCacheModeAgnosticTest.class);
+ suite.addTestSuite(QueryEntityCaseMismatchTest.class);
return suite;
}
[22/50] [abbrv] ignite git commit: IGNITE-2356: Added
high-availability feature to IGFS client. From now on it is possible to
connect to IGFS through Ignite client. This way in case one server fails,
client will still be able to work with other nodes. Th
Posted by vo...@apache.org.
IGNITE-2356: Added high-availability feature to IGFS client. From now on it is possible to connect to IGFS through Ignite client. This way in case one server fails, client will still be able to work with other nodes. This closes #1155. This closes #1251.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6bdff2c3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6bdff2c3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6bdff2c3
Branch: refs/heads/ignite-4565-ddl
Commit: 6bdff2c31ae9e754d38b2bc5504198c77b173be6
Parents: 4a78341
Author: tledkov-gridgain <tl...@gridgain.com>
Authored: Wed Feb 15 18:42:56 2017 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Wed Feb 15 18:42:56 2017 +0300
----------------------------------------------------------------------
.../local/LocalIgfsSecondaryFileSystem.java | 6 +-
.../org/apache/ignite/internal/IgnitionEx.java | 59 +++-
.../internal/processors/igfs/IgfsImpl.java | 30 +-
.../processors/igfs/IgfsMetaManager.java | 14 +-
.../igfs/client/IgfsClientAbstractCallable.java | 23 +-
.../igfs/client/IgfsClientAffinityCallable.java | 6 +-
.../igfs/client/IgfsClientDeleteCallable.java | 6 +-
.../igfs/client/IgfsClientExistsCallable.java | 5 +-
.../igfs/client/IgfsClientInfoCallable.java | 5 +-
.../client/IgfsClientListFilesCallable.java | 5 +-
.../client/IgfsClientListPathsCallable.java | 5 +-
.../igfs/client/IgfsClientMkdirsCallable.java | 6 +-
.../igfs/client/IgfsClientRenameCallable.java | 6 +-
.../igfs/client/IgfsClientSetTimesCallable.java | 6 +-
.../igfs/client/IgfsClientSizeCallable.java | 5 +-
.../igfs/client/IgfsClientSummaryCallable.java | 5 +-
.../igfs/client/IgfsClientUpdateCallable.java | 6 +-
.../meta/IgfsClientMetaIdsForPathCallable.java | 5 +-
.../meta/IgfsClientMetaInfoForPathCallable.java | 5 +-
.../meta/IgfsClientMetaUnlockCallable.java | 8 +-
.../secondary/local/LocalFileSystemUtils.java | 25 ++
.../util/tostring/GridToStringBuilder.java | 2 +-
.../testframework/junits/GridAbstractTest.java | 21 +-
.../junits/multijvm/IgniteNodeRunner.java | 55 +++-
.../junits/multijvm/IgniteProcessProxy.java | 58 ++--
modules/hadoop/pom.xml | 7 +
.../hadoop/impl/igfs/HadoopIgfsInProc.java | 190 ++++++++++--
.../hadoop/impl/igfs/HadoopIgfsUtils.java | 6 +
.../hadoop/impl/igfs/HadoopIgfsWrapper.java | 99 +++---
.../test/config/hadoop-fs-open-test/grid-0.xml | 141 +++++++++
.../test/config/hadoop-fs-open-test/grid-1.xml | 141 +++++++++
.../test/config/hadoop-fs-open-test/grid-2.xml | 141 +++++++++
.../test/config/igfs-cli-config-dual-async.xml | 150 +++++++++
.../test/config/igfs-cli-config-dual-sync.xml | 148 +++++++++
.../src/test/config/igfs-cli-config-primary.xml | 139 +++++++++
.../src/test/config/igfs-cli-config-proxy.xml | 148 +++++++++
.../IgniteHadoopFileSystemAbstractSelfTest.java | 117 ++++---
...opFileSystemClientBasedAbstractSelfTest.java | 193 ++++++++++++
...pFileSystemClientBasedDualAsyncSelfTest.java | 38 +++
...opFileSystemClientBasedDualSyncSelfTest.java | 38 +++
...niteHadoopFileSystemClientBasedOpenTest.java | 304 +++++++++++++++++++
...oopFileSystemClientBasedPrimarySelfTest.java | 38 +++
...adoopFileSystemClientBasedProxySelfTest.java | 37 +++
...oopbackExternalToClientAbstractSelfTest.java | 61 ++++
...opbackExternalToClientDualAsyncSelfTest.java | 33 ++
...oopbackExternalToClientDualSyncSelfTest.java | 33 ++
...LoopbackExternalToClientPrimarySelfTest.java | 33 ++
...emLoopbackExternalToClientProxySelfTest.java | 33 ++
...ileSystemShmemEmbeddedDualAsyncSelfTest.java | 33 --
...FileSystemShmemEmbeddedDualSyncSelfTest.java | 33 --
...pFileSystemShmemEmbeddedPrimarySelfTest.java | 33 --
...ileSystemShmemEmbeddedSecondarySelfTest.java | 33 --
...emShmemExternalToClientAbstractSelfTest.java | 106 +++++++
...mShmemExternalToClientDualAsyncSelfTest.java | 33 ++
...emShmemExternalToClientDualSyncSelfTest.java | 33 ++
...temShmemExternalToClientPrimarySelfTest.java | 33 ++
...ystemShmemExternalToClientProxySelfTest.java | 33 ++
.../testsuites/IgniteHadoopTestSuite.java | 21 +-
.../IgniteIgfsLinuxAndMacOSTestSuite.java | 17 +-
59 files changed, 2700 insertions(+), 353 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/core/src/main/java/org/apache/ignite/igfs/secondary/local/LocalIgfsSecondaryFileSystem.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/secondary/local/LocalIgfsSecondaryFileSystem.java b/modules/core/src/main/java/org/apache/ignite/igfs/secondary/local/LocalIgfsSecondaryFileSystem.java
index 86f7387..209c6d3 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/secondary/local/LocalIgfsSecondaryFileSystem.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/secondary/local/LocalIgfsSecondaryFileSystem.java
@@ -366,13 +366,15 @@ public class LocalIgfsSecondaryFileSystem implements IgfsSecondaryFileSystem, Li
Map<String, String> props = LocalFileSystemUtils.posixAttributesToMap(attrs);
+ BasicFileAttributes basicAttrs = LocalFileSystemUtils.basicAttributes(file);
+
if (isDir) {
return new LocalFileSystemIgfsFile(path, false, true, 0,
- attrs.lastAccessTime().toMillis(), attrs.lastModifiedTime().toMillis(), 0, props);
+ basicAttrs.lastAccessTime().toMillis(), basicAttrs.lastModifiedTime().toMillis(), 0, props);
}
else {
return new LocalFileSystemIgfsFile(path, file.isFile(), false, 0,
- attrs.lastAccessTime().toMillis(), attrs.lastModifiedTime().toMillis(), file.length(), props);
+ basicAttrs.lastAccessTime().toMillis(), basicAttrs.lastModifiedTime().toMillis(), file.length(), props);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index 42ff739..05d19c0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -45,6 +45,7 @@ import javax.management.MBeanServer;
import javax.management.ObjectName;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteIllegalStateException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.IgniteState;
@@ -71,6 +72,7 @@ import org.apache.ignite.internal.util.spring.IgniteSpringHelper;
import org.apache.ignite.internal.util.typedef.CA;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.internal.util.typedef.T2;
import org.apache.ignite.internal.util.typedef.internal.A;
import org.apache.ignite.internal.util.typedef.internal.CU;
import org.apache.ignite.internal.util.typedef.internal.U;
@@ -173,7 +175,7 @@ public class IgnitionEx {
/** */
private static ThreadLocal<Boolean> clientMode = new ThreadLocal<>();
- /**
+ /*
* Checks runtime version to be 1.7.x or 1.8.x.
* This will load pretty much first so we must do these checks here.
*/
@@ -499,7 +501,8 @@ public class IgnitionEx {
U.warn(null, "Default Spring XML file not found (is IGNITE_HOME set?): " + DFLT_CFG);
- return start0(new GridStartContext(new IgniteConfiguration(), null, springCtx), true).grid();
+ return start0(new GridStartContext(new IgniteConfiguration(), null, springCtx), true)
+ .get1().grid();
}
/**
@@ -512,7 +515,7 @@ public class IgnitionEx {
* also if named grid has already been started.
*/
public static Ignite start(IgniteConfiguration cfg) throws IgniteCheckedException {
- return start(cfg, null, true);
+ return start(cfg, null, true).get1();
}
/**
@@ -521,14 +524,35 @@ public class IgnitionEx {
*
* @param cfg Grid configuration. This cannot be {@code null}.
* failIfStarted Throw or not an exception if grid is already started.
- * @return Started grid.
+ * @param failIfStarted When flag is {@code true} and grid with specified name has been already started
+ * the exception is thrown. Otherwise the existing instance of the grid is returned.
+ * @return Started grid or existing grid.
* @throws IgniteCheckedException If grid could not be started. This exception will be thrown
* also if named grid has already been started.
*/
public static Ignite start(IgniteConfiguration cfg, boolean failIfStarted) throws IgniteCheckedException {
- return start(cfg, null, failIfStarted);
+ return start(cfg, null, failIfStarted).get1();
+ }
+
+ /**
+ * Gets or starts new grid instance if it hasn't been started yet.
+ *
+ * @param cfg Grid configuration. This cannot be {@code null}.
+ * @return Tuple with: grid instance and flag to indicate the instance is started by this call.
+ * So, when the new ignite instance is started the flag is {@code true}. If an existing instance is returned
+ * the flag is {@code false}.
+ * @throws IgniteException If grid could not be started.
+ */
+ public static T2<Ignite, Boolean> getOrStart(IgniteConfiguration cfg) throws IgniteException {
+ try {
+ return start(cfg, null, false);
+ }
+ catch (IgniteCheckedException e) {
+ throw U.convertException(e);
+ }
}
+
/**
* Starts grid with given configuration. Note that this method will throw and exception if grid with the name
* provided in given configuration is already started.
@@ -545,7 +569,7 @@ public class IgnitionEx {
public static Ignite start(IgniteConfiguration cfg, @Nullable GridSpringResourceContext springCtx) throws IgniteCheckedException {
A.notNull(cfg, "cfg");
- return start0(new GridStartContext(cfg, null, springCtx), true).grid();
+ return start0(new GridStartContext(cfg, null, springCtx), true).get1().grid();
}
/**
@@ -558,14 +582,18 @@ public class IgnitionEx {
* If provided, this context can be injected into grid tasks and grid jobs using
* {@link SpringApplicationContextResource @SpringApplicationContextResource} annotation.
* @param failIfStarted Throw or not an exception if grid is already started.
- * @return Started grid.
+ * @return Tuple with: grid instance and flag to indicate the instance is started by this call.
+ * So, when the new ignite instance is started the flag is {@code true}. If an existing instance is returned
+ * the flag is {@code false}.
* @throws IgniteCheckedException If grid could not be started. This exception will be thrown
* also if named grid has already been started.
*/
- public static Ignite start(IgniteConfiguration cfg, @Nullable GridSpringResourceContext springCtx, boolean failIfStarted) throws IgniteCheckedException {
+ public static T2<Ignite, Boolean> start(IgniteConfiguration cfg, @Nullable GridSpringResourceContext springCtx, boolean failIfStarted) throws IgniteCheckedException {
A.notNull(cfg, "cfg");
- return start0(new GridStartContext(cfg, null, springCtx), failIfStarted).grid();
+ T2<IgniteNamedInstance, Boolean> res = start0(new GridStartContext(cfg, null, springCtx), failIfStarted);
+
+ return new T2<>((Ignite)res.get1().grid(), res.get2());
}
/**
@@ -961,7 +989,8 @@ public class IgnitionEx {
// Use either user defined context or our one.
IgniteNamedInstance grid = start0(
- new GridStartContext(cfg, springCfgUrl, springCtx == null ? cfgMap.get2() : springCtx), true);
+ new GridStartContext(cfg, springCfgUrl, springCtx == null
+ ? cfgMap.get2() : springCtx), true).get1();
// Add it if it was not stopped during startup.
if (grid != null)
@@ -993,10 +1022,12 @@ public class IgnitionEx {
*
* @param startCtx Start context.
* @param failIfStarted Throw or not an exception if grid is already started.
- * @return Started grid.
+ * @return Tuple with: grid instance and flag to indicate the instance is started by this call.
+ * So, when the new ignite instance is started the flag is {@code true}. If an existing instance is returned
+ * the flag is {@code false}.
* @throws IgniteCheckedException If grid could not be started.
*/
- private static IgniteNamedInstance start0(GridStartContext startCtx, boolean failIfStarted ) throws IgniteCheckedException {
+ private static T2<IgniteNamedInstance, Boolean> start0(GridStartContext startCtx, boolean failIfStarted ) throws IgniteCheckedException {
assert startCtx != null;
String name = startCtx.config().getGridName();
@@ -1027,7 +1058,7 @@ public class IgnitionEx {
throw new IgniteCheckedException("Ignite instance with this name has already been started: " + name);
}
else
- return old;
+ return new T2<>(old, false);
if (startCtx.config().getWarmupClosure() != null)
startCtx.config().getWarmupClosure().apply(startCtx.config());
@@ -1069,7 +1100,7 @@ public class IgnitionEx {
if (grid == null)
throw new IgniteCheckedException("Failed to start grid with provided configuration.");
- return grid;
+ return new T2<>(grid, true);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
index 59674f8..56da121 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
@@ -59,6 +59,7 @@ import org.apache.ignite.igfs.IgfsPath;
import org.apache.ignite.igfs.IgfsPathIsDirectoryException;
import org.apache.ignite.igfs.IgfsPathNotFoundException;
import org.apache.ignite.igfs.IgfsPathSummary;
+import org.apache.ignite.igfs.IgfsUserContext;
import org.apache.ignite.igfs.mapreduce.IgfsRecordResolver;
import org.apache.ignite.igfs.mapreduce.IgfsTask;
import org.apache.ignite.igfs.secondary.IgfsSecondaryFileSystem;
@@ -494,7 +495,7 @@ public final class IgfsImpl implements IgfsEx {
A.notNull(path, "path");
if (meta.isClient())
- return meta.runClientTask(new IgfsClientExistsCallable(cfg.getName(), path));
+ return meta.runClientTask(new IgfsClientExistsCallable(cfg.getName(), IgfsUserContext.currentUser(), path));
return safeOp(new Callable<Boolean>() {
@Override public Boolean call() throws Exception {
@@ -544,7 +545,7 @@ public final class IgfsImpl implements IgfsEx {
A.notNull(path, "path");
if (meta.isClient())
- return meta.runClientTask(new IgfsClientInfoCallable(cfg.getName(), path));
+ return meta.runClientTask(new IgfsClientInfoCallable(cfg.getName(), IgfsUserContext.currentUser(), path));
return safeOp(new Callable<IgfsFile>() {
@Override public IgfsFile call() throws Exception {
@@ -570,7 +571,8 @@ public final class IgfsImpl implements IgfsEx {
A.notNull(path, "path");
if (meta.isClient())
- return meta.runClientTask(new IgfsClientSummaryCallable(cfg.getName(), path));
+ return meta.runClientTask(new IgfsClientSummaryCallable(cfg.getName(), IgfsUserContext.currentUser(),
+ path));
return safeOp(new Callable<IgfsPathSummary>() {
@Override public IgfsPathSummary call() throws Exception {
@@ -589,7 +591,8 @@ public final class IgfsImpl implements IgfsEx {
A.ensure(!props.isEmpty(), "!props.isEmpty()");
if (meta.isClient())
- return meta.runClientTask(new IgfsClientUpdateCallable(cfg.getName(), path, props));
+ return meta.runClientTask(new IgfsClientUpdateCallable(cfg.getName(), IgfsUserContext.currentUser(),
+ path, props));
return safeOp(new Callable<IgfsFile>() {
@Override public IgfsFile call() throws Exception {
@@ -652,7 +655,7 @@ public final class IgfsImpl implements IgfsEx {
A.notNull(dest, "dest");
if (meta.isClient()) {
- meta.runClientTask(new IgfsClientRenameCallable(cfg.getName(), src, dest));
+ meta.runClientTask(new IgfsClientRenameCallable(cfg.getName(), IgfsUserContext.currentUser(), src, dest));
return;
}
@@ -712,7 +715,8 @@ public final class IgfsImpl implements IgfsEx {
A.notNull(path, "path");
if (meta.isClient())
- return meta.runClientTask(new IgfsClientDeleteCallable(cfg.getName(), path, recursive));
+ return meta.runClientTask(new IgfsClientDeleteCallable(cfg.getName(), IgfsUserContext.currentUser(),
+ path, recursive));
return safeOp(new Callable<Boolean>() {
@Override public Boolean call() throws Exception {
@@ -754,7 +758,7 @@ public final class IgfsImpl implements IgfsEx {
A.notNull(path, "path");
if (meta.isClient()) {
- meta.runClientTask(new IgfsClientMkdirsCallable(cfg.getName(), path, props));
+ meta.runClientTask(new IgfsClientMkdirsCallable(cfg.getName(), IgfsUserContext.currentUser(), path, props));
return ;
}
@@ -797,7 +801,7 @@ public final class IgfsImpl implements IgfsEx {
A.notNull(path, "path");
if (meta.isClient())
- meta.runClientTask(new IgfsClientListPathsCallable(cfg.getName(), path));
+ meta.runClientTask(new IgfsClientListPathsCallable(cfg.getName(), IgfsUserContext.currentUser(), path));
return safeOp(new Callable<Collection<IgfsPath>>() {
@Override public Collection<IgfsPath> call() throws Exception {
@@ -846,7 +850,7 @@ public final class IgfsImpl implements IgfsEx {
A.notNull(path, "path");
if (meta.isClient())
- meta.runClientTask(new IgfsClientListFilesCallable(cfg.getName(), path));
+ meta.runClientTask(new IgfsClientListFilesCallable(cfg.getName(), IgfsUserContext.currentUser(), path));
return safeOp(new Callable<Collection<IgfsFile>>() {
@Override public Collection<IgfsFile> call() throws Exception {
@@ -1223,7 +1227,8 @@ public final class IgfsImpl implements IgfsEx {
return;
if (meta.isClient()) {
- meta.runClientTask(new IgfsClientSetTimesCallable(cfg.getName(), path, accessTime, modificationTime));
+ meta.runClientTask(new IgfsClientSetTimesCallable(cfg.getName(), IgfsUserContext.currentUser(), path,
+ accessTime, modificationTime));
return;
}
@@ -1257,7 +1262,8 @@ public final class IgfsImpl implements IgfsEx {
A.ensure(len >= 0, "len >= 0");
if (meta.isClient())
- return meta.runClientTask(new IgfsClientAffinityCallable(cfg.getName(), path, start, len, maxLen));
+ return meta.runClientTask(new IgfsClientAffinityCallable(cfg.getName(), IgfsUserContext.currentUser(),
+ path, start, len, maxLen));
return safeOp(new Callable<Collection<IgfsBlockLocation>>() {
@Override public Collection<IgfsBlockLocation> call() throws Exception {
@@ -1343,7 +1349,7 @@ public final class IgfsImpl implements IgfsEx {
A.notNull(path, "path");
if (meta.isClient())
- return meta.runClientTask(new IgfsClientSizeCallable(cfg.getName(), path));
+ return meta.runClientTask(new IgfsClientSizeCallable(cfg.getName(), IgfsUserContext.currentUser(), path));
return safeOp(new Callable<Long>() {
@Override public Long call() throws Exception {
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
index 4f579e8..95d73a8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
@@ -38,6 +38,7 @@ import org.apache.ignite.igfs.IgfsPathAlreadyExistsException;
import org.apache.ignite.igfs.IgfsPathIsDirectoryException;
import org.apache.ignite.igfs.IgfsPathIsNotDirectoryException;
import org.apache.ignite.igfs.IgfsPathNotFoundException;
+import org.apache.ignite.igfs.IgfsUserContext;
import org.apache.ignite.igfs.secondary.IgfsSecondaryFileSystem;
import org.apache.ignite.igfs.secondary.IgfsSecondaryFileSystemPositionedReadable;
import org.apache.ignite.internal.IgniteEx;
@@ -423,7 +424,8 @@ public class IgfsMetaManager extends IgfsManager {
// Get IDs.
if (client) {
- List<IgniteUuid> ids = runClientTask(new IgfsClientMetaIdsForPathCallable(cfg.getName(), path));
+ List<IgniteUuid> ids = runClientTask(new IgfsClientMetaIdsForPathCallable(cfg.getName(),
+ IgfsUserContext.currentUser(), path));
return new IgfsPathIds(path, parts, ids.toArray(new IgniteUuid[ids.size()]));
}
@@ -667,8 +669,8 @@ public class IgfsMetaManager extends IgfsManager {
throws IgniteCheckedException {
if(client) {
- runClientTask(new IgfsClientMetaUnlockCallable(cfg.getName(), fileId, lockId, modificationTime,
- updateSpace, space, affRange));
+ runClientTask(new IgfsClientMetaUnlockCallable(cfg.getName(), IgfsUserContext.currentUser(), fileId,
+ lockId, modificationTime, updateSpace, space, affRange));
return;
}
@@ -2073,7 +2075,8 @@ public class IgfsMetaManager extends IgfsManager {
* @throws IgniteCheckedException If failed.
*/
@Nullable public IgfsEntryInfo infoForPath(IgfsPath path) throws IgniteCheckedException {
- return client ? runClientTask(new IgfsClientMetaInfoForPathCallable(cfg.getName(), path)) : info(fileId(path));
+ return client ? runClientTask(new IgfsClientMetaInfoForPathCallable(cfg.getName(),
+ IgfsUserContext.currentUser(), path)) : info(fileId(path));
}
/**
@@ -2084,7 +2087,8 @@ public class IgfsMetaManager extends IgfsManager {
* @throws IgniteCheckedException If failed.
*/
public List<IgniteUuid> idsForPath(IgfsPath path) throws IgniteCheckedException {
- return client ? runClientTask(new IgfsClientMetaIdsForPathCallable(cfg.getName(), path)) : fileIds(path);
+ return client ? runClientTask(new IgfsClientMetaIdsForPathCallable(cfg.getName(),
+ IgfsUserContext.currentUser(), path)) : fileIds(path);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientAbstractCallable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientAbstractCallable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientAbstractCallable.java
index d9c3456..7a4b5b1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientAbstractCallable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientAbstractCallable.java
@@ -17,6 +17,7 @@
package org.apache.ignite.internal.processors.igfs.client;
+import java.util.concurrent.Callable;
import org.apache.ignite.Ignite;
import org.apache.ignite.binary.BinaryObjectException;
import org.apache.ignite.binary.BinaryRawReader;
@@ -25,6 +26,7 @@ import org.apache.ignite.binary.BinaryReader;
import org.apache.ignite.binary.BinaryWriter;
import org.apache.ignite.binary.Binarylizable;
import org.apache.ignite.igfs.IgfsPath;
+import org.apache.ignite.igfs.IgfsUserContext;
import org.apache.ignite.internal.processors.igfs.IgfsContext;
import org.apache.ignite.internal.processors.igfs.IgfsEx;
import org.apache.ignite.internal.processors.igfs.IgfsUtils;
@@ -45,7 +47,11 @@ public abstract class IgfsClientAbstractCallable<T> implements IgniteCallable<T>
/** Path for operation. */
protected IgfsPath path;
+ /** User name. */
+ protected String user;
+
/** Injected instance. */
+ @SuppressWarnings("UnusedDeclaration")
@IgniteInstanceResource
private transient Ignite ignite;
@@ -60,20 +66,29 @@ public abstract class IgfsClientAbstractCallable<T> implements IgniteCallable<T>
* Constructor.
*
* @param igfsName IGFS name.
+ * @param user IGFS user name.
* @param path Path.
*/
- protected IgfsClientAbstractCallable(@Nullable String igfsName, @Nullable IgfsPath path) {
+ protected IgfsClientAbstractCallable(@Nullable String igfsName, @Nullable String user, @Nullable IgfsPath path) {
this.igfsName = igfsName;
this.path = path;
+ this.user = user;
}
/** {@inheritDoc} */
@Override public final T call() throws Exception {
assert ignite != null;
- IgfsEx igfs = (IgfsEx)ignite.fileSystem(igfsName);
+ final IgfsEx igfs = (IgfsEx)ignite.fileSystem(igfsName);
- return call0(igfs.context());
+ if (user != null) {
+ return IgfsUserContext.doAs(user, new Callable<T>() {
+ @Override public T call() throws Exception {
+ return call0(igfs.context());
+ }
+ });
+ } else
+ return call0(igfs.context());
}
/**
@@ -90,6 +105,7 @@ public abstract class IgfsClientAbstractCallable<T> implements IgniteCallable<T>
BinaryRawWriter rawWriter = writer.rawWriter();
rawWriter.writeString(igfsName);
+ rawWriter.writeString(user);
IgfsUtils.writePath(rawWriter, path);
writeBinary0(rawWriter);
@@ -100,6 +116,7 @@ public abstract class IgfsClientAbstractCallable<T> implements IgniteCallable<T>
BinaryRawReader rawReader = reader.rawReader();
igfsName = rawReader.readString();
+ user = rawReader.readString();
path = IgfsUtils.readPath(rawReader);
readBinary0(rawReader);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientAffinityCallable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientAffinityCallable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientAffinityCallable.java
index 1668f36..790d57e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientAffinityCallable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientAffinityCallable.java
@@ -55,13 +55,15 @@ public class IgfsClientAffinityCallable extends IgfsClientAbstractCallable<Colle
* Constructor.
*
* @param igfsName IGFS name.
+ * @param user IGFS user name.
* @param path Path.
* @param start Start.
* @param len Length.
* @param maxLen Maximum length.
*/
- public IgfsClientAffinityCallable(@Nullable String igfsName, IgfsPath path, long start, long len, long maxLen) {
- super(igfsName, path);
+ public IgfsClientAffinityCallable(@Nullable String igfsName, @Nullable String user, IgfsPath path, long start,
+ long len, long maxLen) {
+ super(igfsName, user, path);
this.start = start;
this.len = len;
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientDeleteCallable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientDeleteCallable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientDeleteCallable.java
index c1b8be8..349bed1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientDeleteCallable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientDeleteCallable.java
@@ -46,11 +46,13 @@ public class IgfsClientDeleteCallable extends IgfsClientAbstractCallable<Boolean
* Constructor.
*
* @param igfsName IGFS name.
+ * @param user IGFS user name.
* @param path Path.
* @param recursive Recursive flag.
*/
- public IgfsClientDeleteCallable(@Nullable String igfsName, IgfsPath path, boolean recursive) {
- super(igfsName, path);
+ public IgfsClientDeleteCallable(@Nullable String igfsName, @Nullable String user,
+ IgfsPath path, boolean recursive) {
+ super(igfsName, user, path);
this.recursive = recursive;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientExistsCallable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientExistsCallable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientExistsCallable.java
index 04b63d8..d8a0858 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientExistsCallable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientExistsCallable.java
@@ -40,10 +40,11 @@ public class IgfsClientExistsCallable extends IgfsClientAbstractCallable<Boolean
* Constructor.
*
* @param igfsName IGFS name.
+ * @param user IGFS user name.
* @param path Path.
*/
- public IgfsClientExistsCallable(@Nullable String igfsName, IgfsPath path) {
- super(igfsName, path);
+ public IgfsClientExistsCallable(@Nullable String igfsName, @Nullable String user, IgfsPath path) {
+ super(igfsName, user, path);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientInfoCallable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientInfoCallable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientInfoCallable.java
index f97c3c4..fef6869 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientInfoCallable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientInfoCallable.java
@@ -41,10 +41,11 @@ public class IgfsClientInfoCallable extends IgfsClientAbstractCallable<IgfsFile>
* Constructor.
*
* @param igfsName IGFS name.
+ * @param user IGFS user name.
* @param path Path.
*/
- public IgfsClientInfoCallable(@Nullable String igfsName, IgfsPath path) {
- super(igfsName, path);
+ public IgfsClientInfoCallable(@Nullable String igfsName, @Nullable String user, IgfsPath path) {
+ super(igfsName, user, path);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientListFilesCallable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientListFilesCallable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientListFilesCallable.java
index 325e714..4414884 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientListFilesCallable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientListFilesCallable.java
@@ -43,10 +43,11 @@ public class IgfsClientListFilesCallable extends IgfsClientAbstractCallable<Coll
* Constructor.
*
* @param igfsName IGFS name.
+ * @param user IGFS user name.
* @param path Path.
*/
- public IgfsClientListFilesCallable(@Nullable String igfsName, IgfsPath path) {
- super(igfsName, path);
+ public IgfsClientListFilesCallable(@Nullable String igfsName, @Nullable String user, IgfsPath path) {
+ super(igfsName, user, path);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientListPathsCallable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientListPathsCallable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientListPathsCallable.java
index 78b4c84..4adf134 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientListPathsCallable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientListPathsCallable.java
@@ -42,10 +42,11 @@ public class IgfsClientListPathsCallable extends IgfsClientAbstractCallable<Coll
* Constructor.
*
* @param igfsName IGFS name.
+ * @param user IGFS user name.
* @param path Path.
*/
- public IgfsClientListPathsCallable(@Nullable String igfsName, IgfsPath path) {
- super(igfsName, path);
+ public IgfsClientListPathsCallable(@Nullable String igfsName, @Nullable String user, IgfsPath path) {
+ super(igfsName, user, path);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientMkdirsCallable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientMkdirsCallable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientMkdirsCallable.java
index 944da6f..4c50be3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientMkdirsCallable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientMkdirsCallable.java
@@ -49,11 +49,13 @@ public class IgfsClientMkdirsCallable extends IgfsClientAbstractCallable<Void> {
* Constructor.
*
* @param igfsName IGFS name.
+ * @param user IGFS user name.
* @param path Path.
* @param props Properties.
*/
- public IgfsClientMkdirsCallable(@Nullable String igfsName, IgfsPath path, @Nullable Map<String, String> props) {
- super(igfsName, path);
+ public IgfsClientMkdirsCallable(@Nullable String igfsName, @Nullable String user, IgfsPath path,
+ @Nullable Map<String, String> props) {
+ super(igfsName, user, path);
this.props = props;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientRenameCallable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientRenameCallable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientRenameCallable.java
index 55afb83..3743127 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientRenameCallable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientRenameCallable.java
@@ -47,11 +47,13 @@ public class IgfsClientRenameCallable extends IgfsClientAbstractCallable<Void> {
* Constructor.
*
* @param igfsName IGFS name.
+ * @param user IGFS user name.
* @param srcPath Source path.
* @param destPath Destination path.
*/
- public IgfsClientRenameCallable(@Nullable String igfsName, IgfsPath srcPath, IgfsPath destPath) {
- super(igfsName, srcPath);
+ public IgfsClientRenameCallable(@Nullable String igfsName, @Nullable String user,
+ IgfsPath srcPath, IgfsPath destPath) {
+ super(igfsName, user, srcPath);
this.destPath = destPath;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientSetTimesCallable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientSetTimesCallable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientSetTimesCallable.java
index 277effc..0914c3e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientSetTimesCallable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientSetTimesCallable.java
@@ -49,13 +49,15 @@ public class IgfsClientSetTimesCallable extends IgfsClientAbstractCallable<Void>
* Constructor.
*
* @param igfsName IGFS name.
+ * @param user IGFS user name.
* @param path Path.
* @param accessTime Access time.
* @param modificationTime Modification time.
*/
- public IgfsClientSetTimesCallable(@Nullable String igfsName, IgfsPath path, long accessTime,
+ public IgfsClientSetTimesCallable(@Nullable String igfsName, @Nullable String user,
+ IgfsPath path, long accessTime,
long modificationTime) {
- super(igfsName, path);
+ super(igfsName, user, path);
this.accessTime = accessTime;
this.modificationTime = modificationTime;
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientSizeCallable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientSizeCallable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientSizeCallable.java
index 928d65d..5d345f8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientSizeCallable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientSizeCallable.java
@@ -40,10 +40,11 @@ public class IgfsClientSizeCallable extends IgfsClientAbstractCallable<Long> {
* Constructor.
*
* @param igfsName IGFS name.
+ * @param user IGFS user name.
* @param path Path.
*/
- public IgfsClientSizeCallable(@Nullable String igfsName, IgfsPath path) {
- super(igfsName, path);
+ public IgfsClientSizeCallable(@Nullable String igfsName, @Nullable String user, IgfsPath path) {
+ super(igfsName, user, path);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientSummaryCallable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientSummaryCallable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientSummaryCallable.java
index 7e29029..ab940bd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientSummaryCallable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientSummaryCallable.java
@@ -41,10 +41,11 @@ public class IgfsClientSummaryCallable extends IgfsClientAbstractCallable<IgfsPa
* Constructor.
*
* @param igfsName IGFS name.
+ * @param user IGFS user name.
* @param path Path.
*/
- public IgfsClientSummaryCallable(@Nullable String igfsName, IgfsPath path) {
- super(igfsName, path);
+ public IgfsClientSummaryCallable(@Nullable String igfsName, @Nullable String user, IgfsPath path) {
+ super(igfsName, user, path);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientUpdateCallable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientUpdateCallable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientUpdateCallable.java
index 4acf4eb..9ae6e22 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientUpdateCallable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientUpdateCallable.java
@@ -50,11 +50,13 @@ public class IgfsClientUpdateCallable extends IgfsClientAbstractCallable<IgfsFil
* Constructor.
*
* @param igfsName IGFS name.
+ * @param user IGFS user name.
* @param path Path.
* @param props Properties.
*/
- public IgfsClientUpdateCallable(@Nullable String igfsName, IgfsPath path, @Nullable Map<String, String> props) {
- super(igfsName, path);
+ public IgfsClientUpdateCallable(@Nullable String igfsName, @Nullable String user, IgfsPath path,
+ @Nullable Map<String, String> props) {
+ super(igfsName, user, path);
this.props = props;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/meta/IgfsClientMetaIdsForPathCallable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/meta/IgfsClientMetaIdsForPathCallable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/meta/IgfsClientMetaIdsForPathCallable.java
index 7b3d142..00fc087 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/meta/IgfsClientMetaIdsForPathCallable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/meta/IgfsClientMetaIdsForPathCallable.java
@@ -45,10 +45,11 @@ public class IgfsClientMetaIdsForPathCallable extends IgfsClientAbstractCallable
* Constructor.
*
* @param igfsName IGFS name.
+ * @param user IGFS user name.
* @param path Path.
*/
- public IgfsClientMetaIdsForPathCallable(@Nullable String igfsName, IgfsPath path) {
- super(igfsName, path);
+ public IgfsClientMetaIdsForPathCallable(@Nullable String igfsName, @Nullable String user, IgfsPath path) {
+ super(igfsName, user, path);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/meta/IgfsClientMetaInfoForPathCallable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/meta/IgfsClientMetaInfoForPathCallable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/meta/IgfsClientMetaInfoForPathCallable.java
index cb31663..4c56adb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/meta/IgfsClientMetaInfoForPathCallable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/meta/IgfsClientMetaInfoForPathCallable.java
@@ -43,10 +43,11 @@ public class IgfsClientMetaInfoForPathCallable extends IgfsClientAbstractCallabl
* Constructor.
*
* @param igfsName IGFS name.
+ * @param user IGFS user name.
* @param path Path.
*/
- public IgfsClientMetaInfoForPathCallable(@Nullable String igfsName, IgfsPath path) {
- super(igfsName, path);
+ public IgfsClientMetaInfoForPathCallable(@Nullable String igfsName, @Nullable String user, IgfsPath path) {
+ super(igfsName, user, path);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/meta/IgfsClientMetaUnlockCallable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/meta/IgfsClientMetaUnlockCallable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/meta/IgfsClientMetaUnlockCallable.java
index a2f4ab7..26c3166 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/meta/IgfsClientMetaUnlockCallable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/meta/IgfsClientMetaUnlockCallable.java
@@ -64,6 +64,7 @@ public class IgfsClientMetaUnlockCallable extends IgfsClientAbstractCallable<Voi
* Constructor.
*
* @param igfsName IGFS name.
+ * @param user IGFS user name.
* @param fileId File ID.
* @param lockId Lock ID.
* @param modificationTime Modification time to write to file info.
@@ -71,9 +72,10 @@ public class IgfsClientMetaUnlockCallable extends IgfsClientAbstractCallable<Voi
* @param space Space.
* @param affRange Affinity range.
*/
- public IgfsClientMetaUnlockCallable(@Nullable String igfsName, IgniteUuid fileId, IgniteUuid lockId,
- long modificationTime, boolean updateSpace, long space, final IgfsFileAffinityRange affRange) {
- super(igfsName, null);
+ public IgfsClientMetaUnlockCallable(@Nullable String igfsName, @Nullable String user, IgniteUuid fileId,
+ IgniteUuid lockId, long modificationTime, boolean updateSpace, long space,
+ final IgfsFileAffinityRange affRange) {
+ super(igfsName, user, null);
this.fileId = fileId;
this.lockId = lockId;
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/secondary/local/LocalFileSystemUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/secondary/local/LocalFileSystemUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/secondary/local/LocalFileSystemUtils.java
index 59383c5..397b709 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/secondary/local/LocalFileSystemUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/secondary/local/LocalFileSystemUtils.java
@@ -17,6 +17,8 @@
package org.apache.ignite.internal.processors.igfs.secondary.local;
+import java.nio.file.attribute.BasicFileAttributeView;
+import java.nio.file.attribute.BasicFileAttributes;
import org.apache.ignite.igfs.IgfsException;
import org.apache.ignite.internal.processors.igfs.IgfsUtils;
import org.apache.ignite.internal.util.typedef.internal.U;
@@ -91,6 +93,7 @@ public class LocalFileSystemUtils {
* Get POSIX attributes for file.
*
* @param file File.
+ * @return PosixFileAttributes.
*/
@Nullable public static PosixFileAttributes posixAttributes(File file) {
PosixFileAttributes attrs = null;
@@ -109,6 +112,28 @@ public class LocalFileSystemUtils {
}
/**
+ * Get POSIX attributes for file.
+ *
+ * @param file File.
+ * @return BasicFileAttributes.
+ */
+ @Nullable public static BasicFileAttributes basicAttributes(File file) {
+ BasicFileAttributes attrs = null;
+
+ try {
+ BasicFileAttributeView view = Files.getFileAttributeView(file.toPath(), BasicFileAttributeView.class);
+
+ if (view != null)
+ attrs = view.readAttributes();
+ }
+ catch (IOException e) {
+ throw new IgfsException("Failed to read basic file attributes: " + file.getAbsolutePath(), e);
+ }
+
+ return attrs;
+ }
+
+ /**
* Convert POSIX attributes to property map.
*
* @param attrs Attributes view.
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java
index 7605a73..cffac65 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java
@@ -659,7 +659,7 @@ public class GridToStringBuilder {
* @param arr Array object.
* @return String representation of an array.
*/
- private static String arrayToString(Class arrType, Object arr) {
+ public static String arrayToString(Class arrType, Object arr) {
if (arrType.equals(byte[].class))
return Arrays.toString((byte[])arr);
if (arrType.equals(boolean[].class))
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
index 6619810..a37a3eb 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
@@ -817,19 +817,37 @@ public abstract class GridAbstractTest extends TestCase {
* Starts new grid at another JVM with given name.
*
* @param gridName Grid name.
+ * @param cfg Ignite configuration.
* @param ctx Spring context.
* @return Started grid.
* @throws Exception If failed.
*/
protected Ignite startRemoteGrid(String gridName, IgniteConfiguration cfg, GridSpringResourceContext ctx)
throws Exception {
+ return startRemoteGrid(gridName, cfg, ctx, grid(0), true);
+ }
+
+ /**
+ * Starts new grid at another JVM with given name.
+ *
+ * @param gridName Grid name.
+ * @param cfg Ignite configuration.
+ * @param ctx Spring context.
+ * @param locNode Local node.
+ * @param resetDiscovery Reset DiscoverySpi.
+ * @return Started grid.
+ * @throws Exception If failed.
+ */
+ protected Ignite startRemoteGrid(String gridName, IgniteConfiguration cfg, GridSpringResourceContext ctx,
+ IgniteEx locNode, boolean resetDiscovery)
+ throws Exception {
if (ctx != null)
throw new UnsupportedOperationException("Starting of grid at another jvm by context doesn't supported.");
if (cfg == null)
cfg = optimize(getConfiguration(gridName));
- return new IgniteProcessProxy(cfg, log, grid(0));
+ return new IgniteProcessProxy(cfg, log, locNode, resetDiscovery);
}
/**
@@ -837,6 +855,7 @@ public abstract class GridAbstractTest extends TestCase {
*
* @param cfg Configuration.
* @return Optimized configuration (by modifying passed in one).
+ * @throws IgniteCheckedException On error.
*/
protected IgniteConfiguration optimize(IgniteConfiguration cfg) throws IgniteCheckedException {
// TODO: IGNITE-605: propose another way to avoid network overhead in tests.
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteNodeRunner.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteNodeRunner.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteNodeRunner.java
index 7d1a37d..3b56b66 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteNodeRunner.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteNodeRunner.java
@@ -96,21 +96,41 @@ public class IgniteNodeRunner {
* @throws IOException If failed.
* @see #readCfgFromFileAndDeleteFile(String)
*/
- public static String storeToFile(IgniteConfiguration cfg) throws IOException {
+ public static String storeToFile(IgniteConfiguration cfg, boolean resetDiscovery) throws IOException {
String fileName = IGNITE_CONFIGURATION_FILE + cfg.getNodeId();
+ storeToFile(cfg, fileName, true, resetDiscovery);
+
+ return fileName;
+ }
+
+ /**
+ * Stores {@link IgniteConfiguration} to file as xml.
+ *
+ * @param cfg Ignite Configuration.
+ * @param fileName A name of file where the configuration was stored.
+ * @param resetMarshaller Reset marshaller configuration to default.
+ * @param resetDiscovery Reset discovery configuration to default.
+ * @throws IOException If failed.
+ * @see #readCfgFromFileAndDeleteFile(String)
+ */
+ public static void storeToFile(IgniteConfiguration cfg, String fileName,
+ boolean resetMarshaller,
+ boolean resetDiscovery) throws IOException {
try(OutputStream out = new BufferedOutputStream(new FileOutputStream(fileName))) {
IgniteConfiguration cfg0 = new IgniteConfiguration(cfg);
+ if (resetMarshaller)
+ cfg0.setMarshaller(null);
+
+ if (resetDiscovery)
+ cfg0.setDiscoverySpi(null);
+
cfg0.setMBeanServer(null);
- cfg0.setMarshaller(null);
- cfg0.setDiscoverySpi(null);
cfg0.setGridLogger(null);
new XStream().toXML(cfg0, out);
}
-
- return fileName;
}
/**
@@ -119,22 +139,27 @@ public class IgniteNodeRunner {
* @param fileName File name.
* @return Readed configuration.
* @throws IOException If failed.
- * @see #storeToFile(IgniteConfiguration)
+ * @see #storeToFile(IgniteConfiguration, boolean)
+ * @throws IgniteCheckedException On error.
*/
private static IgniteConfiguration readCfgFromFileAndDeleteFile(String fileName)
throws IOException, IgniteCheckedException {
try(BufferedReader cfgReader = new BufferedReader(new FileReader(fileName))) {
IgniteConfiguration cfg = (IgniteConfiguration)new XStream().fromXML(cfgReader);
- Marshaller marsh = IgniteTestResources.getMarshaller();
+ if (cfg.getMarshaller() == null) {
+ Marshaller marsh = IgniteTestResources.getMarshaller();
- cfg.setMarshaller(marsh);
+ cfg.setMarshaller(marsh);
+ }
- X.println("Configured marshaller class: " + marsh.getClass().getName());
+ X.println("Configured marshaller class: " + cfg.getMarshaller().getClass().getName());
- TcpDiscoverySpi disco = new TcpDiscoverySpi();
- disco.setIpFinder(GridCacheAbstractFullApiSelfTest.LOCAL_IP_FINDER);
- cfg.setDiscoverySpi(disco);
+ if (cfg.getDiscoverySpi() == null) {
+ TcpDiscoverySpi disco = new TcpDiscoverySpi();
+ disco.setIpFinder(GridCacheAbstractFullApiSelfTest.LOCAL_IP_FINDER);
+ cfg.setDiscoverySpi(disco);
+ }
return cfg;
}
@@ -161,9 +186,9 @@ public class IgniteNodeRunner {
MonitoredVm vm = monitoredHost.getMonitoredVm(new VmIdentifier("//" + jvmId + "?mode=r"), 0);
if (IgniteNodeRunner.class.getName().equals(MonitoredVmUtil.mainClass(vm, true))) {
- Process killProc = U.isWindows() ?
- Runtime.getRuntime().exec(new String[] {"taskkill", "/pid", jvmId.toString(), "/f", "/t"}) :
- Runtime.getRuntime().exec(new String[] {"kill", "-9", jvmId.toString()});
+ Process killProc = Runtime.getRuntime().exec(U.isWindows() ?
+ new String[] {"taskkill", "/pid", jvmId.toString(), "/f", "/t"} :
+ new String[] {"kill", "-9", jvmId.toString()});
killProc.waitFor();
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java
index 9bb5205..f6d938c 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java
@@ -113,14 +113,27 @@ public class IgniteProcessProxy implements IgniteEx {
* @param cfg Configuration.
* @param log Logger.
* @param locJvmGrid Local JVM grid.
+ * @throws Exception On error.
*/
public IgniteProcessProxy(IgniteConfiguration cfg, IgniteLogger log, Ignite locJvmGrid)
throws Exception {
+ this(cfg, log, locJvmGrid, true);
+ }
+
+ /**
+ * @param cfg Configuration.
+ * @param log Logger.
+ * @param locJvmGrid Local JVM grid.
+ * @param resetDiscovery Reset DiscoverySpi at the configuration.
+ * @throws Exception On error.
+ */
+ public IgniteProcessProxy(IgniteConfiguration cfg, IgniteLogger log, Ignite locJvmGrid, boolean resetDiscovery)
+ throws Exception {
this.cfg = cfg;
this.locJvmGrid = locJvmGrid;
this.log = log.getLogger("jvm-" + id.toString().substring(0, id.toString().indexOf('-')));
- String cfgFileName = IgniteNodeRunner.storeToFile(cfg.setNodeId(id));
+ String cfgFileName = IgniteNodeRunner.storeToFile(cfg.setNodeId(id), resetDiscovery);
Collection<String> filteredJvmArgs = new ArrayList<>();
@@ -138,7 +151,8 @@ public class IgniteProcessProxy implements IgniteEx {
final CountDownLatch rmtNodeStartedLatch = new CountDownLatch(1);
- locJvmGrid.events().localListen(new NodeStartedListener(id, rmtNodeStartedLatch), EventType.EVT_NODE_JOINED);
+ if (locJvmGrid != null)
+ locJvmGrid.events().localListen(new NodeStartedListener(id, rmtNodeStartedLatch), EventType.EVT_NODE_JOINED);
proc = GridJavaProcess.exec(
IgniteNodeRunner.class.getCanonicalName(),
@@ -156,7 +170,8 @@ public class IgniteProcessProxy implements IgniteEx {
System.getProperty("surefire.test.class.path")
);
- assert rmtNodeStartedLatch.await(30, TimeUnit.SECONDS): "Remote node has not joined [id=" + id + ']';
+ if (locJvmGrid != null)
+ assert rmtNodeStartedLatch.await(30, TimeUnit.SECONDS): "Remote node has not joined [id=" + id + ']';
IgniteProcessProxy prevVal = gridProxies.putIfAbsent(cfg.getGridName(), this);
@@ -611,27 +626,29 @@ public class IgniteProcessProxy implements IgniteEx {
/** {@inheritDoc} */
@Override public void close() throws IgniteException {
- final CountDownLatch rmtNodeStoppedLatch = new CountDownLatch(1);
+ if (locJvmGrid != null) {
+ final CountDownLatch rmtNodeStoppedLatch = new CountDownLatch(1);
- locJvmGrid.events().localListen(new IgnitePredicateX<Event>() {
- @Override public boolean applyx(Event e) {
- if (((DiscoveryEvent)e).eventNode().id().equals(id)) {
- rmtNodeStoppedLatch.countDown();
+ locJvmGrid.events().localListen(new IgnitePredicateX<Event>() {
+ @Override public boolean applyx(Event e) {
+ if (((DiscoveryEvent)e).eventNode().id().equals(id)) {
+ rmtNodeStoppedLatch.countDown();
- return false;
- }
+ return false;
+ }
- return true;
- }
- }, EventType.EVT_NODE_LEFT, EventType.EVT_NODE_FAILED);
+ return true;
+ }
+ }, EventType.EVT_NODE_LEFT, EventType.EVT_NODE_FAILED);
- compute().run(new StopGridTask(localJvmGrid().name(), true));
+ compute().run(new StopGridTask(localJvmGrid().name(), true));
- try {
- assert U.await(rmtNodeStoppedLatch, 15, TimeUnit.SECONDS) : "NodeId=" + id;
- }
- catch (IgniteInterruptedCheckedException e) {
- throw new IgniteException(e);
+ try {
+ assert U.await(rmtNodeStoppedLatch, 15, TimeUnit.SECONDS) : "NodeId=" + id;
+ }
+ catch (IgniteInterruptedCheckedException e) {
+ throw new IgniteException(e);
+ }
}
try {
@@ -658,6 +675,9 @@ public class IgniteProcessProxy implements IgniteEx {
* @return {@link IgniteCompute} instance to communicate with remote node.
*/
public IgniteCompute remoteCompute() {
+ if (locJvmGrid == null)
+ return null;
+
ClusterGroup grp = locJvmGrid.cluster().forNodeId(id);
if (grp.nodes().isEmpty())
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/hadoop/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hadoop/pom.xml b/modules/hadoop/pom.xml
index e5373ab..5432052 100644
--- a/modules/hadoop/pom.xml
+++ b/modules/hadoop/pom.xml
@@ -42,6 +42,13 @@
</dependency>
<dependency>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <version>1.4.8</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-log4j</artifactId>
<version>${project.version}</version>
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsInProc.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsInProc.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsInProc.java
index f9f98ed..ed882c7 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsInProc.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsInProc.java
@@ -17,9 +17,20 @@
package org.apache.ignite.internal.processors.hadoop.impl.igfs;
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentHashMap;
import org.apache.commons.logging.Log;
+import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteFileSystem;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.igfs.IgfsBlockLocation;
import org.apache.ignite.igfs.IgfsFile;
import org.apache.ignite.igfs.IgfsInputStream;
@@ -28,25 +39,32 @@ import org.apache.ignite.igfs.IgfsPath;
import org.apache.ignite.igfs.IgfsPathSummary;
import org.apache.ignite.igfs.IgfsUserContext;
import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.IgnitionEx;
import org.apache.ignite.internal.processors.igfs.IgfsEx;
import org.apache.ignite.internal.processors.igfs.IgfsHandshakeResponse;
import org.apache.ignite.internal.processors.igfs.IgfsStatus;
import org.apache.ignite.internal.processors.igfs.IgfsUtils;
+import org.apache.ignite.internal.processors.resource.GridSpringResourceContext;
import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.internal.util.typedef.T2;
+import org.apache.ignite.lang.IgniteBiTuple;
import org.apache.ignite.lang.IgniteOutClosure;
import org.jetbrains.annotations.Nullable;
-import java.io.Closeable;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Map;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ConcurrentHashMap;
+import static org.apache.ignite.IgniteState.STARTED;
/**
* Communication with grid in the same process.
*/
public class HadoopIgfsInProc implements HadoopIgfsEx {
+ /** Ignite client reference counters (node name, reference count). */
+ private static final Map<String, Integer> REF_CTRS = new HashMap<>();
+
+ /** Reference count monitor. */
+ private static final Object REF_CTR_MUX = new Object();
+
/** Target IGFS. */
private final IgfsEx igfs;
@@ -68,15 +86,122 @@ public class HadoopIgfsInProc implements HadoopIgfsEx {
*
* @param igfs Target IGFS.
* @param log Log.
+ * @param userName User name.
*/
- public HadoopIgfsInProc(IgfsEx igfs, Log log, String userName) throws IgniteCheckedException {
- this.user = IgfsUtils.fixUserName(userName);
-
+ private HadoopIgfsInProc(IgfsEx igfs, Log log, String userName) {
this.igfs = igfs;
this.log = log;
bufSize = igfs.configuration().getBlockSize() * 2;
+
+ user = IgfsUtils.fixUserName(userName);
+ }
+
+ /**
+ * Creates instance of the HadoopIgfsInProcWithIgniteRefsCount by IGFS name.
+ *
+ * @param igfsName Target IGFS name.
+ * @param log Log.
+ * @param userName User name.
+ * @return HadoopIgfsInProcWithIgniteRefsCount instance. {@code null} if the IGFS not fount in the current VM.
+ */
+ public static HadoopIgfsInProc create(String igfsName, Log log, String userName) {
+ synchronized (REF_CTR_MUX) {
+ for (Ignite ignite : Ignition.allGrids()) {
+ HadoopIgfsInProc delegate = create0(ignite, igfsName, log, userName);
+
+ if (delegate != null)
+ return delegate;
+ }
+ }
+
+ return null;
+ }
+
+ /**
+ * Creates instance of the HadoopIgfsInProcWithIgniteRefsCount by IGFS name, ignite client node is created
+ * if necessary.
+ *
+ * @param igniteCfgPath Path to ignite configuration.
+ * @param igfsName Target IGFS name.
+ * @param log Log.
+ * @param userName User name.
+ * @return HadoopIgfsInProcWithIgniteRefsCount instance. {@code null} if the IGFS not fount in the current VM.
+ * @throws IgniteCheckedException On error.
+ */
+ public static HadoopIgfsInProc create(String igniteCfgPath, String igfsName, Log log, String userName)
+ throws IgniteCheckedException {
+ IgniteBiTuple<IgniteConfiguration, GridSpringResourceContext> cfgPair =
+ IgnitionEx.loadConfiguration(igniteCfgPath);
+
+ IgniteConfiguration cfg = cfgPair.get1();
+
+ cfg.setClientMode(true);
+
+ String nodeName = cfg.getGridName();
+
+ synchronized (REF_CTR_MUX) {
+ T2<Ignite, Boolean> startRes = IgnitionEx.getOrStart(cfg);
+
+ boolean newNodeStarted = startRes.get2();
+
+ if (newNodeStarted) {
+ assert !REF_CTRS.containsKey(nodeName) : "The ignite instance already exists in the ref count map";
+
+ REF_CTRS.put(nodeName, 0);
+ }
+
+ HadoopIgfsInProc hadoop = create0(startRes.get1(), igfsName, log, userName);
+
+ if (hadoop == null) {
+ if (newNodeStarted) {
+ REF_CTRS.remove(nodeName);
+
+ Ignition.stop(nodeName, true);
+ }
+
+ throw new HadoopIgfsCommunicationException("Ignite client node doesn't have IGFS with the " +
+ "given name: " + igfsName);
+ }
+
+ return hadoop;
+ }
+ }
+
+ /**
+ * Creates instance of the HadoopIgfsInProcWithIgniteRefsCount by IGFS name.
+ *
+ * @param ignite Ignite instance.
+ * @param igfsName Target IGFS name.
+ * @param log Log.
+ * @param userName User name.
+ * @return HadoopIgfsInProcWithIgniteRefsCount instance. {@code null} if the IGFS not found
+ * in the specified ignite instance.
+ */
+ private static HadoopIgfsInProc create0(Ignite ignite, String igfsName, Log log, String userName) {
+ assert Thread.holdsLock(REF_CTR_MUX);
+ assert ignite != null;
+
+ if (Ignition.state(ignite.name()) == STARTED) {
+ try {
+ for (IgniteFileSystem fs : ignite.fileSystems()) {
+ if (F.eq(fs.name(), igfsName)) {
+ Integer ctr = REF_CTRS.get(ignite.name());
+
+ if (ctr != null)
+ REF_CTRS.put(ignite.name(), ctr + 1);
+
+ return new HadoopIgfsInProc((IgfsEx)fs, log, userName);
+ }
+ }
+ }
+ catch (IllegalStateException ignore) {
+ // May happen if the grid state has changed:
+ }
+ }
+
+ return null;
}
/** {@inheritDoc} */
@@ -91,8 +216,10 @@ public class HadoopIgfsInProc implements HadoopIgfsEx {
});
}
- /** {@inheritDoc} */
- @Override public void close(boolean force) {
+ /**
+ * Call onClose for all listeners.
+ */
+ private void notifyListenersOnClose() {
// Perform cleanup.
for (HadoopIgfsStreamEventListener lsnr : lsnrs.values()) {
try {
@@ -106,6 +233,29 @@ public class HadoopIgfsInProc implements HadoopIgfsEx {
}
/** {@inheritDoc} */
+ @Override public void close(boolean force) {
+ notifyListenersOnClose();
+
+ String gridName = igfs.context().kernalContext().grid().name();
+
+ synchronized (REF_CTR_MUX) {
+ Integer cnt = REF_CTRS.get(gridName);
+
+ if (cnt != null) {
+ // The node was created by this HadoopIgfsWrapper.
+ // The node must be stopped when there are not opened filesystems that are used one.
+ if (cnt > 1)
+ REF_CTRS.put(gridName, cnt - 1);
+ else {
+ REF_CTRS.remove(gridName);
+
+ G.stop(gridName, false);
+ }
+ }
+ }
+ }
+
+ /** {@inheritDoc} */
@Override public IgfsFile info(final IgfsPath path) throws IgniteCheckedException {
try {
return IgfsUserContext.doAs(user, new IgniteOutClosure<IgfsFile>() {
@@ -123,7 +273,8 @@ public class HadoopIgfsInProc implements HadoopIgfsEx {
}
/** {@inheritDoc} */
- @Override public IgfsFile update(final IgfsPath path, final Map<String, String> props) throws IgniteCheckedException {
+ @Override public IgfsFile update(final IgfsPath path, final Map<String, String> props) throws
+ IgniteCheckedException {
try {
return IgfsUserContext.doAs(user, new IgniteOutClosure<IgfsFile>() {
@Override public IgfsFile apply() {
@@ -140,7 +291,8 @@ public class HadoopIgfsInProc implements HadoopIgfsEx {
}
/** {@inheritDoc} */
- @Override public Boolean setTimes(final IgfsPath path, final long accessTime, final long modificationTime) throws IgniteCheckedException {
+ @Override public Boolean setTimes(final IgfsPath path, final long accessTime, final long modificationTime)
+ throws IgniteCheckedException {
try {
IgfsUserContext.doAs(user, new IgniteOutClosure<Void>() {
@Override public Void apply() {
@@ -253,7 +405,8 @@ public class HadoopIgfsInProc implements HadoopIgfsEx {
}
/** {@inheritDoc} */
- @Override public Boolean mkdirs(final IgfsPath path, final Map<String, String> props) throws IgniteCheckedException {
+ @Override public Boolean mkdirs(final IgfsPath path, final Map<String, String> props)
+ throws IgniteCheckedException {
try {
IgfsUserContext.doAs(user, new IgniteOutClosure<Void>() {
@Override public Void apply() {
@@ -269,7 +422,7 @@ public class HadoopIgfsInProc implements HadoopIgfsEx {
throw new IgniteCheckedException(e);
}
catch (IllegalStateException ignored) {
- throw new HadoopIgfsCommunicationException("Failed to create directory because Grid is stopping: " +
+ throw new HadoopIgfsCommunicationException("Failed to findIgfsAndCreate directory because Grid is stopping: " +
path);
}
}
@@ -350,8 +503,9 @@ public class HadoopIgfsInProc implements HadoopIgfsEx {
}
/** {@inheritDoc} */
- @Override public HadoopIgfsStreamDelegate create(final IgfsPath path, final boolean overwrite, final boolean colocate,
- final int replication, final long blockSize, final @Nullable Map<String, String> props) throws IgniteCheckedException {
+ @Override public HadoopIgfsStreamDelegate create(final IgfsPath path, final boolean overwrite,
+ final boolean colocate, final int replication, final long blockSize, final @Nullable Map<String, String> props)
+ throws IgniteCheckedException {
try {
return IgfsUserContext.doAs(user, new IgniteOutClosure<HadoopIgfsStreamDelegate>() {
@Override public HadoopIgfsStreamDelegate apply() {
@@ -366,7 +520,7 @@ public class HadoopIgfsInProc implements HadoopIgfsEx {
throw new IgniteCheckedException(e);
}
catch (IllegalStateException ignored) {
- throw new HadoopIgfsCommunicationException("Failed to create file because Grid is stopping: " + path);
+ throw new HadoopIgfsCommunicationException("Failed to findIgfsAndCreate file because Grid is stopping: " + path);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsUtils.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsUtils.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsUtils.java
index ee7756e..3349cbf 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsUtils.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsUtils.java
@@ -48,6 +48,12 @@ public class HadoopIgfsUtils {
/** Parameter name for endpoint no local TCP flag. */
public static final String PARAM_IGFS_ENDPOINT_NO_LOCAL_TCP = "fs.igfs.%s.endpoint.no_local_tcp";
+ /** Parameter name for endpoint no remote TCP flag. */
+ public static final String PARAM_IGFS_ENDPOINT_NO_REMOTE_TCP = "fs.igfs.%s.endpoint.no_remote_tcp";
+
+ /** Parameter name for endpoint path to Ignite client configuration. */
+ public static final String PARAM_IGFS_ENDPOINT_IGNITE_CFG_PATH = "fs.igfs.%s.config_path";
+
/**
* Get string parameter.
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsWrapper.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsWrapper.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsWrapper.java
index aaf79de..6fa5d60 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsWrapper.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsWrapper.java
@@ -17,19 +17,20 @@
package org.apache.ignite.internal.processors.hadoop.impl.igfs;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
import org.apache.commons.logging.Log;
import org.apache.hadoop.conf.Configuration;
-import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.IgniteFileSystem;
-import org.apache.ignite.IgniteIllegalStateException;
-import org.apache.ignite.Ignition;
import org.apache.ignite.igfs.IgfsBlockLocation;
import org.apache.ignite.igfs.IgfsFile;
import org.apache.ignite.igfs.IgfsPath;
import org.apache.ignite.igfs.IgfsPathSummary;
import org.apache.ignite.internal.processors.hadoop.igfs.HadoopIgfsEndpoint;
-import org.apache.ignite.internal.processors.igfs.IgfsEx;
import org.apache.ignite.internal.processors.igfs.IgfsHandshakeResponse;
import org.apache.ignite.internal.processors.igfs.IgfsStatus;
import org.apache.ignite.internal.util.typedef.F;
@@ -38,18 +39,12 @@ import org.apache.ignite.internal.util.typedef.internal.SB;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.jetbrains.annotations.Nullable;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
-
-import static org.apache.ignite.IgniteState.STARTED;
import static org.apache.ignite.internal.processors.hadoop.igfs.HadoopIgfsEndpoint.LOCALHOST;
+import static org.apache.ignite.internal.processors.hadoop.impl.igfs.HadoopIgfsUtils.PARAM_IGFS_ENDPOINT_IGNITE_CFG_PATH;
import static org.apache.ignite.internal.processors.hadoop.impl.igfs.HadoopIgfsUtils.PARAM_IGFS_ENDPOINT_NO_EMBED;
import static org.apache.ignite.internal.processors.hadoop.impl.igfs.HadoopIgfsUtils.PARAM_IGFS_ENDPOINT_NO_LOCAL_SHMEM;
import static org.apache.ignite.internal.processors.hadoop.impl.igfs.HadoopIgfsUtils.PARAM_IGFS_ENDPOINT_NO_LOCAL_TCP;
+import static org.apache.ignite.internal.processors.hadoop.impl.igfs.HadoopIgfsUtils.PARAM_IGFS_ENDPOINT_NO_REMOTE_TCP;
import static org.apache.ignite.internal.processors.hadoop.impl.igfs.HadoopIgfsUtils.parameter;
/**
@@ -82,9 +77,9 @@ public class HadoopIgfsWrapper implements HadoopIgfs {
*
* @param authority Authority (connection string).
* @param logDir Log directory for server.
- * @param user User name.
* @param conf Configuration.
* @param log Current logger.
+ * @param user User name.
* @throws IOException On error.
*/
public HadoopIgfsWrapper(String authority, String logDir, Configuration conf, Log log, String user)
@@ -358,6 +353,7 @@ public class HadoopIgfsWrapper implements HadoopIgfs {
// These fields will contain possible exceptions from shmem and TCP endpoints.
Exception errShmem = null;
Exception errTcp = null;
+ Exception errClient = null;
// 1. If delegate is set, return it immediately.
Delegate curDelegate = delegateRef.get();
@@ -369,28 +365,37 @@ public class HadoopIgfsWrapper implements HadoopIgfs {
boolean skipInProc = parameter(conf, PARAM_IGFS_ENDPOINT_NO_EMBED, authority, false);
if (!skipInProc) {
- IgfsEx igfs = getIgfsEx(endpoint.igfs());
+ HadoopIgfsInProc hadoop = HadoopIgfsInProc.create(endpoint.igfs(), log, userName);
+
+ if (hadoop != null)
+ curDelegate = new Delegate(hadoop, hadoop.handshake(logDir));
+ }
+
+ // 3. Try Ignite client
+ String igniteCliCfgPath = parameter(conf, PARAM_IGFS_ENDPOINT_IGNITE_CFG_PATH, authority, null);
- if (igfs != null) {
- HadoopIgfsEx hadoop = null;
+ if (curDelegate == null && !F.isEmpty(igniteCliCfgPath)) {
+ HadoopIgfsInProc hadoop = null;
- try {
- hadoop = new HadoopIgfsInProc(igfs, log, userName);
+ try {
+ hadoop = HadoopIgfsInProc.create(igniteCliCfgPath, endpoint.igfs(), log, userName);
+ if (hadoop != null)
curDelegate = new Delegate(hadoop, hadoop.handshake(logDir));
- }
- catch (IOException | IgniteCheckedException e) {
- if (e instanceof HadoopIgfsCommunicationException)
- if (hadoop != null)
- hadoop.close(true);
+ }
+ catch (Exception e) {
+ if (hadoop != null)
+ hadoop.close(true);
- if (log.isDebugEnabled())
- log.debug("Failed to connect to in-process IGFS, fallback to IPC mode.", e);
- }
+ if (log.isDebugEnabled())
+ log.debug("Failed to connect to IGFS using Ignite client [host=" + endpoint.host() +
+ ", port=" + endpoint.port() + ", igniteCfg=" + igniteCliCfgPath + ']', e);
+
+ errClient = e;
}
}
- // 3. Try connecting using shmem.
+ // 4. Try connecting using shmem.
boolean skipLocShmem = parameter(conf, PARAM_IGFS_ENDPOINT_NO_LOCAL_SHMEM, authority, false);
if (curDelegate == null && !skipLocShmem && !U.isWindows()) {
@@ -412,7 +417,7 @@ public class HadoopIgfsWrapper implements HadoopIgfs {
}
}
- // 4. Try local TCP connection.
+ // 5. Try local TCP connection.
boolean skipLocTcp = parameter(conf, PARAM_IGFS_ENDPOINT_NO_LOCAL_TCP, authority, false);
if (curDelegate == null && !skipLocTcp) {
@@ -436,8 +441,10 @@ public class HadoopIgfsWrapper implements HadoopIgfs {
}
}
- // 5. Try remote TCP connection.
- if (curDelegate == null && (skipLocTcp || !F.eq(LOCALHOST, endpoint.host()))) {
+ // 6. Try remote TCP connection.
+ boolean skipRmtTcp = parameter(conf, PARAM_IGFS_ENDPOINT_NO_REMOTE_TCP, authority, false);
+
+ if (curDelegate == null && !skipRmtTcp && (skipLocTcp || !F.eq(LOCALHOST, endpoint.host()))) {
HadoopIgfsEx hadoop = null;
try {
@@ -470,7 +477,11 @@ public class HadoopIgfsWrapper implements HadoopIgfs {
if (errShmem != null)
errMsg.a("[type=SHMEM, port=" + endpoint.port() + ", err=" + errShmem + "], ");
- errMsg.a("[type=TCP, host=" + endpoint.host() + ", port=" + endpoint.port() + ", err=" + errTcp + "]] ");
+ if (errTcp != null)
+ errMsg.a("[type=TCP, host=" + endpoint.host() + ", port=" + endpoint.port() + ", err=" + errTcp + "]] ");
+
+ if (errClient != null)
+ errMsg.a("[type=CLIENT, cfg=" + igniteCliCfgPath + ", err=" + errClient + "]] ");
errMsg.a("(ensure that IGFS is running and have IPC endpoint enabled; ensure that " +
"ignite-shmem-1.0.0.jar is in Hadoop classpath if you use shared memory endpoint).");
@@ -532,28 +543,4 @@ public class HadoopIgfsWrapper implements HadoopIgfs {
hadoop.close(force);
}
}
-
- /**
- * Helper method to find Igfs of the given name in the given Ignite instance.
- *
- * @param igfsName The name of Igfs.
- * @return The file system instance, or null if not found.
- */
- private static IgfsEx getIgfsEx(@Nullable String igfsName) {
- for (Ignite ignite : Ignition.allGrids()) {
- if (Ignition.state(ignite.name()) == STARTED) {
- try {
- for (IgniteFileSystem fs : ignite.fileSystems()) {
- if (F.eq(fs.name(), igfsName))
- return (IgfsEx)fs;
- }
- }
- catch (IgniteIllegalStateException ignore) {
- // May happen if the grid state has changed:
- }
- }
- }
-
- return null;
- }
}
\ No newline at end of file
[37/50] [abbrv] ignite git commit: IGNITE-4711 Propagate platform
cache plugin configuration to Java
Posted by vo...@apache.org.
IGNITE-4711 Propagate platform cache plugin configuration to Java
This closes #1552
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ab1b6850
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ab1b6850
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ab1b6850
Branch: refs/heads/ignite-4565-ddl
Commit: ab1b68507cae85eb21fd2e0479a8c9f3148fabc2
Parents: 1c9b024
Author: Pavel Tupitsyn <pt...@apache.org>
Authored: Fri Feb 17 17:18:36 2017 +0300
Committer: Pavel Tupitsyn <pt...@apache.org>
Committed: Fri Feb 17 17:18:36 2017 +0300
----------------------------------------------------------------------
.../utils/PlatformConfigurationUtils.java | 64 ++++++++++-
...PlatformCachePluginConfigurationClosure.java | 31 +++++
...mCachePluginConfigurationClosureFactory.java | 37 ++++++
...atformCachePluginConfigurationClosureFactory | 1 +
.../cache/PlatformGetCachePluginsTask.java | 85 ++++++++++++++
.../PlatformTestCachePluginConfiguration.java | 60 ++++++++++
...formTestCachePluginConfigurationClosure.java | 48 ++++++++
...tCachePluginConfigurationClosureFactory.java | 37 ++++++
.../cache/PlatformTestCachePluginProvider.java | 73 ++++++++++++
.../Apache.Ignite.Core.Tests.csproj | 2 +
.../Cache/CacheJavaPluginConfiguration.cs | 45 ++++++++
.../Plugin/Cache/CacheJavaPluginTest.cs | 113 +++++++++++++++++++
.../Plugin/Cache/CachePluginConfiguration.cs | 24 ++++
.../Plugin/Cache/CachePluginTest.cs | 7 +-
.../Cache/Configuration/CacheConfiguration.cs | 22 +++-
.../Plugin/Cache/ICachePluginConfiguration.cs | 18 ++-
16 files changed, 655 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ab1b6850/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
index f295ff5..bce3735 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
@@ -56,6 +56,8 @@ import org.apache.ignite.platform.dotnet.PlatformDotNetBinaryTypeConfiguration;
import org.apache.ignite.platform.dotnet.PlatformDotNetCacheStoreFactoryNative;
import org.apache.ignite.platform.dotnet.PlatformDotNetConfiguration;
import org.apache.ignite.plugin.CachePluginConfiguration;
+import org.apache.ignite.plugin.platform.PlatformCachePluginConfigurationClosure;
+import org.apache.ignite.plugin.platform.PlatformCachePluginConfigurationClosureFactory;
import org.apache.ignite.plugin.platform.PlatformPluginConfigurationClosure;
import org.apache.ignite.plugin.platform.PlatformPluginConfigurationClosureFactory;
import org.apache.ignite.spi.communication.CommunicationSpi;
@@ -80,6 +82,7 @@ import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
@@ -214,12 +217,23 @@ public class PlatformConfigurationUtils {
int pluginCnt = in.readInt();
if (pluginCnt > 0) {
- CachePluginConfiguration[] plugins = new CachePluginConfiguration[pluginCnt];
+ ArrayList<CachePluginConfiguration> plugins = new ArrayList<>();
+
+ for (int i = 0; i < pluginCnt; i++) {
+ if (in.readBoolean()) {
+ // Java cache plugin.
+ readCachePluginConfiguration(ccfg, in);
+ } else {
+ // Platform cache plugin.
+ plugins.add(new PlatformCachePluginConfiguration(in.readObjectDetached()));
+ }
+ }
- for (int i = 0; i < pluginCnt; i++)
- plugins[i] = new PlatformCachePluginConfiguration(in.readObjectDetached());
+ if (ccfg.getPluginConfigurations() != null) {
+ Collections.addAll(plugins, ccfg.getPluginConfigurations());
+ }
- ccfg.setPluginConfigurations(plugins);
+ ccfg.setPluginConfigurations(plugins.toArray(new CachePluginConfiguration[plugins.size()]));
}
return ccfg;
@@ -1325,6 +1339,48 @@ public class PlatformConfigurationUtils {
}
/**
+ * Reads the plugin configuration.
+ *
+ * @param cfg Ignite configuration to update.
+ * @param in Reader.
+ */
+ private static void readCachePluginConfiguration(CacheConfiguration cfg, BinaryRawReader in) {
+ int plugCfgFactoryId = in.readInt();
+
+ PlatformCachePluginConfigurationClosure plugCfg = cachePluginConfiguration(plugCfgFactoryId);
+
+ plugCfg.apply(cfg, in);
+ }
+
+ /**
+ * Create PlatformCachePluginConfigurationClosure for the given factory ID.
+ *
+ * @param factoryId Factory ID.
+ * @return PlatformCachePluginConfigurationClosure.
+ */
+ private static PlatformCachePluginConfigurationClosure cachePluginConfiguration(final int factoryId) {
+ PlatformCachePluginConfigurationClosureFactory factory = AccessController.doPrivileged(
+ new PrivilegedAction<PlatformCachePluginConfigurationClosureFactory>() {
+ @Override public PlatformCachePluginConfigurationClosureFactory run() {
+ for (PlatformCachePluginConfigurationClosureFactory factory :
+ ServiceLoader.load(PlatformCachePluginConfigurationClosureFactory.class)) {
+ if (factory.id() == factoryId)
+ return factory;
+ }
+
+ return null;
+ }
+ });
+
+ if (factory == null) {
+ throw new IgniteException("PlatformPluginConfigurationClosureFactory is not found " +
+ "(did you put into the classpath?): " + factoryId);
+ }
+
+ return factory.create();
+ }
+
+ /**
* Private constructor.
*/
private PlatformConfigurationUtils() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/ab1b6850/modules/core/src/main/java/org/apache/ignite/plugin/platform/PlatformCachePluginConfigurationClosure.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/platform/PlatformCachePluginConfigurationClosure.java b/modules/core/src/main/java/org/apache/ignite/plugin/platform/PlatformCachePluginConfigurationClosure.java
new file mode 100644
index 0000000..b03d84b
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/platform/PlatformCachePluginConfigurationClosure.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.plugin.platform;
+
+import org.apache.ignite.binary.BinaryRawReader;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.lang.IgniteBiInClosure;
+
+/**
+ * Platform cache configuration handler:
+ * updates plugin configuration using data sent from platform code.
+ */
+public interface PlatformCachePluginConfigurationClosure
+ extends IgniteBiInClosure<CacheConfiguration, BinaryRawReader> {
+ // No-op.
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ab1b6850/modules/core/src/main/java/org/apache/ignite/plugin/platform/PlatformCachePluginConfigurationClosureFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/platform/PlatformCachePluginConfigurationClosureFactory.java b/modules/core/src/main/java/org/apache/ignite/plugin/platform/PlatformCachePluginConfigurationClosureFactory.java
new file mode 100644
index 0000000..d6398ea
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/platform/PlatformCachePluginConfigurationClosureFactory.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.plugin.platform;
+
+/**
+ * Factory for @{@link PlatformCachePluginConfigurationClosure} with a unique id.
+ */
+public interface PlatformCachePluginConfigurationClosureFactory {
+ /**
+ * Gets the factory id.
+ *
+ * @return Factory id.
+ */
+ int id();
+
+ /**
+ * Creates configuration closure instance.
+ *
+ * @return Configuration closure instance.
+ */
+ PlatformCachePluginConfigurationClosure create();
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ab1b6850/modules/core/src/test/java/META-INF/services/org.apache.ignite.plugin.platform.PlatformCachePluginConfigurationClosureFactory
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/META-INF/services/org.apache.ignite.plugin.platform.PlatformCachePluginConfigurationClosureFactory b/modules/core/src/test/java/META-INF/services/org.apache.ignite.plugin.platform.PlatformCachePluginConfigurationClosureFactory
new file mode 100644
index 0000000..a99b3b9
--- /dev/null
+++ b/modules/core/src/test/java/META-INF/services/org.apache.ignite.plugin.platform.PlatformCachePluginConfigurationClosureFactory
@@ -0,0 +1 @@
+org.apache.ignite.platform.plugin.cache.PlatformTestCachePluginConfigurationClosureFactory
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/ab1b6850/modules/core/src/test/java/org/apache/ignite/platform/plugin/cache/PlatformGetCachePluginsTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/platform/plugin/cache/PlatformGetCachePluginsTask.java b/modules/core/src/test/java/org/apache/ignite/platform/plugin/cache/PlatformGetCachePluginsTask.java
new file mode 100644
index 0000000..cfcf0d5
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/platform/plugin/cache/PlatformGetCachePluginsTask.java
@@ -0,0 +1,85 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.platform.plugin.cache;
+
+import org.apache.ignite.Ignite;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeTaskAdapter;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.plugin.CachePluginConfiguration;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Task to get a list of cache plugins.
+ */
+public class PlatformGetCachePluginsTask extends ComputeTaskAdapter<String, String[]> {
+ /** {@inheritDoc} */
+ @Nullable @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid,
+ @Nullable String arg) {
+ return Collections.singletonMap(new GetCachePluginsJob(arg), F.first(subgrid));
+ }
+
+ /** {@inheritDoc} */
+ @Nullable @Override public String[] reduce(List<ComputeJobResult> results) {
+ return results.get(0).getData();
+ }
+
+ /**
+ * Job.
+ */
+ @SuppressWarnings("unchecked")
+ private static class GetCachePluginsJob extends ComputeJobAdapter {
+ /** */
+ private final String cacheName;
+
+ /** */
+ @IgniteInstanceResource
+ private final Ignite ignite;
+
+ /** */
+ GetCachePluginsJob(String cacheName) {
+ this.cacheName = cacheName;
+ ignite = null;
+ }
+
+ /** {@inheritDoc} */
+ @Nullable @Override public String[] execute() {
+ CachePluginConfiguration[] cfg =
+ ignite.cache(cacheName).getConfiguration(CacheConfiguration.class).getPluginConfigurations();
+
+ if (cfg == null)
+ return null;
+
+ String[] res = new String[cfg.length];
+
+ for (int i = 0; i < cfg.length; i++)
+ res[i] = cfg[i].getClass().getName();
+
+ return res;
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/ab1b6850/modules/core/src/test/java/org/apache/ignite/platform/plugin/cache/PlatformTestCachePluginConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/platform/plugin/cache/PlatformTestCachePluginConfiguration.java b/modules/core/src/test/java/org/apache/ignite/platform/plugin/cache/PlatformTestCachePluginConfiguration.java
new file mode 100644
index 0000000..88a021a
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/platform/plugin/cache/PlatformTestCachePluginConfiguration.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.platform.plugin.cache;
+
+import org.apache.ignite.plugin.CachePluginConfiguration;
+import org.apache.ignite.plugin.CachePluginContext;
+import org.apache.ignite.plugin.CachePluginProvider;
+
+/**
+ * Test plugin configuration.
+ */
+public class PlatformTestCachePluginConfiguration implements CachePluginConfiguration {
+ /** */
+ private String pluginProperty;
+
+ /**
+ * Initializes a new instance of PlatformTestPluginConfiguration.
+ */
+ PlatformTestCachePluginConfiguration() {
+ // No-op.
+ }
+
+ /**
+ * Gets the plugin property.
+ *
+ * @return Plugin property.
+ */
+ public String pluginProperty() {
+ return pluginProperty;
+ }
+
+ /**
+ * Sets the plugin property.
+ *
+ * @param pluginProperty Value.
+ */
+ void setPluginProperty(String pluginProperty) {
+ this.pluginProperty = pluginProperty;
+ }
+
+ /** {@inheritDoc} */
+ @Override public CachePluginProvider createProvider(CachePluginContext ctx) {
+ return new PlatformTestCachePluginProvider();
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ab1b6850/modules/core/src/test/java/org/apache/ignite/platform/plugin/cache/PlatformTestCachePluginConfigurationClosure.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/platform/plugin/cache/PlatformTestCachePluginConfigurationClosure.java b/modules/core/src/test/java/org/apache/ignite/platform/plugin/cache/PlatformTestCachePluginConfigurationClosure.java
new file mode 100644
index 0000000..2763c4f
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/platform/plugin/cache/PlatformTestCachePluginConfigurationClosure.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.platform.plugin.cache;
+
+import org.apache.ignite.binary.BinaryRawReader;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.plugin.CachePluginConfiguration;
+import org.apache.ignite.plugin.platform.PlatformCachePluginConfigurationClosure;
+
+import java.util.ArrayList;
+import java.util.Collections;
+
+/**
+ * Test config closure.
+ */
+public class PlatformTestCachePluginConfigurationClosure implements PlatformCachePluginConfigurationClosure {
+ /** {@inheritDoc} */
+ @Override public void apply(CacheConfiguration cacheConfiguration, BinaryRawReader reader) {
+ ArrayList<CachePluginConfiguration> cfgs = new ArrayList<>();
+
+ if (cacheConfiguration.getPluginConfigurations() != null) {
+ Collections.addAll(cfgs, cacheConfiguration.getPluginConfigurations());
+ }
+
+ PlatformTestCachePluginConfiguration plugCfg = new PlatformTestCachePluginConfiguration();
+
+ plugCfg.setPluginProperty(reader.readString());
+
+ cfgs.add(plugCfg);
+
+ cacheConfiguration.setPluginConfigurations(cfgs.toArray(new CachePluginConfiguration[cfgs.size()]));
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ab1b6850/modules/core/src/test/java/org/apache/ignite/platform/plugin/cache/PlatformTestCachePluginConfigurationClosureFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/platform/plugin/cache/PlatformTestCachePluginConfigurationClosureFactory.java b/modules/core/src/test/java/org/apache/ignite/platform/plugin/cache/PlatformTestCachePluginConfigurationClosureFactory.java
new file mode 100644
index 0000000..85fa8e4
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/platform/plugin/cache/PlatformTestCachePluginConfigurationClosureFactory.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.platform.plugin.cache;
+
+import org.apache.ignite.plugin.platform.PlatformCachePluginConfigurationClosure;
+import org.apache.ignite.plugin.platform.PlatformCachePluginConfigurationClosureFactory;
+
+/**
+ * Test closure factory.
+ */
+public class PlatformTestCachePluginConfigurationClosureFactory
+ implements PlatformCachePluginConfigurationClosureFactory {
+ /** {@inheritDoc} */
+ @Override public int id() {
+ return 0;
+ }
+
+ /** {@inheritDoc} */
+ @Override public PlatformCachePluginConfigurationClosure create() {
+ return new PlatformTestCachePluginConfigurationClosure();
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ab1b6850/modules/core/src/test/java/org/apache/ignite/platform/plugin/cache/PlatformTestCachePluginProvider.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/platform/plugin/cache/PlatformTestCachePluginProvider.java b/modules/core/src/test/java/org/apache/ignite/platform/plugin/cache/PlatformTestCachePluginProvider.java
new file mode 100644
index 0000000..1dcd81f
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/platform/plugin/cache/PlatformTestCachePluginProvider.java
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.platform.plugin.cache;
+
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.plugin.CachePluginConfiguration;
+import org.apache.ignite.plugin.CachePluginProvider;
+import org.jetbrains.annotations.Nullable;
+
+import javax.cache.Cache;
+
+/**
+ * Test cache plugin provider.
+ */
+public class PlatformTestCachePluginProvider implements CachePluginProvider {
+ /** {@inheritDoc} */
+ @Override public void start() throws IgniteCheckedException {
+ // No-op.
+ }
+
+ /** {@inheritDoc} */
+ @Override public void stop(boolean cancel) {
+ // No-op.
+ }
+
+ /** {@inheritDoc} */
+ @Override public void onIgniteStart() throws IgniteCheckedException {
+ // No-op.
+ }
+
+ /** {@inheritDoc} */
+ @Override public void onIgniteStop(boolean cancel) {
+ // No-op.
+ }
+
+ /** {@inheritDoc} */
+ @Override public void validate() throws IgniteCheckedException {
+ // No-op.
+ }
+
+ /** {@inheritDoc} */
+ @Override public void validateRemote(CacheConfiguration locCfg, CachePluginConfiguration locPluginCcfg,
+ CacheConfiguration rmtCfg, ClusterNode rmtNode) throws IgniteCheckedException {
+ // No-op.
+ }
+
+ /** {@inheritDoc} */
+ @Nullable @Override public Object unwrapCacheEntry(Cache.Entry entry, Class cls) {
+ return null;
+ }
+
+ /** {@inheritDoc} */
+ @Nullable @Override public Object createComponent(Class cls) {
+ return null;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ab1b6850/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
index 71b0593..0eb3e39 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
@@ -91,6 +91,8 @@
<Compile Include="Log\DefaultLoggerTest.cs" />
<Compile Include="Log\Log4NetLoggerTest.cs" />
<Compile Include="Log\NLogLoggerTest.cs" />
+ <Compile Include="Plugin\Cache\CacheJavaPluginConfiguration.cs" />
+ <Compile Include="Plugin\Cache\CacheJavaPluginTest.cs" />
<Compile Include="Plugin\PluginTest.cs" />
<Compile Include="Plugin\TestIgnitePlugin.cs" />
<Compile Include="Plugin\TestIgnitePluginConfiguration.cs" />
http://git-wip-us.apache.org/repos/asf/ignite/blob/ab1b6850/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/Cache/CacheJavaPluginConfiguration.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/Cache/CacheJavaPluginConfiguration.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/Cache/CacheJavaPluginConfiguration.cs
new file mode 100644
index 0000000..2db875d
--- /dev/null
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/Cache/CacheJavaPluginConfiguration.cs
@@ -0,0 +1,45 @@
+\ufeff/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Apache.Ignite.Core.Tests.Plugin.Cache
+{
+ using Apache.Ignite.Core.Binary;
+ using Apache.Ignite.Core.Plugin.Cache;
+
+ /// <summary>
+ /// Configuration with a plugin with Java part.
+ /// </summary>
+ public class CacheJavaPluginConfiguration : ICachePluginConfiguration
+ {
+ /// <summary>
+ /// Gets or sets the custom property.
+ /// </summary>
+ public string Foo { get; set; }
+
+ /** <inheritdoc /> */
+ public int? CachePluginConfigurationClosureFactoryId
+ {
+ get { return 0; }
+ }
+
+ /** <inheritdoc /> */
+ public void WriteBinary(IBinaryRawWriter writer)
+ {
+ writer.WriteString(Foo);
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/ab1b6850/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/Cache/CacheJavaPluginTest.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/Cache/CacheJavaPluginTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/Cache/CacheJavaPluginTest.cs
new file mode 100644
index 0000000..56d2b90
--- /dev/null
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/Cache/CacheJavaPluginTest.cs
@@ -0,0 +1,113 @@
+\ufeff/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Apache.Ignite.Core.Tests.Plugin.Cache
+{
+ using Apache.Ignite.Core.Cache;
+ using Apache.Ignite.Core.Cache.Configuration;
+ using NUnit.Framework;
+
+ /// <summary>
+ /// Tests the plugin with Java part.
+ /// </summary>
+ public class CacheJavaPluginTest
+ {
+ /** */
+ private const string CacheName = "staticCache";
+
+ /** */
+ private const string DynCacheName = "dynamicCache";
+
+ /** */
+ private const string GetPluginsTask = "org.apache.ignite.platform.plugin.cache.PlatformGetCachePluginsTask";
+
+ /** */
+ private const string PluginConfigurationClass =
+ "org.apache.ignite.platform.plugin.cache.PlatformTestCachePluginConfiguration";
+
+ /** */
+ private IIgnite _grid;
+
+ /// <summary>
+ /// Fixture set up.
+ /// </summary>
+ [TestFixtureSetUp]
+ public void FixtureSetUp()
+ {
+ var cfg = new IgniteConfiguration(TestUtils.GetTestConfiguration())
+ {
+ CacheConfiguration = new[]
+ {
+ new CacheConfiguration(CacheName)
+ {
+ PluginConfigurations = new[] {new CacheJavaPluginConfiguration()}
+ }
+ }
+ };
+
+ _grid = Ignition.Start(cfg);
+ }
+
+ /// <summary>
+ /// Fixture tear down.
+ /// </summary>
+ [TestFixtureTearDown]
+ public void FixtureTearDown()
+ {
+ Ignition.StopAll(true);
+ }
+
+ /// <summary>
+ /// Tests that cache plugin works with static cache.
+ /// </summary>
+ [Test]
+ public void TestStaticCache()
+ {
+ var cache = _grid.GetCache<int, int>(CacheName);
+
+ VerifyCachePlugin(cache);
+ }
+
+ /// <summary>
+ /// Tests that cache plugin works with static cache.
+ /// </summary>
+ [Test]
+ public void TestDynamicCache()
+ {
+ var cache = _grid.CreateCache<int, int>(new CacheConfiguration(DynCacheName)
+ {
+ PluginConfigurations = new[] {new CacheJavaPluginConfiguration()}
+ });
+
+ VerifyCachePlugin(cache);
+ }
+
+ /// <summary>
+ /// Verifies the cache plugin.
+ /// </summary>
+ private void VerifyCachePlugin(ICache<int, int> cache)
+ {
+ Assert.IsNull(cache.GetConfiguration().PluginConfigurations); // Java cache plugins are not returned.
+
+ cache[1] = 1;
+ Assert.AreEqual(1, cache[1]);
+
+ var plugins = _grid.GetCompute().ExecuteJavaTask<string[]>(GetPluginsTask, cache.Name);
+ Assert.AreEqual(new[] {PluginConfigurationClass}, plugins);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ab1b6850/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/Cache/CachePluginConfiguration.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/Cache/CachePluginConfiguration.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/Cache/CachePluginConfiguration.cs
index 4627aa0..72220ff 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/Cache/CachePluginConfiguration.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/Cache/CachePluginConfiguration.cs
@@ -18,7 +18,9 @@
namespace Apache.Ignite.Core.Tests.Plugin.Cache
{
using System;
+ using Apache.Ignite.Core.Binary;
using Apache.Ignite.Core.Plugin.Cache;
+ using NUnit.Framework;
/// <summary>
/// Cache plugin config.
@@ -35,6 +37,28 @@ namespace Apache.Ignite.Core.Tests.Plugin.Cache
/// <summary>
/// Gets or sets a value indicating whether the plugin should throw an error.
/// </summary>
+ // ReSharper disable once UnusedAutoPropertyAccessor.Global
public bool ThrowError { get; set; }
+
+ /// <summary>
+ /// Gets the id to locate PlatformCachePluginConfigurationClosureFactory on Java side
+ /// and read the data written by
+ /// <see cref="WriteBinary(IBinaryRawWriter)" /> method.
+ /// </summary>
+ public int? CachePluginConfigurationClosureFactoryId
+ {
+ get { return null; }
+ }
+
+ /// <summary>
+ /// Writes this instance to a raw writer.
+ /// This method will be called when <see cref="CachePluginConfigurationClosureFactoryId" />
+ /// is not null to propagate configuration to the Java side.
+ /// </summary>
+ /// <param name="writer">The writer.</param>
+ public void WriteBinary(IBinaryRawWriter writer)
+ {
+ Assert.Fail("Should not be called");
+ }
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/ab1b6850/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/Cache/CachePluginTest.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/Cache/CachePluginTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/Cache/CachePluginTest.cs
index 583d314..0fc8877 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/Cache/CachePluginTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/Cache/CachePluginTest.cs
@@ -20,6 +20,7 @@ namespace Apache.Ignite.Core.Tests.Plugin.Cache
using System;
using System.Collections.Generic;
using System.Linq;
+ using Apache.Ignite.Core.Binary;
using Apache.Ignite.Core.Cache;
using Apache.Ignite.Core.Cache.Configuration;
using Apache.Ignite.Core.Plugin.Cache;
@@ -202,14 +203,16 @@ namespace Apache.Ignite.Core.Tests.Plugin.Cache
[CachePluginProviderType(typeof(CachePlugin))]
private class NonSerializableCachePluginConfig : ICachePluginConfiguration
{
- // No-op.
+ public int? CachePluginConfigurationClosureFactoryId { get { return null; } }
+ public void WriteBinary(IBinaryRawWriter writer) { /* No-op. */ }
}
[Serializable]
[CachePluginProviderType(typeof(string))]
private class ThrowCachePluginConfig : ICachePluginConfiguration
{
- // No-op.
+ public int? CachePluginConfigurationClosureFactoryId { get { return null; } }
+ public void WriteBinary(IBinaryRawWriter writer) { /* No-op. */ }
}
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ab1b6850/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheConfiguration.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheConfiguration.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheConfiguration.cs
index 0e270dc..ebf412d 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheConfiguration.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheConfiguration.cs
@@ -375,11 +375,23 @@ namespace Apache.Ignite.Core.Cache.Configuration
throw new InvalidOperationException("Invalid cache configuration: " +
"ICachePluginConfiguration can't be null.");
- if (!cachePlugin.GetType().IsSerializable)
- throw new InvalidOperationException("Invalid cache configuration: " +
- "ICachePluginConfiguration should be Serializable.");
-
- writer.WriteObject(cachePlugin);
+ if (cachePlugin.CachePluginConfigurationClosureFactoryId != null)
+ {
+ writer.WriteBoolean(true);
+ writer.WriteInt(cachePlugin.CachePluginConfigurationClosureFactoryId.Value);
+ cachePlugin.WriteBinary(writer);
+ }
+ else
+ {
+ if (!cachePlugin.GetType().IsSerializable)
+ {
+ throw new InvalidOperationException("Invalid cache configuration: " +
+ "ICachePluginConfiguration should be Serializable.");
+ }
+
+ writer.WriteBoolean(false);
+ writer.WriteObject(cachePlugin);
+ }
}
}
else
http://git-wip-us.apache.org/repos/asf/ignite/blob/ab1b6850/modules/platforms/dotnet/Apache.Ignite.Core/Plugin/Cache/ICachePluginConfiguration.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Plugin/Cache/ICachePluginConfiguration.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Plugin/Cache/ICachePluginConfiguration.cs
index 5ea3b51..1790357 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Plugin/Cache/ICachePluginConfiguration.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Plugin/Cache/ICachePluginConfiguration.cs
@@ -18,6 +18,7 @@
namespace Apache.Ignite.Core.Plugin.Cache
{
using System.Diagnostics.CodeAnalysis;
+ using Apache.Ignite.Core.Binary;
using Apache.Ignite.Core.Cache.Configuration;
/// <summary>
@@ -45,6 +46,21 @@ namespace Apache.Ignite.Core.Plugin.Cache
[SuppressMessage("Microsoft.Design", "CA1040:AvoidEmptyInterfaces")]
public interface ICachePluginConfiguration
{
- // No-op.
+ /// <summary>
+ /// Gets the id to locate PlatformCachePluginConfigurationClosureFactory on Java side
+ /// and read the data written by <see cref="WriteBinary"/> method.
+ /// <para />
+ /// When this property is not null, all cache plugin functionality is delegated to Java part.
+ /// <see cref="ICachePluginProvider{TConfig}"/> won't be invoked.
+ /// </summary>
+ int? CachePluginConfigurationClosureFactoryId { get; }
+
+ /// <summary>
+ /// Writes this instance to a raw writer.
+ /// This method will be called when <see cref="CachePluginConfigurationClosureFactoryId"/>
+ /// is not null to propagate configuration to the Java side.
+ /// </summary>
+ /// <param name="writer">The writer.</param>
+ void WriteBinary(IBinaryRawWriter writer);
}
}
[39/50] [abbrv] ignite git commit: IGNITE-4212 Ignite Benchmarking
Simplification and Automation / IGNITE-4478 Fixing documentation and
resolving lack of usability
Posted by vo...@apache.org.
IGNITE-4212 Ignite Benchmarking Simplification and Automation / IGNITE-4478 Fixing documentation and resolving lack of usability
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/12657937
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/12657937
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/12657937
Branch: refs/heads/ignite-4565-ddl
Commit: 12657937d00a1ff93f215270bba06d09b810329c
Parents: 260ec36
Author: Author: oleg-ostanin <oo...@gridgain.com>
Authored: Fri Feb 17 19:51:50 2017 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Fri Feb 17 19:51:50 2017 +0300
----------------------------------------------------------------------
modules/yardstick/DEVNOTES-standalone.txt | 5 +-
modules/yardstick/README.txt | 85 +++++++------
.../config/benchmark-atomic-win.properties | 2 +-
.../config/benchmark-atomic.properties | 35 ++++--
.../config/benchmark-bin-identity.properties | 16 +--
.../config/benchmark-cache-load-win.properties | 2 +-
.../config/benchmark-cache-load.properties | 4 +-
.../config/benchmark-client-mode.properties | 68 +++++++----
.../config/benchmark-compute-win.properties | 2 +-
.../config/benchmark-compute.properties | 30 ++++-
.../config/benchmark-failover.properties | 2 +-
.../yardstick/config/benchmark-full.properties | 62 +++++-----
.../config/benchmark-multicast.properties | 107 +++++++++--------
.../config/benchmark-put-indexed-val.properties | 23 +++-
.../benchmark-query-put-separated.properties | 3 +-
.../config/benchmark-query-win.properties | 2 +-
.../yardstick/config/benchmark-query.properties | 33 +++--
.../config/benchmark-remote-sample.properties | 80 +++++++++++++
.../config/benchmark-remote.properties | 119 +++++++++++++++++++
.../config/benchmark-sample.properties | 22 +++-
.../config/benchmark-sql-dml.properties | 36 ++++--
.../yardstick/config/benchmark-store.properties | 3 +-
.../config/benchmark-tx-win.properties | 2 +-
.../yardstick/config/benchmark-tx.properties | 33 +++--
.../yardstick/config/benchmark-win.properties | 2 +-
modules/yardstick/config/benchmark.properties | 76 +++++++-----
.../yardstick/config/ignite-remote-config.xml | 47 ++++++++
.../test-max-int-values-offheap.properties | 3 +-
.../test-max-int-values-onheap.properties | 3 +-
.../config/test-max-int-values-swap.properties | 3 +-
modules/yardstick/pom-standalone.xml | 2 +-
modules/yardstick/pom.xml | 2 +-
pom.xml | 5 +-
33 files changed, 660 insertions(+), 259 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/12657937/modules/yardstick/DEVNOTES-standalone.txt
----------------------------------------------------------------------
diff --git a/modules/yardstick/DEVNOTES-standalone.txt b/modules/yardstick/DEVNOTES-standalone.txt
index d14dde2..50aa7c4 100644
--- a/modules/yardstick/DEVNOTES-standalone.txt
+++ b/modules/yardstick/DEVNOTES-standalone.txt
@@ -11,5 +11,6 @@ Artifacts can be found in `/target/assembly directory.`
Writing Ignite Benchmarks
=========================
-All benchmarks extend `AbstractBenchmark` class. A new benchmark should also extend this abstract class
-and implement `test` method. This is the method which actually tests performance.
\ No newline at end of file
+All benchmarks extend `AbstractBenchmark` class. A new benchmark should also extend
+this abstract class and implement `test` method. This method is the entry point for
+a benchmark execution.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/12657937/modules/yardstick/README.txt
----------------------------------------------------------------------
diff --git a/modules/yardstick/README.txt b/modules/yardstick/README.txt
index dcfe0e6..5903fd4 100644
--- a/modules/yardstick/README.txt
+++ b/modules/yardstick/README.txt
@@ -1,61 +1,73 @@
Yardstick Ignite Benchmarks
===========================
-Apache Ignite benchmarks are written on top of Yardstick Framework (https://github.com/gridgain/yardstick) and allow
-you to measure performance of various Apache Ignite components and modules.
+Apache Ignite benchmarks are written on top of Yardstick Framework (https://github.com/gridgain/yardstick)
+and allow you to measure performance of various Apache Ignite components and modules.
The documentation below describes how to execute and configure already assembled benchmarks. If you need to add new
benchmarks or build existing one then refer to instruction from `DEVNOTES.txt` in source directory.
-Visit Yardstick Repository (https://github.com/gridgain/yardstick) for detailed information in regards resulting graphs
-generation and how the frameworks works.
+Visit Yardstick Repository (https://github.com/gridgain/yardstick) for detailed information in regards resulting
+graphs generation and how the frameworks works.
Running Ignite Benchmarks Locally
-==========================================
+=================================
-The simplest way to start with benchmarking is to use one of the executable scripts available under `benchmarks\bin` directory:
+The simplest way to start with benchmarking is to use one of the executable scripts available under `benchmarks\bin`
+directory:
-./bin/benchmark-run-all.sh config/benchmark-atomic-put.properties
+./bin/benchmark-run-all.sh config/benchmark-sample.properties
-The command above will benchmark the cache put operation for a distributed atomic cache. The results of the benchmark will be added
-to auto-generated `results-{DATE-TIME}` directory.
+The command above will benchmark the cache put operation for a distributed atomic cache. The results of the
+benchmark will be added to an auto-generated `output/results-{DATE-TIME}` directory.
-If `./bin/benchmark-run-all.sh` command is executed as is without any parameters and modifications in configurations files then
-all the available benchmarks will be executed on a local machine using `config/benchmark.properties` configuration.
+If `./bin/benchmark-run-all.sh` command is executed as is without any parameters and modifications in configurations
+files then all the available benchmarks will be executed on a local machine using `config/benchmark.properties` configuration.
-To get more information about available benchmarks and configuration parameters refer to \u201cProvided Benchmarks\u201d and
-\u201cProperties And Command Line Arguments\u201d sections below.
+In case of any issue refer to the logs that are added to an auto-generated
+`output/logs-{DATE-TIME}` directory.
+
+To get more information about available benchmarks and configuration parameters refer
+to \u201cProvided Benchmarks\u201d and \u201cProperties And Command Line Arguments\u201d sections below.
Running Ignite Benchmarks Remotely
-=========================================
+==================================
+
+To benchmark Apache Ignite across several remote hosts the following steps need
+to be done:
-For running Ignite benchmarks on remote hosts you need to upload Ignite-Yardstick to each one of your remote hosts.
+1. Go to `config/ignite-remote-config.xml` and replace
+`<value>127.0.0.1:47500..47509</value>` with actual IPs of all the remote hosts.
+Refer to the documentation section below if you prefer to use other kind of IP finder:
+https://apacheignite.readme.io/docs/cluster-config
-NOTE: The path to the uploaded Ignite-Yardstick should be exactly the same on each host.
+2. Go to `config/benchmark-remote-sample.properties` and replace the `localhost` with
+actual IPs of the remote hosts in the following places:
+SERVERS='localhost,localhost'
+DRIVERS='localhost'
-Then you need to make some changes in config files:
+DRIVERS is the remote hosts where benchmarks execution will be and driven.
-1. You need to comment or delete the
- <property name="localHost" value="127.0.0.1"/>
-line in `config/ignite-localhost-config.xml` file.
+Replace `localhost` occurrences in the same places in
+`config/benchmark-remote.properties` files if you plan to execute a full set of
+benchmarks available.
-2. You need to replace all the `127.0.0.1` addresses in `ignite-localhost-config.xml` file by actual IPs of your remote
-servers. You can add or delete lines with IP addresses if you want to run benchmarks on different number of hosts.
-There must be at least one IP address in the list.
+3. Upload Ignite Yardstick Benchmarks to one of your DRIVERS host in its own working directory.
-3. You need to replace the `localhost` strings by actual IP of your servers in the lines
-SERVERS='localhost,localhost'
-DRIVERS='localhost'
-in `config/benchmark-atomic-put.properties` file.
+4. Log in on the remote host that will be the DRIVER and execute the following command:
-Then use the following command:
+./bin/benchmark-run-all.sh config/benchmark-remote-sample.properties
-./bin/benchmark-run-all.sh config/benchmark-atomic-put.properties
+By default, all the necessary files will be automatically uploaded from the host in which you run the command above to
+every other host to the same path. If you prefer to do it manually set the AUTO_COPY variable in property file to `false`.
+The command above will benchmark the cache put operation for a distributed atomic cache. The results of the benchmark
+will be added to an auto-generated `output/results-{DATE-TIME}` directory.
-It is recommended to create some copies of original config files, edit these copies and then use as a
-parameter for `./bin/benchmark-run-all.sh` script.
+If you want to execute all the available benchmarks across the remote hosts then
+execute the following command on the DRIVER side:
+./bin/benchmark-run-all.sh config/benchmark-remote.properties
Provided Benchmarks
@@ -90,9 +102,9 @@ The following benchmarks are provided:
Properties And Command Line Arguments
=====================================
-Note that this section only describes configuration parameters specific to Ignite benchmarks,
-and not for Yardstick framework. To run Ignite benchmarks and generate graphs, you will need to run them using
-Yardstick framework scripts in `bin` folder.
+Note that this section only describes configuration parameters specific to Ignite benchmarks, and not for Yardstick
+framework. To run Ignite benchmarks and generate graphs, you will need to run them using Yardstick framework scripts in
+`bin` folder.
Refer to Yardstick Documentation (https://github.com/gridgain/yardstick) for common Yardstick properties
and command line arguments for running Yardstick scripts.
@@ -102,7 +114,8 @@ The following Ignite benchmark properties can be defined in the benchmark config
* `-b <num>` or `--backups <num>` - Number of backups for every key
* `-cfg <path>` or `--Config <path>` - Path to Ignite configuration file
* `-cs` or `--cacheStore` - Enable or disable cache store readThrough, writeThrough
-* `-cl` or `--client` - Client flag
+* `-cl` or `--client` - Client flag. Use this flag if you running more than one `DRIVER`, otherwise additional drivers
+would behave like a `servers`.
* `-nc` or `--nearCache` - Near cache flag
* `-nn <num>` or `--nodeNumber <num>` - Number of nodes (automatically set in `benchmark.properties`), used to wait for
the specified number of nodes to start
@@ -141,4 +154,4 @@ Use Ignite Apache JIRA (https://issues.apache.org/jira/browse/IGNITE) to file bu
License
=======
-Yardstick Ignite is available under Apache 2.0 (http://www.apache.org/licenses/LICENSE-2.0.html) Open Source license.
+Yardstick Ignite is available under Apache 2.0 (http://www.apache.org/licenses/LICENSE-2.0.html) Open Source license.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/12657937/modules/yardstick/config/benchmark-atomic-win.properties
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/benchmark-atomic-win.properties b/modules/yardstick/config/benchmark-atomic-win.properties
index efcb0a4..202306e 100644
--- a/modules/yardstick/config/benchmark-atomic-win.properties
+++ b/modules/yardstick/config/benchmark-atomic-win.properties
@@ -51,7 +51,7 @@ set DRIVER_HOSTS=localhost
:: set REMOTE_USER=
:: Run configuration which contains all benchmarks.
-:: Note that each benchmark is set to run for 300 seconds (5 mins) with warm-up set to 60 seconds (1 minute).
+:: Note that each benchmark is set to run for 300 seconds (5 min) with warm-up set to 60 seconds (1 minute).
set CONFIGS=^
-cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteGetBenchmark -sn IgniteNode -ds atomic-get-1-backup,^
-cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteGetOffHeapBenchmark -sn IgniteNode -ds atomic-get-offheap-1-backup,^
http://git-wip-us.apache.org/repos/asf/ignite/blob/12657937/modules/yardstick/config/benchmark-atomic.properties
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/benchmark-atomic.properties b/modules/yardstick/config/benchmark-atomic.properties
index fc827e0..7226384 100644
--- a/modules/yardstick/config/benchmark-atomic.properties
+++ b/modules/yardstick/config/benchmark-atomic.properties
@@ -55,16 +55,31 @@ DRIVER_HOSTS=localhost
# Number of nodes, used to wait for the specified number of nodes to start.
nodesNum=$((`echo ${SERVER_HOSTS} | tr ',' '\n' | wc -l` + `echo ${DRIVER_HOSTS} | tr ',' '\n' | wc -l`))
+# Backups count.
+b=1
+
+# Warmup.
+w=60
+
+# Duration.
+d=300
+
+# Threads count.
+t=64
+
+# Sync mode.
+sm=PRIMARY_SYNC
+
# Run configuration.
-# Note that each benchmark is set to run for 300 seconds (5 mins) with warm-up set to 60 seconds (1 minute).
+# Note that each benchmark is set to run for 300 seconds (5 min) with warm-up set to 60 seconds (1 minute).
CONFIGS="\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteGetBenchmark -sn IgniteNode -ds atomic-get-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteGetOffHeapBenchmark -sn IgniteNode -ds atomic-get-offheap-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteGetOffHeapValuesBenchmark -sn IgniteNode -ds atomic-get-offheap-val-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutGetBenchmark -sn IgniteNode -ds atomic-put-get-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutGetOffHeapBenchmark -sn IgniteNode -ds atomic-put-get-offheap-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutGetOffHeapValuesBenchmark -sn IgniteNode -ds atomic-put-get-offheap-val-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutBenchmark -sn IgniteNode -ds atomic-put-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutOffHeapBenchmark -sn IgniteNode -ds atomic-put-offheap-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutOffHeapValuesBenchmark -sn IgniteNode -ds atomic-put-offheap-val-1-backup\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteGetBenchmark -sn IgniteNode -ds atomic-get-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteGetOffHeapBenchmark -sn IgniteNode -ds atomic-get-offheap-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteGetOffHeapValuesBenchmark -sn IgniteNode -ds atomic-get-offheap-val-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetBenchmark -sn IgniteNode -ds atomic-put-get-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetOffHeapBenchmark -sn IgniteNode -ds atomic-put-get-offheap-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetOffHeapValuesBenchmark -sn IgniteNode -ds atomic-put-get-offheap-val-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutBenchmark -sn IgniteNode -ds atomic-put-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutOffHeapBenchmark -sn IgniteNode -ds atomic-put-offheap-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutOffHeapValuesBenchmark -sn IgniteNode -ds atomic-put-offheap-val-${b}-backup\
"
http://git-wip-us.apache.org/repos/asf/ignite/blob/12657937/modules/yardstick/config/benchmark-bin-identity.properties
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/benchmark-bin-identity.properties b/modules/yardstick/config/benchmark-bin-identity.properties
index 3d754c5..6468d8f 100644
--- a/modules/yardstick/config/benchmark-bin-identity.properties
+++ b/modules/yardstick/config/benchmark-bin-identity.properties
@@ -24,7 +24,6 @@ JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false"
# Uncomment to enable concurrent garbage collection (GC) if you encounter long GC pauses.
JVM_OPTS=${JVM_OPTS}" \
--Xloggc:./gc${now0}.log \
-XX:+PrintGCDetails \
-verbose:gc \
-XX:+UseParNewGC \
@@ -48,7 +47,7 @@ BENCHMARK_DEFAULT_PROBES=ThroughputLatencyProbe,PercentileProbe,DStatProbe
# Packages where the specified benchmark is searched by reflection mechanism.
BENCHMARK_PACKAGES=org.yardstickframework,org.apache.ignite.yardstick
-# Restart servers for each benchmark.
+# Flag which indicates to restart the servers before every benchmark execution.
RESTART_SERVERS=true
# Probe point writer class name.
@@ -81,14 +80,11 @@ t=64
# Sync mode.
sm=PRIMARY_SYNC
-# Jobs.
-j=10
-
# Run configuration which contains all benchmarks.
-# Note that each benchmark is set to run for 300 seconds (5 mins) with warm-up set to 60 seconds (1 minute).
+# Note that each benchmark is set to run for 300 seconds (5 min) with warm-up set to 60 seconds (1 minute).
CONFIGS="\
--cfg ${SCRIPT_DIR}/../config/ignite-bin-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteFieldsBinaryIdentityGetBenchmark -sn IgniteNode -ds ${ver}fields-bin-id-atomic-get-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-bin-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteFieldsBinaryIdentityPutBenchmark -sn IgniteNode -ds ${ver}fields-bin-id-atomic-put-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-bin-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteLegacyBinaryIdentityGetBenchmark -sn IgniteNode -ds ${ver}legacy-bin-id-atomic-get-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-bin-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteLegacyBinaryIdentityPutBenchmark -sn IgniteNode -ds ${ver}legacy-bin-id-atomic-put-1-backup\
+-cfg ${SCRIPT_DIR}/../config/ignite-bin-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteFieldsBinaryIdentityGetBenchmark -sn IgniteNode -ds ${ver}fields-bin-id-atomic-get-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-bin-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteFieldsBinaryIdentityPutBenchmark -sn IgniteNode -ds ${ver}fields-bin-id-atomic-put-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-bin-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteLegacyBinaryIdentityGetBenchmark -sn IgniteNode -ds ${ver}legacy-bin-id-atomic-get-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-bin-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteLegacyBinaryIdentityPutBenchmark -sn IgniteNode -ds ${ver}legacy-bin-id-atomic-put-${b}-backup\
"
http://git-wip-us.apache.org/repos/asf/ignite/blob/12657937/modules/yardstick/config/benchmark-cache-load-win.properties
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/benchmark-cache-load-win.properties b/modules/yardstick/config/benchmark-cache-load-win.properties
index efe24f5..3ee11a3 100644
--- a/modules/yardstick/config/benchmark-cache-load-win.properties
+++ b/modules/yardstick/config/benchmark-cache-load-win.properties
@@ -54,7 +54,7 @@ set DRIVER_HOSTS=localhost
set ops=PUT PUT_ALL GET GET_ALL INVOKE INVOKE_ALL REMOVE REMOVE_ALL PUT_IF_ABSENT REPLACE SCAN_QUERY SQL_QUERY CONTINUOUS_QUERY
:: Run configuration which contains all benchmarks.
-:: Note that each benchmark is set to run for 300 seconds (5 mins) with warm-up set to 60 seconds (1 minute).
+:: Note that each benchmark is set to run for 300 seconds (5 min) with warm-up set to 60 seconds (1 minute).
set CONFIGS=^
-cfg %SCRIPT_DIR%\..\config\ignite-cache-load-config.xml -r 10000 -pa 500 -bs 50 -b 1 -w 20 -d 30 -t 64 -sm PRIMARY_SYNC -dn IgniteCacheRandomOperationBenchmark -sn IgniteNode -ds cache-random-benchmark-1-backup -nn 1^
-ltqf config\queries.sql -ltops %ops%
http://git-wip-us.apache.org/repos/asf/ignite/blob/12657937/modules/yardstick/config/benchmark-cache-load.properties
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/benchmark-cache-load.properties b/modules/yardstick/config/benchmark-cache-load.properties
index 7312cb6..12e07c3 100644
--- a/modules/yardstick/config/benchmark-cache-load.properties
+++ b/modules/yardstick/config/benchmark-cache-load.properties
@@ -21,7 +21,6 @@ JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false"
# Uncomment to enable concurrent garbage collection (GC) if you encounter long GC pauses.
JVM_OPTS=${JVM_OPTS}" \
--Xloggc:./gc${now0}.log \
-XX:+PrintGCDetails \
-verbose:gc \
-XX:+UseParNewGC \
@@ -79,14 +78,13 @@ pa=500000
r=1000000
# Batch size
-
bs=50
# Allow Operation
ops="PUT PUT_ALL GET GET_ALL INVOKE INVOKE_ALL REMOVE REMOVE_ALL PUT_IF_ABSENT REPLACE SCAN_QUERY SQL_QUERY CONTINUOUS_QUERY"
# Run configuration.
-# Note that each benchmark is set to run for 300 seconds (5 mins) with warm-up set to 60 seconds (1 minute).
+# Note that each benchmark is set to run for 300 seconds (5 min) with warm-up set to 60 seconds (1 minute).
CONFIGS="\
-cfg ${SCRIPT_DIR}/../config/ignite-cache-load-config.xml -r ${r} -pa ${pa} -bs ${bs} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteCacheRandomOperationBenchmark -sn IgniteNode -ds cache-random-benchmark-${b}-backup -nn ${nodesNum} \
-ltqf ${SCRIPT_DIR}/../config/queries.sql -ltops ${ops}"
http://git-wip-us.apache.org/repos/asf/ignite/blob/12657937/modules/yardstick/config/benchmark-client-mode.properties
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/benchmark-client-mode.properties b/modules/yardstick/config/benchmark-client-mode.properties
index f7c8347..0723fcb 100644
--- a/modules/yardstick/config/benchmark-client-mode.properties
+++ b/modules/yardstick/config/benchmark-client-mode.properties
@@ -24,7 +24,6 @@ JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false"
# Uncomment to enable concurrent garbage collection (GC) if you encounter long GC pauses.
JVM_OPTS=${JVM_OPTS}" \
--Xloggc:./gc${now0}.log \
-XX:+PrintGCDetails \
-verbose:gc \
-XX:+UseParNewGC \
@@ -47,6 +46,7 @@ BENCHMARK_DEFAULT_PROBES=ThroughputLatencyProbe,PercentileProbe,DStatProbe
# Packages where the specified benchmark is searched by reflection mechanism.
BENCHMARK_PACKAGES=org.yardstickframework,org.apache.ignite.yardstick
+# Flag which indicates to restart the servers before every benchmark execution.
RESTART_SERVERS=true
# Probe point writer class name.
@@ -64,30 +64,48 @@ DRIVER_HOSTS=localhost
# Number of nodes, used to wait for the specified number of nodes to start.
nodesNum=$((`echo ${SERVER_HOSTS} | tr ',' '\n' | wc -l` + `echo ${DRIVER_HOSTS} | tr ',' '\n' | wc -l`))
+# Backups count.
+b=1
+
+# Warmup.
+w=60
+
+# Duration.
+d=300
+
+# Threads count.
+t=64
+
+# Sync mode.
+sm=PRIMARY_SYNC
+
+# Jobs.
+j=10
+
# Run configuration which contains all benchmarks.
-# Note that each benchmark is set to run for 300 seconds (5 mins) with warm-up set to 60 seconds (1 minute).
+# Note that each benchmark is set to run for 300 seconds (5 min) with warm-up set to 60 seconds (1 minute).
CONFIGS="\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 --client -sm PRIMARY_SYNC -dn IgnitePutBenchmark -sn IgniteNode -ds ${ver}atomic-put-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 --client -sm PRIMARY_SYNC -dn IgnitePutGetBenchmark -sn IgniteNode -ds ${ver}atomic-put-get-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 --client -sm PRIMARY_SYNC -dn IgnitePutTxBenchmark -sn IgniteNode -ds ${ver}tx-put-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 --client -sm PRIMARY_SYNC -dn IgniteGetAndPutTxBenchmark -sn IgniteNode -ds ${ver}tx-getAndPut-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 --client -sm PRIMARY_SYNC -dn IgniteInvokeTxBenchmark -sn IgniteNode -ds ${ver}tx-invoke-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 --client -sm PRIMARY_SYNC -dn IgnitePutGetTxBenchmark -sn IgniteNode -ds ${ver}tx-put-get-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 --client -sm PRIMARY_SYNC -dn IgniteSqlQueryBenchmark -sn IgniteNode -ds ${ver}sql-query-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 --client -sm PRIMARY_SYNC -dn IgniteSqlQueryJoinBenchmark -sn IgniteNode -ds ${ver}sql-query-join-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 --client -sm PRIMARY_SYNC -dn IgniteSqlQueryPutBenchmark -sn IgniteNode -ds ${ver}sql-query-put-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 --client -sm PRIMARY_SYNC -j 10 -dn IgniteAffinityCallBenchmark -sn IgniteNode -ds ${ver}affcall-compute-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 --client -sm PRIMARY_SYNC -j 10 -dn IgniteApplyBenchmark -sn IgniteNode -ds ${ver}apply-compute-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 --client -sm PRIMARY_SYNC -j 10 -dn IgniteBroadcastBenchmark -sn IgniteNode -ds ${ver}broad-compute-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 --client -sm PRIMARY_SYNC -j 10 -dn IgniteExecuteBenchmark -sn IgniteNode -ds ${ver}exec-compute-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 --client -sm PRIMARY_SYNC -j 10 -dn IgniteRunBenchmark -sn IgniteNode -ds ${ver}run-compute-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 --client -sm PRIMARY_SYNC -dn IgnitePutGetOffHeapBenchmark -sn IgniteNode -ds ${ver}atomic-put-get-offheap-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 --client -sm PRIMARY_SYNC -dn IgnitePutGetOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}atomic-put-get-offheap-val-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 --client -sm PRIMARY_SYNC -dn IgnitePutOffHeapBenchmark -sn IgniteNode -ds ${ver}atomic-put-offheap-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 --client -sm PRIMARY_SYNC -dn IgnitePutOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}atomic-put-offheap-val-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 --client -sm PRIMARY_SYNC -dn IgnitePutTxOffHeapBenchmark -sn IgniteNode -ds ${ver}tx-put-offheap-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 --client -sm PRIMARY_SYNC -dn IgnitePutTxOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}tx-put-offheap-val-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 --client -sm PRIMARY_SYNC -dn IgniteSqlQueryOffHeapBenchmark -sn IgniteNode -ds ${ver}sql-query-offheap-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 --client -sm PRIMARY_SYNC -dn IgniteSqlQueryJoinOffHeapBenchmark -sn IgniteNode -ds ${ver}sql-query-join-offheap-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 --client -sm PRIMARY_SYNC -dn IgniteSqlQueryPutOffHeapBenchmark -sn IgniteNode -ds ${ver}sql-query-put-offheap-1-backup\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} --client -sm PRIMARY_SYNC -dn IgnitePutBenchmark -sn IgniteNode -ds ${ver}atomic-put-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} --client -sm PRIMARY_SYNC -dn IgnitePutGetBenchmark -sn IgniteNode -ds ${ver}atomic-put-get-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} --client -sm PRIMARY_SYNC -dn IgnitePutTxBenchmark -sn IgniteNode -ds ${ver}tx-put-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} --client -sm PRIMARY_SYNC -dn IgniteGetAndPutTxBenchmark -sn IgniteNode -ds ${ver}tx-getAndPut-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} --client -sm PRIMARY_SYNC -dn IgniteInvokeTxBenchmark -sn IgniteNode -ds ${ver}tx-invoke-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} --client -sm PRIMARY_SYNC -dn IgnitePutGetTxBenchmark -sn IgniteNode -ds ${ver}tx-put-get-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} --client -sm PRIMARY_SYNC -dn IgniteSqlQueryBenchmark -sn IgniteNode -ds ${ver}sql-query-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} --client -sm PRIMARY_SYNC -dn IgniteSqlQueryJoinBenchmark -sn IgniteNode -ds ${ver}sql-query-join-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} --client -sm PRIMARY_SYNC -dn IgniteSqlQueryPutBenchmark -sn IgniteNode -ds ${ver}sql-query-put-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} --client -sm PRIMARY_SYNC -j ${j} -dn IgniteAffinityCallBenchmark -sn IgniteNode -ds ${ver}affcall-compute-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} --client -sm PRIMARY_SYNC -j ${j} -dn IgniteApplyBenchmark -sn IgniteNode -ds ${ver}apply-compute-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} --client -sm PRIMARY_SYNC -j ${j} -dn IgniteBroadcastBenchmark -sn IgniteNode -ds ${ver}broad-compute-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} --client -sm PRIMARY_SYNC -j ${j} -dn IgniteExecuteBenchmark -sn IgniteNode -ds ${ver}exec-compute-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} --client -sm PRIMARY_SYNC -j ${j} -dn IgniteRunBenchmark -sn IgniteNode -ds ${ver}run-compute-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} --client -sm PRIMARY_SYNC -dn IgnitePutGetOffHeapBenchmark -sn IgniteNode -ds ${ver}atomic-put-get-offheap-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} --client -sm PRIMARY_SYNC -dn IgnitePutGetOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}atomic-put-get-offheap-val-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} --client -sm PRIMARY_SYNC -dn IgnitePutOffHeapBenchmark -sn IgniteNode -ds ${ver}atomic-put-offheap-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} --client -sm PRIMARY_SYNC -dn IgnitePutOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}atomic-put-offheap-val-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} --client -sm PRIMARY_SYNC -dn IgnitePutTxOffHeapBenchmark -sn IgniteNode -ds ${ver}tx-put-offheap-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} --client -sm PRIMARY_SYNC -dn IgnitePutTxOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}tx-put-offheap-val-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} --client -sm PRIMARY_SYNC -dn IgniteSqlQueryOffHeapBenchmark -sn IgniteNode -ds ${ver}sql-query-offheap-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} --client -sm PRIMARY_SYNC -dn IgniteSqlQueryJoinOffHeapBenchmark -sn IgniteNode -ds ${ver}sql-query-join-offheap-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} --client -sm PRIMARY_SYNC -dn IgniteSqlQueryPutOffHeapBenchmark -sn IgniteNode -ds ${ver}sql-query-put-offheap-${b}-backup\
"
http://git-wip-us.apache.org/repos/asf/ignite/blob/12657937/modules/yardstick/config/benchmark-compute-win.properties
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/benchmark-compute-win.properties b/modules/yardstick/config/benchmark-compute-win.properties
index 9c60a31..a4c6f44 100644
--- a/modules/yardstick/config/benchmark-compute-win.properties
+++ b/modules/yardstick/config/benchmark-compute-win.properties
@@ -51,7 +51,7 @@ set DRIVER_HOSTS=localhost
:: set REMOTE_USER=
:: Run configuration which contains all benchmarks.
-:: Note that each benchmark is set to run for 300 seconds (5 mins) with warm-up set to 60 seconds (1 minute).
+:: Note that each benchmark is set to run for 300 seconds (5 min) with warm-up set to 60 seconds (1 minute).
set CONFIGS=^
-cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 1 -d 30 -t 1 -sm PRIMARY_SYNC -j 10 -dn IgniteAffinityCallBenchmark -sn IgniteNode -ds affcall-compute-1-backup,^
-cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 1 -d 30 -t 1 -sm PRIMARY_SYNC -j 10 -dn IgniteApplyBenchmark -sn IgniteNode -ds apply-compute-1-backup,^
http://git-wip-us.apache.org/repos/asf/ignite/blob/12657937/modules/yardstick/config/benchmark-compute.properties
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/benchmark-compute.properties b/modules/yardstick/config/benchmark-compute.properties
index a4816bd..66cb930 100644
--- a/modules/yardstick/config/benchmark-compute.properties
+++ b/modules/yardstick/config/benchmark-compute.properties
@@ -55,12 +55,30 @@ DRIVER_HOSTS=localhost
# Number of nodes, used to wait for the specified number of nodes to start.
nodesNum=$((`echo ${SERVER_HOSTS} | tr ',' '\n' | wc -l` + `echo ${DRIVER_HOSTS} | tr ',' '\n' | wc -l`))
+# Backups count.
+b=1
+
+# Warmup.
+w=60
+
+# Duration.
+d=300
+
+# Threads count.
+t=64
+
+# Sync mode.
+sm=PRIMARY_SYNC
+
+# Jobs.
+j=10
+
# Run configuration.
-# Note that each benchmark is set to run for 300 seconds (5 mins) with warm-up set to 60 seconds (1 minute).
+# Note that each benchmark is set to run for 300 seconds (5 min) with warm-up set to 60 seconds (1 minute).
CONFIGS="\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -j 10 -dn IgniteAffinityCallBenchmark -sn IgniteNode -ds affcall-compute-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -j 10 -dn IgniteApplyBenchmark -sn IgniteNode -ds apply-compute-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -j 10 -dn IgniteBroadcastBenchmark -sn IgniteNode -ds broad-compute-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -j 10 -dn IgniteExecuteBenchmark -sn IgniteNode -ds exec-compute-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -j 10 -dn IgniteRunBenchmark -sn IgniteNode -ds run-compute-1-backup\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -j ${j} -dn IgniteAffinityCallBenchmark -sn IgniteNode -ds affcall-compute-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -j ${j} -dn IgniteApplyBenchmark -sn IgniteNode -ds apply-compute-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -j ${j} -dn IgniteBroadcastBenchmark -sn IgniteNode -ds broad-compute-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -j ${j} -dn IgniteExecuteBenchmark -sn IgniteNode -ds exec-compute-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -j ${j} -dn IgniteRunBenchmark -sn IgniteNode -ds run-compute-${b}-backup\
"
http://git-wip-us.apache.org/repos/asf/ignite/blob/12657937/modules/yardstick/config/benchmark-failover.properties
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/benchmark-failover.properties b/modules/yardstick/config/benchmark-failover.properties
index 352e2d4..4c6a12a 100644
--- a/modules/yardstick/config/benchmark-failover.properties
+++ b/modules/yardstick/config/benchmark-failover.properties
@@ -27,7 +27,6 @@ JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false -ea"
# Uncomment to enable concurrent garbage collection (GC) if you encounter long GC pauses.
JVM_OPTS=${JVM_OPTS}" \
- -Xloggc:./gc${now0}.log \
-XX:+PrintGCDetails \
-verbose:gc \
-XX:+UseParNewGC \
@@ -51,6 +50,7 @@ BENCHMARK_DEFAULT_PROBES=ThroughputLatencyProbe,PercentileProbe,DStatProbe
# Packages where the specified benchmark is searched by reflection mechanism.
BENCHMARK_PACKAGES=org.yardstickframework,org.apache.ignite.yardstick
+# Flag which indicates to restart the servers before every benchmark execution.
RESTART_SERVERS=true
# Probe point writer class name.
http://git-wip-us.apache.org/repos/asf/ignite/blob/12657937/modules/yardstick/config/benchmark-full.properties
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/benchmark-full.properties b/modules/yardstick/config/benchmark-full.properties
index da3ae9f..b64612e 100644
--- a/modules/yardstick/config/benchmark-full.properties
+++ b/modules/yardstick/config/benchmark-full.properties
@@ -24,7 +24,6 @@ JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false"
# Uncomment to enable concurrent garbage collection (GC) if you encounter long GC pauses.
JVM_OPTS=${JVM_OPTS}" \
- -Xloggc:./gc${now0}.log \
-XX:+PrintGCDetails \
-verbose:gc \
-XX:+UseParNewGC \
@@ -48,6 +47,7 @@ BENCHMARK_DEFAULT_PROBES=ThroughputLatencyProbe,PercentileProbe,DStatProbe
# Packages where the specified benchmark is searched by reflection mechanism.
BENCHMARK_PACKAGES=org.yardstickframework,org.apache.ignite.yardstick
+# Flag which indicates to restart the servers before every benchmark execution.
RESTART_SERVERS=true
# Probe point writer class name.
@@ -82,35 +82,35 @@ sm=PRIMARY_SYNC
# Run configuration which contains all benchmarks.
-# Note that each benchmark is set to run for 300 seconds (5 mins) with warm-up set to 60 seconds (1 minute).
+# Note that each benchmark is set to run for 300 seconds (5 min) with warm-up set to 60 seconds (1 minute).
CONFIGS="\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutBenchmark -sn IgniteNode -ds ${ver}atomic-put-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetBenchmark -sn IgniteNode -ds ${ver}atomic-put-get-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 2 -dn IgnitePutGetBatchBenchmark -sn IgniteNode -ds ${ver}atomic-put-get-bs-2-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 6 -dn IgnitePutGetBatchBenchmark -sn IgniteNode -ds ${ver}atomic-put-get-bs-6-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 10 -dn IgnitePutGetBatchBenchmark -sn IgniteNode -ds ${ver}atomic-put-get-bs-10-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxImplicitBenchmark -sn IgniteNode -ds ${ver}tx-optimistic-put-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -txc OPTIMISTIC -dn IgnitePutGetTxBenchmark -sn IgniteNode -ds ${ver}tx-optim-repRead-put-get-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -txc PESSIMISTIC -dn IgnitePutGetTxBenchmark -sn IgniteNode -ds ${ver}tx-pessim-repRead-put-get-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -txc OPTIMISTIC -txi SERIALIZABLE -dn IgnitePutGetTxBenchmark -sn IgniteNode -ds ${ver}tx-opt-serial-put-get-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryBenchmark -sn IgniteNode -ds ${ver}sql-query-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryPutBenchmark -sn IgniteNode -ds ${ver}sql-query-put-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 2 -dn IgnitePutAllBenchmark -sn IgniteNode -ds ${ver}atomic-putAll-bs-2-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 6 -dn IgnitePutAllBenchmark -sn IgniteNode -ds ${ver}atomic-putAll-bs-6-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 10 -dn IgnitePutAllBenchmark -sn IgniteNode -ds ${ver}atomic-putAll-bs-10-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 2 -dn IgnitePutAllTxBenchmark -sn IgniteNode -ds ${ver}tx-putAll-bs2-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 6 -dn IgnitePutAllTxBenchmark -sn IgniteNode -ds ${ver}tx-putAll-bs-6-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 10 -dn IgnitePutAllTxBenchmark -sn IgniteNode -ds ${ver}tx-putAll-bs-10-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 2 -dn IgnitePutAllSerializableTxBenchmark -sn IgniteNode -ds ${ver}tx-putAllSerializable-bs-2-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 6 -dn IgnitePutAllSerializableTxBenchmark -sn IgniteNode -ds ${ver}tx-putAllSerializable-bs-6-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 10 -dn IgnitePutAllSerializableTxBenchmark -sn IgniteNode -ds ${ver}tx-putAllSerializable-bs-10-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 2 -txc OPTIMISTIC -dn IgniteGetAllPutAllTxBenchmark -sn IgniteNode -ds ${ver}tx-optimistic-getAllPutAll-bs-2-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 6 -txc OPTIMISTIC -dn IgniteGetAllPutAllTxBenchmark -sn IgniteNode -ds ${ver}tx-optimistic-getAllPutAll-bs-6-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 10 -txc OPTIMISTIC -dn IgniteGetAllPutAllTxBenchmark -sn IgniteNode -ds ${ver}tx-optimistic-getAllPutAll-bs-10-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 2 -txc PESSIMISTIC -dn IgniteGetAllPutAllTxBenchmark -sn IgniteNode -ds ${ver}tx-pessimistic-getAllPutAll-bs-2-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 6 -txc PESSIMISTIC -dn IgniteGetAllPutAllTxBenchmark -sn IgniteNode -ds ${ver}tx-pessimistic-getAllPutAll-bs-6-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 10 -txc PESSIMISTIC -dn IgniteGetAllPutAllTxBenchmark -sn IgniteNode -ds ${ver}tx-pessimistic-getAllPutAll-bs-10-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 2 -txc OPTIMISTIC -txi SERIALIZABLE -dn IgniteGetAllPutAllTxBenchmark -sn IgniteNode -ds ${ver}tx-opt-serializable-getAllPutAll-bs-2-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 6 -txc OPTIMISTIC -txi SERIALIZABLE -dn IgniteGetAllPutAllTxBenchmark -sn IgniteNode -ds ${ver}tx-opt-serializable-getAllPutAll-bs-6-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 10 -txc OPTIMISTIC -txi SERIALIZABLE -dn IgniteGetAllPutAllTxBenchmark -sn IgniteNode -ds ${ver}tx-opt-serializable-getAllPutAll-bs-10-1-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutBenchmark -sn IgniteNode -ds ${ver}atomic-put-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetBenchmark -sn IgniteNode -ds ${ver}atomic-put-get-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 2 -dn IgnitePutGetBatchBenchmark -sn IgniteNode -ds ${ver}atomic-put-get-bs-2-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 6 -dn IgnitePutGetBatchBenchmark -sn IgniteNode -ds ${ver}atomic-put-get-bs-6-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 10 -dn IgnitePutGetBatchBenchmark -sn IgniteNode -ds ${ver}atomic-put-get-bs-10-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxImplicitBenchmark -sn IgniteNode -ds ${ver}tx-optimistic-put-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -txc OPTIMISTIC -dn IgnitePutGetTxBenchmark -sn IgniteNode -ds ${ver}tx-optim-repRead-put-get-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -txc PESSIMISTIC -dn IgnitePutGetTxBenchmark -sn IgniteNode -ds ${ver}tx-pessim-repRead-put-get-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -txc OPTIMISTIC -txi SERIALIZABLE -dn IgnitePutGetTxBenchmark -sn IgniteNode -ds ${ver}tx-opt-serial-put-get-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryBenchmark -sn IgniteNode -ds ${ver}sql-query-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryPutBenchmark -sn IgniteNode -ds ${ver}sql-query-put-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 2 -dn IgnitePutAllBenchmark -sn IgniteNode -ds ${ver}atomic-putAll-bs-2-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 6 -dn IgnitePutAllBenchmark -sn IgniteNode -ds ${ver}atomic-putAll-bs-6-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 10 -dn IgnitePutAllBenchmark -sn IgniteNode -ds ${ver}atomic-putAll-bs-10-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 2 -dn IgnitePutAllTxBenchmark -sn IgniteNode -ds ${ver}tx-putAll-bs2-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 6 -dn IgnitePutAllTxBenchmark -sn IgniteNode -ds ${ver}tx-putAll-bs-6-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 10 -dn IgnitePutAllTxBenchmark -sn IgniteNode -ds ${ver}tx-putAll-bs-10-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 2 -dn IgnitePutAllSerializableTxBenchmark -sn IgniteNode -ds ${ver}tx-putAllSerializable-bs-2-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 6 -dn IgnitePutAllSerializableTxBenchmark -sn IgniteNode -ds ${ver}tx-putAllSerializable-bs-6-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 10 -dn IgnitePutAllSerializableTxBenchmark -sn IgniteNode -ds ${ver}tx-putAllSerializable-bs-10-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 2 -txc OPTIMISTIC -dn IgniteGetAllPutAllTxBenchmark -sn IgniteNode -ds ${ver}tx-optimistic-getAllPutAll-bs-2-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 6 -txc OPTIMISTIC -dn IgniteGetAllPutAllTxBenchmark -sn IgniteNode -ds ${ver}tx-optimistic-getAllPutAll-bs-6-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 10 -txc OPTIMISTIC -dn IgniteGetAllPutAllTxBenchmark -sn IgniteNode -ds ${ver}tx-optimistic-getAllPutAll-bs-10-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 2 -txc PESSIMISTIC -dn IgniteGetAllPutAllTxBenchmark -sn IgniteNode -ds ${ver}tx-pessimistic-getAllPutAll-bs-2-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 6 -txc PESSIMISTIC -dn IgniteGetAllPutAllTxBenchmark -sn IgniteNode -ds ${ver}tx-pessimistic-getAllPutAll-bs-6-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 10 -txc PESSIMISTIC -dn IgniteGetAllPutAllTxBenchmark -sn IgniteNode -ds ${ver}tx-pessimistic-getAllPutAll-bs-10-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 2 -txc OPTIMISTIC -txi SERIALIZABLE -dn IgniteGetAllPutAllTxBenchmark -sn IgniteNode -ds ${ver}tx-opt-serializable-getAllPutAll-bs-2-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 6 -txc OPTIMISTIC -txi SERIALIZABLE -dn IgniteGetAllPutAllTxBenchmark -sn IgniteNode -ds ${ver}tx-opt-serializable-getAllPutAll-bs-6-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 10 -txc OPTIMISTIC -txi SERIALIZABLE -dn IgniteGetAllPutAllTxBenchmark -sn IgniteNode -ds ${ver}tx-opt-serializable-getAllPutAll-bs-10-${b}-backup,\
"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/12657937/modules/yardstick/config/benchmark-multicast.properties
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/benchmark-multicast.properties b/modules/yardstick/config/benchmark-multicast.properties
index b1c6b31..c10d0c6 100644
--- a/modules/yardstick/config/benchmark-multicast.properties
+++ b/modules/yardstick/config/benchmark-multicast.properties
@@ -24,7 +24,6 @@ JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false"
# Uncomment to enable concurrent garbage collection (GC) if you encounter long GC pauses.
JVM_OPTS=${JVM_OPTS}" \
--Xloggc:./gc${now0}.log \
-XX:+PrintGCDetails \
-verbose:gc \
-XX:+UseParNewGC \
@@ -48,7 +47,7 @@ BENCHMARK_DEFAULT_PROBES=ThroughputLatencyProbe,PercentileProbe,DStatProbe
# Packages where the specified benchmark is searched by reflection mechanism.
BENCHMARK_PACKAGES=org.yardstickframework,org.apache.ignite.yardstick
-# Restart servers for each benchmark.
+# Flag which indicates to restart the servers before every benchmark execution.
RESTART_SERVERS=true
# Probe point writer class name.
@@ -85,57 +84,57 @@ sm=PRIMARY_SYNC
j=10
# Run configuration which contains all benchmarks.
-# Note that each benchmark is set to run for 300 seconds (5 mins) with warm-up set to 60 seconds (1 minute).
+# Note that each benchmark is set to run for 300 seconds (5 min) with warm-up set to 60 seconds (1 minute).
CONFIGS="\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutBenchmark -sn IgniteNode -ds ${ver}atomic-put-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetBenchmark -sn IgniteNode -ds ${ver}atomic-put-get-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetEntryBenchmark -sn IgniteNode -ds ${ver}atomic-put-getEntry-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxImplicitBenchmark -sn IgniteNode -ds ${ver}tx-optimistic-put-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -txc OPTIMISTIC -dn IgnitePutGetTxBenchmark -sn IgniteNode -ds ${ver}tx-optim-repRead-put-get-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -txc OPTIMISTIC -dn IgnitePutGetEntryTxBenchmark -sn IgniteNode -ds ${ver}tx-optim-repRead-put-getEntry-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -txc PESSIMISTIC -dn IgnitePutGetTxBenchmark -sn IgniteNode -ds ${ver}tx-pessim-repRead-put-get-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -txc PESSIMISTIC -dn IgnitePutGetEntryTxBenchmark -sn IgniteNode -ds ${ver}tx-pessim-repRead-put-getEntry-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -txc OPTIMISTIC -txi SERIALIZABLE -dn IgnitePutGetTxBenchmark -sn IgniteNode -ds ${ver}tx-opt-serial-put-get-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -txc OPTIMISTIC -txi SERIALIZABLE -dn IgnitePutGetEntryTxBenchmark -sn IgniteNode -ds ${ver}tx-opt-serial-put-getEntry-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryBenchmark -sn IgniteNode -ds ${ver}sql-query-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryJoinBenchmark -sn IgniteNode -ds ${ver}sql-query-join-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryPutBenchmark -sn IgniteNode -ds ${ver}sql-query-put-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -j ${j} -dn IgniteAffinityCallBenchmark -sn IgniteNode -ds ${ver}affcall-compute-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -j ${j} -dn IgniteApplyBenchmark -sn IgniteNode -ds ${ver}apply-compute-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -j ${j} -dn IgniteBroadcastBenchmark -sn IgniteNode -ds ${ver}broad-compute-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -j ${j} -dn IgniteExecuteBenchmark -sn IgniteNode -ds ${ver}exec-compute-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -j ${j} -dn IgniteRunBenchmark -sn IgniteNode -ds ${ver}run-compute-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetOffHeapBenchmark -sn IgniteNode -ds ${ver}atomic-put-get-offheap-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}atomic-put-get-offheap-val-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutOffHeapBenchmark -sn IgniteNode -ds ${ver}atomic-put-offheap-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}atomic-put-offheap-val-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxOffHeapBenchmark -sn IgniteNode -ds ${ver}tx-optimistic-put-offheap-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}tx-optimistic-put-offheap-val-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryOffHeapBenchmark -sn IgniteNode -ds ${ver}sql-query-offheap-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryJoinOffHeapBenchmark -sn IgniteNode -ds ${ver}sql-query-join-offheap-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryPutOffHeapBenchmark -sn IgniteNode -ds ${ver}sql-query-put-offheap-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 100 -dn IgnitePutAllBenchmark -sn IgniteNode -ds ${ver}atomic-putAll-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 100 -dn IgnitePutAllTxBenchmark -sn IgniteNode -ds ${ver}tx-putAll-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 100 -dn IgnitePutAllSerializableTxBenchmark -sn IgniteNode -ds ${ver}tx-putAllSerializable-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 100 -dn IgniteSqlMergeAllBenchmark -sn IgniteNode -ds ${ver}sql-merge-all-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteReplaceIndexedValue1Benchmark -sn IgniteNode -ds ${ver}replace-indexed1-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutIfAbsentIndexedValue1Benchmark -sn IgniteNode -ds ${ver}put-if-absent-indexed1-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlMergeBenchmark -sn IgniteNode -ds ${ver}sql-merge-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlMergeQueryBenchmark -sn IgniteNode -ds ${ver}sql-merge-query-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlMergeIndexedValue1Benchmark -sn IgniteNode -ds ${ver}sql-merge-indexed1-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlMergeIndexedValue2Benchmark -sn IgniteNode -ds ${ver}sql-merge-indexed2-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlMergeIndexedValue8Benchmark -sn IgniteNode -ds ${ver}sql-merge-indexed8-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlInsertIndexedValue1Benchmark -sn IgniteNode -ds ${ver}sql-insert-indexed1-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlInsertIndexedValue2Benchmark -sn IgniteNode -ds ${ver}sql-insert-indexed2-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlInsertIndexedValue8Benchmark -sn IgniteNode -ds ${ver}sql-insert-indexed8-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -r 300000 -dn IgniteSqlDeleteBenchmark -sn IgniteNode -ds ${ver}sql-delete-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlDeleteFilteredBenchmark -sn IgniteNode -ds ${ver}sql-delete-filtered-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlUpdateBenchmark -sn IgniteNode -ds ${ver}sql-update-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlUpdateFilteredBenchmark -sn IgniteNode -ds ${ver}sql-update-filtered-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 10 -txc OPTIMISTIC -dn IgniteGetAllPutAllTxBenchmark -sn IgniteNode -ds ${ver}tx-optimistic-getAllPutAll-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 10 -txc OPTIMISTIC -dn IgniteGetEntriesPutAllTxBenchmark -sn IgniteNode -ds ${ver}tx-optimistic-getEntriesPutAll-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 10 -txc PESSIMISTIC -dn IgniteGetAllPutAllTxBenchmark -sn IgniteNode -ds ${ver}tx-pessimistic-getAllPutAll-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 10 -txc PESSIMISTIC -dn IgniteGetEntriesPutAllTxBenchmark -sn IgniteNode -ds ${ver}tx-pessimistic-getEntriesPutAll-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 10 -txc OPTIMISTIC -txi SERIALIZABLE -dn IgniteGetAllPutAllTxBenchmark -sn IgniteNode -ds ${ver}tx-opt-serializable-getAllPutAll-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 10 -txc OPTIMISTIC -txi SERIALIZABLE -dn IgniteGetEntriesPutAllTxBenchmark -sn IgniteNode -ds ${ver}tx-opt-serializable-getEntriesPutAll-1-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutBenchmark -sn IgniteNode -ds ${ver}atomic-put-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetBenchmark -sn IgniteNode -ds ${ver}atomic-put-get-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetEntryBenchmark -sn IgniteNode -ds ${ver}atomic-put-getEntry-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxImplicitBenchmark -sn IgniteNode -ds ${ver}tx-optimistic-put-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -txc OPTIMISTIC -dn IgnitePutGetTxBenchmark -sn IgniteNode -ds ${ver}tx-optim-repRead-put-get-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -txc OPTIMISTIC -dn IgnitePutGetEntryTxBenchmark -sn IgniteNode -ds ${ver}tx-optim-repRead-put-getEntry-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -txc PESSIMISTIC -dn IgnitePutGetTxBenchmark -sn IgniteNode -ds ${ver}tx-pessim-repRead-put-get-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -txc PESSIMISTIC -dn IgnitePutGetEntryTxBenchmark -sn IgniteNode -ds ${ver}tx-pessim-repRead-put-getEntry-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -txc OPTIMISTIC -txi SERIALIZABLE -dn IgnitePutGetTxBenchmark -sn IgniteNode -ds ${ver}tx-opt-serial-put-get-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -txc OPTIMISTIC -txi SERIALIZABLE -dn IgnitePutGetEntryTxBenchmark -sn IgniteNode -ds ${ver}tx-opt-serial-put-getEntry-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryBenchmark -sn IgniteNode -ds ${ver}sql-query-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryJoinBenchmark -sn IgniteNode -ds ${ver}sql-query-join-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryPutBenchmark -sn IgniteNode -ds ${ver}sql-query-put-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -j ${j} -dn IgniteAffinityCallBenchmark -sn IgniteNode -ds ${ver}affcall-compute-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -j ${j} -dn IgniteApplyBenchmark -sn IgniteNode -ds ${ver}apply-compute-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -j ${j} -dn IgniteBroadcastBenchmark -sn IgniteNode -ds ${ver}broad-compute-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -j ${j} -dn IgniteExecuteBenchmark -sn IgniteNode -ds ${ver}exec-compute-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -j ${j} -dn IgniteRunBenchmark -sn IgniteNode -ds ${ver}run-compute-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetOffHeapBenchmark -sn IgniteNode -ds ${ver}atomic-put-get-offheap-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}atomic-put-get-offheap-val-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutOffHeapBenchmark -sn IgniteNode -ds ${ver}atomic-put-offheap-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}atomic-put-offheap-val-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxOffHeapBenchmark -sn IgniteNode -ds ${ver}tx-optimistic-put-offheap-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}tx-optimistic-put-offheap-val-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryOffHeapBenchmark -sn IgniteNode -ds ${ver}sql-query-offheap-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryJoinOffHeapBenchmark -sn IgniteNode -ds ${ver}sql-query-join-offheap-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryPutOffHeapBenchmark -sn IgniteNode -ds ${ver}sql-query-put-offheap-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 100 -dn IgnitePutAllBenchmark -sn IgniteNode -ds ${ver}atomic-putAll-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 100 -dn IgnitePutAllTxBenchmark -sn IgniteNode -ds ${ver}tx-putAll-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 100 -dn IgnitePutAllSerializableTxBenchmark -sn IgniteNode -ds ${ver}tx-putAllSerializable-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 100 -dn IgniteSqlMergeAllBenchmark -sn IgniteNode -ds ${ver}sql-merge-all-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteReplaceIndexedValue1Benchmark -sn IgniteNode -ds ${ver}replace-indexed1-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutIfAbsentIndexedValue1Benchmark -sn IgniteNode -ds ${ver}put-if-absent-indexed1-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlMergeBenchmark -sn IgniteNode -ds ${ver}sql-merge-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlMergeQueryBenchmark -sn IgniteNode -ds ${ver}sql-merge-query-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlMergeIndexedValue1Benchmark -sn IgniteNode -ds ${ver}sql-merge-indexed1-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlMergeIndexedValue2Benchmark -sn IgniteNode -ds ${ver}sql-merge-indexed2-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlMergeIndexedValue8Benchmark -sn IgniteNode -ds ${ver}sql-merge-indexed8-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlInsertIndexedValue1Benchmark -sn IgniteNode -ds ${ver}sql-insert-indexed1-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlInsertIndexedValue2Benchmark -sn IgniteNode -ds ${ver}sql-insert-indexed2-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlInsertIndexedValue8Benchmark -sn IgniteNode -ds ${ver}sql-insert-indexed8-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -r 300000 -dn IgniteSqlDeleteBenchmark -sn IgniteNode -ds ${ver}sql-delete-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlDeleteFilteredBenchmark -sn IgniteNode -ds ${ver}sql-delete-filtered-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlUpdateBenchmark -sn IgniteNode -ds ${ver}sql-update-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlUpdateFilteredBenchmark -sn IgniteNode -ds ${ver}sql-update-filtered-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 10 -txc OPTIMISTIC -dn IgniteGetAllPutAllTxBenchmark -sn IgniteNode -ds ${ver}tx-optimistic-getAllPutAll-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 10 -txc OPTIMISTIC -dn IgniteGetEntriesPutAllTxBenchmark -sn IgniteNode -ds ${ver}tx-optimistic-getEntriesPutAll-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 10 -txc PESSIMISTIC -dn IgniteGetAllPutAllTxBenchmark -sn IgniteNode -ds ${ver}tx-pessimistic-getAllPutAll-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 10 -txc PESSIMISTIC -dn IgniteGetEntriesPutAllTxBenchmark -sn IgniteNode -ds ${ver}tx-pessimistic-getEntriesPutAll-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 10 -txc OPTIMISTIC -txi SERIALIZABLE -dn IgniteGetAllPutAllTxBenchmark -sn IgniteNode -ds ${ver}tx-opt-serializable-getAllPutAll-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 10 -txc OPTIMISTIC -txi SERIALIZABLE -dn IgniteGetEntriesPutAllTxBenchmark -sn IgniteNode -ds ${ver}tx-opt-serializable-getEntriesPutAll-${b}-backup,\
"
http://git-wip-us.apache.org/repos/asf/ignite/blob/12657937/modules/yardstick/config/benchmark-put-indexed-val.properties
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/benchmark-put-indexed-val.properties b/modules/yardstick/config/benchmark-put-indexed-val.properties
index e81ae6f..0d699c5 100644
--- a/modules/yardstick/config/benchmark-put-indexed-val.properties
+++ b/modules/yardstick/config/benchmark-put-indexed-val.properties
@@ -55,10 +55,25 @@ DRIVER_HOSTS=localhost
# Number of nodes, used to wait for the specified number of nodes to start.
nodesNum=$((`echo ${SERVER_HOSTS} | tr ',' '\n' | wc -l` + `echo ${DRIVER_HOSTS} | tr ',' '\n' | wc -l`))
+# Backups count.
+b=1
+
+# Warmup.
+w=60
+
+# Duration.
+d=300
+
+# Threads count.
+t=64
+
+# Sync mode.
+sm=PRIMARY_SYNC
+
# Run configuration.
-# Note that each benchmark is set to run for 300 seconds (5 mins) with warm-up set to 60 seconds (1 minute).
+# Note that each benchmark is set to run for 300 seconds (5 min) with warm-up set to 60 seconds (1 minute).
CONFIGS="\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutIndexedValue1Benchmark -sn IgniteNode -ds atomic-put-indexed-val-1,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutIndexedValue2Benchmark -sn IgniteNode -ds atomic-put-indexed-val-2,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutIndexedValue8Benchmark -sn IgniteNode -ds atomic-put-indexed-val-8\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutIndexedValue1Benchmark -sn IgniteNode -ds atomic-put-indexed-val-1,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutIndexedValue2Benchmark -sn IgniteNode -ds atomic-put-indexed-val-2,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutIndexedValue8Benchmark -sn IgniteNode -ds atomic-put-indexed-val-8\
"
http://git-wip-us.apache.org/repos/asf/ignite/blob/12657937/modules/yardstick/config/benchmark-query-put-separated.properties
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/benchmark-query-put-separated.properties b/modules/yardstick/config/benchmark-query-put-separated.properties
index 6d2ce33..500e4fa 100644
--- a/modules/yardstick/config/benchmark-query-put-separated.properties
+++ b/modules/yardstick/config/benchmark-query-put-separated.properties
@@ -24,7 +24,6 @@ JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false"
# Uncomment to enable concurrent garbage collection (GC) if you encounter long GC pauses.
JVM_OPTS=${JVM_OPTS}" \
--Xloggc:./gc${now0}.log \
-XX:+PrintGCDetails \
-verbose:gc \
-XX:+UseParNewGC \
@@ -83,5 +82,5 @@ sm=PRIMARY_SYNC
# Run configuration which contains separated query put benchmark.
CONFIGS="\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w ${w} -d ${d} -t ${t} -sm PRIMARY_SYNC -dn IgniteSqlQueryPutSeparatedBenchmark -sn IgniteNode -ds ${ver}query-put-separated-1b,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b {b} -w ${w} -d ${d} -t ${t} -sm PRIMARY_SYNC -dn IgniteSqlQueryPutSeparatedBenchmark -sn IgniteNode -ds ${ver}query-put-separated-1b,\
"
http://git-wip-us.apache.org/repos/asf/ignite/blob/12657937/modules/yardstick/config/benchmark-query-win.properties
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/benchmark-query-win.properties b/modules/yardstick/config/benchmark-query-win.properties
index b71f3e4..6bd8fb9 100644
--- a/modules/yardstick/config/benchmark-query-win.properties
+++ b/modules/yardstick/config/benchmark-query-win.properties
@@ -51,7 +51,7 @@ set DRIVER_HOSTS=localhost
:: set REMOTE_USER=
:: Run configuration which contains all benchmarks.
-:: Note that each benchmark is set to run for 300 seconds (5 mins) with warm-up set to 60 seconds (1 minute).
+:: Note that each benchmark is set to run for 300 seconds (5 min) with warm-up set to 60 seconds (1 minute).
set CONFIGS=^
-cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteSqlQueryBenchmark -sn IgniteNode -ds sql-query-1-backup,^
-cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteSqlQueryOffHeapBenchmark -sn IgniteNode -ds sql-query-offheap-1-backup,^
http://git-wip-us.apache.org/repos/asf/ignite/blob/12657937/modules/yardstick/config/benchmark-query.properties
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/benchmark-query.properties b/modules/yardstick/config/benchmark-query.properties
index 486d00e..af9b07e 100644
--- a/modules/yardstick/config/benchmark-query.properties
+++ b/modules/yardstick/config/benchmark-query.properties
@@ -55,15 +55,30 @@ DRIVER_HOSTS=localhost
# Number of nodes, used to wait for the specified number of nodes to start.
nodesNum=$((`echo ${SERVER_HOSTS} | tr ',' '\n' | wc -l` + `echo ${DRIVER_HOSTS} | tr ',' '\n' | wc -l`))
+# Backups count.
+b=1
+
+# Warmup.
+w=60
+
+# Duration.
+d=300
+
+# Threads count.
+t=64
+
+# Sync mode.
+sm=PRIMARY_SYNC
+
# Run configuration.
-# Note that each benchmark is set to run for 300 seconds (5 mins) with warm-up set to 60 seconds (1 minute).
+# Note that each benchmark is set to run for 300 seconds (5 min) with warm-up set to 60 seconds (1 minute).
CONFIGS="\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteSqlQueryBenchmark -sn IgniteNode -ds sql-query-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteSqlQueryOffHeapBenchmark -sn IgniteNode -ds sql-query-offheap-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteSqlQueryJoinBenchmark -sn IgniteNode -ds sql-query-join-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteSqlQueryJoinOffHeapBenchmark -sn IgniteNode -ds sql-query-join-offheap-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteSqlQueryPutBenchmark -sn IgniteNode -ds sql-query-put-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteSqlQueryPutOffHeapBenchmark -sn IgniteNode -ds sql-query-put-offheap-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -jdbc jdbc:ignite://127.0.0.1/query -t 64 -sm PRIMARY_SYNC -dn IgniteJdbcSqlQueryBenchmark -sn IgniteNode -ds sql-query-jdbc-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -jdbc jdbc:ignite:cfg://cache=query@config/ignite-jdbc-config.xml -t 64 -sm PRIMARY_SYNC -dn IgniteJdbcSqlQueryBenchmark -sn IgniteNode -ds sql-query-jdbc-1-backup\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryBenchmark -sn IgniteNode -ds sql-query-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryOffHeapBenchmark -sn IgniteNode -ds sql-query-offheap-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryJoinBenchmark -sn IgniteNode -ds sql-query-join-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryJoinOffHeapBenchmark -sn IgniteNode -ds sql-query-join-offheap-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryPutBenchmark -sn IgniteNode -ds sql-query-put-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryPutOffHeapBenchmark -sn IgniteNode -ds sql-query-put-offheap-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -jdbc jdbc:ignite://127.0.0.1/query -t ${t} -sm ${sm} -dn IgniteJdbcSqlQueryBenchmark -sn IgniteNode -ds sql-query-jdbc-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -jdbc jdbc:ignite:cfg://cache=query@config/ignite-jdbc-config.xml -t ${t} -sm ${sm} -dn IgniteJdbcSqlQueryBenchmark -sn IgniteNode -ds sql-query-jdbc-${b}-backup\
"
[27/50] [abbrv] ignite git commit: IGNITE-4472 Minor UI fix.
Posted by vo...@apache.org.
IGNITE-4472 Minor UI fix.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d4efbf34
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d4efbf34
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d4efbf34
Branch: refs/heads/ignite-4565-ddl
Commit: d4efbf342142f7376016f0700bc553c60b8f1b90
Parents: 97c7ed7
Author: Andrey Novikov <an...@gridgain.com>
Authored: Thu Feb 16 18:38:40 2017 +0700
Committer: Andrey Novikov <an...@gridgain.com>
Committed: Thu Feb 16 18:38:40 2017 +0700
----------------------------------------------------------------------
.../list-of-registered-users.controller.js | 2 +-
.../frontend/app/components/ui-grid-settings/ui-grid-settings.scss | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d4efbf34/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.controller.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.controller.js b/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.controller.js
index 5761073..272681a 100644
--- a/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.controller.js
+++ b/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.controller.js
@@ -133,7 +133,7 @@ export default class IgniteListOfRegisteredUsersCtrl {
api.toggleAdmin = toggleAdmin;
api.showActivities = showActivities;
- api.grid.registerRowsProcessor(companiesExcludeFilter, 300);
+ api.grid.registerRowsProcessor(companiesExcludeFilter, 50);
}
};
http://git-wip-us.apache.org/repos/asf/ignite/blob/d4efbf34/modules/web-console/frontend/app/components/ui-grid-settings/ui-grid-settings.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/ui-grid-settings/ui-grid-settings.scss b/modules/web-console/frontend/app/components/ui-grid-settings/ui-grid-settings.scss
index bc16271..4beb2a1 100644
--- a/modules/web-console/frontend/app/components/ui-grid-settings/ui-grid-settings.scss
+++ b/modules/web-console/frontend/app/components/ui-grid-settings/ui-grid-settings.scss
@@ -47,7 +47,7 @@
float: right;
.ignite-form-field {
- width: 260px;
+ width: 280px;
margin-right: 10px;
&__label {
[48/50] [abbrv] ignite git commit: IGNITE-3625: IGFS: "meta" and
"data" caches are now configured inside IGFS bean. This closes #923. This
closes #972.
Posted by vo...@apache.org.
IGNITE-3625: IGFS: "meta" and "data" caches are now configured inside IGFS bean. This closes #923. This closes #972.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3ca46d1a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3ca46d1a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3ca46d1a
Branch: refs/heads/ignite-4565-ddl
Commit: 3ca46d1a1bebf940f916ef47eaae48c3a181433d
Parents: f55370b
Author: tledkov-gridgain <tl...@gridgain.com>
Authored: Tue Feb 21 13:55:30 2017 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Tue Feb 21 13:55:30 2017 +0300
----------------------------------------------------------------------
config/hadoop/default-config.xml | 29 --
examples/config/filesystem/example-igfs.xml | 27 --
.../JettyRestProcessorAbstractSelfTest.java | 23 --
.../configuration/FileSystemConfiguration.java | 75 +++--
.../org/apache/ignite/internal/IgnitionEx.java | 9 +-
.../processors/cache/GridCacheAdapter.java | 3 +-
.../processors/cache/GridCacheProcessor.java | 5 +-
.../processors/igfs/IgfsDataManager.java | 11 +-
.../internal/processors/igfs/IgfsImpl.java | 2 +-
.../processors/igfs/IgfsMetaManager.java | 13 +-
.../internal/processors/igfs/IgfsProcessor.java | 130 +-------
.../internal/processors/igfs/IgfsUtils.java | 215 +++++++++++--
.../visor/node/VisorIgfsConfiguration.java | 4 +-
.../visor/node/VisorNodeDataCollectorJob.java | 6 +-
modules/core/src/test/config/igfs-loopback.xml | 27 --
modules/core/src/test/config/igfs-shmem.xml | 27 --
.../ignite/igfs/IgfsEventsAbstractSelfTest.java | 51 ++-
.../igfs/IgfsFragmentizerAbstractSelfTest.java | 17 +-
.../ignite/igfs/IgfsFragmentizerSelfTest.java | 3 +-
.../igfs/IgfsAbstractBaseSelfTest.java | 17 +-
.../igfs/IgfsBackupFailoverSelfTest.java | 7 +-
...lockMessageSystemPoolStarvationSelfTest.java | 17 +-
...sCachePerBlockLruEvictionPolicySelfTest.java | 18 +-
.../processors/igfs/IgfsCacheSelfTest.java | 19 +-
.../igfs/IgfsDataManagerSelfTest.java | 33 +-
.../processors/igfs/IgfsMaxSizeSelfTest.java | 6 +-
.../igfs/IgfsMetaManagerSelfTest.java | 6 +-
.../processors/igfs/IgfsMetricsSelfTest.java | 16 +-
.../processors/igfs/IgfsModesSelfTest.java | 51 ++-
.../processors/igfs/IgfsOneClientNodeTest.java | 13 +-
.../processors/igfs/IgfsProcessorSelfTest.java | 25 +-
.../igfs/IgfsProcessorValidationSelfTest.java | 320 ++++---------------
...gfsSecondaryFileSystemInjectionSelfTest.java | 8 +-
...IpcEndpointRegistrationAbstractSelfTest.java | 17 +-
.../processors/igfs/IgfsSizeSelfTest.java | 27 +-
.../processors/igfs/IgfsStartCacheTest.java | 28 +-
.../processors/igfs/IgfsStreamsSelfTest.java | 46 +--
.../processors/igfs/IgfsTaskSelfTest.java | 8 +-
.../IgfsAbstractRecordResolverSelfTest.java | 8 +-
.../ipc/shmem/IpcSharedMemoryNodeStartup.java | 30 +-
.../test/config/hadoop-fs-open-test/grid-0.xml | 57 ++--
.../test/config/hadoop-fs-open-test/grid-1.xml | 57 ++--
.../test/config/hadoop-fs-open-test/grid-2.xml | 57 ++--
.../test/config/igfs-cli-config-dual-async.xml | 57 ++--
.../test/config/igfs-cli-config-dual-sync.xml | 57 ++--
.../src/test/config/igfs-cli-config-primary.xml | 57 ++--
.../src/test/config/igfs-cli-config-proxy.xml | 57 ++--
.../impl/HadoopAbstractMapReduceTest.java | 6 +-
.../hadoop/impl/HadoopAbstractSelfTest.java | 18 +-
.../igfs/HadoopFIleSystemFactorySelfTest.java | 8 +-
.../HadoopIgfs20FileSystemAbstractSelfTest.java | 52 +--
.../igfs/HadoopIgfsDualAbstractSelfTest.java | 8 +-
...oopSecondaryFileSystemConfigurationTest.java | 69 ++--
.../igfs/IgfsNearOnlyMultiNodeSelfTest.java | 6 +-
.../IgniteHadoopFileSystemAbstractSelfTest.java | 67 ++--
...niteHadoopFileSystemClientBasedOpenTest.java | 3 +-
.../IgniteHadoopFileSystemClientSelfTest.java | 56 ++--
...IgniteHadoopFileSystemHandshakeSelfTest.java | 8 +-
.../IgniteHadoopFileSystemIpcCacheSelfTest.java | 47 +--
...niteHadoopFileSystemLoggerStateSelfTest.java | 22 +-
...condaryFileSystemInitializationSelfTest.java | 30 +-
.../org/apache/ignite/spring/sprint-exclude.xml | 2 -
62 files changed, 889 insertions(+), 1309 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/config/hadoop/default-config.xml
----------------------------------------------------------------------
diff --git a/config/hadoop/default-config.xml b/config/hadoop/default-config.xml
index d8d3636..83d3679 100644
--- a/config/hadoop/default-config.xml
+++ b/config/hadoop/default-config.xml
@@ -54,31 +54,6 @@
-->
<bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration">
<!--
- Configure caches where IGFS will store data.
- -->
- <property name="cacheConfiguration">
- <list>
- <!--
- Configure metadata cache where file system structure will be stored. It must be TRANSACTIONAL,
- and must have backups to maintain file system consistency in case of node crash.
- -->
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="igfs-meta"/>
- <property name="cacheMode" value="REPLICATED"/>
- <property name="atomicityMode" value="TRANSACTIONAL"/>
- </bean>
-
- <!--
- Configure data cache where file's data will be stored.
- -->
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="igfs-data"/>
- <property name="atomicityMode" value="TRANSACTIONAL"/>
- </bean>
- </list>
- </property>
-
- <!--
This port will be used by Apache Hadoop client to connect to Ignite node as if it was a job tracker.
-->
<property name="connectorConfiguration">
@@ -96,10 +71,6 @@
<!-- IGFS name you will use to access IGFS through Hadoop API. -->
<property name="name" value="igfs"/>
- <!-- Caches with these names must be configured. -->
- <property name="metaCacheName" value="igfs-meta"/>
- <property name="dataCacheName" value="igfs-data"/>
-
<!-- Configure TCP endpoint for communication with the file system instance. -->
<property name="ipcEndpointConfiguration">
<bean class="org.apache.ignite.igfs.IgfsIpcEndpointConfiguration">
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/examples/config/filesystem/example-igfs.xml
----------------------------------------------------------------------
diff --git a/examples/config/filesystem/example-igfs.xml b/examples/config/filesystem/example-igfs.xml
index a72ddce..2236821 100644
--- a/examples/config/filesystem/example-igfs.xml
+++ b/examples/config/filesystem/example-igfs.xml
@@ -61,8 +61,6 @@
<list>
<bean class="org.apache.ignite.configuration.FileSystemConfiguration">
<property name="name" value="igfs"/>
- <property name="metaCacheName" value="igfs-meta"/>
- <property name="dataCacheName" value="igfs-data"/>
<!-- Must correlate with cache affinity mapper. -->
<property name="blockSize" value="#{128 * 1024}"/>
@@ -97,31 +95,6 @@
</list>
</property>
- <property name="cacheConfiguration">
- <list>
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="igfs-data"/>
- <property name="cacheMode" value="PARTITIONED"/>
- <property name="atomicityMode" value="TRANSACTIONAL"/>
- <property name="writeSynchronizationMode" value="FULL_SYNC"/>
- <property name="backups" value="0"/>
- <property name="affinityMapper">
- <bean class="org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper">
- <!-- Haw many blocks in row will be stored on the same node. -->
- <constructor-arg value="512"/>
- </bean>
- </property>
- </bean>
-
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="igfs-meta"/>
- <property name="cacheMode" value="REPLICATED"/>
- <property name="atomicityMode" value="TRANSACTIONAL"/>
- <property name="writeSynchronizationMode" value="FULL_SYNC"/>
- </bean>
- </list>
- </property>
-
<!-- Explicitly configure TCP discovery SPI to provide list of initial nodes. -->
<property name="discoverySpi">
<bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
index 8d3ab74..84071ea 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
@@ -2274,32 +2274,9 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- CacheConfiguration cacheIgfs_data = new CacheConfiguration();
-
- cacheIgfs_data.setName("igfs-data");
- cacheIgfs_data.setCacheMode(CacheMode.PARTITIONED);
- cacheIgfs_data.setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL);
- cacheIgfs_data.setBackups(0);
-
- cacheIgfs_data.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
-
- cacheIgfs_data.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(512));
-
- CacheConfiguration cacheIgfs_meta = new CacheConfiguration();
-
- cacheIgfs_meta.setName("igfs-meta");
- cacheIgfs_meta.setCacheMode(CacheMode.REPLICATED);
- cacheIgfs_meta.setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL);
-
- cacheIgfs_meta.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
-
- cfg.setCacheConfiguration(cfg.getCacheConfiguration()[0], cacheIgfs_data, cacheIgfs_meta);
-
FileSystemConfiguration igfs = new FileSystemConfiguration();
igfs.setName("igfs");
- igfs.setDataCacheName("igfs-data");
- igfs.setMetaCacheName("igfs-meta");
igfs.setIpcEndpointConfiguration(new IgfsIpcEndpointConfiguration());
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/main/java/org/apache/ignite/configuration/FileSystemConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/FileSystemConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/FileSystemConfiguration.java
index e665e84..1a8d576 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/FileSystemConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/FileSystemConfiguration.java
@@ -98,12 +98,6 @@ public class FileSystemConfiguration {
/** IGFS instance name. */
private String name;
- /** Cache name to store IGFS meta information. */
- private String metaCacheName;
-
- /** Cache name to store file's data blocks. */
- private String dataCacheName;
-
/** File's data block size (bytes). */
private int blockSize = DFLT_BLOCK_SIZE;
@@ -185,6 +179,12 @@ public class FileSystemConfiguration {
/** Update file length on flush flag. */
private boolean updateFileLenOnFlush = DFLT_UPDATE_FILE_LEN_ON_FLUSH;
+ /** Meta cache config. */
+ private CacheConfiguration metaCacheCfg;
+
+ /** Data cache config. */
+ private CacheConfiguration dataCacheCfg;
+
/**
* Constructs default configuration.
*/
@@ -206,7 +206,7 @@ public class FileSystemConfiguration {
blockSize = cfg.getBlockSize();
bufSize = cfg.getStreamBufferSize();
colocateMeta = cfg.isColocateMetadata();
- dataCacheName = cfg.getDataCacheName();
+ dataCacheCfg = cfg.getDataCacheConfiguration();
dfltMode = cfg.getDefaultMode();
dualModeMaxPendingPutsSize = cfg.getDualModeMaxPendingPutsSize();
dualModePutExec = cfg.getDualModePutExecutorService();
@@ -222,7 +222,7 @@ public class FileSystemConfiguration {
ipcEndpointEnabled = cfg.isIpcEndpointEnabled();
maxSpace = cfg.getMaxSpaceSize();
maxTaskRangeLen = cfg.getMaximumTaskRangeLength();
- metaCacheName = cfg.getMetaCacheName();
+ metaCacheCfg = cfg.getMetaCacheConfiguration();
mgmtPort = cfg.getManagementPort();
name = cfg.getName();
pathModes = cfg.getPathModes();
@@ -255,40 +255,55 @@ public class FileSystemConfiguration {
}
/**
- * Cache name to store IGFS meta information. If {@code null}, then instance
- * with default meta-cache name will be used.
+ * Cache config to store IGFS meta information.
*
- * @return Cache name to store IGFS meta information.
+ * @return Cache configuration object.
*/
- @Nullable public String getMetaCacheName() {
- return metaCacheName;
+ @Nullable public CacheConfiguration getMetaCacheConfiguration() {
+ return metaCacheCfg;
}
/**
- * Sets cache name to store IGFS meta information.
+ * Cache config to store IGFS meta information. If {@code null}, then default config for
+ * meta-cache will be used.
+ *
+ * Default configuration for the meta cache is:
+ * <ul>
+ * <li>atomicityMode = TRANSACTIONAL</li>
+ * <li>cacheMode = PARTITIONED</li>
+ * <li>backups = 1</li>
+ * </ul>
*
- * @param metaCacheName Cache name to store IGFS meta information.
+ * @param metaCacheCfg Cache configuration object.
*/
- public void setMetaCacheName(String metaCacheName) {
- this.metaCacheName = metaCacheName;
+ public void setMetaCacheConfiguration(CacheConfiguration metaCacheCfg) {
+ this.metaCacheCfg = metaCacheCfg;
}
/**
- * Cache name to store IGFS data.
+ * Cache config to store IGFS data.
*
- * @return Cache name to store IGFS data.
+ * @return Cache configuration object.
*/
- @Nullable public String getDataCacheName() {
- return dataCacheName;
+ @Nullable public CacheConfiguration getDataCacheConfiguration() {
+ return dataCacheCfg;
}
/**
- * Sets cache name to store IGFS data.
+ * Cache config to store IGFS data. If {@code null}, then default config for
+ * data cache will be used.
+ *
+ * Default configuration for the data cache is:
+ * <ul>
+ * <<li>atomicityMode = TRANSACTIONAL</li>
+ * <li>cacheMode = PARTITIONED</li>
+ * <li>backups = 0</li>
+ * </ul>
*
- * @param dataCacheName Cache name to store IGFS data.
+ * @param dataCacheCfg Cache configuration object.
*/
- public void setDataCacheName(String dataCacheName) {
- this.dataCacheName = dataCacheName;
+ public void setDataCacheConfiguration(CacheConfiguration dataCacheCfg) {
+ this.dataCacheCfg = dataCacheCfg;
}
/**
@@ -878,11 +893,11 @@ public class FileSystemConfiguration {
* transaction with keys owned only by a single node.
* <p>
* IGFS stores information about file system structure (metadata) inside a transactional cache configured through
- * {@link #getMetaCacheName()} property. Metadata updates caused by operations on IGFS usually require several
- * internal keys to be updated. As IGFS metadata cache usually operates in {@link CacheMode#REPLICATED} mode,
- * meaning that all nodes have all metadata locally, it makes sense to give a hint to Ignite to co-locate
- * ownership of all metadata keys on a single node. This will decrease amount of network trips required to update
- * metadata and hence could improve performance.
+ * {@link #getMetaCacheConfiguration()} property. Metadata updates caused by operations on IGFS usually require
+ * several internal keys to be updated. As IGFS metadata cache usually operates
+ * in {@link CacheMode#REPLICATED} mode, meaning that all nodes have all metadata locally, it makes sense to give
+ * a hint to Ignite to co-locate ownership of all metadata keys on a single node.
+ * This will decrease amount of network trips required to update metadata and hence could improve performance.
* <p>
* This property should be disabled if you see excessive CPU and network load on a single node, which
* degrades performance and cannot be explained by business logic of your application.
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index 05d19c0..9fe2dba 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -2126,17 +2126,20 @@ public class IgnitionEx {
throw new IgniteCheckedException("Cache name cannot be \"" + CU.UTILITY_CACHE_NAME +
"\" because it is reserved for internal purposes.");
+ if (IgfsUtils.matchIgfsCacheName(ccfg.getName()))
+ throw new IgniteCheckedException(
+ "Cache name cannot start with \""+ IgfsUtils.IGFS_CACHE_PREFIX
+ + "\" because it is reserved for IGFS internal purposes.");
+
cacheCfgs.add(ccfg);
}
}
cfg.setCacheConfiguration(cacheCfgs.toArray(new CacheConfiguration[cacheCfgs.size()]));
- // Iterate over IGFS caches and prepare their configurations if needed.
assert cfg.getCacheConfiguration() != null;
- for (CacheConfiguration ccfg : cfg.getCacheConfiguration())
- IgfsUtils.prepareCacheConfiguration(cfg, ccfg);
+ IgfsUtils.prepareCacheConfigurations(cfg);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 4507c53..285ba11 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -97,6 +97,7 @@ import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
import org.apache.ignite.internal.processors.datastreamer.DataStreamerEntry;
import org.apache.ignite.internal.processors.datastreamer.DataStreamerImpl;
import org.apache.ignite.internal.processors.dr.IgniteDrDataStreamerCacheUpdater;
+import org.apache.ignite.internal.processors.igfs.IgfsUtils;
import org.apache.ignite.internal.processors.platform.cache.PlatformCacheEntryFilter;
import org.apache.ignite.internal.processors.task.GridInternal;
import org.apache.ignite.internal.transactions.IgniteTxHeuristicCheckedException;
@@ -338,7 +339,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
if (igfsCfgs != null) {
for (FileSystemConfiguration igfsCfg : igfsCfgs) {
- if (F.eq(ctx.name(), igfsCfg.getDataCacheName())) {
+ if (F.eq(ctx.name(), igfsCfg.getDataCacheConfiguration().getName())) {
if (!ctx.isNear()) {
igfsDataCache = true;
igfsDataCacheSize = new LongAdder8();
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index 17f9c2a..b1644d1 100755
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -99,6 +99,7 @@ import org.apache.ignite.internal.processors.cache.transactions.IgniteTransactio
import org.apache.ignite.internal.processors.cache.transactions.IgniteTxManager;
import org.apache.ignite.internal.processors.cache.version.GridCacheVersionManager;
import org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessor;
+import org.apache.ignite.internal.processors.igfs.IgfsUtils;
import org.apache.ignite.internal.processors.plugin.CachePluginManager;
import org.apache.ignite.internal.processors.query.GridQueryProcessor;
import org.apache.ignite.internal.processors.timeout.GridTimeoutObject;
@@ -726,8 +727,8 @@ public class GridCacheProcessor extends GridProcessorAdapter {
if (igfsCfgs != null) {
for (FileSystemConfiguration igfsCfg : igfsCfgs) {
- internalCaches.add(maskNull(igfsCfg.getMetaCacheName()));
- internalCaches.add(maskNull(igfsCfg.getDataCacheName()));
+ internalCaches.add(maskNull(igfsCfg.getMetaCacheConfiguration().getName()));
+ internalCaches.add(maskNull(igfsCfg.getDataCacheConfiguration().getName()));
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java
index d6297b9..dc845ee 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java
@@ -130,6 +130,9 @@ public class IgfsDataManager extends IgfsManager {
/** Async file delete worker. */
private AsyncDeleteWorker delWorker;
+ /** Async file delete worker. */
+ private String dataCacheName;
+
/** On-going remote reads futures. */
private final ConcurrentHashMap8<IgfsBlockKey, IgniteInternalFuture<byte[]>> rmtReadFuts =
new ConcurrentHashMap8<>();
@@ -180,19 +183,21 @@ public class IgfsDataManager extends IgfsManager {
delWorker = new AsyncDeleteWorker(igfsCtx.kernalContext().gridName(),
"igfs-" + igfsName + "-delete-worker", log);
+
+ dataCacheName = igfsCtx.configuration().getDataCacheConfiguration().getName();
}
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
@Override protected void onKernalStart0() throws IgniteCheckedException {
- dataCachePrj = igfsCtx.kernalContext().cache().getOrStartCache(igfsCtx.configuration().getDataCacheName());
+ dataCachePrj = igfsCtx.kernalContext().cache().getOrStartCache(dataCacheName);
assert dataCachePrj != null;
dataCache = (IgniteInternalCache)dataCachePrj;
AffinityKeyMapper mapper = igfsCtx.kernalContext().cache()
- .internalCache(igfsCtx.configuration().getDataCacheName()).configuration().getAffinityMapper();
+ .internalCache(dataCacheName).configuration().getAffinityMapper();
grpSize = mapper instanceof IgfsGroupDataBlocksKeyMapper ?
((IgfsGroupDataBlocksKeyMapper)mapper).getGroupSize() : 1;
@@ -201,7 +206,7 @@ public class IgfsDataManager extends IgfsManager {
assert grpBlockSize != 0;
- igfsCtx.kernalContext().cache().internalCache(igfsCtx.configuration().getDataCacheName()).preloader()
+ igfsCtx.kernalContext().cache().internalCache(dataCacheName).preloader()
.startFuture().listen(new CI1<IgniteInternalFuture<Object>>() {
@Override public void apply(IgniteInternalFuture<Object> f) {
dataCacheStartLatch.countDown();
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
index 56da121..7165f31 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
@@ -263,7 +263,7 @@ public final class IgfsImpl implements IgfsEx {
secondaryPaths = new IgfsPaths(secondaryFsPayload, dfltMode, modeRslvr.modesOrdered());
// Check whether IGFS LRU eviction policy is set on data cache.
- String dataCacheName = igfsCtx.configuration().getDataCacheName();
+ String dataCacheName = igfsCtx.configuration().getDataCacheConfiguration().getName();
for (CacheConfiguration cacheCfg : igfsCtx.kernalContext().config().getCacheConfiguration()) {
if (F.eq(dataCacheName, cacheCfg.getName())) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
index 95d73a8..35d0776 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
@@ -155,6 +155,9 @@ public class IgfsMetaManager extends IgfsManager {
/** Compute facade for client tasks. */
private IgniteCompute cliCompute;
+ /** Compute facade for client tasks. */
+ private String metaCacheName;
+
/**
* Constructor.
*
@@ -189,16 +192,18 @@ public class IgfsMetaManager extends IgfsManager {
sampling = new IgfsSamplingKey(cfg.getName());
log = igfsCtx.kernalContext().log(IgfsMetaManager.class);
+
+ metaCacheName = cfg.getMetaCacheConfiguration().getName();
}
/** {@inheritDoc} */
@SuppressWarnings("RedundantCast")
@Override protected void onKernalStart0() throws IgniteCheckedException {
- metaCache = igfsCtx.kernalContext().cache().getOrStartCache(cfg.getMetaCacheName());
+ metaCache = igfsCtx.kernalContext().cache().getOrStartCache(metaCacheName);
assert metaCache != null;
- igfsCtx.kernalContext().cache().internalCache(cfg.getMetaCacheName()).preloader().startFuture()
+ igfsCtx.kernalContext().cache().internalCache(metaCacheName).preloader().startFuture()
.listen(new CI1<IgniteInternalFuture<Object>>() {
@Override public void apply(IgniteInternalFuture<Object> f) {
metaCacheStartLatch.countDown();
@@ -267,7 +272,7 @@ public class IgfsMetaManager extends IgfsManager {
<T> T runClientTask(IgniteUuid affinityFileId, IgfsClientAbstractCallable<T> task) {
try {
return (cfg.isColocateMetadata()) ?
- clientCompute().affinityCall(cfg.getMetaCacheName(), affinityFileId, task) :
+ clientCompute().affinityCall(metaCacheName, affinityFileId, task) :
clientCompute().call(task);
}
catch (ClusterTopologyException e) {
@@ -288,7 +293,7 @@ public class IgfsMetaManager extends IgfsManager {
if (cliCompute0 == null) {
IgniteEx ignite = igfsCtx.kernalContext().grid();
- ClusterGroup cluster = ignite.cluster().forIgfsMetadataDataNodes(cfg.getName(), cfg.getMetaCacheName());
+ ClusterGroup cluster = ignite.cluster().forIgfsMetadataDataNodes(cfg.getName(), metaCacheName);
cliCompute0 = ignite.compute(cluster);
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java
index 57bf70f..405016c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java
@@ -26,14 +26,11 @@ import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.FileSystemConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper;
-import org.apache.ignite.igfs.IgfsIpcEndpointConfiguration;
-import org.apache.ignite.igfs.IgfsMode;
import org.apache.ignite.igfs.IgfsPath;
import org.apache.ignite.igfs.mapreduce.IgfsJob;
import org.apache.ignite.igfs.mapreduce.IgfsRecordResolver;
import org.apache.ignite.internal.GridKernalContext;
import org.apache.ignite.internal.IgniteNodeAttributes;
-import org.apache.ignite.internal.processors.query.GridQueryProcessor;
import org.apache.ignite.internal.util.ipc.IpcServerEndpoint;
import org.apache.ignite.internal.util.typedef.C1;
import org.apache.ignite.internal.util.typedef.F;
@@ -46,7 +43,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.List;
import java.util.ListIterator;
import java.util.Map;
@@ -55,8 +51,6 @@ import java.util.concurrent.ConcurrentMap;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_SKIP_CONFIGURATION_CONSISTENCY_CHECK;
import static org.apache.ignite.IgniteSystemProperties.getBoolean;
-import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.igfs.IgfsMode.PROXY;
import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_IGFS;
/**
@@ -66,12 +60,6 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
/** Null IGFS name. */
private static final String NULL_NAME = UUID.randomUUID().toString();
- /** Min available TCP port. */
- private static final int MIN_TCP_PORT = 1;
-
- /** Max available TCP port. */
- private static final int MAX_TCP_PORT = 0xFFFF;
-
/** Converts context to IGFS. */
private static final IgniteClosure<IgfsContext,IgniteFileSystem> CTX_TO_IGFS = new C1<IgfsContext, IgniteFileSystem>() {
@Override public IgniteFileSystem apply(IgfsContext igfsCtx) {
@@ -101,8 +89,6 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
assert cfgs != null && cfgs.length > 0;
- validateLocalIgfsConfigurations(cfgs);
-
// Start IGFS instances.
for (FileSystemConfiguration cfg : cfgs) {
FileSystemConfiguration cfg0 = new FileSystemConfiguration(cfg);
@@ -111,9 +97,11 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
CacheConfiguration[] cacheCfgs = igniteCfg.getCacheConfiguration();
+ String metaCacheName = cfg.getMetaCacheConfiguration().getName();
+
if (cacheCfgs != null) {
for (CacheConfiguration cacheCfg : cacheCfgs) {
- if (F.eq(cacheCfg.getName(), cfg.getMetaCacheName())) {
+ if (F.eq(cacheCfg.getName(), metaCacheName)) {
metaClient = false;
break;
@@ -162,7 +150,9 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
assert igniteCfg.getFileSystemConfiguration() != null;
for (FileSystemConfiguration igfsCfg : igniteCfg.getFileSystemConfiguration()) {
- CacheConfiguration cacheCfg = cacheCfgs.get(igfsCfg.getDataCacheName());
+ String dataCacheName = igfsCfg.getDataCacheConfiguration().getName();
+
+ CacheConfiguration cacheCfg = cacheCfgs.get(dataCacheName);
if (cacheCfg == null)
continue; // No cache for the given IGFS configuration.
@@ -178,8 +168,8 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
igfsCfg.getName(),
igfsCfg.getBlockSize(),
((IgfsGroupDataBlocksKeyMapper)affMapper).getGroupSize(),
- igfsCfg.getMetaCacheName(),
- igfsCfg.getDataCacheName(),
+ igfsCfg.getMetaCacheConfiguration().getName(),
+ dataCacheName,
igfsCfg.getDefaultMode(),
igfsCfg.getPathModes(),
igfsCfg.isFragmentizerEnabled()));
@@ -288,110 +278,6 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
}
/**
- * Validates local IGFS configurations. Compares attributes only for IGFSes with same name.
- * @param cfgs IGFS configurations
- * @throws IgniteCheckedException If any of IGFS configurations is invalid.
- */
- private void validateLocalIgfsConfigurations(FileSystemConfiguration[] cfgs) throws IgniteCheckedException {
- Collection<String> cfgNames = new HashSet<>();
-
- Collection<String> dataCacheNames = new HashSet<>();
- Collection<String> metaCacheNames = new HashSet<>();
-
- for (FileSystemConfiguration cfg : cfgs) {
- String name = cfg.getName();
-
- if (cfgNames.contains(name))
- throw new IgniteCheckedException("Duplicate IGFS name found (check configuration and " +
- "assign unique name to each): " + name);
-
- CacheConfiguration dataCacheCfg = config(cfg.getDataCacheName());
- CacheConfiguration metaCacheCfg = config(cfg.getMetaCacheName());
-
- if (dataCacheCfg == null)
- throw new IgniteCheckedException("Data cache is not configured locally for IGFS: " + cfg);
-
- if (GridQueryProcessor.isEnabled(dataCacheCfg))
- throw new IgniteCheckedException("IGFS data cache cannot start with enabled query indexing.");
-
- if (dataCacheCfg.getAtomicityMode() != TRANSACTIONAL && cfg.isFragmentizerEnabled())
- throw new IgniteCheckedException("Data cache should be transactional: " + cfg.getDataCacheName() +
- " when fragmentizer is enabled");
-
- if (metaCacheCfg == null)
- throw new IgniteCheckedException("Metadata cache is not configured locally for IGFS: " + cfg);
-
- if (GridQueryProcessor.isEnabled(metaCacheCfg))
- throw new IgniteCheckedException("IGFS metadata cache cannot start with enabled query indexing.");
-
- if (metaCacheCfg.getAtomicityMode() != TRANSACTIONAL)
- throw new IgniteCheckedException("Meta cache should be transactional: " + cfg.getMetaCacheName());
-
- if (F.eq(cfg.getDataCacheName(), cfg.getMetaCacheName()))
- throw new IgniteCheckedException("Cannot use same cache as both data and meta cache: " + cfg.getName());
-
- if (dataCacheNames.contains(cfg.getDataCacheName()))
- throw new IgniteCheckedException("Data cache names should be different for different IGFS instances: "
- + cfg.getName());
-
- if (metaCacheNames.contains(cfg.getMetaCacheName()))
- throw new IgniteCheckedException("Meta cache names should be different for different IGFS instances: "
- + cfg.getName());
-
- if (!(dataCacheCfg.getAffinityMapper() instanceof IgfsGroupDataBlocksKeyMapper))
- throw new IgniteCheckedException("Invalid IGFS data cache configuration (key affinity mapper class should be " +
- IgfsGroupDataBlocksKeyMapper.class.getSimpleName() + "): " + cfg);
-
- IgfsIpcEndpointConfiguration ipcCfg = cfg.getIpcEndpointConfiguration();
-
- if (ipcCfg != null) {
- final int tcpPort = ipcCfg.getPort();
-
- if (!(tcpPort >= MIN_TCP_PORT && tcpPort <= MAX_TCP_PORT))
- throw new IgniteCheckedException("IGFS endpoint TCP port is out of range [" + MIN_TCP_PORT +
- ".." + MAX_TCP_PORT + "]: " + tcpPort);
-
- if (ipcCfg.getThreadCount() <= 0)
- throw new IgniteCheckedException("IGFS endpoint thread count must be positive: " +
- ipcCfg.getThreadCount());
- }
-
- boolean secondary = cfg.getDefaultMode() == PROXY;
-
- if (cfg.getPathModes() != null) {
- for (Map.Entry<String, IgfsMode> mode : cfg.getPathModes().entrySet()) {
- if (mode.getValue() == PROXY)
- secondary = true;
- }
- }
-
- if (secondary) {
- // When working in any mode except of primary, secondary FS config must be provided.
- assertParameter(cfg.getSecondaryFileSystem() != null,
- "secondaryFileSystem cannot be null when mode is not " + IgfsMode.PRIMARY);
- }
-
- dataCacheNames.add(cfg.getDataCacheName());
- metaCacheNames.add(cfg.getMetaCacheName());
-
- cfgNames.add(name);
- }
- }
-
- /**
- * @param cacheName Cache name.
- * @return Configuration.
- */
- private CacheConfiguration config(String cacheName) {
- for (CacheConfiguration ccfg : ctx.config().getCacheConfiguration()) {
- if (F.eq(cacheName, ccfg.getName()))
- return ccfg;
- }
-
- return null;
- }
-
- /**
* Check IGFS config on remote node.
*
* @param rmtNode Remote node.
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsUtils.java
index 6763d2a..ec12884 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsUtils.java
@@ -17,11 +17,16 @@
package org.apache.ignite.internal.processors.igfs;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteSystemProperties;
import org.apache.ignite.binary.BinaryRawReader;
import org.apache.ignite.binary.BinaryRawWriter;
+import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
+import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.cluster.ClusterTopologyException;
@@ -31,6 +36,7 @@ import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.events.IgfsEvent;
import org.apache.ignite.igfs.IgfsException;
import org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper;
+import org.apache.ignite.igfs.IgfsIpcEndpointConfiguration;
import org.apache.ignite.igfs.IgfsMode;
import org.apache.ignite.igfs.IgfsPath;
import org.apache.ignite.internal.GridKernalContext;
@@ -38,6 +44,7 @@ import org.apache.ignite.internal.binary.BinaryUtils;
import org.apache.ignite.internal.cluster.ClusterTopologyServerNotFoundException;
import org.apache.ignite.internal.managers.eventstorage.GridEventStorageManager;
import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
+import org.apache.ignite.internal.processors.query.GridQueryProcessor;
import org.apache.ignite.internal.util.IgniteUtils;
import org.apache.ignite.internal.util.future.IgniteFutureImpl;
import org.apache.ignite.internal.util.lang.IgniteOutClosureX;
@@ -65,6 +72,8 @@ import java.util.UUID;
import java.util.concurrent.ThreadLocalRandom;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_CACHE_RETRIES_COUNT;
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
import static org.apache.ignite.igfs.IgfsMode.DUAL_ASYNC;
import static org.apache.ignite.igfs.IgfsMode.DUAL_SYNC;
import static org.apache.ignite.igfs.IgfsMode.PRIMARY;
@@ -127,9 +136,27 @@ public class IgfsUtils {
/** Flag: this is a file. */
private static final byte FLAG_FILE = 0x2;
+ /** Filesystem cache prefix. */
+ public static final String IGFS_CACHE_PREFIX = "igfs-internal-";
+
+ /** Data cache suffix. */
+ public static final String DATA_CACHE_SUFFIX = "-data";
+
+ /** Meta cache suffix. */
+ public static final String META_CACHE_SUFFIX = "-meta";
+
/** Maximum string length to be written at once. */
private static final int MAX_STR_LEN = 0xFFFF / 4;
+ /** Min available TCP port. */
+ private static final int MIN_TCP_PORT = 1;
+
+ /** Max available TCP port. */
+ private static final int MAX_TCP_PORT = 0xFFFF;
+
+ /*
+ * Static initializer.
+ */
static {
TRASH_IDS = new IgniteUuid[TRASH_CONCURRENCY];
@@ -311,6 +338,7 @@ public class IgfsUtils {
/**
* Sends a series of event.
*
+ * @param kernalCtx Kernal context.
* @param path The path of the created file.
* @param type The type of event to send.
*/
@@ -321,6 +349,7 @@ public class IgfsUtils {
/**
* Sends a series of event.
*
+ * @param kernalCtx Kernal context.
* @param path The path of the created file.
* @param newPath New path.
* @param type The type of event to send.
@@ -342,70 +371,189 @@ public class IgfsUtils {
}
/**
+ * @param cacheName Cache name.
+ * @return {@code True} in this is IGFS data or meta cache.
+ */
+ public static boolean matchIgfsCacheName(@Nullable String cacheName) {
+ return cacheName != null && cacheName.startsWith(IGFS_CACHE_PREFIX);
+ }
+
+ /**
* @param cfg Grid configuration.
* @param cacheName Cache name.
* @return {@code True} in this is IGFS data or meta cache.
*/
public static boolean isIgfsCache(IgniteConfiguration cfg, @Nullable String cacheName) {
+ return matchIgfsCacheName(cacheName);
+ }
+
+ /**
+ * Prepare cache configuration if this is IGFS meta or data cache.
+ *
+ * @param cfg Configuration.
+ * @throws IgniteCheckedException If failed.
+ */
+ public static void prepareCacheConfigurations(IgniteConfiguration cfg) throws IgniteCheckedException {
FileSystemConfiguration[] igfsCfgs = cfg.getFileSystemConfiguration();
+ List<CacheConfiguration> ccfgs = new ArrayList<>(Arrays.asList(cfg.getCacheConfiguration()));
if (igfsCfgs != null) {
for (FileSystemConfiguration igfsCfg : igfsCfgs) {
- // IGFS config probably has not been validated yet => possible NPE, so we check for null.
- if (igfsCfg != null) {
- if (F.eq(cacheName, igfsCfg.getDataCacheName()) || F.eq(cacheName, igfsCfg.getMetaCacheName()))
- return true;
+ if (igfsCfg == null)
+ continue;
+
+ CacheConfiguration ccfgMeta = igfsCfg.getMetaCacheConfiguration();
+
+ if (ccfgMeta == null) {
+ ccfgMeta = defaultMetaCacheConfig();
+
+ igfsCfg.setMetaCacheConfiguration(ccfgMeta);
+ }
+
+ ccfgMeta.setName(IGFS_CACHE_PREFIX + igfsCfg.getName() + META_CACHE_SUFFIX);
+
+ ccfgs.add(ccfgMeta);
+
+ CacheConfiguration ccfgData = igfsCfg.getDataCacheConfiguration();
+
+ if (ccfgData == null) {
+ ccfgData = defaultDataCacheConfig();
+
+ igfsCfg.setDataCacheConfiguration(ccfgData);
}
+
+ ccfgData.setName(IGFS_CACHE_PREFIX + igfsCfg.getName() + DATA_CACHE_SUFFIX);
+
+ ccfgs.add(ccfgData);
+
+
+ // No copy-on-read.
+ ccfgMeta.setCopyOnRead(false);
+ ccfgData.setCopyOnRead(false);
+
+ // Always full-sync to maintain consistency.
+ ccfgMeta.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
+ ccfgData.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
+
+ // Set co-located affinity mapper if needed.
+ if (igfsCfg.isColocateMetadata() && ccfgMeta.getAffinityMapper() == null)
+ ccfgMeta.setAffinityMapper(new IgfsColocatedMetadataAffinityKeyMapper());
+
+ // Set affinity mapper if needed.
+ if (ccfgData.getAffinityMapper() == null)
+ ccfgData.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper());
}
+
+ cfg.setCacheConfiguration(ccfgs.toArray(new CacheConfiguration[ccfgs.size()]));
}
- return false;
+ validateLocalIgfsConfigurations(cfg);
}
/**
- * Prepare cache configuration if this is IGFS meta or data cache.
+ * Validates local IGFS configurations. Compares attributes only for IGFSes with same name.
*
- * @param cfg Configuration.
- * @param ccfg Cache configuration.
+ * @param igniteCfg Ignite config.
+ * @throws IgniteCheckedException If any of IGFS configurations is invalid.
*/
- public static void prepareCacheConfiguration(IgniteConfiguration cfg, CacheConfiguration ccfg) {
- FileSystemConfiguration[] igfsCfgs = cfg.getFileSystemConfiguration();
+ private static void validateLocalIgfsConfigurations(IgniteConfiguration igniteCfg)
+ throws IgniteCheckedException {
- if (igfsCfgs != null) {
- for (FileSystemConfiguration igfsCfg : igfsCfgs) {
- if (igfsCfg != null) {
- if (F.eq(ccfg.getName(), igfsCfg.getMetaCacheName())) {
- // No copy-on-read.
- ccfg.setCopyOnRead(false);
+ if (igniteCfg.getFileSystemConfiguration() == null || igniteCfg.getFileSystemConfiguration().length == 0)
+ return;
+
+ Collection<String> cfgNames = new HashSet<>();
- // Always full-sync to maintain consistency.
- ccfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
+ for (FileSystemConfiguration cfg : igniteCfg.getFileSystemConfiguration()) {
+ String name = cfg.getName();
- // Set co-located affinity mapper if needed.
- if (igfsCfg.isColocateMetadata() && ccfg.getAffinityMapper() == null)
- ccfg.setAffinityMapper(new IgfsColocatedMetadataAffinityKeyMapper());
+ if (cfgNames.contains(name))
+ throw new IgniteCheckedException("Duplicate IGFS name found (check configuration and " +
+ "assign unique name to each): " + name);
- return;
- }
+ CacheConfiguration ccfgData = cfg.getDataCacheConfiguration();
- if (F.eq(ccfg.getName(), igfsCfg.getDataCacheName())) {
- // No copy-on-read.
- ccfg.setCopyOnRead(false);
+ CacheConfiguration ccfgMeta = cfg.getMetaCacheConfiguration();
- // Always full-sync to maintain consistency.
- ccfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
+ if (GridQueryProcessor.isEnabled(ccfgData))
+ throw new IgniteCheckedException("IGFS data cache cannot start with enabled query indexing.");
- // Set affinity mapper if needed.
- if (ccfg.getAffinityMapper() == null)
- ccfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper());
+ if (GridQueryProcessor.isEnabled(ccfgMeta))
+ throw new IgniteCheckedException("IGFS metadata cache cannot start with enabled query indexing.");
- return;
- }
+ if (ccfgMeta.getAtomicityMode() != TRANSACTIONAL)
+ throw new IgniteCheckedException("IGFS metadata cache should be transactional: " + cfg.getName());
+
+ if (!(ccfgData.getAffinityMapper() instanceof IgfsGroupDataBlocksKeyMapper))
+ throw new IgniteCheckedException(
+ "Invalid IGFS data cache configuration (key affinity mapper class should be " +
+ IgfsGroupDataBlocksKeyMapper.class.getSimpleName() + "): " + cfg);
+
+ IgfsIpcEndpointConfiguration ipcCfg = cfg.getIpcEndpointConfiguration();
+
+ if (ipcCfg != null) {
+ final int tcpPort = ipcCfg.getPort();
+
+ if (!(tcpPort >= MIN_TCP_PORT && tcpPort <= MAX_TCP_PORT))
+ throw new IgniteCheckedException("IGFS endpoint TCP port is out of range [" + MIN_TCP_PORT +
+ ".." + MAX_TCP_PORT + "]: " + tcpPort);
+
+ if (ipcCfg.getThreadCount() <= 0)
+ throw new IgniteCheckedException("IGFS endpoint thread count must be positive: " +
+ ipcCfg.getThreadCount());
+ }
+
+ boolean secondary = cfg.getDefaultMode() == IgfsMode.PROXY;
+
+ if (cfg.getPathModes() != null) {
+ for (Map.Entry<String, IgfsMode> mode : cfg.getPathModes().entrySet()) {
+ if (mode.getValue() == IgfsMode.PROXY)
+ secondary = true;
}
}
+
+ if (secondary && cfg.getSecondaryFileSystem() == null) {
+ // When working in any mode except of primary, secondary FS config must be provided.
+ throw new IgniteCheckedException("Grid configuration parameter invalid: " +
+ "secondaryFileSystem cannot be null when mode is not " + IgfsMode.PRIMARY);
+ }
+
+ cfgNames.add(name);
}
}
+
+ /**
+ * @return Default IGFS cache configuration.
+ */
+ private static CacheConfiguration defaultCacheConfig() {
+ CacheConfiguration cfg = new CacheConfiguration();
+ cfg.setAtomicWriteOrderMode(CacheAtomicWriteOrderMode.PRIMARY);
+ cfg.setAtomicityMode(TRANSACTIONAL);
+ cfg.setWriteSynchronizationMode(FULL_SYNC);
+ cfg.setCacheMode(CacheMode.PARTITIONED);
+
+ return cfg;
+ }
+
+ /**
+ * @return Default IGFS meta cache configuration.
+ */
+ private static CacheConfiguration defaultMetaCacheConfig() {
+ CacheConfiguration cfg = defaultCacheConfig();
+
+ cfg.setBackups(1);
+
+ return cfg;
+ }
+
+ /**
+ * @return Default IGFS data cache configuration.
+ */
+ private static CacheConfiguration defaultDataCacheConfig() {
+ return defaultCacheConfig();
+ }
+
/**
* Create empty directory with the given ID.
*
@@ -532,6 +680,7 @@ public class IgfsUtils {
*
* @param in Reader.
* @return Entry.
+ * @throws IOException If failed.
*/
@Nullable public static IgfsListingEntry readListingEntry(DataInput in) throws IOException {
if (in.readBoolean()) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java
index cb10c1c..7f8e3b0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java
@@ -130,8 +130,8 @@ public class VisorIgfsConfiguration implements Serializable, LessNamingBean {
VisorIgfsConfiguration cfg = new VisorIgfsConfiguration();
cfg.name = igfs.getName();
- cfg.metaCacheName = igfs.getMetaCacheName();
- cfg.dataCacheName = igfs.getDataCacheName();
+ cfg.metaCacheName = igfs.getMetaCacheConfiguration().getName();
+ cfg.dataCacheName = igfs.getDataCacheConfiguration().getName();
cfg.blockSize = igfs.getBlockSize();
cfg.prefetchBlocks = igfs.getPrefetchBlocks();
cfg.streamBufSize = igfs.getStreamBufferSize();
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
index abe1364..48487ed 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
@@ -188,7 +188,8 @@ public class VisorNodeDataCollectorJob extends VisorJob<VisorNodeDataCollectorTa
if (proxyCache(cacheName))
continue;
- if (arg.systemCaches() || !(isSystemCache(cacheName) || isIgfsCache(cfg, cacheName))) {
+ if (arg.systemCaches() ||
+ !(isSystemCache(cacheName) || isIgfsCache(ignite.configuration(), cacheName))) {
long start0 = U.currentTimeMillis();
try {
@@ -227,7 +228,8 @@ public class VisorNodeDataCollectorJob extends VisorJob<VisorNodeDataCollectorTa
FileSystemConfiguration igfsCfg = igfs.configuration();
- if (proxyCache(igfsCfg.getDataCacheName()) || proxyCache(igfsCfg.getMetaCacheName()))
+ if (proxyCache(igfsCfg.getDataCacheConfiguration().getName())
+ || proxyCache(igfsCfg.getMetaCacheConfiguration().getName()))
continue;
try {
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/test/config/igfs-loopback.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/igfs-loopback.xml b/modules/core/src/test/config/igfs-loopback.xml
index dbbfb4e..5bfbdae 100644
--- a/modules/core/src/test/config/igfs-loopback.xml
+++ b/modules/core/src/test/config/igfs-loopback.xml
@@ -75,8 +75,6 @@
<list>
<bean class="org.apache.ignite.configuration.FileSystemConfiguration">
<property name="name" value="igfs"/>
- <property name="metaCacheName" value="igfs-meta"/>
- <property name="dataCacheName" value="igfs-data"/>
<!-- Must correlate with cache affinity mapper. -->
<property name="blockSize" value="#{128 * 1024}"/>
@@ -97,31 +95,6 @@
</list>
</property>
- <property name="cacheConfiguration">
- <list>
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="igfs-data"/>
- <property name="cacheMode" value="PARTITIONED"/>
- <property name="atomicityMode" value="TRANSACTIONAL"/>
- <property name="writeSynchronizationMode" value="FULL_SYNC"/>
- <property name="backups" value="0"/>
- <property name="affinityMapper">
- <bean class="org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper">
- <!-- Haw many blocks in row will be stored on the same node. -->
- <constructor-arg value="512"/>
- </bean>
- </property>
- </bean>
-
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="igfs-meta"/>
- <property name="cacheMode" value="REPLICATED"/>
- <property name="atomicityMode" value="TRANSACTIONAL"/>
- <property name="writeSynchronizationMode" value="FULL_SYNC"/>
- </bean>
- </list>
- </property>
-
<!--
Disable events.
-->
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/test/config/igfs-shmem.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/igfs-shmem.xml b/modules/core/src/test/config/igfs-shmem.xml
index c4c8704..5876b41 100644
--- a/modules/core/src/test/config/igfs-shmem.xml
+++ b/modules/core/src/test/config/igfs-shmem.xml
@@ -75,8 +75,6 @@
<list>
<bean class="org.apache.ignite.configuration.FileSystemConfiguration">
<property name="name" value="igfs"/>
- <property name="metaCacheName" value="igfs-meta"/>
- <property name="dataCacheName" value="igfs-data"/>
<!-- Must correlate with cache affinity mapper. -->
<property name="blockSize" value="#{128 * 1024}"/>
@@ -97,31 +95,6 @@
</list>
</property>
- <property name="cacheConfiguration">
- <list>
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="igfs-data"/>
- <property name="cacheMode" value="PARTITIONED"/>
- <property name="atomicityMode" value="TRANSACTIONAL"/>
- <property name="writeSynchronizationMode" value="FULL_SYNC"/>
- <property name="backups" value="0"/>
- <property name="affinityMapper">
- <bean class="org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper">
- <!-- Haw many blocks in row will be stored on the same node. -->
- <constructor-arg value="512"/>
- </bean>
- </property>
- </bean>
-
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="igfs-meta"/>
- <property name="cacheMode" value="REPLICATED"/>
- <property name="atomicityMode" value="TRANSACTIONAL"/>
- <property name="writeSynchronizationMode" value="FULL_SYNC"/>
- </bean>
- </list>
- </property>
-
<!--
Disable events.
-->
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java
index 9c2c6e5..ea2be11 100644
--- a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java
@@ -71,46 +71,33 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest
private IgnitePredicate<Event> lsnr;
/**
- * Gets cache configuration.
- *
- * @param gridName Grid name.
- * @return Cache configuration.
+ * @return IGFS configuration for this test.
*/
- @SuppressWarnings("deprecation")
- protected CacheConfiguration[] getCacheConfiguration(String gridName) {
- CacheConfiguration cacheCfg = defaultCacheConfiguration();
-
- cacheCfg.setName("dataCache");
- cacheCfg.setCacheMode(PARTITIONED);
- cacheCfg.setNearConfiguration(null);
- cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
- cacheCfg.setEvictionPolicy(null);
- cacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(128));
- cacheCfg.setBackups(0);
- cacheCfg.setAtomicityMode(TRANSACTIONAL);
+ protected FileSystemConfiguration getIgfsConfiguration() throws IgniteCheckedException {
+ FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
+
+ igfsCfg.setName("igfs");
+ igfsCfg.setBlockSize(512 * 1024); // Together with group blocks mapper will yield 64M per node groups.
+
+ CacheConfiguration dataCacheCfg = defaultCacheConfiguration();
+
+ dataCacheCfg.setCacheMode(PARTITIONED);
+ dataCacheCfg.setNearConfiguration(null);
+ dataCacheCfg.setWriteSynchronizationMode(FULL_SYNC);
+ dataCacheCfg.setEvictionPolicy(null);
+ dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(128));
+ dataCacheCfg.setBackups(0);
+ dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
- metaCacheCfg.setName("metaCache");
metaCacheCfg.setCacheMode(REPLICATED);
metaCacheCfg.setWriteSynchronizationMode(FULL_SYNC);
metaCacheCfg.setEvictionPolicy(null);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
- return new CacheConfiguration[] {cacheCfg, metaCacheCfg};
- }
-
- /**
- * @return IGFS configuration for this test.
- */
- protected FileSystemConfiguration getIgfsConfiguration() throws IgniteCheckedException {
- FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
-
- igfsCfg.setDataCacheName("dataCache");
- igfsCfg.setMetaCacheName("metaCache");
- igfsCfg.setName("igfs");
-
- igfsCfg.setBlockSize(512 * 1024); // Together with group blocks mapper will yield 64M per node groups.
+ igfsCfg.setMetaCacheConfiguration(metaCacheCfg);
+ igfsCfg.setDataCacheConfiguration(dataCacheCfg);
return igfsCfg;
}
@@ -139,8 +126,6 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest
cfg.setFileSystemConfiguration(igfsCfg);
- cfg.setCacheConfiguration(getCacheConfiguration(gridName));
-
cfg.setHadoopConfiguration(null);
TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java
index d52a918..6536267 100644
--- a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java
@@ -51,12 +51,6 @@ public class IgfsFragmentizerAbstractSelfTest extends IgfsCommonAbstractTest {
/** IGFS group size. */
protected static final int IGFS_GROUP_SIZE = 32;
- /** Metadata cache name. */
- private static final String META_CACHE_NAME = "meta";
-
- /** File data cache name. */
- protected static final String DATA_CACHE_NAME = "data";
-
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
@@ -67,13 +61,9 @@ public class IgfsFragmentizerAbstractSelfTest extends IgfsCommonAbstractTest {
cfg.setDiscoverySpi(discoSpi);
- cfg.setCacheConfiguration(metaConfiguration(), dataConfiguration());
-
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
igfsCfg.setName("igfs");
- igfsCfg.setMetaCacheName(META_CACHE_NAME);
- igfsCfg.setDataCacheName(DATA_CACHE_NAME);
igfsCfg.setBlockSize(IGFS_BLOCK_SIZE);
// Need to set this to avoid thread starvation.
@@ -82,6 +72,9 @@ public class IgfsFragmentizerAbstractSelfTest extends IgfsCommonAbstractTest {
igfsCfg.setFragmentizerThrottlingBlockLength(16 * IGFS_BLOCK_SIZE);
igfsCfg.setFragmentizerThrottlingDelay(10);
+ igfsCfg.setMetaCacheConfiguration(metaConfiguration());
+ igfsCfg.setDataCacheConfiguration(dataConfiguration());
+
cfg.setFileSystemConfiguration(igfsCfg);
return cfg;
@@ -95,8 +88,6 @@ public class IgfsFragmentizerAbstractSelfTest extends IgfsCommonAbstractTest {
protected CacheConfiguration metaConfiguration() {
CacheConfiguration cfg = defaultCacheConfiguration();
- cfg.setName(META_CACHE_NAME);
-
cfg.setCacheMode(REPLICATED);
cfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
cfg.setAtomicityMode(TRANSACTIONAL);
@@ -112,8 +103,6 @@ public class IgfsFragmentizerAbstractSelfTest extends IgfsCommonAbstractTest {
protected CacheConfiguration dataConfiguration() {
CacheConfiguration cfg = defaultCacheConfiguration();
- cfg.setName(DATA_CACHE_NAME);
-
cfg.setCacheMode(PARTITIONED);
cfg.setBackups(0);
cfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(IGFS_GROUP_SIZE));
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerSelfTest.java
index 4e0f12b..5149493 100644
--- a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerSelfTest.java
@@ -244,7 +244,8 @@ public class IgfsFragmentizerSelfTest extends IgfsFragmentizerAbstractSelfTest {
for (int i = 0; i < NODE_CNT; i++) {
IgniteEx g = grid(i);
- GridCacheAdapter<Object, Object> cache = ((IgniteKernal)g).internalCache(DATA_CACHE_NAME);
+ GridCacheAdapter<Object, Object> cache = ((IgniteKernal)g).internalCache(
+ g.igfsx("igfs").configuration().getDataCacheConfiguration().getName());
assertTrue("Data cache is not empty [keys=" + cache.keySet() +
", node=" + g.localNode().id() + ']', cache.isEmpty());
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractBaseSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractBaseSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractBaseSelfTest.java
index 374d3d3..90ac4b1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractBaseSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractBaseSelfTest.java
@@ -375,8 +375,6 @@ public abstract class IgfsAbstractBaseSelfTest extends IgfsCommonAbstractTest {
TcpDiscoveryIpFinder ipFinder) throws Exception {
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
- igfsCfg.setDataCacheName("dataCache");
- igfsCfg.setMetaCacheName("metaCache");
igfsCfg.setName(igfsName);
igfsCfg.setBlockSize(IGFS_BLOCK_SIZE);
igfsCfg.setDefaultMode(mode);
@@ -391,7 +389,6 @@ public abstract class IgfsAbstractBaseSelfTest extends IgfsCommonAbstractTest {
CacheConfiguration dataCacheCfg = defaultCacheConfiguration();
- dataCacheCfg.setName("dataCache");
dataCacheCfg.setNearConfiguration(null);
dataCacheCfg.setCacheMode(PARTITIONED);
dataCacheCfg.setNearConfiguration(null);
@@ -404,12 +401,16 @@ public abstract class IgfsAbstractBaseSelfTest extends IgfsCommonAbstractTest {
CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
- metaCacheCfg.setName("metaCache");
metaCacheCfg.setNearConfiguration(null);
metaCacheCfg.setCacheMode(REPLICATED);
metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
+ prepareCacheConfigurations(dataCacheCfg, metaCacheCfg);
+
+ igfsCfg.setDataCacheConfiguration(dataCacheCfg);
+ igfsCfg.setMetaCacheConfiguration(metaCacheCfg);
+
IgniteConfiguration cfg = new IgniteConfiguration();
if (useOptimizedMarshaller())
@@ -421,10 +422,7 @@ public abstract class IgfsAbstractBaseSelfTest extends IgfsCommonAbstractTest {
discoSpi.setIpFinder(ipFinder);
- prepareCacheConfigurations(dataCacheCfg, metaCacheCfg);
-
cfg.setDiscoverySpi(discoSpi);
- cfg.setCacheConfiguration(dataCacheCfg, metaCacheCfg);
cfg.setFileSystemConfiguration(igfsCfg);
cfg.setLocalHost("127.0.0.1");
@@ -545,6 +543,7 @@ public abstract class IgfsAbstractBaseSelfTest extends IgfsCommonAbstractTest {
/**
* Create the file in the given IGFS and write provided data chunks to it.
*
+ * @param uni FS tests adaptor.
* @param file File.
* @param chunks Data chunks.
* @throws IOException In case of IO exception.
@@ -942,7 +941,7 @@ public abstract class IgfsAbstractBaseSelfTest extends IgfsCommonAbstractTest {
* @return The data cache.
*/
protected static GridCacheAdapter<IgfsBlockKey, byte[]> getDataCache(IgniteFileSystem igfs) {
- String dataCacheName = igfs.configuration().getDataCacheName();
+ String dataCacheName = igfs.configuration().getDataCacheConfiguration().getName();
IgniteEx igniteEx = ((IgfsEx)igfs).context().kernalContext().grid();
@@ -956,7 +955,7 @@ public abstract class IgfsAbstractBaseSelfTest extends IgfsCommonAbstractTest {
* @return The data cache.
*/
protected static GridCacheAdapter<IgniteUuid, IgfsEntryInfo> getMetaCache(IgniteFileSystem igfs) {
- String dataCacheName = igfs.configuration().getMetaCacheName();
+ String dataCacheName = igfs.configuration().getMetaCacheConfiguration().getName();
IgniteEx igniteEx = ((IgfsEx)igfs).context().kernalContext().grid();
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsBackupFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsBackupFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsBackupFailoverSelfTest.java
index 187aeeb..51b9ace 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsBackupFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsBackupFailoverSelfTest.java
@@ -133,8 +133,6 @@ public class IgfsBackupFailoverSelfTest extends IgfsCommonAbstractTest {
throws Exception {
final FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
- igfsCfg.setDataCacheName("dataCache");
- igfsCfg.setMetaCacheName("metaCache");
igfsCfg.setName("igfs");
igfsCfg.setBlockSize(igfsBlockSize);
igfsCfg.setDefaultMode(mode);
@@ -142,7 +140,6 @@ public class IgfsBackupFailoverSelfTest extends IgfsCommonAbstractTest {
CacheConfiguration<?,?> dataCacheCfg = defaultCacheConfiguration();
- dataCacheCfg.setName("dataCache");
dataCacheCfg.setCacheMode(PARTITIONED);
dataCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(affGrpSize));
@@ -151,11 +148,13 @@ public class IgfsBackupFailoverSelfTest extends IgfsCommonAbstractTest {
CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
- metaCacheCfg.setName("metaCache");
metaCacheCfg.setCacheMode(REPLICATED);
metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
+ igfsCfg.setMetaCacheConfiguration(metaCacheCfg);
+ igfsCfg.setDataCacheConfiguration(dataCacheCfg);
+
IgniteConfiguration cfg = new IgniteConfiguration();
cfg.setGridName(gridName);
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsBlockMessageSystemPoolStarvationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsBlockMessageSystemPoolStarvationSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsBlockMessageSystemPoolStarvationSelfTest.java
index 57c709b..fba78c8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsBlockMessageSystemPoolStarvationSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsBlockMessageSystemPoolStarvationSelfTest.java
@@ -57,12 +57,6 @@ public class IgfsBlockMessageSystemPoolStarvationSelfTest extends IgfsCommonAbst
/** Second node name. */
private static final String NODE_2_NAME = "node2";
- /** Data cache name. */
- private static final String DATA_CACHE_NAME = "data";
-
- /** Meta cache name. */
- private static final String META_CACHE_NAME = "meta";
-
/** Key in data caceh we will use to reproduce the issue. */
private static final Integer DATA_KEY = 1;
@@ -212,13 +206,15 @@ public class IgfsBlockMessageSystemPoolStarvationSelfTest extends IgfsCommonAbst
* @throws Exception If failed.
*/
private GridCacheAdapter dataCache(Ignite node) throws Exception {
- return ((IgniteKernal)node).internalCache(DATA_CACHE_NAME);
+ return ((IgniteKernal)node).internalCache(((IgniteKernal)node).igfsx(null).configuration()
+ .getDataCacheConfiguration().getName());
}
/**
* Create node configuration.
*
* @param name Node name.
+ * @param ipFinder IpFinder.
* @return Configuration.
* @throws Exception If failed.
*/
@@ -226,7 +222,6 @@ public class IgfsBlockMessageSystemPoolStarvationSelfTest extends IgfsCommonAbst
// Data cache configuration.
CacheConfiguration dataCcfg = new CacheConfiguration();
- dataCcfg.setName(DATA_CACHE_NAME);
dataCcfg.setCacheMode(CacheMode.REPLICATED);
dataCcfg.setAtomicityMode(TRANSACTIONAL);
dataCcfg.setWriteSynchronizationMode(FULL_SYNC);
@@ -236,7 +231,6 @@ public class IgfsBlockMessageSystemPoolStarvationSelfTest extends IgfsCommonAbst
// Meta cache configuration.
CacheConfiguration metaCcfg = new CacheConfiguration();
- metaCcfg.setName(META_CACHE_NAME);
metaCcfg.setCacheMode(CacheMode.REPLICATED);
metaCcfg.setAtomicityMode(TRANSACTIONAL);
metaCcfg.setWriteSynchronizationMode(FULL_SYNC);
@@ -245,10 +239,10 @@ public class IgfsBlockMessageSystemPoolStarvationSelfTest extends IgfsCommonAbst
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
igfsCfg.setDefaultMode(IgfsMode.PRIMARY);
- igfsCfg.setDataCacheName(DATA_CACHE_NAME);
- igfsCfg.setMetaCacheName(META_CACHE_NAME);
igfsCfg.setFragmentizerEnabled(false);
igfsCfg.setBlockSize(1024);
+ igfsCfg.setDataCacheConfiguration(dataCcfg);
+ igfsCfg.setMetaCacheConfiguration(metaCcfg);
// Ignite configuration.
IgniteConfiguration cfg = getConfiguration(name);
@@ -258,7 +252,6 @@ public class IgfsBlockMessageSystemPoolStarvationSelfTest extends IgfsCommonAbst
discoSpi.setIpFinder(ipFinder);
cfg.setDiscoverySpi(discoSpi);
- cfg.setCacheConfiguration(dataCcfg, metaCcfg);
cfg.setFileSystemConfiguration(igfsCfg);
cfg.setLocalHost("127.0.0.1");
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCachePerBlockLruEvictionPolicySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCachePerBlockLruEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCachePerBlockLruEvictionPolicySelfTest.java
index 93171ba..1b8ab58 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCachePerBlockLruEvictionPolicySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCachePerBlockLruEvictionPolicySelfTest.java
@@ -98,8 +98,6 @@ public class IgfsCachePerBlockLruEvictionPolicySelfTest extends IgfsCommonAbstra
private void startPrimary() throws Exception {
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
- igfsCfg.setDataCacheName("dataCache");
- igfsCfg.setMetaCacheName("metaCache");
igfsCfg.setName(IGFS_PRIMARY);
igfsCfg.setBlockSize(512);
igfsCfg.setDefaultMode(DUAL_SYNC);
@@ -115,7 +113,6 @@ public class IgfsCachePerBlockLruEvictionPolicySelfTest extends IgfsCommonAbstra
CacheConfiguration dataCacheCfg = defaultCacheConfiguration();
- dataCacheCfg.setName("dataCache");
dataCacheCfg.setCacheMode(PARTITIONED);
dataCacheCfg.setNearConfiguration(null);
dataCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
@@ -129,12 +126,14 @@ public class IgfsCachePerBlockLruEvictionPolicySelfTest extends IgfsCommonAbstra
CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
- metaCacheCfg.setName("metaCache");
metaCacheCfg.setCacheMode(REPLICATED);
metaCacheCfg.setNearConfiguration(null);
metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
+ igfsCfg.setMetaCacheConfiguration(metaCacheCfg);
+ igfsCfg.setDataCacheConfiguration(dataCacheCfg);
+
IgniteConfiguration cfg = new IgniteConfiguration();
cfg.setGridName("grid-primary");
@@ -144,7 +143,6 @@ public class IgfsCachePerBlockLruEvictionPolicySelfTest extends IgfsCommonAbstra
discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true));
cfg.setDiscoverySpi(discoSpi);
- cfg.setCacheConfiguration(dataCacheCfg, metaCacheCfg);
cfg.setFileSystemConfiguration(igfsCfg);
cfg.setLocalHost("127.0.0.1");
@@ -155,7 +153,7 @@ public class IgfsCachePerBlockLruEvictionPolicySelfTest extends IgfsCommonAbstra
igfsPrimary = (IgfsImpl)g.fileSystem(IGFS_PRIMARY);
dataCache = igfsPrimary.context().kernalContext().cache().internalCache(
- igfsPrimary.context().configuration().getDataCacheName());
+ igfsPrimary.context().configuration().getDataCacheConfiguration().getName());
}
/**
@@ -166,8 +164,6 @@ public class IgfsCachePerBlockLruEvictionPolicySelfTest extends IgfsCommonAbstra
private void startSecondary() throws Exception {
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
- igfsCfg.setDataCacheName("dataCache");
- igfsCfg.setMetaCacheName("metaCache");
igfsCfg.setName(IGFS_SECONDARY);
igfsCfg.setBlockSize(512);
igfsCfg.setDefaultMode(PRIMARY);
@@ -175,7 +171,6 @@ public class IgfsCachePerBlockLruEvictionPolicySelfTest extends IgfsCommonAbstra
CacheConfiguration dataCacheCfg = defaultCacheConfiguration();
- dataCacheCfg.setName("dataCache");
dataCacheCfg.setCacheMode(PARTITIONED);
dataCacheCfg.setNearConfiguration(null);
dataCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
@@ -185,12 +180,14 @@ public class IgfsCachePerBlockLruEvictionPolicySelfTest extends IgfsCommonAbstra
CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
- metaCacheCfg.setName("metaCache");
metaCacheCfg.setCacheMode(REPLICATED);
metaCacheCfg.setNearConfiguration(null);
metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
+ igfsCfg.setMetaCacheConfiguration(metaCacheCfg);
+ igfsCfg.setDataCacheConfiguration(dataCacheCfg);
+
IgniteConfiguration cfg = new IgniteConfiguration();
cfg.setGridName("grid-secondary");
@@ -200,7 +197,6 @@ public class IgfsCachePerBlockLruEvictionPolicySelfTest extends IgfsCommonAbstra
discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true));
cfg.setDiscoverySpi(discoSpi);
- cfg.setCacheConfiguration(dataCacheCfg, metaCacheCfg);
cfg.setFileSystemConfiguration(igfsCfg);
cfg.setLocalHost("127.0.0.1");
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java
index 81caa91..090c86a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java
@@ -41,12 +41,6 @@ import static org.apache.ignite.cache.CacheMode.REPLICATED;
* Tests ensuring that IGFS data and meta caches are not "visible" through public API.
*/
public class IgfsCacheSelfTest extends IgfsCommonAbstractTest {
- /** Meta-information cache name. */
- private static final String META_CACHE_NAME = "meta";
-
- /** Data cache name. */
- private static final String DATA_CACHE_NAME = null;
-
/** Regular cache name. */
private static final String CACHE_NAME = "cache";
@@ -54,8 +48,7 @@ public class IgfsCacheSelfTest extends IgfsCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- cfg.setCacheConfiguration(cacheConfiguration(META_CACHE_NAME), cacheConfiguration(DATA_CACHE_NAME),
- cacheConfiguration(CACHE_NAME));
+ cfg.setCacheConfiguration(cacheConfiguration(CACHE_NAME));
TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
@@ -65,9 +58,9 @@ public class IgfsCacheSelfTest extends IgfsCommonAbstractTest {
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
- igfsCfg.setMetaCacheName(META_CACHE_NAME);
- igfsCfg.setDataCacheName(DATA_CACHE_NAME);
igfsCfg.setName("igfs");
+ igfsCfg.setMetaCacheConfiguration(cacheConfiguration("meta"));
+ igfsCfg.setDataCacheConfiguration(cacheConfiguration("data"));
cfg.setFileSystemConfiguration(igfsCfg);
@@ -80,7 +73,7 @@ public class IgfsCacheSelfTest extends IgfsCommonAbstractTest {
cacheCfg.setName(cacheName);
- if (META_CACHE_NAME.equals(cacheName))
+ if ("meta".equals(cacheName))
cacheCfg.setCacheMode(REPLICATED);
else {
cacheCfg.setCacheMode(PARTITIONED);
@@ -128,7 +121,7 @@ public class IgfsCacheSelfTest extends IgfsCommonAbstractTest {
GridTestUtils.assertThrows(log(), new Callable<Object>() {
@Override public Object call() throws Exception {
- g.cache(META_CACHE_NAME);
+ g.cache(((IgniteKernal)g).igfsx("igfs").configuration().getMetaCacheConfiguration().getName());
return null;
}
@@ -136,7 +129,7 @@ public class IgfsCacheSelfTest extends IgfsCommonAbstractTest {
GridTestUtils.assertThrows(log(), new Callable<Object>() {
@Override public Object call() throws Exception {
- g.cache(DATA_CACHE_NAME);
+ g.cache(((IgniteKernal)g).igfsx("igfs").configuration().getDataCacheConfiguration().getName());
return null;
}
[04/50] [abbrv] ignite git commit: IGNITE-4159: Kubernetes IP finder.
Posted by vo...@apache.org.
IGNITE-4159: Kubernetes IP finder.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/37c0a220
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/37c0a220
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/37c0a220
Branch: refs/heads/ignite-4565-ddl
Commit: 37c0a220284527a38b181561865e8a57cfb1549b
Parents: 3ef7a0e
Author: Denis Magda <dm...@gridgain.com>
Authored: Mon Feb 13 17:33:32 2017 -0800
Committer: Denis Magda <dm...@gridgain.com>
Committed: Mon Feb 13 17:33:32 2017 -0800
----------------------------------------------------------------------
modules/kubernetes/DEVNOTES.txt | 63 ++++
modules/kubernetes/README.txt | 33 ++
modules/kubernetes/config/Dockerfile | 45 +++
modules/kubernetes/config/example-kube.xml | 44 +++
.../kubernetes/config/ignite-deployment.yaml | 26 ++
modules/kubernetes/config/ignite-service.yaml | 14 +
modules/kubernetes/config/run.sh | 50 +++
modules/kubernetes/licenses/apache-2.0.txt | 202 ++++++++++++
modules/kubernetes/pom.xml | 93 ++++++
.../TcpDiscoveryKubernetesIpFinder.java | 315 +++++++++++++++++++
.../tcp/ipfinder/kubernetes/package-info.java | 22 ++
.../TcpDiscoveryKubernetesIpFinderSelfTest.java | 93 ++++++
.../tcp/ipfinder/kubernetes/package-info.java | 22 ++
.../testsuites/IgniteKubernetesTestSuite.java | 41 +++
pom.xml | 1 +
15 files changed, 1064 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/37c0a220/modules/kubernetes/DEVNOTES.txt
----------------------------------------------------------------------
diff --git a/modules/kubernetes/DEVNOTES.txt b/modules/kubernetes/DEVNOTES.txt
new file mode 100644
index 0000000..b2a8173
--- /dev/null
+++ b/modules/kubernetes/DEVNOTES.txt
@@ -0,0 +1,63 @@
+Building and testing Kubernetes module
+=========================================
+
+The instructions provide a guidance on how to build and test Ignite Kubernetes IP finder in Kubernetes environment.
+
+To test the IP finder you have to build the whole Apache Ignite project, package the binary as a Docker image and
+feed the image to your kubernetes environment.
+
+Building Apache Ignite
+=========================
+
+Use the command below to assemble an Apache Ignite binary:
+ mvn clean package -Prelease -Dignite.edition=fabric-lgpl -DskipTests
+
+Note, if you alter the build instruction somehow make sure to update the files under 'config' folder if needed.
+
+Installing Docker and Minikube
+==============================
+
+Install Docker and Minikube for testing purpose in your development environment.
+
+Once this is done, make sure that Minikube sees Docker images registered locally:
+ eval $(minikube docker-env)
+
+Start Minikube:
+ minikube start --vm-driver=xhyve
+
+Assembling Apache Ignite Docker Image
+=====================================
+
+Create a folder for all the files to be placed in the Docker image and copy the following there:
+ - Apache Ignite binary in a zip form built at the step above.
+ - Dockerfile from `ignite-kubernetes/config/Dockerfile`.
+ - Ignite configuration with enabled Kubernetes IP finder from `ignite-kubernetes/config/example-kube.xml`.
+ - The executable file that will start an Ignite node process from `ignite-kubernetes/config/run.sh`
+
+Go to the folder and execute a command below to prepare the image:
+ docker build -t ignite-kube:v1 .
+
+Creating containerized Ignite pods and Ignite lookup service
+============================================================
+
+Start the Kubernetes service that is used for IP addresses lookup. Use `ignite-kubernetes/config/ignite-service.yaml`:
+ kubectl create -f {path_to}/ignite-service.yaml
+
+Create and deploy Ignite pods using `ignite-kubernetes/config/ignite-deployment.yaml` configuration:
+ kubectl create -f {path_to}/ignite-deployment.yaml
+
+Make sure that the pods were deployed and running properly:
+ kubectl get pod
+ kubectl logs {pod name}
+
+Increase or decrease number of Ignite pods checking that Kubernetes IP finder works as expected:
+ kubectl scale --replicas=4 -f {path_to}/ignite-deployment.yaml
+
+Docker Image Redeployment
+=========================
+
+If you need to redeploy the docker image after it gets updated and you prefer not to change the image version then
+delete a current Kubernetes Ignite deployment (don't delete the service):
+ kubectl delete deployment ignite-cluster
+
+After that you are free to build and deploy an updated docker image using the same commands as listed above.
http://git-wip-us.apache.org/repos/asf/ignite/blob/37c0a220/modules/kubernetes/README.txt
----------------------------------------------------------------------
diff --git a/modules/kubernetes/README.txt b/modules/kubernetes/README.txt
new file mode 100644
index 0000000..a9a5a09
--- /dev/null
+++ b/modules/kubernetes/README.txt
@@ -0,0 +1,33 @@
+Apache Ignite Kubernetes Module
+------------------------
+
+Apache Ignite Kubernetes module provides a TCP Discovery IP Finder that uses a dedicated Kubernetes service
+for IP addresses lookup of Apache Ignite pods containerized by Kubernetes.
+
+To enable Kubernetes module when starting a standalone node, move 'optional/ignite-kubernetes' folder to
+'libs' folder before running 'ignite.{sh|bat}' script. The content of the module folder will
+be added to classpath in this case.
+
+Importing Kubernetes Module In Maven Project
+-------------------------------------
+
+If you are using Maven to manage dependencies of your project, you can add Kubernetes module
+dependency like this (replace '${ignite.version}' with actual Ignite version you are
+interested in):
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ ...
+ <dependencies>
+ ...
+ <dependency>
+ <groupId>org.apache.ignite</groupId>
+ <artifactId>ignite-kubernetes</artifactId>
+ <version>${ignite.version}</version>
+ </dependency>
+ ...
+ </dependencies>
+ ...
+</project>
http://git-wip-us.apache.org/repos/asf/ignite/blob/37c0a220/modules/kubernetes/config/Dockerfile
----------------------------------------------------------------------
diff --git a/modules/kubernetes/config/Dockerfile b/modules/kubernetes/config/Dockerfile
new file mode 100644
index 0000000..4e08ce8
--- /dev/null
+++ b/modules/kubernetes/config/Dockerfile
@@ -0,0 +1,45 @@
+# Use Java 8 image as default one.
+FROM java:8
+
+# Set Apache Ignite version.
+ENV IGNITE_VERSION 2.0.0-SNAPSHOT
+
+# Set IGNITE_HOME variable.
+ENV IGNITE_HOME /opt/ignite/apache-ignite-fabric-lgpl-${IGNITE_VERSION}-bin
+
+# Setting a path to an Apache Ignite configuration file. Used by run.sh script below.
+ENV CONFIG_URI ${IGNITE_HOME}/config/example-kube.xml
+
+# Make sure kubernetes lib is copied to 'libs' folder.
+ENV OPTION_LIBS ignite-kubernetes
+
+# Disabling quiet mode.
+ENV IGNITE_QUIET=false
+
+# Install or update needed tools.
+RUN apt-get update && apt-get install -y --no-install-recommends unzip
+
+# Creating and setting a working directory for following commands.
+WORKDIR /opt/ignite
+
+# Copying local Apache Ignite build to the docker image.
+COPY ./apache-ignite-fabric-lgpl-${IGNITE_VERSION}-bin.zip apache-ignite-fabric-lgpl-${IGNITE_VERSION}-bin.zip
+
+# Unpacking the build.
+RUN unzip apache-ignite-fabric-lgpl-${IGNITE_VERSION}-bin.zip
+RUN rm apache-ignite-fabric-lgpl-${IGNITE_VERSION}-bin.zip
+
+# Copying the executable file and setting permissions.
+COPY ./run.sh $IGNITE_HOME/
+RUN chmod +x $IGNITE_HOME/run.sh
+
+# Copying the configuration.
+COPY ./example-kube.xml $IGNITE_HOME/config
+
+# Starting an Apache Ignite node.
+CMD $IGNITE_HOME/run.sh
+
+# Exposing the ports.
+EXPOSE 11211 47100 47500 49112
+
+
http://git-wip-us.apache.org/repos/asf/ignite/blob/37c0a220/modules/kubernetes/config/example-kube.xml
----------------------------------------------------------------------
diff --git a/modules/kubernetes/config/example-kube.xml b/modules/kubernetes/config/example-kube.xml
new file mode 100644
index 0000000..bc04463
--- /dev/null
+++ b/modules/kubernetes/config/example-kube.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ 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.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!--
+ Configuration example with Kubernetes IP finder enabled.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+ <bean id="ignite.cfg" class="org.apache.ignite.configuration.IgniteConfiguration">
+
+ <!-- Explicitly configure TCP discovery SPI to provide list of initial nodes. -->
+ <property name="discoverySpi">
+ <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">
+ <property name="ipFinder">
+ <!--
+ Enables Kubernetes IP finder with default settings.
+ -->
+ <bean
+ class="org.apache.ignite.spi.discovery.tcp.ipfinder.kubernetes.TcpDiscoveryKubernetesIpFinder"/>
+ </property>
+ </bean>
+ </property>
+ </bean>
+</beans>
http://git-wip-us.apache.org/repos/asf/ignite/blob/37c0a220/modules/kubernetes/config/ignite-deployment.yaml
----------------------------------------------------------------------
diff --git a/modules/kubernetes/config/ignite-deployment.yaml b/modules/kubernetes/config/ignite-deployment.yaml
new file mode 100644
index 0000000..ed5c102
--- /dev/null
+++ b/modules/kubernetes/config/ignite-deployment.yaml
@@ -0,0 +1,26 @@
+# An example of a Kubernetes configuration for Ignite pods deployment.
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+ # Custom Ignite cluster's name.
+ name: ignite-cluster
+spec:
+ # Number of nodes to be started by Kubernetes initially.
+ replicas: 2
+ template:
+ metadata:
+ labels:
+ # Must be equal to Ignite's Kubernetes service name.
+ app: ignite
+ spec:
+ containers:
+ # Custom Ignite node's pod name.
+ - name: ignite-node
+ # Custom Ignite Docker image name.
+ image: ignite-kube:v1
+ ports:
+ # Ports to open.
+ - containerPort: 11211 # REST port number.
+ - containerPort: 47100 # communication SPI port number.
+ - containerPort: 47500 # discovery SPI port number.
+ - containerPort: 49112 # JMX port number.
http://git-wip-us.apache.org/repos/asf/ignite/blob/37c0a220/modules/kubernetes/config/ignite-service.yaml
----------------------------------------------------------------------
diff --git a/modules/kubernetes/config/ignite-service.yaml b/modules/kubernetes/config/ignite-service.yaml
new file mode 100644
index 0000000..07b7516
--- /dev/null
+++ b/modules/kubernetes/config/ignite-service.yaml
@@ -0,0 +1,14 @@
+# An example of a Kubernetes configuration for Ignite lookup service deployment.
+apiVersion: v1
+kind: Service
+metadata:
+ # Name of Ignite Service used by Kubernetes IP finder for IP addresses lookup.
+ # The name must be equal to TcpDiscoveryKubernetesIpFinder.setServiceName parameter.
+ name: ignite
+spec:
+ clusterIP: None
+ ports:
+ - port: 9042 # some custom port (optional).
+ selector:
+ # Must be equal to the label set for Ignite pods.
+ app: ignite
http://git-wip-us.apache.org/repos/asf/ignite/blob/37c0a220/modules/kubernetes/config/run.sh
----------------------------------------------------------------------
diff --git a/modules/kubernetes/config/run.sh b/modules/kubernetes/config/run.sh
new file mode 100644
index 0000000..dbf2871
--- /dev/null
+++ b/modules/kubernetes/config/run.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+if [ ! -z "$OPTION_LIBS" ]; then
+ IFS=, LIBS_LIST=("$OPTION_LIBS")
+
+ for lib in ${LIBS_LIST[@]}; do
+ cp -r $IGNITE_HOME/libs/optional/"$lib"/* \
+ $IGNITE_HOME/libs/
+ done
+fi
+
+if [ ! -z "$EXTERNAL_LIBS" ]; then
+ IFS=, LIBS_LIST=("$EXTERNAL_LIBS")
+
+ for lib in ${LIBS_LIST[@]}; do
+ echo $lib >> temp
+ done
+
+ wget -i temp -P $IGNITE_HOME/libs
+
+ rm temp
+fi
+
+QUIET=""
+
+if [ "$IGNITE_QUIET" = "false" ]; then
+ QUIET="-v"
+fi
+
+if [ -z $CONFIG_URI ]; then
+ $IGNITE_HOME/bin/ignite.sh $QUIET
+else
+ $IGNITE_HOME/bin/ignite.sh $QUIET $CONFIG_URI
+fi
http://git-wip-us.apache.org/repos/asf/ignite/blob/37c0a220/modules/kubernetes/licenses/apache-2.0.txt
----------------------------------------------------------------------
diff --git a/modules/kubernetes/licenses/apache-2.0.txt b/modules/kubernetes/licenses/apache-2.0.txt
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/modules/kubernetes/licenses/apache-2.0.txt
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
+ See the License for the specific language governing permissions and
+ limitations under the License.
http://git-wip-us.apache.org/repos/asf/ignite/blob/37c0a220/modules/kubernetes/pom.xml
----------------------------------------------------------------------
diff --git a/modules/kubernetes/pom.xml b/modules/kubernetes/pom.xml
new file mode 100644
index 0000000..5d4e5f0
--- /dev/null
+++ b/modules/kubernetes/pom.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ 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.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!--
+ POM file.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.ignite</groupId>
+ <artifactId>ignite-parent</artifactId>
+ <version>1</version>
+ <relativePath>../../parent</relativePath>
+ </parent>
+
+ <artifactId>ignite-kubernetes</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <url>http://ignite.apache.org</url>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ignite</groupId>
+ <artifactId>ignite-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ignite</groupId>
+ <artifactId>ignite-core</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>${spring.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${spring.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/ignite/blob/37c0a220/modules/kubernetes/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/kubernetes/TcpDiscoveryKubernetesIpFinder.java
----------------------------------------------------------------------
diff --git a/modules/kubernetes/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/kubernetes/TcpDiscoveryKubernetesIpFinder.java b/modules/kubernetes/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/kubernetes/TcpDiscoveryKubernetesIpFinder.java
new file mode 100644
index 0000000..a5bd24f
--- /dev/null
+++ b/modules/kubernetes/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/kubernetes/TcpDiscoveryKubernetesIpFinder.java
@@ -0,0 +1,315 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.spi.discovery.tcp.ipfinder.kubernetes;
+
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.security.SecureRandom;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicBoolean;
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinderAdapter;
+import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+import org.codehaus.jackson.map.ObjectMapper;
+
+/**
+ * IP finder for automatic lookup of Ignite nodes running in Kubernetes environment. All Ignite nodes have to deployed
+ * as Kubernetes pods in order to be discovered. An application that uses Ignite client nodes as a gateway to the
+ * cluster is required to be containerized as well. Applications and Ignite nodes running outside of Kubernetes will
+ * not be able to reach the containerized counterparts.
+ * <p>
+ * The implementation is based on a dedicated Kubernetes service that has to be created and should be deployed prior
+ * Ignite nodes startup. The service will maintain a list of all endpoints (internal IP addresses) of all containerized
+ * Ignite pods running so far. The name of the service must be equal to {@link #setServiceName(String)} which is
+ * `ignite` by default.
+ * <p>
+ * As for Ignite pods, it's recommended to label them in such a way that the service will use the label in its selector
+ * configuration excluding endpoints of irrelevant Kubernetes pods running in parallel.
+ * <p>
+ * The IP finder, in its turn, will call this service to retrieve Ignite pods IP addresses. The port will be
+ * either the one that is set with {@link TcpDiscoverySpi#setLocalPort(int)} or {@link TcpDiscoverySpi#DFLT_PORT}.
+ * Make sure that all Ignite pods occupy a similar discovery port, otherwise they will not be able to discover each
+ * other using this IP finder.
+ * <h2 class="header">Optional configuration</h2>
+ * <ul>
+ * <li>The Kubernetes service name for IP addresses lookup (see {@link #setServiceName(String)})</li>
+ * <li>The Kubernetes service namespace for IP addresses lookup (see {@link #setNamespace(String)}</li>
+ * <li>The host name of the Kubernetes API server (see {@link #setMasterUrl(String)})</li>
+ * <li>Path to the service token (see {@link #setAccountToken(String)}</li>
+ * </ul>
+ * <p>
+ * Both {@link #registerAddresses(Collection)} and {@link #unregisterAddresses(Collection)} have no effect.
+ * <p>
+ * Note, this IP finder is only workable when it used in Kubernetes environment.
+ * Choose another implementation of {@link org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder} for local
+ * or home network tests.
+ */
+public class TcpDiscoveryKubernetesIpFinder extends TcpDiscoveryIpFinderAdapter {
+ /** Grid logger. */
+ @LoggerResource
+ private IgniteLogger log;
+
+ /** Init routine guard. */
+ private final AtomicBoolean initGuard = new AtomicBoolean();
+
+ /** Init routine latch. */
+ private final CountDownLatch initLatch = new CountDownLatch(1);
+
+ /** Trust manager. */
+ private TrustManager[] trustAll = new TrustManager[] {
+ new X509TrustManager() {
+ public void checkServerTrusted(X509Certificate[] certs, String authType) {}
+ public void checkClientTrusted(X509Certificate[] certs, String authType) {}
+ public X509Certificate[] getAcceptedIssuers() { return null; }
+ }
+ };
+
+ /** Host verifier. */
+ private HostnameVerifier trustAllHosts = new HostnameVerifier() {
+ public boolean verify(String hostname, SSLSession session) {
+ return true;
+ }
+ };
+
+ /** Ignite's Kubernetes Service name. */
+ private String serviceName = "ignite";
+
+ /** Ignite Pod setNamespace name. */
+ private String namespace = "default";
+
+ /** Kubernetes API server URL in a string form. */
+ private String master = "https://kubernetes.default.svc.cluster.local:443";
+
+ /** Account token location. */
+ private String accountToken = "/var/run/secrets/kubernetes.io/serviceaccount/token";
+
+ /** Kubernetes API server URL. */
+ private URL url;
+
+ /** SSL context */
+ private SSLContext ctx;
+
+ /**
+ * Creates an instance of Kubernetes IP finder.
+ */
+ public TcpDiscoveryKubernetesIpFinder() {
+ setShared(true);
+ }
+
+ /** {@inheritDoc} */
+ @Override public Collection<InetSocketAddress> getRegisteredAddresses() throws IgniteSpiException {
+ init();
+
+ Collection<InetSocketAddress> addrs = new ArrayList<>();
+
+ try {
+ System.out.println("Getting Apache Ignite endpoints from: " + url);
+
+ HttpsURLConnection conn = (HttpsURLConnection)url.openConnection();
+
+ conn.setHostnameVerifier(trustAllHosts);
+
+ conn.setSSLSocketFactory(ctx.getSocketFactory());
+ conn.addRequestProperty("Authorization", "Bearer " + serviceAccountToken(accountToken));
+
+ // Sending the request and processing a response.
+ ObjectMapper mapper = new ObjectMapper();
+
+ Endpoints endpoints = mapper.readValue(conn.getInputStream(), Endpoints.class);
+
+ if (endpoints != null) {
+ if (endpoints.subsets != null && !endpoints.subsets.isEmpty()) {
+ for (Subset subset : endpoints.subsets) {
+
+ if (subset.addresses != null && !subset.addresses.isEmpty()) {
+ for (Address address : subset.addresses) {
+ addrs.add(new InetSocketAddress(address.ip, 0));
+
+ System.out.println("Added an address to the list: " + address.ip);
+ }
+ }
+ }
+ }
+ }
+ }
+ catch (Exception e) {
+ throw new IgniteSpiException("Failed to retrieve Ignite pods IP addresses.", e);
+ }
+
+ return addrs;
+ }
+
+ /** {@inheritDoc} */
+ @Override public void registerAddresses(Collection<InetSocketAddress> addrs) throws IgniteSpiException {
+ // No-op
+ }
+
+ /** {@inheritDoc} */
+ @Override public void unregisterAddresses(Collection<InetSocketAddress> addrs) throws IgniteSpiException {
+ // No-op
+ }
+
+ /**
+ * Sets the name of Kubernetes service for Ignite pods' IP addresses lookup. The name of the service must be equal
+ * to the name set in service's Kubernetes configuration. If this parameter is not changed then the name of the
+ * service has to be set to 'ignite' in the corresponding Kubernetes configuration.
+ *
+ * @param service Kubernetes service name for IP addresses lookup. If it's not set then 'ignite' is used by default.
+ */
+ public void setServiceName(String service) {
+ this.serviceName = service;
+ }
+
+ /**
+ * Sets the namespace the Kubernetes service belongs to. By default, it's supposed that the service is running under
+ * Kubernetes `default` namespace.
+ *
+ * @param namespace The Kubernetes service namespace for IP addresses lookup.
+ */
+ public void setNamespace(String namespace) {
+ this.namespace = namespace;
+ }
+
+ /**
+ * Sets the host name of the Kubernetes API server. By default the following host name is used:
+ * 'https://kubernetes.default.svc.cluster.local:443'.
+ *
+ * @param master The host name of the Kubernetes API server.
+ */
+ public void setMasterUrl(String master) {
+ this.master = master;
+ }
+
+ /**
+ * Specifies the path to the service token file. By default the following account token is used:
+ * '/var/run/secrets/kubernetes.io/serviceaccount/token'.
+ *
+ * @param accountToken The path to the service token file.
+ */
+ public void setAccountToken(String accountToken) {
+ this.accountToken = accountToken;
+ }
+
+ /**
+ * Kubernetes IP finder initialization.
+ *
+ * @throws IgniteSpiException In case of error.
+ */
+ private void init() throws IgniteSpiException {
+ if (initGuard.compareAndSet(false, true)) {
+
+ if (serviceName == null || serviceName.isEmpty() ||
+ namespace == null || namespace.isEmpty() ||
+ master == null || master.isEmpty() ||
+ accountToken == null || accountToken.isEmpty()) {
+ throw new IgniteSpiException(
+ "One or more configuration parameters are invalid [setServiceName=" +
+ serviceName + ", setNamespace=" + namespace + ", setMasterUrl=" +
+ master + ", setAccountToken=" + accountToken + "]");
+ }
+
+ try {
+ // Preparing the URL and SSL context to be used for connection purposes.
+ String path = String.format("/api/v1/namespaces/%s/endpoints/%s", namespace, serviceName);
+
+ url = new URL(master + path);
+
+ ctx = SSLContext.getInstance("SSL");
+
+ ctx.init(null, trustAll, new SecureRandom());
+ }
+ catch (Exception e) {
+ throw new IgniteSpiException("Failed to connect to Ignite's Kubernetes Service.", e);
+ }
+ finally {
+ initLatch.countDown();
+ }
+ }
+ else {
+ try {
+ U.await(initLatch);
+ }
+ catch (IgniteInterruptedCheckedException e) {
+ throw new IgniteSpiException("Thread has been interrupted.", e);
+ }
+
+ if (url == null || ctx == null)
+ throw new IgniteSpiException("IP finder has not been initialized properly.");
+ }
+ }
+
+ /**
+ * Reads content of the service account token file.
+ *
+ * @param file The path to the service account token.
+ * @return Service account token.
+ */
+ private String serviceAccountToken(String file) {
+ try {
+ return new String(Files.readAllBytes(Paths.get(file)));
+ } catch (IOException e) {
+ throw new IgniteSpiException("Failed to load services account token [setAccountToken= " + file + "]", e);
+ }
+ }
+
+ /**
+ * Object used by Jackson for processing of Kubernetes lookup service's response.
+ */
+ @JsonIgnoreProperties(ignoreUnknown = true)
+ private static class Address {
+ /** */
+ public String ip;
+ }
+
+ /**
+ * Object used by Jackson for processing of Kubernetes lookup service's response.
+ */
+ @JsonIgnoreProperties(ignoreUnknown = true)
+ private static class Subset {
+ /** */
+ public List<Address> addresses;
+ }
+
+ /**
+ * Object used by Jackson for processing of Kubernetes lookup service's response.
+ */
+ @JsonIgnoreProperties(ignoreUnknown = true)
+ private static class Endpoints {
+ /** */
+ public List<Subset> subsets;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/37c0a220/modules/kubernetes/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/kubernetes/package-info.java
----------------------------------------------------------------------
diff --git a/modules/kubernetes/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/kubernetes/package-info.java b/modules/kubernetes/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/kubernetes/package-info.java
new file mode 100644
index 0000000..a572cb2
--- /dev/null
+++ b/modules/kubernetes/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/kubernetes/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * <!-- Package description. -->
+ * Contains Kubernetes IP finder implementation.
+ */
+package org.apache.ignite.spi.discovery.tcp.ipfinder.kubernetes;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/37c0a220/modules/kubernetes/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/kubernetes/TcpDiscoveryKubernetesIpFinderSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/kubernetes/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/kubernetes/TcpDiscoveryKubernetesIpFinderSelfTest.java b/modules/kubernetes/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/kubernetes/TcpDiscoveryKubernetesIpFinderSelfTest.java
new file mode 100644
index 0000000..fd3e2a3
--- /dev/null
+++ b/modules/kubernetes/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/kubernetes/TcpDiscoveryKubernetesIpFinderSelfTest.java
@@ -0,0 +1,93 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.spi.discovery.tcp.ipfinder.kubernetes;
+
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinderAbstractSelfTest;
+
+/**
+ * TcpDiscoveryKubernetesIpFinder test.
+ */
+public class TcpDiscoveryKubernetesIpFinderSelfTest extends
+ TcpDiscoveryIpFinderAbstractSelfTest<TcpDiscoveryKubernetesIpFinder> {
+ /**
+ * Constructor.
+ *
+ * @throws Exception If any error occurs.
+ */
+ public TcpDiscoveryKubernetesIpFinderSelfTest() throws Exception {
+ // No-op.
+ }
+
+ @Override protected void beforeTest() throws Exception {
+ // No-op.
+ }
+
+ /* {@inheritDoc} */
+ @Override protected TcpDiscoveryKubernetesIpFinder ipFinder() throws Exception {
+ // No-op.
+ return null;
+ }
+
+ /* {@inheritDoc} */
+ @Override public void testIpFinder() throws Exception {
+ TcpDiscoveryKubernetesIpFinder ipFinder = new TcpDiscoveryKubernetesIpFinder();
+
+ ipFinder.setAccountToken(null);
+
+ try {
+ ipFinder.getRegisteredAddresses();
+ }
+ catch (IgniteSpiException e) {
+ assertTrue(e.getMessage().startsWith("One or more configuration parameters are invalid"));
+ }
+
+ ipFinder = new TcpDiscoveryKubernetesIpFinder();
+
+ ipFinder.setMasterUrl(null);
+
+ try {
+ ipFinder.getRegisteredAddresses();
+ }
+ catch (IgniteSpiException e) {
+ assertTrue(e.getMessage().startsWith("One or more configuration parameters are invalid"));
+ }
+
+ ipFinder = new TcpDiscoveryKubernetesIpFinder();
+
+ ipFinder.setNamespace(null);
+
+ try {
+ ipFinder.getRegisteredAddresses();
+ }
+ catch (IgniteSpiException e) {
+ assertTrue(e.getMessage().startsWith("One or more configuration parameters are invalid"));
+ }
+
+ ipFinder = new TcpDiscoveryKubernetesIpFinder();
+
+ ipFinder.setServiceName("");
+
+ try {
+ ipFinder.getRegisteredAddresses();
+ }
+ catch (IgniteSpiException e) {
+ assertTrue(e.getMessage().startsWith("One or more configuration parameters are invalid"));
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/37c0a220/modules/kubernetes/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/kubernetes/package-info.java
----------------------------------------------------------------------
diff --git a/modules/kubernetes/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/kubernetes/package-info.java b/modules/kubernetes/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/kubernetes/package-info.java
new file mode 100644
index 0000000..83ab56f
--- /dev/null
+++ b/modules/kubernetes/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/kubernetes/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * <!-- Package description. -->
+ * Contains Kubernetes IP finder internal tests.
+ */
+package org.apache.ignite.spi.discovery.tcp.ipfinder.kubernetes;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/37c0a220/modules/kubernetes/src/test/java/org/apache/ignite/testsuites/IgniteKubernetesTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/kubernetes/src/test/java/org/apache/ignite/testsuites/IgniteKubernetesTestSuite.java b/modules/kubernetes/src/test/java/org/apache/ignite/testsuites/IgniteKubernetesTestSuite.java
new file mode 100644
index 0000000..540657e
--- /dev/null
+++ b/modules/kubernetes/src/test/java/org/apache/ignite/testsuites/IgniteKubernetesTestSuite.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.testsuites;
+
+
+import junit.framework.TestSuite;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.kubernetes.TcpDiscoveryKubernetesIpFinderSelfTest;
+import org.apache.ignite.testframework.IgniteTestSuite;
+
+/**
+ * Ignite Kubernetes integration test.
+ */
+public class IgniteKubernetesTestSuite extends TestSuite {
+ /**
+ * @return Test suite.
+ * @throws Exception Thrown in case of the failure.
+ */
+ public static TestSuite suite() throws Exception {
+ TestSuite suite = new IgniteTestSuite("Kubernetes Integration Test Suite");
+
+ // Cloud Nodes IP finder.
+ suite.addTestSuite(TcpDiscoveryKubernetesIpFinderSelfTest.class);
+
+ return suite;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/37c0a220/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ea76053..238361b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,6 +88,7 @@
<module>modules/web/ignite-websphere-test</module>
<module>modules/cassandra</module>
<module>modules/flink</module>
+ <module>modules/kubernetes</module>
</modules>
<profiles>
[09/50] [abbrv] ignite git commit: ignite-4492 Add MBean for
StripedExecutor This closes #1491.
Posted by vo...@apache.org.
ignite-4492 Add MBean for StripedExecutor
This closes #1491.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8e12513e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8e12513e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8e12513e
Branch: refs/heads/ignite-4565-ddl
Commit: 8e12513efb24cc6df1da0968560ac932544ee68d
Parents: c52cb9f
Author: voipp <al...@gmail.com>
Authored: Tue Feb 14 15:08:59 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Feb 14 15:08:59 2017 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/IgniteKernal.java | 48 +++++-
.../internal/StripedExecutorMXBeanAdapter.java | 90 ++++++++++
.../ignite/internal/util/StripedExecutor.java | 55 +++++-
.../ignite/mxbean/StripedExecutorMXBean.java | 90 ++++++++++
.../internal/util/StripedExecutorTest.java | 168 +++++++++++++++++++
.../testsuites/IgniteComputeGridTestSuite.java | 2 +
6 files changed, 447 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/8e12513e/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index a3d8c7b..cdbe2e3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -168,6 +168,7 @@ import org.apache.ignite.marshaller.MarshallerExclusions;
import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
import org.apache.ignite.mxbean.ClusterLocalNodeMetricsMXBean;
import org.apache.ignite.mxbean.IgniteMXBean;
+import org.apache.ignite.mxbean.StripedExecutorMXBean;
import org.apache.ignite.mxbean.ThreadPoolMXBean;
import org.apache.ignite.plugin.IgnitePlugin;
import org.apache.ignite.plugin.PluginNotFoundException;
@@ -296,6 +297,10 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
@GridToStringExclude
private ObjectName restExecSvcMBean;
+ /** */
+ @GridToStringExclude
+ private ObjectName stripedExecSvcMBean;
+
/** Kernal start timestamp. */
private long startTime = U.currentTimeMillis();
@@ -963,6 +968,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
registerKernalMBean();
registerLocalNodeMBean();
registerExecutorMBeans(execSvc, sysExecSvc, p2pExecSvc, mgmtExecSvc, restExecSvc);
+ registerStripedExecutorMBean(stripedExecSvc);
// Lifecycle bean notifications.
notifyLifecycleBeans(AFTER_NODE_START);
@@ -1541,7 +1547,14 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
}
}
- /** @throws IgniteCheckedException If registration failed. */
+ /**
+ * @param execSvc
+ * @param sysExecSvc
+ * @param p2pExecSvc
+ * @param mgmtExecSvc
+ * @param restExecSvc
+ * @throws IgniteCheckedException If failed.
+ */
private void registerExecutorMBeans(ExecutorService execSvc,
ExecutorService sysExecSvc,
ExecutorService p2pExecSvc,
@@ -1582,8 +1595,34 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
return res;
}
catch (JMException e) {
- throw new IgniteCheckedException("Failed to register executor service MBean [name=" + name + ", exec=" + exec + ']',
- e);
+ throw new IgniteCheckedException("Failed to register executor service MBean [name=" + name +
+ ", exec=" + exec + ']', e);
+ }
+ }
+
+ /**
+ * @param stripedExecSvc Executor service.
+ * @throws IgniteCheckedException If registration failed.
+ */
+ private void registerStripedExecutorMBean(StripedExecutor stripedExecSvc) throws IgniteCheckedException {
+ if (stripedExecSvc != null) {
+ String name = "StripedExecutor";
+
+ try {
+ stripedExecSvcMBean = U.registerMBean(
+ cfg.getMBeanServer(),
+ cfg.getGridName(),
+ "Thread Pools",
+ name,
+ new StripedExecutorMXBeanAdapter(stripedExecSvc),
+ StripedExecutorMXBean.class);
+
+ if (log.isDebugEnabled())
+ log.debug("Registered executor service MBean: " + stripedExecSvcMBean);
+ } catch (JMException e) {
+ throw new IgniteCheckedException("Failed to register executor service MBean [name="
+ + name + ", exec=" + stripedExecSvc + ']', e);
+ }
}
}
@@ -2046,7 +2085,8 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
unregisterMBean(p2PExecSvcMBean) &
unregisterMBean(kernalMBean) &
unregisterMBean(locNodeMBean) &
- unregisterMBean(restExecSvcMBean)
+ unregisterMBean(restExecSvcMBean) &
+ unregisterMBean(stripedExecSvcMBean)
))
errOnStop = false;
http://git-wip-us.apache.org/repos/asf/ignite/blob/8e12513e/modules/core/src/main/java/org/apache/ignite/internal/StripedExecutorMXBeanAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/StripedExecutorMXBeanAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/StripedExecutorMXBeanAdapter.java
new file mode 100644
index 0000000..e6811b7
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/StripedExecutorMXBeanAdapter.java
@@ -0,0 +1,90 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal;
+
+import java.util.concurrent.ExecutorService;
+import org.apache.ignite.internal.util.StripedExecutor;
+import org.apache.ignite.mxbean.StripedExecutorMXBean;
+
+/**
+ * Adapter for {@link StripedExecutorMXBean} which delegates all method calls to the underlying
+ * {@link ExecutorService} instance.
+ */
+public class StripedExecutorMXBeanAdapter implements StripedExecutorMXBean {
+ /** */
+ private final StripedExecutor exec;
+
+ /**
+ * @param exec Executor service
+ */
+ StripedExecutorMXBeanAdapter(StripedExecutor exec) {
+ assert exec != null;
+
+ this.exec = exec;
+ }
+
+ /** {@inheritDoc} */
+ @Override public void checkStarvation() {
+ exec.checkStarvation();
+ }
+
+ /** {@inheritDoc} */
+ @Override public int getStripesCount() {
+ return exec.stripes();
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean isShutdown() {
+ return exec.isShutdown();
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean isTerminated() {
+ return exec.isTerminated();
+ }
+
+ /** {@inheritDoc} */
+ @Override public int getTotalQueueSize() {
+ return exec.queueSize();
+ }
+
+ /** {@inheritDoc} */
+ @Override public long getTotalCompletedTasksCount() {
+ return exec.completedTasks();
+ }
+
+ /** {@inheritDoc} */
+ @Override public long[] getStripesCompletedTasksCounts() {
+ return exec.stripesCompletedTasks();
+ }
+
+ /** {@inheritDoc} */
+ @Override public int getActiveCount() {
+ return exec.activeStripesCount();
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean[] getStripesActiveStatuses() {
+ return exec.stripesActiveStatuses();
+ }
+
+ /** {@inheritDoc} */
+ @Override public int[] getStripesQueueSizes() {
+ return exec.stripesQueueSizes();
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/8e12513e/modules/core/src/main/java/org/apache/ignite/internal/util/StripedExecutor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/StripedExecutor.java b/modules/core/src/main/java/org/apache/ignite/internal/util/StripedExecutor.java
index 201cb34..e70f0ce 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/StripedExecutor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/StripedExecutor.java
@@ -55,9 +55,10 @@ public class StripedExecutor implements ExecutorService {
private final IgniteLogger log;
/**
- * Constructor.
- *
* @param cnt Count.
+ * @param gridName Node name.
+ * @param poolName Pool name.
+ * @param log Logger.
*/
public StripedExecutor(int cnt, String gridName, String poolName, final IgniteLogger log) {
A.ensure(cnt > 0, "cnt > 0");
@@ -268,6 +269,56 @@ public class StripedExecutor implements ExecutorService {
}
/**
+ * @return Completed tasks per stripe count.
+ */
+ public long[] stripesCompletedTasks() {
+ long[] res = new long[stripes()];
+
+ for (int i = 0; i < res.length; i++)
+ res[i] = stripes[i].completedCnt;
+
+ return res;
+ }
+
+ /**
+ * @return Number of active tasks per stripe.
+ */
+ public boolean[] stripesActiveStatuses() {
+ boolean[] res = new boolean[stripes()];
+
+ for (int i = 0; i < res.length; i++)
+ res[i] = stripes[i].active;
+
+ return res;
+ }
+
+ /**
+ * @return Number of active tasks.
+ */
+ public int activeStripesCount() {
+ int res = 0;
+
+ for (boolean status : stripesActiveStatuses()) {
+ if (status)
+ res++;
+ }
+
+ return res;
+ }
+
+ /**
+ * @return Size of queue per stripe.
+ */
+ public int[] stripesQueueSizes() {
+ int[] res = new int[stripes()];
+
+ for (int i = 0; i < res.length; i++)
+ res[i] = stripes[i].queueSize();
+
+ return res;
+ }
+
+ /**
* Operation not supported.
*/
@NotNull @Override public <T> Future<T> submit(
http://git-wip-us.apache.org/repos/asf/ignite/blob/8e12513e/modules/core/src/main/java/org/apache/ignite/mxbean/StripedExecutorMXBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/StripedExecutorMXBean.java b/modules/core/src/main/java/org/apache/ignite/mxbean/StripedExecutorMXBean.java
new file mode 100644
index 0000000..7428b19
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/mxbean/StripedExecutorMXBean.java
@@ -0,0 +1,90 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.mxbean;
+
+/**
+ * MBean that provides access to information about striped executor service.
+ */
+@MXBeanDescription("MBean that provides access to information about striped executor service.")
+public interface StripedExecutorMXBean {
+ /**
+ * Checks for starvation in striped pool, dumps in log information if potential starvation
+ * was found.
+ */
+ @MXBeanDescription("Checks for starvation in striped pool.")
+ public void checkStarvation();
+
+ /**
+ * @return Stripes count.
+ */
+ @MXBeanDescription("Stripes count.")
+ public int getStripesCount();
+
+ /**
+ *
+ * @return {@code True} if this executor has been shut down.
+ */
+ @MXBeanDescription("True if this executor has been shut down.")
+ public boolean isShutdown();
+
+ /**
+ * Note that
+ * {@code isTerminated()} is never {@code true} unless either {@code shutdown()} or
+ * {@code shutdownNow()} was called first.
+ *
+ * @return {@code True} if all tasks have completed following shut down.
+ */
+ @MXBeanDescription("True if all tasks have completed following shut down.")
+ public boolean isTerminated();
+
+ /**
+ * @return Return total queue size of all stripes.
+ */
+ @MXBeanDescription("Total queue size of all stripes.")
+ public int getTotalQueueSize();
+
+ /**
+ * @return Completed tasks count.
+ */
+ @MXBeanDescription("Completed tasks count of all stripes.")
+ public long getTotalCompletedTasksCount();
+
+ /**
+ * @return Number of completed tasks per stripe.
+ */
+ @MXBeanDescription("Number of completed tasks per stripe.")
+ public long[] getStripesCompletedTasksCounts();
+
+ /**
+ * @return Number of active tasks.
+ */
+ @MXBeanDescription("Number of active tasks of all stripes.")
+ public int getActiveCount();
+
+ /**
+ * @return Number of active tasks per stripe.
+ */
+ @MXBeanDescription("Number of active tasks per stripe.")
+ public boolean[] getStripesActiveStatuses();
+
+ /**
+ * @return Size of queue per stripe.
+ */
+ @MXBeanDescription("Size of queue per stripe.")
+ public int[] getStripesQueueSizes();
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/8e12513e/modules/core/src/test/java/org/apache/ignite/internal/util/StripedExecutorTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/StripedExecutorTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/StripedExecutorTest.java
new file mode 100644
index 0000000..543907f
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/StripedExecutorTest.java
@@ -0,0 +1,168 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.util;
+
+import org.apache.ignite.logger.java.JavaLogger;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+/**
+ *
+ */
+public class StripedExecutorTest extends GridCommonAbstractTest {
+ /** */
+ private StripedExecutor stripedExecSvc;
+
+ /** {@inheritDoc} */
+ @Override public void beforeTest() {
+ stripedExecSvc = new StripedExecutor(3, "foo name", "pool name", new JavaLogger());
+ }
+
+ /** {@inheritDoc} */
+ @Override public void afterTest() {
+ stripedExecSvc.shutdown();
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testCompletedTasks() throws Exception {
+ stripedExecSvc.execute(0, new TestRunnable());
+ stripedExecSvc.execute(1, new TestRunnable());
+
+ sleepASec();
+
+ assertEquals(2, stripedExecSvc.completedTasks());
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testStripesCompletedTasks() throws Exception {
+ stripedExecSvc.execute(0, new TestRunnable());
+ stripedExecSvc.execute(1, new TestRunnable());
+
+ sleepASec();
+
+ long[] completedTaks = stripedExecSvc.stripesCompletedTasks();
+
+ assertEquals(1, completedTaks[0]);
+ assertEquals(1, completedTaks[1]);
+ assertEquals(0, completedTaks[2]);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testStripesActiveStatuses() throws Exception {
+ stripedExecSvc.execute(0, new TestRunnable());
+ stripedExecSvc.execute(1, new TestRunnable(true));
+
+ sleepASec();
+
+ boolean[] statuses = stripedExecSvc.stripesActiveStatuses();
+
+ assertFalse(statuses[0]);
+ assertTrue(statuses[1]);
+ assertFalse(statuses[0]);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testActiveStripesCount() throws Exception {
+ stripedExecSvc.execute(0, new TestRunnable());
+ stripedExecSvc.execute(1, new TestRunnable(true));
+
+ sleepASec();
+
+ assertEquals(1, stripedExecSvc.activeStripesCount());
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testStripesQueueSizes() throws Exception {
+ stripedExecSvc.execute(0, new TestRunnable());
+ stripedExecSvc.execute(0, new TestRunnable(true));
+ stripedExecSvc.execute(0, new TestRunnable(true));
+ stripedExecSvc.execute(1, new TestRunnable(true));
+ stripedExecSvc.execute(1, new TestRunnable(true));
+ stripedExecSvc.execute(1, new TestRunnable(true));
+
+ sleepASec();
+
+ int[] queueSizes = stripedExecSvc.stripesQueueSizes();
+
+ assertEquals(1, queueSizes[0]);
+ assertEquals(2, queueSizes[1]);
+ assertEquals(0, queueSizes[2]);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testQueueSize() throws Exception {
+ stripedExecSvc.execute(1, new TestRunnable());
+ stripedExecSvc.execute(1, new TestRunnable(true));
+ stripedExecSvc.execute(1, new TestRunnable(true));
+
+ sleepASec();
+
+ assertEquals(1, stripedExecSvc.queueSize());
+ }
+
+ /**
+ *
+ */
+ private final class TestRunnable implements Runnable {
+ /** */
+ private final boolean infinitely;
+
+ /**
+ *
+ */
+ public TestRunnable() {
+ this(false);
+ }
+
+ /**
+ * @param infinitely {@code True} if should sleep infinitely.
+ */
+ public TestRunnable(boolean infinitely) {
+ this.infinitely = infinitely;
+ }
+
+ /** {@inheritDoc} */
+ @Override public void run() {
+ try {
+ while (infinitely)
+ sleepASec();
+ }
+ catch (InterruptedException e) {
+ info("Got interrupted exception while sleeping: " + e);
+ }
+ }
+ }
+
+ /**
+ * @throws InterruptedException If interrupted.
+ */
+ private void sleepASec() throws InterruptedException {
+ Thread.sleep(1000);
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/8e12513e/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java
index 8a501fd..9a80b10 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java
@@ -72,6 +72,7 @@ import org.apache.ignite.internal.managers.checkpoint.GridCheckpointManagerSelfT
import org.apache.ignite.internal.managers.checkpoint.GridCheckpointTaskSelfTest;
import org.apache.ignite.internal.managers.communication.GridCommunicationManagerListenersSelfTest;
import org.apache.ignite.internal.processors.compute.PublicThreadpoolStarvationTest;
+import org.apache.ignite.internal.util.StripedExecutorTest;
import org.apache.ignite.p2p.GridMultinodeRedeployContinuousModeSelfTest;
import org.apache.ignite.p2p.GridMultinodeRedeployIsolatedModeSelfTest;
import org.apache.ignite.p2p.GridMultinodeRedeployPrivateModeSelfTest;
@@ -152,6 +153,7 @@ public class IgniteComputeGridTestSuite {
suite.addTestSuite(TaskNodeRestartTest.class);
suite.addTestSuite(IgniteRoundRobinErrorAfterClientReconnectTest.class);
suite.addTestSuite(PublicThreadpoolStarvationTest.class);
+ suite.addTestSuite(StripedExecutorTest.class);
return suite;
}
[07/50] [abbrv] ignite git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/ignite
Posted by vo...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c52cb9f1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c52cb9f1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c52cb9f1
Branch: refs/heads/ignite-4565-ddl
Commit: c52cb9f1fa32d7339f24310bbb37733e94ef85ce
Parents: b9bf77c 0bdcfb0
Author: Denis Magda <dm...@gridgain.com>
Authored: Mon Feb 13 22:03:58 2017 -0800
Committer: Denis Magda <dm...@gridgain.com>
Committed: Mon Feb 13 22:03:58 2017 -0800
----------------------------------------------------------------------
modules/web-console/frontend/package.json | 182 ++++++++++++-------------
1 file changed, 91 insertions(+), 91 deletions(-)
----------------------------------------------------------------------
[34/50] [abbrv] ignite git commit: IGNITE-4511: SQL: set default
index type to "SORTED". This closes #1513.
Posted by vo...@apache.org.
IGNITE-4511: SQL: set default index type to "SORTED". This closes #1513.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1c9b0246
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1c9b0246
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1c9b0246
Branch: refs/heads/ignite-4565-ddl
Commit: 1c9b02462f38cda8fabfbc84aa6c7aae65c8d33d
Parents: f2328a4
Author: Andrey V. Mashenkov <an...@gmail.com>
Authored: Fri Feb 17 14:33:40 2017 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Fri Feb 17 14:33:40 2017 +0300
----------------------------------------------------------------------
.../org/apache/ignite/cache/QueryEntity.java | 4 +-
.../org/apache/ignite/cache/QueryIndex.java | 25 ++++-
.../processors/query/GridQueryProcessor.java | 15 ++-
.../cache/IgniteCacheAbstractQuerySelfTest.java | 97 ++++++++++++++++++++
4 files changed, 130 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1c9b0246/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java b/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java
index 5a3671b..48cdae5 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java
@@ -190,6 +190,9 @@ public class QueryEntity implements Serializable {
if (idx.getName() == null)
idx.setName(defaultIndexName(idx));
+ if (idx.getIndexType() == null)
+ throw new IllegalArgumentException("Index type is not set " + idx.getName());
+
if (!this.idxs.containsKey(idx.getName()))
this.idxs.put(idx.getName(), idx);
else
@@ -198,7 +201,6 @@ public class QueryEntity implements Serializable {
}
}
-
/**
* Gets table name for this query entity.
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/1c9b0246/modules/core/src/main/java/org/apache/ignite/cache/QueryIndex.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/QueryIndex.java b/modules/core/src/main/java/org/apache/ignite/cache/QueryIndex.java
index af11999..53f9e4c 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/QueryIndex.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/QueryIndex.java
@@ -31,6 +31,9 @@ public class QueryIndex implements Serializable {
/** */
private static final long serialVersionUID = 0L;
+ /** */
+ private static final QueryIndexType DFLT_IDX_TYP = QueryIndexType.SORTED;
+
/** Index name. */
private String name;
@@ -38,7 +41,7 @@ public class QueryIndex implements Serializable {
private LinkedHashMap<String, Boolean> fields;
/** */
- private QueryIndexType type;
+ private QueryIndexType type = DFLT_IDX_TYP;
/**
* Creates an empty index. Should be populated via setters.
@@ -163,9 +166,12 @@ public class QueryIndex implements Serializable {
* Sets index name.
*
* @param name Index name.
+ * @return {@code this} for chaining.
*/
- public void setName(String name) {
+ public QueryIndex setName(String name) {
this.name = name;
+
+ return this;
}
/**
@@ -181,9 +187,12 @@ public class QueryIndex implements Serializable {
* Sets fields included in the index.
*
* @param fields Collection of index fields.
+ * @return {@code this} for chaining.
*/
- public void setFields(LinkedHashMap<String, Boolean> fields) {
+ public QueryIndex setFields(LinkedHashMap<String, Boolean> fields) {
this.fields = fields;
+
+ return this;
}
/**
@@ -199,12 +208,15 @@ public class QueryIndex implements Serializable {
*
* @param fields Collection of fields.
* @param asc Ascending flag.
+ * @return {@code this} for chaining.
*/
- public void setFieldNames(Collection<String> fields, boolean asc) {
+ public QueryIndex setFieldNames(Collection<String> fields, boolean asc) {
this.fields = new LinkedHashMap<>();
for (String field : fields)
this.fields.put(field, asc);
+
+ return this;
}
/**
@@ -220,8 +232,11 @@ public class QueryIndex implements Serializable {
* Sets index type.
*
* @param type Index type.
+ * @return {@code this} for chaining.
*/
- public void setIndexType(QueryIndexType type) {
+ public QueryIndex setIndexType(QueryIndexType type) {
this.type = type;
+
+ return this;
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/1c9b0246/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
index 0ff6d8b..24ccb05 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
@@ -1566,8 +1566,10 @@ public class GridQueryProcessor extends GridProcessorAdapter {
if (idxName == null)
idxName = QueryEntity.defaultIndexName(idx);
- if (idx.getIndexType() == QueryIndexType.SORTED || idx.getIndexType() == QueryIndexType.GEOSPATIAL) {
- d.addIndex(idxName, idx.getIndexType() == QueryIndexType.SORTED ? SORTED : GEO_SPATIAL);
+ QueryIndexType idxTyp = idx.getIndexType();
+
+ if (idxTyp == QueryIndexType.SORTED || idxTyp == QueryIndexType.GEOSPATIAL) {
+ d.addIndex(idxName, idxTyp == QueryIndexType.SORTED ? SORTED : GEO_SPATIAL);
int i = 0;
@@ -1583,9 +1585,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
d.addFieldToIndex(idxName, field, i++, !asc);
}
}
- else {
- assert idx.getIndexType() == QueryIndexType.FULLTEXT;
-
+ else if (idxTyp == QueryIndexType.FULLTEXT){
for (String field : idx.getFields().keySet()) {
String alias = aliases.get(field);
@@ -1595,6 +1595,11 @@ public class GridQueryProcessor extends GridProcessorAdapter {
d.addFieldToTextIndex(field);
}
}
+ else if (idxTyp != null)
+ throw new IllegalArgumentException("Unsupported index type [idx=" + idx.getName() +
+ ", typ=" + idxTyp + ']');
+ else
+ throw new IllegalArgumentException("Index type is not set: " + idx.getName());
}
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/1c9b0246/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
index 81c28a3..2b240e9 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
@@ -207,6 +207,21 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
entityList.add(qryEntity);
+ qryEntity = new QueryEntity();
+
+ qryEntity.setKeyType(Integer.class.getName());
+ qryEntity.setValueType(ObjectValue2.class.getName());
+
+ qryEntity.addQueryField("strVal", String.class.getName(), null);
+
+ final QueryIndex strIdx = new QueryIndex(); // Default index type
+
+ strIdx.setFieldNames(Collections.singletonList("strVal"), true);
+
+ qryEntity.setIndexes(Arrays.asList(strIdx));
+
+ entityList.add(qryEntity);
+
cc.setQueryEntities(entityList);
if (cacheMode() != CacheMode.LOCAL)
@@ -759,6 +774,40 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
*
* @throws Exception In case of error.
*/
+ public void testObjectWithString() throws Exception {
+ IgniteCache<Integer, ObjectValue2> cache = ignite().cache(null);
+
+ cache.put(1, new ObjectValue2("value 1"));
+ cache.put(2, new ObjectValue2("value 2"));
+ cache.put(3, new ObjectValue2("value 3"));
+
+ QueryCursor<Cache.Entry<Integer, ObjectValue2>> qry
+ = cache.query(new SqlQuery<Integer, ObjectValue2>(ObjectValue2.class, "strVal like ?").setArgs("value%"));
+
+ int expCnt = 3;
+
+ List<Cache.Entry<Integer, ObjectValue2>> results = qry.getAll();
+
+ assertEquals(expCnt, results.size());
+
+ qry = cache.query(new SqlQuery<Integer, ObjectValue2>(ObjectValue2.class, "strVal > ?").setArgs("value 1"));
+
+ results = qry.getAll();
+
+ assertEquals(expCnt - 1, results.size());
+
+ qry = cache.query(new TextQuery<Integer, ObjectValue2>(ObjectValue2.class, "value"));
+
+ results = qry.getAll();
+
+ assertEquals(0, results.size()); //Should fail for FULL_TEXT index, but SORTED
+ }
+
+ /**
+ * JUnit.
+ *
+ * @throws Exception In case of error.
+ */
public void testEnumObjectQuery() throws Exception {
final IgniteCache<Long, EnumObject> cache = ignite().cache(null);
@@ -2061,6 +2110,54 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
}
/**
+ * Another test value object.
+ */
+ private static class ObjectValue2 {
+ /** Value. */
+ private String strVal;
+
+ /**
+ * @param strVal String value.
+ */
+ ObjectValue2(String strVal) {
+ this.strVal = strVal;
+ }
+
+ /**
+ * Gets value.
+ *
+ * @return Value.
+ */
+ public String value() {
+ return strVal;
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean equals(Object o) {
+ if (this == o)
+ return true;
+
+ if (o == null || getClass() != o.getClass())
+ return false;
+
+ ObjectValue2 other = (ObjectValue2)o;
+
+ return strVal == null ? other.strVal == null : strVal.equals(other.strVal);
+
+ }
+
+ /** {@inheritDoc} */
+ @Override public int hashCode() {
+ return strVal != null ? strVal.hashCode() : 0;
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(ObjectValue2.class, this);
+ }
+ }
+
+ /**
* Empty test object.
*/
@SuppressWarnings("UnusedDeclaration")
[16/50] [abbrv] ignite git commit: ignite-3727 Support local
listeners async execution for IgniteMessage.send
Posted by vo...@apache.org.
ignite-3727 Support local listeners async execution for IgniteMessage.send
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e8f8e0ac
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e8f8e0ac
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e8f8e0ac
Branch: refs/heads/ignite-4565-ddl
Commit: e8f8e0acf254133dd978d72adb73c5362752f706
Parents: 2cfd55d
Author: Dmitriy Govorukhin <dm...@gmail.com>
Authored: Wed Feb 15 13:51:33 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Feb 15 13:52:22 2017 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/IgniteMessaging.java | 11 +-
.../ignite/internal/IgniteMessagingImpl.java | 6 +-
.../internal/managers/GridManagerAdapter.java | 2 +-
.../managers/communication/GridIoManager.java | 55 +-
.../communication/GridIoManagerSelfTest.java | 6 +-
...niteMessagingConfigVariationFullApiTest.java | 195 +++++--
.../ignite/messaging/GridMessagingSelfTest.java | 114 +++-
.../messaging/IgniteMessagingSendAsyncTest.java | 544 +++++++++++++++++++
.../ignite/testsuites/IgniteBasicTestSuite.java | 2 +
.../hadoop/shuffle/HadoopShuffle.java | 2 +-
10 files changed, 865 insertions(+), 72 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e8f8e0ac/modules/core/src/main/java/org/apache/ignite/IgniteMessaging.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteMessaging.java b/modules/core/src/main/java/org/apache/ignite/IgniteMessaging.java
index ab554af..e64ded5 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteMessaging.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteMessaging.java
@@ -77,6 +77,10 @@ public interface IgniteMessaging extends IgniteAsyncSupport {
/**
* Sends given message with specified topic to the nodes in the underlying cluster group.
+ * <p>
+ * By default all local listeners will be executed in the calling thread, or if you use
+ * {@link #withAsync()}, listeners will execute in public thread pool (in this case it is user's
+ * responsibility to implement back-pressure and limit number of concurrently executed async messages).
*
* @param topic Topic to send to, {@code null} for default topic.
* @param msg Message to send.
@@ -87,6 +91,10 @@ public interface IgniteMessaging extends IgniteAsyncSupport {
/**
* Sends given messages with the specified topic to the nodes in the underlying cluster group.
+ * <p>
+ * By default all local listeners will be executed in the calling thread, or if you use
+ * {@link #withAsync()}, listeners will execute in public thread pool (in this case it is user's
+ * responsibility to implement back-pressure and limit number of concurrently executed async messages).
*
* @param topic Topic to send to, {@code null} for default topic.
* @param msgs Messages to send. Order of the sending is undefined. If the method produces
@@ -99,7 +107,8 @@ public interface IgniteMessaging extends IgniteAsyncSupport {
/**
* Sends given message with specified topic to the nodes in the underlying cluster group. Messages sent with
* this method will arrive in the same order they were sent. Note that if a topic is used
- * for ordered messages, then it cannot be reused for non-ordered messages.
+ * for ordered messages, then it cannot be reused for non-ordered messages. Note that local listeners
+ * are always executed in public thread pool, no matter default or {@link #withAsync()} mode is used.
* <p>
* The {@code timeout} parameter specifies how long an out-of-order message will stay in a queue,
* waiting for messages that are ordered ahead of it to arrive. If timeout expires, then all ordered
http://git-wip-us.apache.org/repos/asf/ignite/blob/e8f8e0ac/modules/core/src/main/java/org/apache/ignite/internal/IgniteMessagingImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteMessagingImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteMessagingImpl.java
index 2800777..541fad4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteMessagingImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteMessagingImpl.java
@@ -86,7 +86,7 @@ public class IgniteMessagingImpl extends AsyncSupportAdapter<IgniteMessaging>
if (snapshot.isEmpty())
throw U.emptyTopologyException();
- ctx.io().sendUserMessage(snapshot, msg, topic, false, 0);
+ ctx.io().sendUserMessage(snapshot, msg, topic, false, 0, isAsync());
}
catch (IgniteCheckedException e) {
throw U.convertException(e);
@@ -111,7 +111,7 @@ public class IgniteMessagingImpl extends AsyncSupportAdapter<IgniteMessaging>
for (Object msg : msgs) {
A.notNull(msg, "msg");
- ctx.io().sendUserMessage(snapshot, msg, topic, false, 0);
+ ctx.io().sendUserMessage(snapshot, msg, topic, false, 0, isAsync());
}
}
catch (IgniteCheckedException e) {
@@ -137,7 +137,7 @@ public class IgniteMessagingImpl extends AsyncSupportAdapter<IgniteMessaging>
if (timeout == 0)
timeout = ctx.config().getNetworkTimeout();
- ctx.io().sendUserMessage(snapshot, msg, topic, true, timeout);
+ ctx.io().sendUserMessage(snapshot, msg, topic, true, timeout, false);
}
catch (IgniteCheckedException e) {
throw U.convertException(e);
http://git-wip-us.apache.org/repos/asf/ignite/blob/e8f8e0ac/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
index 584cc56..5992eda 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
@@ -390,7 +390,7 @@ public abstract class GridManagerAdapter<T extends IgniteSpi> implements GridMan
if (msg instanceof Message)
ctx.io().send(node, topic, (Message)msg, SYSTEM_POOL);
else
- ctx.io().sendUserMessage(Collections.singletonList(node), msg, topic, false, 0);
+ ctx.io().sendUserMessage(Collections.singletonList(node), msg, topic, false, 0, false);
}
catch (IgniteCheckedException e) {
throw unwrapException(e);
http://git-wip-us.apache.org/repos/asf/ignite/blob/e8f8e0ac/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
index 7ef7bc0..84b4543 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
@@ -785,7 +785,8 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
finally {
threadProcessingMessage(false);
- msgC.run();
+ if (msgC != null)
+ msgC.run();
}
}
@@ -1237,6 +1238,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
* @param timeout Timeout.
* @param skipOnTimeout Whether message can be skipped on timeout.
* @param ackC Ack closure.
+ * @param async If {@code true} message for local node will be processed in pool, otherwise in current thread.
* @throws IgniteCheckedException Thrown in case of any errors.
*/
private void send(
@@ -1248,7 +1250,8 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
boolean ordered,
long timeout,
boolean skipOnTimeout,
- IgniteInClosure<IgniteException> ackC
+ IgniteInClosure<IgniteException> ackC,
+ boolean async
) throws IgniteCheckedException {
assert node != null;
assert topic != null;
@@ -1266,6 +1269,11 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
if (ordered)
processOrderedMessage(locNodeId, ioMsg, plc, null);
+ else if (async) {
+ assert msg instanceof GridIoUserMessage : ioMsg; // Async execution was added only for IgniteMessaging.
+
+ processRegularMessage(locNodeId, ioMsg, plc, null);
+ }
else
processRegularMessage0(ioMsg, locNodeId);
@@ -1323,7 +1331,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
if (node == null)
throw new IgniteCheckedException("Failed to send message to node (has node left grid?): " + nodeId);
- send(node, topic, topic.ordinal(), msg, plc, false, 0, false, null);
+ send(node, topic, topic.ordinal(), msg, plc, false, 0, false, null, false);
}
/**
@@ -1335,7 +1343,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
*/
public void send(ClusterNode node, Object topic, Message msg, byte plc)
throws IgniteCheckedException {
- send(node, topic, -1, msg, plc, false, 0, false, null);
+ send(node, topic, -1, msg, plc, false, 0, false, null, false);
}
/**
@@ -1343,11 +1351,12 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
* @param topic Topic to send the message to.
* @param msg Message to send.
* @param plc Type of processing.
+ * @param async Async flag.
* @throws IgniteCheckedException Thrown in case of any errors.
*/
- public void send(ClusterNode node, GridTopic topic, Message msg, byte plc)
+ public void send(ClusterNode node, GridTopic topic, Message msg, byte plc, boolean async)
throws IgniteCheckedException {
- send(node, topic, topic.ordinal(), msg, plc, false, 0, false, null);
+ send(node, topic, topic.ordinal(), msg, plc, false, 0, false, null, async);
}
/**
@@ -1360,7 +1369,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
*/
public void send(ClusterNode node, Object topic, int topicOrd, Message msg, byte plc)
throws IgniteCheckedException {
- send(node, topic, topicOrd, msg, plc, false, 0, false, null);
+ send(node, topic, topicOrd, msg, plc, false, 0, false, null, false);
}
/**
@@ -1382,7 +1391,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
) throws IgniteCheckedException {
assert timeout > 0 || skipOnTimeout;
- send(node, topic, (byte)-1, msg, plc, true, timeout, skipOnTimeout, null);
+ send(node, topic, (byte)-1, msg, plc, true, timeout, skipOnTimeout, null, false);
}
/**
@@ -1409,7 +1418,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
if (node == null)
throw new IgniteCheckedException("Failed to send message to node (has node left grid?): " + nodeId);
- send(node, topic, (byte)-1, msg, plc, true, timeout, skipOnTimeout, null);
+ send(node, topic, (byte)-1, msg, plc, true, timeout, skipOnTimeout, null, false);
}
/**
@@ -1422,7 +1431,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
*/
public void send(ClusterNode node, GridTopic topic, Message msg, byte plc,
IgniteInClosure<IgniteException> ackC) throws IgniteCheckedException {
- send(node, topic, topic.ordinal(), msg, plc, false, 0, false, ackC);
+ send(node, topic, topic.ordinal(), msg, plc, false, 0, false, ackC, false);
}
/**
@@ -1458,7 +1467,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
*/
public void send(ClusterNode node, Object topic, Message msg, byte plc, IgniteInClosure<IgniteException> ackC)
throws IgniteCheckedException {
- send(node, topic, -1, msg, plc, false, 0, false, ackC);
+ send(node, topic, -1, msg, plc, false, 0, false, ackC, false);
}
/**
@@ -1514,10 +1523,10 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
) throws IgniteCheckedException {
assert timeout > 0 || skipOnTimeout;
- send(node, topic, (byte)-1, msg, plc, true, timeout, skipOnTimeout, ackC);
+ send(node, topic, (byte)-1, msg, plc, true, timeout, skipOnTimeout, ackC, false);
}
- /**
+ /**
* Sends a peer deployable user message.
*
* @param nodes Destination nodes.
@@ -1525,7 +1534,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
* @throws IgniteCheckedException Thrown in case of any errors.
*/
public void sendUserMessage(Collection<? extends ClusterNode> nodes, Object msg) throws IgniteCheckedException {
- sendUserMessage(nodes, msg, null, false, 0);
+ sendUserMessage(nodes, msg, null, false, 0, false);
}
/**
@@ -1536,11 +1545,12 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
* @param topic Message topic to use.
* @param ordered Is message ordered?
* @param timeout Message timeout in milliseconds for ordered messages.
+ * @param async Async flag.
* @throws IgniteCheckedException Thrown in case of any errors.
*/
@SuppressWarnings("ConstantConditions")
public void sendUserMessage(Collection<? extends ClusterNode> nodes, Object msg,
- @Nullable Object topic, boolean ordered, long timeout) throws IgniteCheckedException {
+ @Nullable Object topic, boolean ordered, long timeout, boolean async) throws IgniteCheckedException {
boolean loc = nodes.size() == 1 && F.first(nodes).id().equals(locNodeId);
byte[] serMsg = null;
@@ -1585,7 +1595,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
if (ordered)
sendOrderedMessage(nodes, TOPIC_COMM_USER, ioMsg, PUBLIC_POOL, timeout, true);
else if (loc)
- send(F.first(nodes), TOPIC_COMM_USER, ioMsg, PUBLIC_POOL);
+ send(F.first(nodes), TOPIC_COMM_USER, ioMsg, PUBLIC_POOL, async);
else {
ClusterNode locNode = F.find(nodes, null, F.localNode(locNodeId));
@@ -1594,10 +1604,11 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
if (!rmtNodes.isEmpty())
send(rmtNodes, TOPIC_COMM_USER, ioMsg, PUBLIC_POOL);
- // Will call local listeners in current thread synchronously, so must go the last
+ // Will call local listeners in current thread synchronously or through pool,
+ // depending async flag, so must go the last
// to allow remote nodes execute the requested operation in parallel.
if (locNode != null)
- send(locNode, TOPIC_COMM_USER, ioMsg, PUBLIC_POOL);
+ send(locNode, TOPIC_COMM_USER, ioMsg, PUBLIC_POOL, async);
}
}
@@ -1664,7 +1675,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
if (node == null)
throw new IgniteCheckedException("Failed to send message to node (has node left grid?): " + nodeId);
- send(node, topic, (byte)-1, msg, plc, true, timeout, skipOnTimeout, ackC);
+ send(node, topic, (byte)-1, msg, plc, true, timeout, skipOnTimeout, ackC, false);
}
/**
@@ -1701,7 +1712,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
// messages to one node vs. many.
if (!nodes.isEmpty()) {
for (ClusterNode node : nodes)
- send(node, topic, topicOrd, msg, plc, ordered, timeout, skipOnTimeout, null);
+ send(node, topic, topicOrd, msg, plc, ordered, timeout, skipOnTimeout, null, false);
}
else if (log.isDebugEnabled())
log.debug("Failed to send message to empty nodes collection [topic=" + topic + ", msg=" +
@@ -1929,8 +1940,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
if (rmv && log.isDebugEnabled())
log.debug("Removed message listener [topic=" + topic + ", lsnr=" + lsnr + ']');
- if (lsnr instanceof ArrayListener)
- {
+ if (lsnr instanceof ArrayListener) {
for (GridMessageListener childLsnr : ((ArrayListener)lsnr).arr)
closeListener(childLsnr);
}
@@ -1942,6 +1952,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
/**
* Closes a listener, if applicable.
+ *
* @param lsnr Listener.
*/
private void closeListener(GridMessageListener lsnr) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/e8f8e0ac/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
index c2cfa76..f5499d3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
@@ -145,7 +145,7 @@ public class GridIoManagerSelfTest extends GridCommonAbstractTest {
GridIoManager ioMgr = spy(new TestGridIoManager(ctx));
try {
- ioMgr.sendUserMessage(F.asList(locNode, rmtNode), msg, GridTopic.TOPIC_IGFS, false, 123L);
+ ioMgr.sendUserMessage(F.asList(locNode, rmtNode), msg, GridTopic.TOPIC_IGFS, false, 123L, false);
}
catch (IgniteCheckedException ignored) {
// No-op. We are using mocks so real sending is impossible.
@@ -169,7 +169,7 @@ public class GridIoManagerSelfTest extends GridCommonAbstractTest {
GridIoManager ioMgr = spy(new TestGridIoManager(ctx));
try {
- ioMgr.sendUserMessage(F.asList(locNode, rmtNode), msg, GridTopic.TOPIC_IGFS, true, 123L);
+ ioMgr.sendUserMessage(F.asList(locNode, rmtNode), msg, GridTopic.TOPIC_IGFS, true, 123L, false);
}
catch (Exception ignored) {
// No-op. We are using mocks so real sending is impossible.
@@ -196,7 +196,7 @@ public class GridIoManagerSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public void send(ClusterNode node, GridTopic topic, Message msg, byte plc)
+ @Override public void send(ClusterNode node, GridTopic topic, Message msg, byte plc, boolean async)
throws IgniteCheckedException {
// No-op.
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/e8f8e0ac/modules/core/src/test/java/org/apache/ignite/internal/processors/messaging/IgniteMessagingConfigVariationFullApiTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/messaging/IgniteMessagingConfigVariationFullApiTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/messaging/IgniteMessagingConfigVariationFullApiTest.java
index 31b0663..49aab10 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/messaging/IgniteMessagingConfigVariationFullApiTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/messaging/IgniteMessagingConfigVariationFullApiTest.java
@@ -58,7 +58,18 @@ public class IgniteMessagingConfigVariationFullApiTest extends IgniteConfigVaria
public void testLocalServer() throws Exception {
runInAllDataModes(new TestRunnable() {
@Override public void run() throws Exception {
- localServerInternal();
+ localServerInternal(false);
+ }
+ });
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testLocalServerAsync() throws Exception {
+ runInAllDataModes(new TestRunnable() {
+ @Override public void run() throws Exception {
+ localServerInternal(true);
}
});
}
@@ -83,7 +94,21 @@ public class IgniteMessagingConfigVariationFullApiTest extends IgniteConfigVaria
runInAllDataModes(new TestRunnable() {
@Override public void run() throws Exception {
- serverClientMessage();
+ serverClientMessage(false);
+ }
+ });
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testServerClientMessageAsync() throws Exception {
+ if (!testsCfg.withClients())
+ return;
+
+ runInAllDataModes(new TestRunnable() {
+ @Override public void run() throws Exception {
+ serverClientMessage(true);
}
});
}
@@ -97,7 +122,21 @@ public class IgniteMessagingConfigVariationFullApiTest extends IgniteConfigVaria
runInAllDataModes(new TestRunnable() {
@Override public void run() throws Exception {
- clientClientMessage();
+ clientClientMessage(false);
+ }
+ });
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testClientClientMessageAsync() throws Exception {
+ if (!testsCfg.withClients())
+ return;
+
+ runInAllDataModes(new TestRunnable() {
+ @Override public void run() throws Exception {
+ clientClientMessage(true);
}
});
}
@@ -111,7 +150,21 @@ public class IgniteMessagingConfigVariationFullApiTest extends IgniteConfigVaria
runInAllDataModes(new TestRunnable() {
@Override public void run() throws Exception {
- clientServerMessage();
+ clientServerMessage(false);
+ }
+ });
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testClientServerMessageAsync() throws Exception {
+ if (!testsCfg.withClients())
+ return;
+
+ runInAllDataModes(new TestRunnable() {
+ @Override public void run() throws Exception {
+ clientServerMessage(true);
}
});
}
@@ -133,7 +186,18 @@ public class IgniteMessagingConfigVariationFullApiTest extends IgniteConfigVaria
public void testOrderedMessage() throws Exception {
runInAllDataModes(new TestRunnable() {
@Override public void run() throws Exception {
- orderedMessage();
+ orderedMessage(false);
+ }
+ });
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testOrderedMessageAsync() throws Exception {
+ runInAllDataModes(new TestRunnable() {
+ @Override public void run() throws Exception {
+ orderedMessage(true);
}
});
}
@@ -147,7 +211,7 @@ public class IgniteMessagingConfigVariationFullApiTest extends IgniteConfigVaria
runInAllDataModes(new TestRunnable() {
@Override public void run() throws Exception {
- clientServerOrderedMessage();
+ clientServerOrderedMessage(false);
}
});
}
@@ -155,13 +219,42 @@ public class IgniteMessagingConfigVariationFullApiTest extends IgniteConfigVaria
/**
* @throws Exception If failed.
*/
+ public void testClientServerOrderedMessageAsync() throws Exception {
+ if (!testsCfg.withClients())
+ return;
+
+ runInAllDataModes(new TestRunnable() {
+ @Override public void run() throws Exception {
+ clientServerOrderedMessage(true);
+ }
+ });
+ }
+
+
+ /**
+ * @throws Exception If failed.
+ */
public void testClientClientOrderedMessage() throws Exception {
if (!testsCfg.withClients())
return;
runInAllDataModes(new TestRunnable() {
@Override public void run() throws Exception {
- clientClientOrderedMessage();
+ clientClientOrderedMessage(false);
+ }
+ });
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testClientClientOrderedMessageAsync() throws Exception {
+ if (!testsCfg.withClients())
+ return;
+
+ runInAllDataModes(new TestRunnable() {
+ @Override public void run() throws Exception {
+ clientClientOrderedMessage(true);
}
});
}
@@ -175,16 +268,32 @@ public class IgniteMessagingConfigVariationFullApiTest extends IgniteConfigVaria
runInAllDataModes(new TestRunnable() {
@Override public void run() throws Exception {
- serverClientOrderedMessage();
+ serverClientOrderedMessage(false);
+ }
+ });
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testServerClientOrderedMessageAsync() throws Exception {
+ if (!testsCfg.withClients())
+ return;
+
+ runInAllDataModes(new TestRunnable() {
+ @Override public void run() throws Exception {
+ serverClientOrderedMessage(true);
}
});
}
/**
* Single server test.
+ *
+ * @param async Async message send flag.
* @throws Exception If failed.
*/
- private void localServerInternal() throws Exception {
+ private void localServerInternal(boolean async) throws Exception {
int messages = MSGS;
Ignite ignite = grid(SERVER_NODE_IDX);
@@ -197,7 +306,7 @@ public class IgniteMessagingConfigVariationFullApiTest extends IgniteConfigVaria
try {
for (int i = 0; i < messages; i++)
- sendMessage(ignite, grp, value(i));
+ sendMessage(ignite, grp, value(i), async);
assertTrue(LATCH.await(10, TimeUnit.SECONDS));
@@ -238,52 +347,59 @@ public class IgniteMessagingConfigVariationFullApiTest extends IgniteConfigVaria
/**
* Server sends a message and client receives it.
+ *
+ * @param async Async message send flag.
* @throws Exception If failed.
*/
- private void serverClientMessage() throws Exception {
+ private void serverClientMessage(boolean async) throws Exception {
Ignite ignite = grid(SERVER_NODE_IDX);
ClusterGroup grp = ignite.cluster().forClients();
assert grp.nodes().size() > 0;
- registerListenerAndSendMessages(ignite, grp);
+ registerListenerAndSendMessages(ignite, grp, async);
}
/**
* Client sends a message and client receives it.
+ *
+ * @param async Async message send flag.
* @throws Exception If failed.
*/
- private void clientClientMessage() throws Exception {
+ private void clientClientMessage(boolean async) throws Exception {
Ignite ignite = grid(CLIENT_NODE_IDX);
ClusterGroup grp = ignite.cluster().forClients();
assert grp.nodes().size() > 0;
- registerListenerAndSendMessages(ignite, grp);
+ registerListenerAndSendMessages(ignite, grp, async);
}
/**
* Client sends a message and client receives it.
+ *
+ * @param async Async message send flag.
* @throws Exception If failed.
*/
- private void clientServerMessage() throws Exception {
+ private void clientServerMessage(boolean async) throws Exception {
Ignite ignite = grid(CLIENT_NODE_IDX);
ClusterGroup grp = ignite.cluster().forServers();
assert grp.nodes().size() > 0;
- registerListenerAndSendMessages(ignite, grp);
+ registerListenerAndSendMessages(ignite, grp, async);
}
/**
* @param ignite Ignite.
* @param grp Cluster group.
+ * @param async Async message send flag.
* @throws Exception If fail.
*/
- private void registerListenerAndSendMessages(Ignite ignite, ClusterGroup grp) throws Exception {
+ private void registerListenerAndSendMessages(Ignite ignite, ClusterGroup grp, boolean async) throws Exception {
int messages = MSGS;
LATCH = new CountDownLatch(grp.nodes().size() * messages);
@@ -292,7 +408,7 @@ public class IgniteMessagingConfigVariationFullApiTest extends IgniteConfigVaria
try {
for (int i = 0; i < messages; i++)
- sendMessage(ignite, grp, value(i));
+ sendMessage(ignite, grp, value(i), async);
assertTrue(LATCH.await(10, TimeUnit.SECONDS));
@@ -335,67 +451,68 @@ public class IgniteMessagingConfigVariationFullApiTest extends IgniteConfigVaria
}
/**
- *
+ * @param async Async message send flag.
* @throws Exception If fail.
*/
- private void orderedMessage() throws Exception {
+ private void orderedMessage(boolean async) throws Exception {
Ignite ignite = grid(SERVER_NODE_IDX);
ClusterGroup grp = gridCount() > 1 ? ignite.cluster().forRemotes() : ignite.cluster().forLocal();
assert grp.nodes().size() > 0;
- registerListenerAndSendOrderedMessages(ignite, grp);
+ registerListenerAndSendOrderedMessages(ignite, grp, async);
}
/**
- *
+ * @param async Async message send flag.
* @throws Exception If fail.
*/
- private void clientServerOrderedMessage() throws Exception {
+ private void clientServerOrderedMessage(boolean async) throws Exception {
Ignite ignite = grid(CLIENT_NODE_IDX);
ClusterGroup grp = ignite.cluster().forServers();
assert grp.nodes().size() > 0;
- registerListenerAndSendOrderedMessages(ignite, grp);
+ registerListenerAndSendOrderedMessages(ignite, grp, async);
}
/**
- *
+ * @param async Async message send flag.
* @throws Exception If fail.
*/
- private void clientClientOrderedMessage() throws Exception {
+ private void clientClientOrderedMessage(boolean async) throws Exception {
Ignite ignite = grid(CLIENT_NODE_IDX);
ClusterGroup grp = ignite.cluster().forClients();
assert grp.nodes().size() > 0;
- registerListenerAndSendOrderedMessages(ignite, grp);
+ registerListenerAndSendOrderedMessages(ignite, grp, async);
}
/**
- *
+ * @param async Async message send flag.
* @throws Exception If fail.
*/
- private void serverClientOrderedMessage() throws Exception {
+ private void serverClientOrderedMessage(boolean async) throws Exception {
Ignite ignite = grid(SERVER_NODE_IDX);
ClusterGroup grp = ignite.cluster().forClients();
assert grp.nodes().size() > 0;
- registerListenerAndSendOrderedMessages(ignite, grp);
+ registerListenerAndSendOrderedMessages(ignite, grp, async);
}
/**
* @param ignite Ignite.
* @param grp Cluster group.
+ * @param async Async message send flag.
* @throws Exception If fail.
*/
- private void registerListenerAndSendOrderedMessages(Ignite ignite, ClusterGroup grp) throws Exception {
+ private void registerListenerAndSendOrderedMessages(Ignite ignite, ClusterGroup grp, boolean async) throws Exception {
int messages = MSGS;
LATCH = new CountDownLatch(grp.nodes().size() * messages);
@@ -403,8 +520,12 @@ public class IgniteMessagingConfigVariationFullApiTest extends IgniteConfigVaria
UUID opId = ignite.message(grp).remoteListen(MESSAGE_TOPIC, new OrderedMessageListener());
try {
- for (int i=0; i < messages; i++)
- ignite.message(grp).sendOrdered(MESSAGE_TOPIC, value(i), 2000);
+ for (int i=0; i < messages; i++){
+ if (async)
+ ignite.message(grp).withAsync().sendOrdered(MESSAGE_TOPIC, value(i), 2000);
+ else
+ ignite.message(grp).sendOrdered(MESSAGE_TOPIC, value(i), 2000);
+ }
assertTrue(LATCH.await(10, TimeUnit.SECONDS));
@@ -419,9 +540,13 @@ public class IgniteMessagingConfigVariationFullApiTest extends IgniteConfigVaria
* @param nodeSnd Sender Ignite node.
* @param grp Cluster group.
* @param msg Message.
+ * @param async Async message send flag.
*/
- private void sendMessage(Ignite nodeSnd, ClusterGroup grp, Object msg) {
- nodeSnd.message(grp).send(MESSAGE_TOPIC, msg);
+ private void sendMessage(Ignite nodeSnd, ClusterGroup grp, Object msg, boolean async) {
+ if (async)
+ nodeSnd.message(grp).withAsync().send(MESSAGE_TOPIC, msg);
+ else
+ nodeSnd.message(grp).send(MESSAGE_TOPIC, msg);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/e8f8e0ac/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java
index e796eb5..a166c3d 100644
--- a/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java
@@ -24,6 +24,7 @@ import java.io.ObjectOutput;
import java.io.Serializable;
import java.net.URL;
import java.net.URLClassLoader;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
@@ -36,15 +37,20 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteMessaging;
import org.apache.ignite.cluster.ClusterGroup;
import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage;
+import org.apache.ignite.internal.processors.continuous.StartRoutineDiscoveryMessage;
+import org.apache.ignite.internal.processors.continuous.StopRoutineDiscoveryMessage;
import org.apache.ignite.internal.util.GridConcurrentHashSet;
import org.apache.ignite.internal.util.typedef.P2;
import org.apache.ignite.internal.util.typedef.PA;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteFuture;
-import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.resources.IgniteInstanceResource;;
+import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
@@ -198,7 +204,7 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest implements Ser
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
+ TestTcpDiscoverySpi discoSpi = new TestTcpDiscoverySpi();
discoSpi.setIpFinder(ipFinder);
@@ -944,7 +950,7 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest implements Ser
* @throws Exception If error occurs.
*/
public void testSendMessageWithExternalClassLoader() throws Exception {
- URL[] urls = new URL[] { new URL(GridTestProperties.getProperty("p2p.uri.cls")) };
+ URL[] urls = new URL[] {new URL(GridTestProperties.getProperty("p2p.uri.cls"))};
ClassLoader extLdr = new URLClassLoader(urls);
@@ -1028,6 +1034,8 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest implements Ser
public void testAsync() throws Exception {
final AtomicInteger msgCnt = new AtomicInteger();
+ TestTcpDiscoverySpi discoSpi = (TestTcpDiscoverySpi)ignite2.configuration().getDiscoverySpi();
+
assertFalse(ignite2.message().isAsync());
final IgniteMessaging msg = ignite2.message().withAsync();
@@ -1044,6 +1052,8 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest implements Ser
}
}, IllegalStateException.class, null);
+ discoSpi.blockCustomEvent();
+
final String topic = "topic";
UUID id = msg.remoteListen(topic, new P2<UUID, Object>() {
@@ -1059,9 +1069,15 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest implements Ser
Assert.assertNull(id);
- IgniteFuture<UUID> fut = msg.future();
+ IgniteFuture<UUID> starFut = msg.future();
+
+ Assert.assertNotNull(starFut);
+
+ U.sleep(500);
- Assert.assertNotNull(fut);
+ Assert.assertFalse(starFut.isDone());
+
+ discoSpi.stopBlock();
GridTestUtils.assertThrows(log, new Callable<Void>() {
@Override public Void call() throws Exception {
@@ -1071,10 +1087,14 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest implements Ser
}
}, IllegalStateException.class, null);
- id = fut.get();
+ id = starFut.get();
Assert.assertNotNull(id);
+ Assert.assertTrue(starFut.isDone());
+
+ discoSpi.blockCustomEvent();
+
message(ignite1.cluster().forRemotes()).send(topic, "msg1");
GridTestUtils.waitForCondition(new PA() {
@@ -1099,8 +1119,16 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest implements Ser
}
}, IllegalStateException.class, null);
+ U.sleep(500);
+
+ Assert.assertFalse(stopFut.isDone());
+
+ discoSpi.stopBlock();
+
stopFut.get();
+ Assert.assertTrue(stopFut.isDone());
+
message(ignite1.cluster().forRemotes()).send(topic, "msg2");
U.sleep(1000);
@@ -1109,6 +1137,80 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest implements Ser
}
/**
+ *
+ */
+ static class TestTcpDiscoverySpi extends TcpDiscoverySpi {
+ /** */
+ private boolean blockCustomEvt;
+
+ /** */
+ private final Object mux = new Object();
+
+ /** */
+ private List<DiscoverySpiCustomMessage> blockedMsgs = new ArrayList<>();
+
+ /** {@inheritDoc} */
+ @Override public void sendCustomEvent(DiscoverySpiCustomMessage msg) throws IgniteException {
+ synchronized (mux) {
+ if (blockCustomEvt) {
+ DiscoveryCustomMessage msg0 = GridTestUtils.getFieldValue(msg, "delegate");
+ if (msg0 instanceof StopRoutineDiscoveryMessage || msg0 instanceof StartRoutineDiscoveryMessage) {
+ log.info("Block custom message: " + msg0);
+ blockedMsgs.add(msg);
+
+ mux.notifyAll();
+ }
+ return;
+ }
+ }
+
+ super.sendCustomEvent(msg);
+ }
+
+ /**
+ *
+ */
+ public void blockCustomEvent() {
+ synchronized (mux) {
+ assert blockedMsgs.isEmpty() : blockedMsgs;
+
+ blockCustomEvt = true;
+ }
+ }
+
+ /**
+ * @throws InterruptedException If interrupted.
+ */
+ public void waitCustomEvent() throws InterruptedException {
+ synchronized (mux) {
+ while (blockedMsgs.isEmpty())
+ mux.wait();
+ }
+ }
+
+ /**
+ *
+ */
+ public void stopBlock() {
+ List<DiscoverySpiCustomMessage> msgs;
+
+ synchronized (this) {
+ msgs = new ArrayList<>(blockedMsgs);
+
+ blockCustomEvt = false;
+
+ blockedMsgs.clear();
+ }
+
+ for (DiscoverySpiCustomMessage msg : msgs) {
+ log.info("Resend blocked message: " + msg);
+
+ super.sendCustomEvent(msg);
+ }
+ }
+ }
+
+ /**
* Tests that message listener registers only for one oldest node.
*
* @throws Exception If an error occurred.
http://git-wip-us.apache.org/repos/asf/ignite/blob/e8f8e0ac/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingSendAsyncTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingSendAsyncTest.java b/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingSendAsyncTest.java
new file mode 100644
index 0000000..75e7d22
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingSendAsyncTest.java
@@ -0,0 +1,544 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.messaging;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicReference;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteMessaging;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.lang.IgniteBiInClosure;
+import org.apache.ignite.lang.IgniteBiPredicate;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.jsr166.ThreadLocalRandom8;
+import org.junit.Assert;
+
+/**
+ *
+ */
+public class IgniteMessagingSendAsyncTest extends GridCommonAbstractTest implements Serializable {
+ /** */
+ private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
+
+ /** Threads number for multi-thread tests. */
+ private static final int THREADS = 10;
+
+ /** */
+ private final String TOPIC = "topic";
+
+ /** */
+ private final String msgStr = "message";
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+ ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder);
+
+ return cfg;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTest() throws Exception {
+ stopAllGrids();
+
+ super.afterTest();
+ }
+
+ /**
+ * Checks if use default mode, local listeners execute in the same thread, 1 node in topology.
+ *
+ * @throws Exception If failed.
+ */
+ public void testSendDefaultMode() throws Exception {
+ Ignite ignite1 = startGrid(1);
+
+ send(ignite1.message(), msgStr, new IgniteBiInClosure<String, Thread> () {
+ @Override public void apply(String msg, Thread thread) {
+ Assert.assertEquals(Thread.currentThread(), thread);
+ Assert.assertEquals(msgStr, msg);
+ }
+ });
+ }
+
+ /**
+ * Checks if use async mode, local listeners execute in another thread, 1 node in topology.
+ *
+ * @throws Exception If failed.
+ */
+ public void testSendAsyncMode() throws Exception {
+ Ignite ignite1 = startGrid(1);
+
+ send(ignite1.message().withAsync(), msgStr, new IgniteBiInClosure<String, Thread> () {
+ @Override public void apply(String msg, Thread thread) {
+ Assert.assertTrue(!Thread.currentThread().equals(thread));
+ Assert.assertEquals(msgStr, msg);
+ }
+ });
+ }
+
+ /**
+ * Checks if use default mode, local listeners execute in the same thread, 2 nodes in topology.
+ *
+ * @throws Exception If failed.
+ */
+ public void testSendDefaultMode2Nodes() throws Exception {
+ Ignite ignite1 = startGrid(1);
+ Ignite ignite2 = startGrid(2);
+
+ sendWith2Nodes(ignite2, ignite1.message(), msgStr, new IgniteBiInClosure<String, Thread> () {
+ @Override public void apply(String msg, Thread thread) {
+ Assert.assertEquals(Thread.currentThread(), thread);
+ Assert.assertEquals(msgStr, msg);
+ }
+ });
+ }
+
+ /**
+ * Checks if use async mode, local listeners execute in another thread, 2 nodes in topology.
+ *
+ * @throws Exception If failed.
+ */
+ public void testSendAsyncMode2Node() throws Exception {
+ Ignite ignite1 = startGrid(1);
+ Ignite ignite2 = startGrid(2);
+
+ sendWith2Nodes(ignite2, ignite1.message().withAsync(), msgStr, new IgniteBiInClosure<String, Thread> () {
+ @Override public void apply(String msg, Thread thread) {
+ Assert.assertTrue(!Thread.currentThread().equals(thread));
+ Assert.assertEquals(msgStr, msg);
+ }
+ });
+ }
+
+ /**
+ * Checks that sendOrdered works in thread pool, 1 node in topology.
+ *
+ * @throws Exception If failed.
+ */
+ public void testSendOrderedDefaultMode() throws Exception {
+ Ignite ignite1 = startGrid(1);
+
+ final List<String> msgs = orderedMessages();
+
+ sendOrdered(ignite1.message(), msgs, new IgniteBiInClosure< List<String>, List<Thread>> () {
+ @Override public void apply(List<String> received, List<Thread> threads) {
+ assertFalse(threads.contains(Thread.currentThread()));
+ assertTrue(msgs.equals(received));
+ }
+ });
+ }
+
+ /**
+ * Checks that sendOrdered work in thread pool, 1 node in topology.
+ *
+ * @throws Exception If failed.
+ */
+ public void testSendOrderedAsyncMode() throws Exception {
+ Ignite ignite1 = startGrid(1);
+
+ final List<String> msgs = orderedMessages();
+
+ sendOrdered(ignite1.message().withAsync(), msgs, new IgniteBiInClosure< List<String>, List<Thread>> () {
+ @Override public void apply(List<String> received, List<Thread> threads) {
+ assertFalse(threads.contains(Thread.currentThread()));
+ assertTrue(msgs.equals(received));
+ }
+ });
+ }
+
+ /**
+ * Checks that sendOrdered work in thread pool, 2 nodes in topology.
+ *
+ * @throws Exception If failed.
+ */
+ public void testSendOrderedDefaultMode2Node() throws Exception {
+ Ignite ignite1 = startGrid(1);
+ Ignite ignite2 = startGrid(2);
+
+ final List<String> msgs = orderedMessages();
+
+ sendOrderedWith2Node(ignite2, ignite1.message(), msgs, new IgniteBiInClosure<List<String>, List<Thread>>() {
+ @Override public void apply(List<String> received, List<Thread> threads) {
+ assertFalse(threads.contains(Thread.currentThread()));
+ assertTrue(msgs.equals(received));
+ }
+ });
+ }
+
+ /**
+ * Checks that sendOrdered work in thread pool, 2 nodes in topology.
+ *
+ * @throws Exception If failed.
+ */
+ public void testSendOrderedAsyncMode2Node() throws Exception {
+ Ignite ignite1 = startGrid(1);
+ Ignite ignite2 = startGrid(2);
+
+ final List<String> msgs = orderedMessages();
+
+ sendOrderedWith2Node(ignite2, ignite1.message().withAsync(), msgs, new IgniteBiInClosure<List<String>, List<Thread>>() {
+ @Override public void apply(List<String> received, List<Thread> threads) {
+ assertFalse(threads.contains(Thread.currentThread()));
+ assertTrue(msgs.equals(received));
+ }
+ });
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testSendOrderedDefaultModeMultiThreads() throws Exception {
+ Ignite ignite = startGrid(1);
+
+ sendOrderedMultiThreads(ignite.message());
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testSendOrderedAsyncModeMultiThreads() throws Exception {
+ Ignite ignite = startGrid(1);
+
+ sendOrderedMultiThreads(ignite.message().withAsync());
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testSendOrderedDefaultModeMultiThreadsWith2Node() throws Exception {
+ Ignite ignite1 = startGrid(1);
+ Ignite ignite2 = startGrid(2);
+
+ sendOrderedMultiThreadsWith2Node(ignite2, ignite1.message());
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testSendOrderedAsyncModeMultiThreadsWith2Node() throws Exception {
+ Ignite ignite1 = startGrid(1);
+ Ignite ignite2 = startGrid(2);
+
+ sendOrderedMultiThreadsWith2Node(ignite2, ignite1.message().withAsync());
+ }
+
+ /**
+ * @param ignite2 Second node.
+ * @param ignMsg IgniteMessage.
+ * @throws Exception If failed.
+ */
+ private void sendOrderedMultiThreadsWith2Node(
+ final Ignite ignite2,
+ final IgniteMessaging ignMsg
+ ) throws Exception {
+ final ConcurrentMap<String, List<String>> expMsg = Maps.newConcurrentMap();
+ final ConcurrentMap<String, List<String>> actlMsg = Maps.newConcurrentMap();
+
+ final List<String> msgs = orderedMessages();
+
+ sendOrderedMultiThreadsWith2Node(ignite2, ignMsg, expMsg, actlMsg, msgs);
+
+ }
+
+ /**
+ * @param ignMsg IgniteMessaging.
+ * @throws Exception If failed.
+ */
+ private void sendOrderedMultiThreads(
+ final IgniteMessaging ignMsg
+ ) throws Exception {
+ final ConcurrentMap<String, List<String>> expMsg = Maps.newConcurrentMap();
+ final ConcurrentMap<String, List<String>> actlMsg = Maps.newConcurrentMap();
+
+ final List<String> msgs = orderedMessages();
+
+ sendOrderedMultiThreads(ignMsg, expMsg, actlMsg, msgs);
+ }
+
+ /**
+ * @param ignite2 Second node.
+ * @param ignMsg Ignite for send message.
+ * @param expMsg Expected messages map.
+ * @param actlMsg Actual message map.
+ * @param msgs List of messages.
+ * @throws Exception If failed.
+ */
+ private void sendOrderedMultiThreadsWith2Node(
+ final Ignite ignite2,
+ final IgniteMessaging ignMsg,
+ final ConcurrentMap<String, List<String>> expMsg,
+ final ConcurrentMap<String, List<String>> actlMsg,
+ final List<String> msgs
+ ) throws Exception {
+ final CountDownLatch latch = new CountDownLatch(THREADS * msgs.size());
+
+ final ConcurrentMap<String, List<String>> actlMsgNode2 = Maps.newConcurrentMap();
+
+ ignite2.message().localListen(TOPIC, new IgniteBiPredicate<UUID, Message>() {
+ @Override public boolean apply(UUID uuid, Message msg) {
+ actlMsgNode2.putIfAbsent(msg.threadName, Lists.<String>newArrayList());
+
+ actlMsgNode2.get(msg.threadName).add(msg.msg);
+
+ latch.countDown();
+
+ return true;
+ }
+ });
+
+ sendOrderedMultiThreads(ignMsg, expMsg, actlMsg, msgs);
+
+ latch.await();
+
+ assertEquals(expMsg.size(), actlMsgNode2.size());
+
+ for (Map.Entry<String, List<String>> entry : expMsg.entrySet())
+ assertTrue(actlMsgNode2.get(entry.getKey()).equals(entry.getValue()));
+ }
+
+ /**
+ * @param ignMsg Ignite for send message.
+ * @param expMsg Expected messages map.
+ * @param actlMsg Actual message map.
+ * @param msgs List of messages.
+ * @throws Exception If failed.
+ */
+ private void sendOrderedMultiThreads(
+ final IgniteMessaging ignMsg,
+ final ConcurrentMap<String, List<String>> expMsg,
+ final ConcurrentMap<String, List<String>> actlMsg,
+ final List<String> msgs
+ ) throws Exception {
+ final CountDownLatch latch = new CountDownLatch(THREADS * msgs.size());
+
+ ignMsg.localListen(TOPIC, new IgniteBiPredicate<UUID, Message>() {
+ @Override public boolean apply(UUID uuid, Message msg) {
+ actlMsg.putIfAbsent(msg.threadName, Lists.<String>newArrayList());
+
+ actlMsg.get(msg.threadName).add(msg.msg);
+
+ latch.countDown();
+
+ return true;
+ }
+ });
+
+ for (int i = 0; i < THREADS; i++)
+ new Thread(new Runnable() {
+ @Override public void run() {
+ String thdName = Thread.currentThread().getName();
+
+ List<String> exp = Lists.newArrayList();
+
+ expMsg.put(thdName, exp);
+
+ for (String msg : msgs) {
+ exp.add(msg);
+
+ ignMsg.sendOrdered(TOPIC, new Message(thdName, msg), 1000);
+ }
+
+ }
+ }).start();
+
+ latch.await();
+
+ assertEquals(expMsg.size(), actlMsg.size());
+
+ for (Map.Entry<String, List<String>> entry : expMsg.entrySet())
+ assertTrue(actlMsg.get(entry.getKey()).equals(entry.getValue()));
+ }
+
+ /**
+ * @param ignite2 Second node.
+ * @param igniteMsg Ignite message.
+ * @param msgStr Message string.
+ * @param cls Callback for compare result.
+ * @throws Exception If failed.
+ */
+ private void sendWith2Nodes(
+ final Ignite ignite2,
+ final IgniteMessaging igniteMsg,
+ final String msgStr,
+ final IgniteBiInClosure<String, Thread> cls
+ ) throws Exception {
+ final CountDownLatch latch = new CountDownLatch(1);
+
+ ignite2.message().localListen(TOPIC, new IgniteBiPredicate<UUID, String>() {
+ @Override public boolean apply(UUID uuid, String msg) {
+ Assert.assertEquals(msgStr, msg);
+
+ latch.countDown();
+
+ return true;
+ }
+ });
+
+ send(igniteMsg, msgStr, cls);
+
+ latch.await();
+ }
+
+ /**
+ * @param igniteMsg Ignite messaging.
+ * @param msgStr Message string.
+ * @param cls Callback for compare result.
+ * @throws Exception If failed.
+ */
+ private void send(
+ final IgniteMessaging igniteMsg,
+ final String msgStr,
+ final IgniteBiInClosure<String, Thread> cls
+ ) throws Exception {
+ final CountDownLatch latch = new CountDownLatch(1);
+
+ final AtomicReference<Thread> thread = new AtomicReference<>();
+ final AtomicReference<String> val = new AtomicReference<>();
+
+ igniteMsg.localListen(TOPIC, new IgniteBiPredicate<UUID, String>() {
+ @Override public boolean apply(UUID uuid, String msgStr) {
+ thread.set(Thread.currentThread());
+
+ val.set(msgStr);
+
+ latch.countDown();
+
+ return true;
+ }
+ });
+
+ igniteMsg.send(TOPIC, msgStr);
+
+ latch.await();
+
+ cls.apply(val.get(), thread.get());
+ }
+
+ /**
+ * @param ignite2 Second node.
+ * @param igniteMsg Ignite message.
+ * @param msgs messages for send.
+ * @param cls Callback for compare result.
+ * @throws Exception If failed.
+ */
+ private void sendOrderedWith2Node(
+ final Ignite ignite2,
+ final IgniteMessaging igniteMsg,
+ final List<String> msgs,
+ final IgniteBiInClosure<List<String>, List<Thread>> cls
+ ) throws Exception {
+ final CountDownLatch latch = new CountDownLatch(msgs.size());
+
+ final List<String> received = Lists.newArrayList();
+
+ ignite2.message().localListen(TOPIC, new IgniteBiPredicate<UUID, String>() {
+ @Override public boolean apply(UUID uuid, String msg) {
+ received.add(msg);
+
+ latch.countDown();
+
+ return true;
+ }
+ });
+
+ sendOrdered(igniteMsg, msgs, cls);
+
+ latch.await();
+
+ assertTrue(msgs.equals(received));
+ }
+
+ /**
+ * @param igniteMsg Ignite message.
+ * @param msgs messages for send.
+ * @param cls Callback for compare result.
+ * @throws Exception If failed.
+ */
+ private<T> void sendOrdered(
+ final IgniteMessaging igniteMsg,
+ final List<T> msgs,
+ final IgniteBiInClosure<List<T>,List<Thread>> cls
+ ) throws Exception {
+ final CountDownLatch latch = new CountDownLatch(msgs.size());
+
+ final List<T> received = Lists.newArrayList();
+ final List<Thread> threads = Lists.newArrayList();
+
+ for (T msg : msgs)
+ igniteMsg.sendOrdered(TOPIC, msg, 1000);
+
+ igniteMsg.localListen(TOPIC, new IgniteBiPredicate<UUID, T>() {
+ @Override public boolean apply(UUID uuid, T s) {
+ received.add(s);
+
+ threads.add(Thread.currentThread());
+
+ latch.countDown();
+
+ return true;
+ }
+ });
+
+ latch.await();
+
+ cls.apply(received, threads);
+ }
+
+ /**
+ * @return List of ordered messages
+ */
+ private List<String> orderedMessages() {
+ final List<String> msgs = Lists.newArrayList();
+
+ for (int i = 0; i < 1000; i++)
+ msgs.add(String.valueOf(ThreadLocalRandom8.current().nextInt()));
+
+ return msgs;
+ }
+
+ /**
+ *
+ */
+ private static class Message implements Serializable{
+ /** Thread name. */
+ private final String threadName;
+
+ /** Message. */
+ private final String msg;
+
+ /**
+ * @param threadName Thread name.
+ * @param msg Message.
+ */
+ private Message(String threadName, String msg) {
+ this.threadName = threadName;
+ this.msg = msg;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/e8f8e0ac/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
index 9e20d2a..688edf7 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
@@ -56,6 +56,7 @@ import org.apache.ignite.marshaller.DynamicProxySerializationMultiJvmSelfTest;
import org.apache.ignite.marshaller.MarshallerContextSelfTest;
import org.apache.ignite.messaging.GridMessagingNoPeerClassLoadingSelfTest;
import org.apache.ignite.messaging.GridMessagingSelfTest;
+import org.apache.ignite.messaging.IgniteMessagingSendAsyncTest;
import org.apache.ignite.messaging.IgniteMessagingWithClientTest;
import org.apache.ignite.plugin.security.SecurityPermissionSetBuilderTest;
import org.apache.ignite.spi.GridSpiLocalHostInjectionTest;
@@ -101,6 +102,7 @@ public class IgniteBasicTestSuite extends TestSuite {
suite.addTest(new TestSuite(GridSelfTest.class));
suite.addTest(new TestSuite(ClusterGroupHostsSelfTest.class));
suite.addTest(new TestSuite(IgniteMessagingWithClientTest.class));
+ suite.addTest(new TestSuite(IgniteMessagingSendAsyncTest.class));
GridTestUtils.addTestIfNeeded(suite, ClusterGroupSelfTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite, GridMessagingSelfTest.class, ignoredTests);
http://git-wip-us.apache.org/repos/asf/ignite/blob/e8f8e0ac/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffle.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffle.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffle.java
index 8ffea8c..3db68c4 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffle.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffle.java
@@ -147,7 +147,7 @@ public class HadoopShuffle extends HadoopComponent {
if (msg instanceof Message)
ctx.kernalContext().io().send(node, GridTopic.TOPIC_HADOOP_MSG, (Message)msg, GridIoPolicy.PUBLIC_POOL);
else
- ctx.kernalContext().io().sendUserMessage(F.asList(node), msg, GridTopic.TOPIC_HADOOP, false, 0);
+ ctx.kernalContext().io().sendUserMessage(F.asList(node), msg, GridTopic.TOPIC_HADOOP, false, 0, false);
}
/**
[42/50] [abbrv] ignite git commit: IGNITE-4717 Fixed hangs in
VisorCacheClearTask.
Posted by vo...@apache.org.
IGNITE-4717 Fixed hangs in VisorCacheClearTask.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/76f30604
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/76f30604
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/76f30604
Branch: refs/heads/ignite-4565-ddl
Commit: 76f30604be3e4e724f3741d3d21545d4f89d2e49
Parents: 50620a7
Author: Andrey Novikov <an...@gridgain.com>
Authored: Mon Feb 20 18:23:33 2017 +0700
Committer: Andrey Novikov <an...@gridgain.com>
Committed: Mon Feb 20 18:23:33 2017 +0700
----------------------------------------------------------------------
.../visor/cache/VisorCacheClearTask.java | 88 +++++---------------
.../visor/compute/VisorGatewayTask.java | 30 ++++++-
2 files changed, 49 insertions(+), 69 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/76f30604/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheClearTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheClearTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheClearTask.java
index 1f1a6fb..0c8476f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheClearTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheClearTask.java
@@ -18,7 +18,6 @@
package org.apache.ignite.internal.visor.cache;
import org.apache.ignite.IgniteCache;
-import org.apache.ignite.IgniteCompute;
import org.apache.ignite.cache.CachePeekMode;
import org.apache.ignite.compute.ComputeJobContext;
import org.apache.ignite.internal.processors.task.GridInternal;
@@ -26,7 +25,6 @@ import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.visor.VisorJob;
import org.apache.ignite.internal.visor.VisorOneNodeTask;
import org.apache.ignite.lang.IgniteBiTuple;
-import org.apache.ignite.lang.IgniteCallable;
import org.apache.ignite.lang.IgniteFuture;
import org.apache.ignite.lang.IgniteInClosure;
import org.apache.ignite.resources.JobContextResource;
@@ -90,17 +88,11 @@ public class VisorCacheClearTask extends VisorOneNodeTask<String, IgniteBiTuple<
}
/**
- * @param subJob Sub job to execute asynchronously.
+ * @param fut Future for asynchronous cache operation.
* @param idx Index.
* @return {@code true} If subJob was not completed and this job should be suspended.
*/
- private boolean callAsync(IgniteCallable<Integer> subJob, int idx) {
- IgniteCompute compute = ignite.compute(ignite.cluster().forCacheNodes(cacheName)).withAsync();
-
- compute.call(subJob);
-
- IgniteFuture<Integer> fut = compute.future();
-
+ private boolean callAsync(IgniteFuture<Integer> fut, int idx) {
futs[idx] = fut;
if (fut.isDone())
@@ -119,16 +111,28 @@ public class VisorCacheClearTask extends VisorOneNodeTask<String, IgniteBiTuple<
futs = new IgniteFuture[3];
if (futs[0] == null || futs[1] == null || futs[2] == null) {
- IgniteCache cache = ignite.cache(cacheName);
+ IgniteCache cache = ignite.cache(cacheName).withAsync();
+
+ if (futs[0] == null) {
+ cache.size(CachePeekMode.PRIMARY);
+
+ if (callAsync(cache.<Integer>future(), 0))
+ return null;
+ }
- if (futs[0] == null && callAsync(new VisorCacheSizeCallable(cache), 0))
- return null;
+ if (futs[1] == null) {
+ cache.clear();
- if (futs[1] == null && callAsync(new VisorCacheClearCallable(cache), 1))
- return null;
+ if (callAsync(cache.<Integer>future(), 1))
+ return null;
+ }
+
+ if (futs[2] == null) {
+ cache.size(CachePeekMode.PRIMARY);
- if (futs[2] == null && callAsync(new VisorCacheSizeCallable(cache), 2))
- return null;
+ if (callAsync(cache.<Integer>future(), 2))
+ return null;
+ }
}
assert futs[0].isDone() && futs[1].isDone() && futs[2].isDone();
@@ -141,54 +145,4 @@ public class VisorCacheClearTask extends VisorOneNodeTask<String, IgniteBiTuple<
return S.toString(VisorCacheClearJob.class, this);
}
}
-
- /**
- * Callable to get cache size.
- */
- @GridInternal
- private static class VisorCacheSizeCallable implements IgniteCallable<Integer> {
- /** */
- private static final long serialVersionUID = 0L;
-
- /** */
- private final IgniteCache cache;
-
- /**
- * @param cache Cache to take size from.
- */
- private VisorCacheSizeCallable(IgniteCache cache) {
- this.cache = cache;
- }
-
- /** {@inheritDoc} */
- @Override public Integer call() throws Exception {
- return cache.size(CachePeekMode.PRIMARY);
- }
- }
-
- /**
- * Callable to clear cache.
- */
- @GridInternal
- private static class VisorCacheClearCallable implements IgniteCallable<Integer> {
- /** */
- private static final long serialVersionUID = 0L;
-
- /** */
- private final IgniteCache cache;
-
- /**
- * @param cache Cache to clear.
- */
- private VisorCacheClearCallable(IgniteCache cache) {
- this.cache = cache;
- }
-
- /** {@inheritDoc} */
- @Override public Integer call() throws Exception {
- cache.clear();
-
- return 0;
- }
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/76f30604/modules/core/src/main/java/org/apache/ignite/internal/visor/compute/VisorGatewayTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/compute/VisorGatewayTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/compute/VisorGatewayTask.java
index 2539a26..a64ec6d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/compute/VisorGatewayTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/compute/VisorGatewayTask.java
@@ -29,21 +29,26 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
+import org.apache.ignite.IgniteCompute;
import org.apache.ignite.IgniteException;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.compute.ComputeJob;
import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobContext;
import org.apache.ignite.compute.ComputeJobResult;
import org.apache.ignite.compute.ComputeJobResultPolicy;
import org.apache.ignite.compute.ComputeTask;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.processors.task.GridInternal;
import org.apache.ignite.internal.util.lang.GridTuple3;
+import org.apache.ignite.internal.util.typedef.CI1;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.visor.VisorTaskArgument;
import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgniteFuture;
import org.apache.ignite.lang.IgniteUuid;
import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.resources.JobContextResource;
import org.jetbrains.annotations.Nullable;
/**
@@ -101,9 +106,16 @@ public class VisorGatewayTask implements ComputeTask<Object[], Object> {
@IgniteInstanceResource
protected transient IgniteEx ignite;
+ /** Auto-inject job context. */
+ @JobContextResource
+ protected transient ComputeJobContext jobCtx;
+
/** Arguments count. */
private final int argsCnt;
+ /** Future for spawned task. */
+ private transient IgniteFuture fut;
+
/**
* Create job with specified argument.
*
@@ -284,6 +296,9 @@ public class VisorGatewayTask implements ComputeTask<Object[], Object> {
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
@Override public Object execute() throws IgniteException {
+ if (fut != null)
+ return fut.get();
+
String nidsArg = argument(0);
String taskName = argument(1);
@@ -355,8 +370,19 @@ public class VisorGatewayTask implements ComputeTask<Object[], Object> {
}
}
- return ignite.compute(ignite.cluster().forNodeIds(nids))
- .execute(taskName, new VisorTaskArgument<>(nids, jobArgs, false));
+ IgniteCompute comp = ignite.compute(ignite.cluster().forNodeIds(nids)).withAsync();
+
+ comp.execute(taskName, new VisorTaskArgument<>(nids, jobArgs, false));
+
+ fut = comp.future();
+
+ fut.listen(new CI1<IgniteFuture<Object>>() {
+ @Override public void apply(IgniteFuture<Object> f) {
+ jobCtx.callcc();
+ }
+ });
+
+ return jobCtx.holdcc();
}
}
}
[26/50] [abbrv] ignite git commit: IGNITE-4538: Improved messages for
BinaryMarshaller field read errors. This closes #1470.
Posted by vo...@apache.org.
IGNITE-4538: Improved messages for BinaryMarshaller field read errors. This closes #1470.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f52ba0f5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f52ba0f5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f52ba0f5
Branch: refs/heads/ignite-4565-ddl
Commit: f52ba0f5d6efe9abc5d6c29352872df08007858c
Parents: 6bdff2c
Author: Alexandr Kuramshin <ak...@gridgain.com>
Authored: Thu Feb 16 12:09:22 2017 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Thu Feb 16 12:09:22 2017 +0300
----------------------------------------------------------------------
.../internal/binary/BinaryClassDescriptor.java | 81 +++---
.../internal/binary/BinaryFieldAccessor.java | 56 ++--
.../internal/binary/BinaryReaderExImpl.java | 284 ++++++++++++++++---
.../ignite/internal/binary/BinaryUtils.java | 11 +-
.../binary/BinaryObjectExceptionSelfTest.java | 209 ++++++++++++++
.../IgniteBinaryObjectsTestSuite.java | 2 +
6 files changed, 544 insertions(+), 99 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/f52ba0f5/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
index b63e674..9b3a377 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
@@ -45,6 +45,7 @@ import org.apache.ignite.internal.processors.query.GridQueryProcessor;
import org.apache.ignite.internal.util.GridUnsafe;
import org.apache.ignite.internal.util.IgniteUtils;
import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.marshaller.MarshallerExclusions;
@@ -819,58 +820,66 @@ public class BinaryClassDescriptor {
* @throws BinaryObjectException If failed.
*/
Object read(BinaryReaderExImpl reader) throws BinaryObjectException {
- assert reader != null;
- assert mode != BinaryWriteMode.OPTIMIZED : "OptimizedMarshaller should not be used here: " + cls.getName();
+ try {
+ assert reader != null;
+ assert mode != BinaryWriteMode.OPTIMIZED : "OptimizedMarshaller should not be used here: " + cls.getName();
- Object res;
+ Object res;
- switch (mode) {
- case BINARY:
- res = newInstance();
+ switch (mode) {
+ case BINARY:
+ res = newInstance();
- reader.setHandle(res);
+ reader.setHandle(res);
- if (serializer != null)
- serializer.readBinary(res, reader);
- else
- ((Binarylizable)res).readBinary(reader);
+ if (serializer != null)
+ serializer.readBinary(res, reader);
+ else
+ ((Binarylizable)res).readBinary(reader);
- break;
+ break;
- case OBJECT:
- res = newInstance();
+ case OBJECT:
+ res = newInstance();
- reader.setHandle(res);
+ reader.setHandle(res);
- for (BinaryFieldAccessor info : fields)
- info.read(res, reader);
+ for (BinaryFieldAccessor info : fields)
+ info.read(res, reader);
- break;
+ break;
- default:
- assert false : "Invalid mode: " + mode;
+ default:
+ assert false : "Invalid mode: " + mode;
- return null;
- }
+ return null;
+ }
- if (readResolveMtd != null) {
- try {
- res = readResolveMtd.invoke(res);
+ if (readResolveMtd != null) {
+ try {
+ res = readResolveMtd.invoke(res);
- reader.setHandle(res);
- }
- catch (IllegalAccessException e) {
- throw new RuntimeException(e);
- }
- catch (InvocationTargetException e) {
- if (e.getTargetException() instanceof BinaryObjectException)
- throw (BinaryObjectException)e.getTargetException();
+ reader.setHandle(res);
+ }
+ catch (IllegalAccessException e) {
+ throw new RuntimeException(e);
+ }
+ catch (InvocationTargetException e) {
+ if (e.getTargetException() instanceof BinaryObjectException)
+ throw (BinaryObjectException)e.getTargetException();
- throw new BinaryObjectException("Failed to execute readResolve() method on " + res, e);
+ throw new BinaryObjectException("Failed to execute readResolve() method on " + res, e);
+ }
}
- }
- return res;
+ return res;
+ }
+ catch (Exception e) {
+ if (S.INCLUDE_SENSITIVE && !F.isEmpty(typeName))
+ throw new BinaryObjectException("Failed to deserialize object [typeName=" + typeName + ']', e);
+ else
+ throw new BinaryObjectException("Failed to deserialize object [typeId=" + typeId + ']', e);
+ }
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/f52ba0f5/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldAccessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldAccessor.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldAccessor.java
index aabb772..f7d35f0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldAccessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldAccessor.java
@@ -27,6 +27,8 @@ import java.util.Map;
import java.util.UUID;
import org.apache.ignite.binary.BinaryObjectException;
import org.apache.ignite.internal.util.GridUnsafe;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
/**
@@ -36,6 +38,9 @@ public abstract class BinaryFieldAccessor {
/** Field ID. */
protected final int id;
+ /** Field name */
+ protected final String name;
+
/** Mode. */
protected final BinaryWriteMode mode;
@@ -119,10 +124,12 @@ public abstract class BinaryFieldAccessor {
* @param id Field ID.
* @param mode Mode;
*/
- protected BinaryFieldAccessor(int id, BinaryWriteMode mode) {
+ protected BinaryFieldAccessor(Field field, int id, BinaryWriteMode mode) {
+ assert field != null;
assert id != 0;
assert mode != null;
+ this.name = field.getName();
this.id = id;
this.mode = mode;
}
@@ -152,7 +159,26 @@ public abstract class BinaryFieldAccessor {
* @param reader Reader.
* @throws BinaryObjectException If failed.
*/
- public abstract void read(Object obj, BinaryReaderExImpl reader) throws BinaryObjectException;
+ public void read(Object obj, BinaryReaderExImpl reader) throws BinaryObjectException {
+ try {
+ read0(obj, reader);
+ }
+ catch (Exception ex) {
+ if (S.INCLUDE_SENSITIVE && !F.isEmpty(name))
+ throw new BinaryObjectException("Failed to read field [name=" + name + ']', ex);
+ else
+ throw new BinaryObjectException("Failed to read field [id=" + id + ']', ex);
+ }
+ }
+
+ /**
+ * Read field.
+ *
+ * @param obj Object.
+ * @param reader Reader.
+ * @throws BinaryObjectException If failed.
+ */
+ protected abstract void read0(Object obj, BinaryReaderExImpl reader) throws BinaryObjectException;
/**
* Base primitive field accessor.
@@ -169,9 +195,7 @@ public abstract class BinaryFieldAccessor {
* @param mode Mode.
*/
protected AbstractPrimitiveAccessor(Field field, int id, BinaryWriteMode mode) {
- super(id, mode);
-
- assert field != null;
+ super(field, id, mode);
offset = GridUnsafe.objectFieldOffset(field);
}
@@ -200,7 +224,7 @@ public abstract class BinaryFieldAccessor {
}
/** {@inheritDoc} */
- @Override public void read(Object obj, BinaryReaderExImpl reader) throws BinaryObjectException {
+ @Override public void read0(Object obj, BinaryReaderExImpl reader) throws BinaryObjectException {
byte val = reader.readByte(id);
GridUnsafe.putByteField(obj, offset, val);
@@ -230,7 +254,7 @@ public abstract class BinaryFieldAccessor {
}
/** {@inheritDoc} */
- @Override public void read(Object obj, BinaryReaderExImpl reader) throws BinaryObjectException {
+ @Override public void read0(Object obj, BinaryReaderExImpl reader) throws BinaryObjectException {
boolean val = reader.readBoolean(id);
GridUnsafe.putBooleanField(obj, offset, val);
@@ -260,7 +284,7 @@ public abstract class BinaryFieldAccessor {
}
/** {@inheritDoc} */
- @Override public void read(Object obj, BinaryReaderExImpl reader) throws BinaryObjectException {
+ @Override public void read0(Object obj, BinaryReaderExImpl reader) throws BinaryObjectException {
short val = reader.readShort(id);
GridUnsafe.putShortField(obj, offset, val);
@@ -290,7 +314,7 @@ public abstract class BinaryFieldAccessor {
}
/** {@inheritDoc} */
- @Override public void read(Object obj, BinaryReaderExImpl reader) throws BinaryObjectException {
+ @Override public void read0(Object obj, BinaryReaderExImpl reader) throws BinaryObjectException {
char val = reader.readChar(id);
GridUnsafe.putCharField(obj, offset, val);
@@ -320,7 +344,7 @@ public abstract class BinaryFieldAccessor {
}
/** {@inheritDoc} */
- @Override public void read(Object obj, BinaryReaderExImpl reader) throws BinaryObjectException {
+ @Override public void read0(Object obj, BinaryReaderExImpl reader) throws BinaryObjectException {
int val = reader.readInt(id);
GridUnsafe.putIntField(obj, offset, val);
@@ -350,7 +374,7 @@ public abstract class BinaryFieldAccessor {
}
/** {@inheritDoc} */
- @Override public void read(Object obj, BinaryReaderExImpl reader) throws BinaryObjectException {
+ @Override public void read0(Object obj, BinaryReaderExImpl reader) throws BinaryObjectException {
long val = reader.readLong(id);
GridUnsafe.putLongField(obj, offset, val);
@@ -380,7 +404,7 @@ public abstract class BinaryFieldAccessor {
}
/** {@inheritDoc} */
- @Override public void read(Object obj, BinaryReaderExImpl reader) throws BinaryObjectException {
+ @Override public void read0(Object obj, BinaryReaderExImpl reader) throws BinaryObjectException {
float val = reader.readFloat(id);
GridUnsafe.putFloatField(obj, offset, val);
@@ -410,7 +434,7 @@ public abstract class BinaryFieldAccessor {
}
/** {@inheritDoc} */
- @Override public void read(Object obj, BinaryReaderExImpl reader) throws BinaryObjectException {
+ @Override public void read0(Object obj, BinaryReaderExImpl reader) throws BinaryObjectException {
double val = reader.readDouble(id);
GridUnsafe.putDoubleField(obj, offset, val);
@@ -435,9 +459,7 @@ public abstract class BinaryFieldAccessor {
* @param mode Mode.
*/
DefaultFinalClassAccessor(Field field, int id, BinaryWriteMode mode, boolean dynamic) {
- super(id, mode);
-
- assert field != null;
+ super(field, id, mode);
this.field = field;
this.dynamic = dynamic;
@@ -648,7 +670,7 @@ public abstract class BinaryFieldAccessor {
}
/** {@inheritDoc} */
- @Override public void read(Object obj, BinaryReaderExImpl reader) throws BinaryObjectException {
+ @Override public void read0(Object obj, BinaryReaderExImpl reader) throws BinaryObjectException {
Object val = dynamic ? reader.readField(id) : readFixedType(reader);
try {
http://git-wip-us.apache.org/repos/asf/ignite/blob/f52ba0f5/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryReaderExImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryReaderExImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryReaderExImpl.java
index 246cf57..b38d0ff 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryReaderExImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryReaderExImpl.java
@@ -36,6 +36,7 @@ import org.apache.ignite.binary.BinaryRawReader;
import org.apache.ignite.binary.BinaryReader;
import org.apache.ignite.internal.binary.streams.BinaryInputStream;
import org.apache.ignite.internal.util.IgniteUtils;
+import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.SB;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -332,7 +333,12 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina
* @throws BinaryObjectException In case of error.
*/
@Nullable Object unmarshalField(String fieldName) throws BinaryObjectException {
- return findFieldByName(fieldName) ? BinaryUtils.unmarshal(in, ctx, ldr, this) : null;
+ try {
+ return findFieldByName(fieldName) ? BinaryUtils.unmarshal(in, ctx, ldr, this) : null;
+ }
+ catch (Exception ex) {
+ throw wrapFieldException(fieldName, ex);
+ }
}
/**
@@ -424,9 +430,29 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina
return (T)obj;
}
+
+ /**
+ * Wraps an exception by adding the fieldName
+ *
+ * @param fieldName the name of the field, causes failure
+ * @param e the cause of the deserialization failure
+ * @return wrapping exception
+ */
+ private BinaryObjectException wrapFieldException(String fieldName, Exception e) {
+ if (S.INCLUDE_SENSITIVE)
+ return new BinaryObjectException("Failed to read field: " + fieldName, e);
+ else
+ return new BinaryObjectException("Failed to read field.", e);
+ }
+
/** {@inheritDoc} */
@Override public byte readByte(String fieldName) throws BinaryObjectException {
- return findFieldByName(fieldName) && checkFlagNoHandles(BYTE) == Flag.NORMAL ? in.readByte() : 0;
+ try {
+ return findFieldByName(fieldName) && checkFlagNoHandles(BYTE) == Flag.NORMAL ? in.readByte() : 0;
+ }
+ catch (Exception ex) {
+ throw wrapFieldException(fieldName, ex);
+ }
}
/**
@@ -454,7 +480,12 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina
/** {@inheritDoc} */
@Nullable @Override public byte[] readByteArray(String fieldName) throws BinaryObjectException {
- return findFieldByName(fieldName) ? this.readByteArray() : null;
+ try {
+ return findFieldByName(fieldName) ? this.readByteArray() : null;
+ }
+ catch (Exception ex) {
+ throw wrapFieldException(fieldName, ex);
+ }
}
/**
@@ -482,7 +513,12 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina
/** {@inheritDoc} */
@Override public boolean readBoolean(String fieldName) throws BinaryObjectException {
- return findFieldByName(fieldName) && checkFlagNoHandles(BOOLEAN) == Flag.NORMAL && in.readBoolean();
+ try {
+ return findFieldByName(fieldName) && checkFlagNoHandles(BOOLEAN) == Flag.NORMAL && in.readBoolean();
+ }
+ catch (Exception ex) {
+ throw wrapFieldException(fieldName, ex);
+ }
}
/**
@@ -510,7 +546,12 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina
/** {@inheritDoc} */
@Nullable @Override public boolean[] readBooleanArray(String fieldName) throws BinaryObjectException {
- return findFieldByName(fieldName) ? this.readBooleanArray() : null;
+ try {
+ return findFieldByName(fieldName) ? this.readBooleanArray() : null;
+ }
+ catch (Exception ex) {
+ throw wrapFieldException(fieldName, ex);
+ }
}
/**
@@ -538,7 +579,12 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina
/** {@inheritDoc} */
@Override public short readShort(String fieldName) throws BinaryObjectException {
- return findFieldByName(fieldName) && checkFlagNoHandles(SHORT) == Flag.NORMAL ? in.readShort() : 0;
+ try {
+ return findFieldByName(fieldName) && checkFlagNoHandles(SHORT) == Flag.NORMAL ? in.readShort() : 0;
+ }
+ catch (Exception ex) {
+ throw wrapFieldException(fieldName, ex);
+ }
}
/**
@@ -566,7 +612,12 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina
/** {@inheritDoc} */
@Nullable @Override public short[] readShortArray(String fieldName) throws BinaryObjectException {
- return findFieldByName(fieldName) ? this.readShortArray() : null;
+ try {
+ return findFieldByName(fieldName) ? this.readShortArray() : null;
+ }
+ catch (Exception ex) {
+ throw wrapFieldException(fieldName, ex);
+ }
}
/**
@@ -594,7 +645,12 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina
/** {@inheritDoc} */
@Override public char readChar(String fieldName) throws BinaryObjectException {
- return findFieldByName(fieldName) && checkFlagNoHandles(CHAR) == Flag.NORMAL ? in.readChar() : 0;
+ try {
+ return findFieldByName(fieldName) && checkFlagNoHandles(CHAR) == Flag.NORMAL ? in.readChar() : 0;
+ }
+ catch (Exception ex) {
+ throw wrapFieldException(fieldName, ex);
+ }
}
/**
@@ -622,7 +678,12 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina
/** {@inheritDoc} */
@Nullable @Override public char[] readCharArray(String fieldName) throws BinaryObjectException {
- return findFieldByName(fieldName) ? this.readCharArray() : null;
+ try {
+ return findFieldByName(fieldName) ? this.readCharArray() : null;
+ }
+ catch (Exception ex) {
+ throw wrapFieldException(fieldName, ex);
+ }
}
/**
@@ -650,7 +711,12 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina
/** {@inheritDoc} */
@Override public int readInt(String fieldName) throws BinaryObjectException {
- return findFieldByName(fieldName) && checkFlagNoHandles(INT) == Flag.NORMAL ? in.readInt() : 0;
+ try {
+ return findFieldByName(fieldName) && checkFlagNoHandles(INT) == Flag.NORMAL ? in.readInt() : 0;
+ }
+ catch (Exception ex) {
+ throw wrapFieldException(fieldName, ex);
+ }
}
/**
@@ -678,7 +744,12 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina
/** {@inheritDoc} */
@Nullable @Override public int[] readIntArray(String fieldName) throws BinaryObjectException {
- return findFieldByName(fieldName) ? this.readIntArray() : null;
+ try {
+ return findFieldByName(fieldName) ? this.readIntArray() : null;
+ }
+ catch (Exception ex) {
+ throw wrapFieldException(fieldName, ex);
+ }
}
/**
@@ -706,7 +777,12 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina
/** {@inheritDoc} */
@Override public long readLong(String fieldName) throws BinaryObjectException {
- return findFieldByName(fieldName) && checkFlagNoHandles(LONG) == Flag.NORMAL ? in.readLong() : 0;
+ try {
+ return findFieldByName(fieldName) && checkFlagNoHandles(LONG) == Flag.NORMAL ? in.readLong() : 0;
+ }
+ catch (Exception ex) {
+ throw wrapFieldException(fieldName, ex);
+ }
}
/**
@@ -734,7 +810,12 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina
/** {@inheritDoc} */
@Nullable @Override public long[] readLongArray(String fieldName) throws BinaryObjectException {
- return findFieldByName(fieldName) ? this.readLongArray() : null;
+ try {
+ return findFieldByName(fieldName) ? this.readLongArray() : null;
+ }
+ catch (Exception ex) {
+ throw wrapFieldException(fieldName, ex);
+ }
}
/**
@@ -762,7 +843,12 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina
/** {@inheritDoc} */
@Override public float readFloat(String fieldName) throws BinaryObjectException {
- return findFieldByName(fieldName) && checkFlagNoHandles(FLOAT) == Flag.NORMAL ? in.readFloat() : 0;
+ try {
+ return findFieldByName(fieldName) && checkFlagNoHandles(FLOAT) == Flag.NORMAL ? in.readFloat() : 0;
+ }
+ catch (Exception ex) {
+ throw wrapFieldException(fieldName, ex);
+ }
}
/**
@@ -790,7 +876,12 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina
/** {@inheritDoc} */
@Nullable @Override public float[] readFloatArray(String fieldName) throws BinaryObjectException {
- return findFieldByName(fieldName) ? this.readFloatArray() : null;
+ try {
+ return findFieldByName(fieldName) ? this.readFloatArray() : null;
+ }
+ catch (Exception ex) {
+ throw wrapFieldException(fieldName, ex);
+ }
}
/**
@@ -818,7 +909,12 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina
/** {@inheritDoc} */
@Override public double readDouble(String fieldName) throws BinaryObjectException {
- return findFieldByName(fieldName) && checkFlagNoHandles(DOUBLE) == Flag.NORMAL ? in.readDouble() : 0;
+ try {
+ return findFieldByName(fieldName) && checkFlagNoHandles(DOUBLE) == Flag.NORMAL ? in.readDouble() : 0;
+ }
+ catch (Exception ex) {
+ throw wrapFieldException(fieldName, ex);
+ }
}
/**
@@ -846,7 +942,12 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina
/** {@inheritDoc} */
@Nullable @Override public double[] readDoubleArray(String fieldName) throws BinaryObjectException {
- return findFieldByName(fieldName) ? this.readDoubleArray() : null;
+ try {
+ return findFieldByName(fieldName) ? this.readDoubleArray() : null;
+ }
+ catch (Exception ex) {
+ throw wrapFieldException(fieldName, ex);
+ }
}
/**
@@ -874,7 +975,12 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina
/** {@inheritDoc} */
@Override @Nullable public BigDecimal readDecimal(String fieldName) throws BinaryObjectException {
- return findFieldByName(fieldName) ? this.readDecimal() : null;
+ try {
+ return findFieldByName(fieldName) ? this.readDecimal() : null;
+ }
+ catch (Exception ex) {
+ throw wrapFieldException(fieldName, ex);
+ }
}
/**
@@ -893,7 +999,12 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina
/** {@inheritDoc} */
@Override @Nullable public BigDecimal[] readDecimalArray(String fieldName) throws BinaryObjectException {
- return findFieldByName(fieldName) ? this.readDecimalArray() : null;
+ try {
+ return findFieldByName(fieldName) ? this.readDecimalArray() : null;
+ }
+ catch (Exception ex) {
+ throw wrapFieldException(fieldName, ex);
+ }
}
/**
@@ -921,7 +1032,12 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina
/** {@inheritDoc} */
@Override @Nullable public String readString(String fieldName) throws BinaryObjectException {
- return findFieldByName(fieldName) ? this.readString() : null;
+ try {
+ return findFieldByName(fieldName) ? this.readString() : null;
+ }
+ catch (Exception ex) {
+ throw wrapFieldException(fieldName, ex);
+ }
}
/**
@@ -940,7 +1056,12 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina
/** {@inheritDoc} */
@Override @Nullable public String[] readStringArray(String fieldName) throws BinaryObjectException {
- return findFieldByName(fieldName) ? this.readStringArray() : null;
+ try {
+ return findFieldByName(fieldName) ? this.readStringArray() : null;
+ }
+ catch (Exception ex) {
+ throw wrapFieldException(fieldName, ex);
+ }
}
/**
@@ -968,7 +1089,12 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina
/** {@inheritDoc} */
@Override @Nullable public UUID readUuid(String fieldName) throws BinaryObjectException {
- return findFieldByName(fieldName) ? this.readUuid() : null;
+ try {
+ return findFieldByName(fieldName) ? this.readUuid() : null;
+ }
+ catch (Exception ex) {
+ throw wrapFieldException(fieldName, ex);
+ }
}
/**
@@ -987,7 +1113,12 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina
/** {@inheritDoc} */
@Override @Nullable public UUID[] readUuidArray(String fieldName) throws BinaryObjectException {
- return findFieldByName(fieldName) ? this.readUuidArray() : null;
+ try {
+ return findFieldByName(fieldName) ? this.readUuidArray() : null;
+ }
+ catch (Exception ex) {
+ throw wrapFieldException(fieldName, ex);
+ }
}
/**
@@ -1015,7 +1146,12 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina
/** {@inheritDoc} */
@Override @Nullable public Date readDate(String fieldName) throws BinaryObjectException {
- return findFieldByName(fieldName) ? this.readDate() : null;
+ try {
+ return findFieldByName(fieldName) ? this.readDate() : null;
+ }
+ catch (Exception ex) {
+ throw wrapFieldException(fieldName, ex);
+ }
}
/**
@@ -1034,7 +1170,12 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina
/** {@inheritDoc} */
@Override @Nullable public Date[] readDateArray(String fieldName) throws BinaryObjectException {
- return findFieldByName(fieldName) ? this.readDateArray() : null;
+ try {
+ return findFieldByName(fieldName) ? this.readDateArray() : null;
+ }
+ catch (Exception ex) {
+ throw wrapFieldException(fieldName, ex);
+ }
}
/**
@@ -1062,7 +1203,12 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina
/** {@inheritDoc} */
@Override @Nullable public Timestamp readTimestamp(String fieldName) throws BinaryObjectException {
- return findFieldByName(fieldName) ? this.readTimestamp() : null;
+ try {
+ return findFieldByName(fieldName) ? this.readTimestamp() : null;
+ }
+ catch (Exception ex) {
+ throw wrapFieldException(fieldName, ex);
+ }
}
/**
@@ -1081,7 +1227,12 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina
/** {@inheritDoc} */
@Override @Nullable public Timestamp[] readTimestampArray(String fieldName) throws BinaryObjectException {
- return findFieldByName(fieldName) ? this.readTimestampArray() : null;
+ try {
+ return findFieldByName(fieldName) ? this.readTimestampArray() : null;
+ }
+ catch (Exception ex) {
+ throw wrapFieldException(fieldName, ex);
+ }
}
/**
@@ -1155,7 +1306,12 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
@Nullable @Override public <T> T readObject(String fieldName) throws BinaryObjectException {
- return findFieldByName(fieldName) ? (T)BinaryUtils.doReadObject(in, ctx, ldr, this) : null;
+ try {
+ return findFieldByName(fieldName) ? (T)BinaryUtils.doReadObject(in, ctx, ldr, this) : null;
+ }
+ catch (Exception ex) {
+ throw wrapFieldException(fieldName, ex);
+ }
}
/**
@@ -1179,7 +1335,12 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina
/** {@inheritDoc} */
@Nullable @Override public Object[] readObjectArray(String fieldName) throws BinaryObjectException {
- return findFieldByName(fieldName) ? this.readObjectArray() : null;
+ try {
+ return findFieldByName(fieldName) ? this.readObjectArray() : null;
+ }
+ catch (Exception ex) {
+ throw wrapFieldException(fieldName, ex);
+ }
}
/**
@@ -1207,7 +1368,12 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina
/** {@inheritDoc} */
@Nullable @Override public <T extends Enum<?>> T readEnum(String fieldName) throws BinaryObjectException {
- return findFieldByName(fieldName) ? (T)readEnum0(null) : null;
+ try {
+ return findFieldByName(fieldName) ? (T)readEnum0(null) : null;
+ }
+ catch (Exception ex) {
+ throw wrapFieldException(fieldName, ex);
+ }
}
/**
@@ -1249,7 +1415,13 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina
/** {@inheritDoc} */
@Nullable @Override public <T extends Enum<?>> T[] readEnumArray(String fieldName)
throws BinaryObjectException {
- return findFieldByName(fieldName) ? (T[])readEnumArray0(null) : null;
+
+ try {
+ return findFieldByName(fieldName) ? (T[])readEnumArray0(null) : null;
+ }
+ catch (Exception ex) {
+ throw wrapFieldException(fieldName, ex);
+ }
}
/**
@@ -1295,13 +1467,24 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina
/** {@inheritDoc} */
@Nullable @Override public <T> Collection<T> readCollection(String fieldName) throws BinaryObjectException {
- return findFieldByName(fieldName) ? (Collection<T>)readCollection0(null) : null;
+ try {
+ return findFieldByName(fieldName) ? (Collection<T>)readCollection0(null) : null;
+ }
+ catch (Exception ex) {
+ throw wrapFieldException(fieldName, ex);
+ }
}
/** {@inheritDoc} */
@Nullable @Override public <T> Collection<T> readCollection(String fieldName, BinaryCollectionFactory<T> factory)
throws BinaryObjectException {
- return findFieldByName(fieldName) ? readCollection0(factory) : null;
+
+ try {
+ return findFieldByName(fieldName) ? readCollection0(factory) : null;
+ }
+ catch (Exception ex) {
+ throw wrapFieldException(fieldName, ex);
+ }
}
/**
@@ -1364,13 +1547,24 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina
/** {@inheritDoc} */
@Nullable @Override public <K, V> Map<K, V> readMap(String fieldName) throws BinaryObjectException {
- return findFieldByName(fieldName) ? (Map<K, V>)readMap0(null) : null;
+ try {
+ return findFieldByName(fieldName) ? (Map<K, V>)readMap0(null) : null;
+ }
+ catch (Exception ex) {
+ throw wrapFieldException(fieldName, ex);
+ }
}
/** {@inheritDoc} */
@Nullable @Override public <K, V> Map<K, V> readMap(String fieldName, BinaryMapFactory<K, V> factory)
throws BinaryObjectException {
- return findFieldByName(fieldName) ? readMap0(factory) : null;
+
+ try {
+ return findFieldByName(fieldName) ? readMap0(factory) : null;
+ }
+ catch (Exception ex) {
+ throw wrapFieldException(fieldName, ex);
+ }
}
/**
@@ -1448,8 +1642,8 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina
int pos = BinaryUtils.positionForHandle(in);
- throw new BinaryObjectException("Unexpected flag value [pos=" + pos + ", expected=" + expFlag +
- ", actual=" + flag + ']');
+ throw new BinaryObjectException("Unexpected field type [pos=" + pos + ", expected=" + fieldFlagName(expFlag) +
+ ", actual=" + fieldFlagName(flag) + ']');
}
/**
@@ -1469,8 +1663,20 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina
int pos = BinaryUtils.positionForHandle(in);
- throw new BinaryObjectException("Unexpected flag value [pos=" + pos + ", expected=" + expFlag +
- ", actual=" + flag + ']');
+ throw new BinaryObjectException("Unexpected field type [pos=" + pos + ", expected=" + fieldFlagName(expFlag) +
+ ", actual=" + fieldFlagName(flag) + ']');
+ }
+
+ /**
+ * Gets a flag name
+ *
+ * @param flag a flag value
+ * @return string representation of the flag (type name, handle, else number)
+ */
+ private String fieldFlagName(byte flag) {
+ String typeName = BinaryUtils.fieldTypeName(flag);
+
+ return typeName == null ? String.valueOf(flag) : typeName;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/f52ba0f5/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
index 24c2f72..28659ab 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
@@ -354,16 +354,13 @@ public class BinaryUtils {
/**
* @param typeId Field type ID.
- * @return Field type name.
+ * @return Field type name or {@code null} if unknown.
*/
public static String fieldTypeName(int typeId) {
- assert typeId >= 0 && typeId < FIELD_TYPE_NAMES.length : typeId;
-
- String typeName = FIELD_TYPE_NAMES[typeId];
-
- assert typeName != null : typeId;
+ if(typeId < 0 || typeId >= FIELD_TYPE_NAMES.length)
+ return null;
- return typeName;
+ return FIELD_TYPE_NAMES[typeId];
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/f52ba0f5/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectExceptionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectExceptionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectExceptionSelfTest.java
new file mode 100644
index 0000000..e4be824
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectExceptionSelfTest.java
@@ -0,0 +1,209 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.ignite.internal.binary;
+
+import java.lang.reflect.Field;
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.UUID;
+import javax.cache.Cache;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.binary.BinaryBasicNameMapper;
+import org.apache.ignite.binary.BinaryObjectException;
+import org.apache.ignite.configuration.BinaryConfiguration;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+/**
+ * BinaryObjectExceptionSelfTest
+ */
+public class BinaryObjectExceptionSelfTest extends GridCommonAbstractTest {
+ /** */
+ private static final String TEST_KEY = "test_key";
+
+ /** */
+ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+ cfg.setMarshaller(new BinaryMarshaller());
+ cfg.setDiscoverySpi(new TcpDiscoverySpi().setIpFinder(IP_FINDER));
+
+ cfg.setCacheConfiguration(new CacheConfiguration().setCopyOnRead(true));
+
+ BinaryConfiguration bcfg = new BinaryConfiguration();
+
+ bcfg.setNameMapper(new BinaryBasicNameMapper(false));
+
+ cfg.setBinaryConfiguration(bcfg);
+
+ return cfg;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void beforeTest() throws Exception {
+ startGrids(2);
+
+ awaitPartitionMapExchange();
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTest() throws Exception {
+ stopAllGrids();
+ }
+
+ /**
+ * Test unexpected field type.
+ *
+ * @throws Exception If failed.
+ */
+ @SuppressWarnings("WhileLoopReplaceableByForEach")
+ public void testUnexpectedFieldType() throws Exception {
+ IgniteEx grid = grid(0);
+
+ IgniteCache<String, Value> cache = grid.cache(null);
+
+ cache.put(TEST_KEY, new Value());
+
+ BinaryObjectImpl b = (BinaryObjectImpl)cache.withKeepBinary().get(TEST_KEY);
+
+ b.deserialize(); // deserialize working
+
+ byte[] a = b.array();
+
+ int unexpectedCnt = 0;
+
+ Field[] fields = Value.class.getDeclaredFields();
+
+ StringBuilder sb = new StringBuilder(4 << 10);
+
+ for (int i = b.dataStartOffset(), j = b.footerStartOffset(); i < j; ++i) {
+ byte old = a[i];
+
+ a[i] = -1;
+
+ try {
+ Iterator<Cache.Entry<String, Value>> it = cache.iterator();
+
+ while (it.hasNext())
+ it.next();
+ }
+ catch (Exception ex) {
+ Throwable root = ex;
+
+ sb.setLength(0);
+
+ sb.append(root.getMessage());
+
+ while (root.getCause() != null) {
+ root = root.getCause();
+
+ sb.append(". ").append(root.getMessage());
+ }
+ if (root instanceof BinaryObjectException && root.getMessage().startsWith("Unexpected field type")) {
+ log().info(sb.toString());
+
+ Field f = fields[unexpectedCnt];
+
+ Throwable t = ex;
+
+ assertTrue(t.getMessage(), t.getMessage().contains(
+ "object [typeName=org.apache.ignite.internal.binary.BinaryObjectExceptionSelfTest$Value"));
+
+ t = t.getCause();
+
+ assertTrue(t.getMessage(), t.getMessage().contains("field [name=" + f.getName()));
+
+ ++unexpectedCnt;
+ }
+ else
+ log().info("Ignored exception: " + sb);
+ }
+
+ a[i] = old;
+ }
+
+ assertEquals("Fields count must match \"Unexpected field type\" exception count", fields.length, unexpectedCnt);
+ }
+
+ /** */
+ private enum EnumValues {
+ /** */
+ val1,
+
+ /** */
+ val2,
+
+ /** */
+ val3;
+ }
+
+ /** */
+ @SuppressWarnings("unused")
+ private static class Value {
+ /** */
+ public byte byteVal = 1;
+
+ /** */
+ public boolean booleanVal = true;
+
+ /** */
+ public short shortVal = 2;
+
+ /** */
+ public char charVal = 'Q';
+
+ /** */
+ public int intVal = 3;
+
+ /** */
+ public long longVal = 4;
+
+ /** */
+ public float floatVal = 5;
+
+ /** */
+ public double doubleVal = 6;
+
+ /** */
+ public BigDecimal bigDecimal = new BigDecimal(7);
+
+ /** */
+ public String string = "QWERTY";
+
+ /** */
+ public UUID uuid = UUID.randomUUID();
+
+ /** */
+ public Date date = new Date();
+
+ /** */
+ public Timestamp timestamp = new Timestamp(date.getTime() + 1000L);
+
+ /** */
+ public EnumValues enumVal = EnumValues.val2;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f52ba0f5/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java
index 3496dbf..1a348e0 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java
@@ -33,6 +33,7 @@ import org.apache.ignite.internal.binary.BinaryMarshallerSelfTest;
import org.apache.ignite.internal.binary.BinaryObjectBuilderAdditionalSelfTest;
import org.apache.ignite.internal.binary.BinaryObjectBuilderDefaultMappersSelfTest;
import org.apache.ignite.internal.binary.BinaryObjectBuilderSimpleNameLowerCaseMappersSelfTest;
+import org.apache.ignite.internal.binary.BinaryObjectExceptionSelfTest;
import org.apache.ignite.internal.binary.BinaryObjectToStringSelfTest;
import org.apache.ignite.internal.binary.BinarySerialiedFieldComparatorSelfTest;
import org.apache.ignite.internal.binary.BinarySimpleNameTestPropertySelfTest;
@@ -93,6 +94,7 @@ public class IgniteBinaryObjectsTestSuite extends TestSuite {
suite.addTestSuite(BinaryTreeSelfTest.class);
suite.addTestSuite(BinaryMarshallerSelfTest.class);
+ suite.addTestSuite(BinaryObjectExceptionSelfTest.class);
suite.addTestSuite(BinarySerialiedFieldComparatorSelfTest.class);
suite.addTestSuite(BinaryArrayIdentityResolverSelfTest.class);
[20/50] [abbrv] ignite git commit: IGNITE-2356: Added
high-availability feature to IGFS client. From now on it is possible to
connect to IGFS through Ignite client. This way in case one server fails,
client will still be able to work with other nodes. Th
Posted by vo...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemLoopbackExternalToClientDualAsyncSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemLoopbackExternalToClientDualAsyncSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemLoopbackExternalToClientDualAsyncSelfTest.java
new file mode 100644
index 0000000..57c060b
--- /dev/null
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemLoopbackExternalToClientDualAsyncSelfTest.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.hadoop.impl.igfs;
+
+import static org.apache.ignite.igfs.IgfsMode.DUAL_ASYNC;
+
+/**
+ * IGFS Hadoop file system IPC loopback self test in PRIMARY mode.
+ */
+public class IgniteHadoopFileSystemLoopbackExternalToClientDualAsyncSelfTest
+ extends IgniteHadoopFileSystemLoopbackExternalToClientAbstractSelfTest {
+ /**
+ * Constructor.
+ */
+ public IgniteHadoopFileSystemLoopbackExternalToClientDualAsyncSelfTest() {
+ super(DUAL_ASYNC);
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemLoopbackExternalToClientDualSyncSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemLoopbackExternalToClientDualSyncSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemLoopbackExternalToClientDualSyncSelfTest.java
new file mode 100644
index 0000000..adddafb
--- /dev/null
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemLoopbackExternalToClientDualSyncSelfTest.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.hadoop.impl.igfs;
+
+import static org.apache.ignite.igfs.IgfsMode.DUAL_SYNC;
+
+/**
+ * IGFS Hadoop file system IPC loopback self test in PRIMARY mode.
+ */
+public class IgniteHadoopFileSystemLoopbackExternalToClientDualSyncSelfTest
+ extends IgniteHadoopFileSystemLoopbackExternalToClientAbstractSelfTest {
+ /**
+ * Constructor.
+ */
+ public IgniteHadoopFileSystemLoopbackExternalToClientDualSyncSelfTest() {
+ super(DUAL_SYNC);
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemLoopbackExternalToClientPrimarySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemLoopbackExternalToClientPrimarySelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemLoopbackExternalToClientPrimarySelfTest.java
new file mode 100644
index 0000000..765778d
--- /dev/null
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemLoopbackExternalToClientPrimarySelfTest.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.hadoop.impl.igfs;
+
+import static org.apache.ignite.igfs.IgfsMode.PRIMARY;
+
+/**
+ * IGFS Hadoop file system IPC loopback self test in PRIMARY mode.
+ */
+public class IgniteHadoopFileSystemLoopbackExternalToClientPrimarySelfTest
+ extends IgniteHadoopFileSystemLoopbackExternalToClientAbstractSelfTest {
+ /**
+ * Constructor.
+ */
+ public IgniteHadoopFileSystemLoopbackExternalToClientPrimarySelfTest() {
+ super(PRIMARY);
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemLoopbackExternalToClientProxySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemLoopbackExternalToClientProxySelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemLoopbackExternalToClientProxySelfTest.java
new file mode 100644
index 0000000..6da9daa
--- /dev/null
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemLoopbackExternalToClientProxySelfTest.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.hadoop.impl.igfs;
+
+import static org.apache.ignite.igfs.IgfsMode.PROXY;
+
+/**
+ * IGFS Hadoop file system IPC loopback self test in PRIMARY mode.
+ */
+public class IgniteHadoopFileSystemLoopbackExternalToClientProxySelfTest
+ extends IgniteHadoopFileSystemLoopbackExternalToClientAbstractSelfTest {
+ /**
+ * Constructor.
+ */
+ public IgniteHadoopFileSystemLoopbackExternalToClientProxySelfTest() {
+ super(PROXY);
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemEmbeddedDualAsyncSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemEmbeddedDualAsyncSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemEmbeddedDualAsyncSelfTest.java
deleted file mode 100644
index cca960b..0000000
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemEmbeddedDualAsyncSelfTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.hadoop.impl.igfs;
-
-import static org.apache.ignite.igfs.IgfsMode.DUAL_ASYNC;
-
-/**
- * IGFS Hadoop file system IPC shmem self test in DUAL_ASYNC mode.
- */
-public class IgniteHadoopFileSystemShmemEmbeddedDualAsyncSelfTest
- extends IgniteHadoopFileSystemShmemAbstractSelfTest {
- /**
- * Constructor.
- */
- public IgniteHadoopFileSystemShmemEmbeddedDualAsyncSelfTest() {
- super(DUAL_ASYNC, false);
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemEmbeddedDualSyncSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemEmbeddedDualSyncSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemEmbeddedDualSyncSelfTest.java
deleted file mode 100644
index 73db4f8..0000000
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemEmbeddedDualSyncSelfTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.hadoop.impl.igfs;
-
-import static org.apache.ignite.igfs.IgfsMode.DUAL_SYNC;
-
-/**
- * IGFS Hadoop file system IPC shmem self test in DUAL_SYNC mode.
- */
-public class IgniteHadoopFileSystemShmemEmbeddedDualSyncSelfTest
- extends IgniteHadoopFileSystemShmemAbstractSelfTest {
- /**
- * Constructor.
- */
- public IgniteHadoopFileSystemShmemEmbeddedDualSyncSelfTest() {
- super(DUAL_SYNC, false);
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemEmbeddedPrimarySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemEmbeddedPrimarySelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemEmbeddedPrimarySelfTest.java
deleted file mode 100644
index 48a4694..0000000
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemEmbeddedPrimarySelfTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.hadoop.impl.igfs;
-
-import static org.apache.ignite.igfs.IgfsMode.PRIMARY;
-
-/**
- * IGFS Hadoop file system IPC shmem self test in PRIMARY mode.
- */
-public class IgniteHadoopFileSystemShmemEmbeddedPrimarySelfTest
- extends IgniteHadoopFileSystemShmemAbstractSelfTest {
- /**
- * Constructor.
- */
- public IgniteHadoopFileSystemShmemEmbeddedPrimarySelfTest() {
- super(PRIMARY, false);
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemEmbeddedSecondarySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemEmbeddedSecondarySelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemEmbeddedSecondarySelfTest.java
deleted file mode 100644
index ab9c357..0000000
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemEmbeddedSecondarySelfTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.hadoop.impl.igfs;
-
-import static org.apache.ignite.igfs.IgfsMode.PROXY;
-
-/**
- * IGFS Hadoop file system IPC shmem self test in SECONDARY mode.
- */
-public class IgniteHadoopFileSystemShmemEmbeddedSecondarySelfTest
- extends IgniteHadoopFileSystemShmemAbstractSelfTest {
- /**
- * Constructor.
- */
- public IgniteHadoopFileSystemShmemEmbeddedSecondarySelfTest() {
- super(PROXY, false);
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemExternalToClientAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemExternalToClientAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemExternalToClientAbstractSelfTest.java
new file mode 100644
index 0000000..e87807c
--- /dev/null
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemExternalToClientAbstractSelfTest.java
@@ -0,0 +1,106 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.hadoop.impl.igfs;
+
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.concurrent.Callable;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.igfs.IgfsIpcEndpointConfiguration;
+import org.apache.ignite.igfs.IgfsIpcEndpointType;
+import org.apache.ignite.igfs.IgfsMode;
+import org.apache.ignite.internal.util.ipc.IpcEndpoint;
+import org.apache.ignite.internal.util.ipc.IpcEndpointFactory;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.testframework.GridTestUtils;
+
+import static org.apache.ignite.internal.util.ipc.shmem.IpcSharedMemoryServerEndpoint.DFLT_IPC_PORT;
+
+/**
+ * IGFS Hadoop file system IPC self test.
+ */
+public abstract class IgniteHadoopFileSystemShmemExternalToClientAbstractSelfTest
+ extends IgniteHadoopFileSystemAbstractSelfTest {
+ /**
+ * Constructor.
+ *
+ * @param mode IGFS mode.
+ * @param skipEmbed Skip embedded mode flag.
+ */
+ protected IgniteHadoopFileSystemShmemExternalToClientAbstractSelfTest(IgfsMode mode, boolean skipEmbed) {
+ super(mode, skipEmbed, false);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+ if (getTestGridIndex(gridName) == 0)
+ cfg.setClientMode(true);
+
+ return cfg;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected IgfsIpcEndpointConfiguration primaryIpcEndpointConfiguration(final String gridName) {
+ IgfsIpcEndpointConfiguration endpointCfg = new IgfsIpcEndpointConfiguration();
+
+ endpointCfg.setType(IgfsIpcEndpointType.SHMEM);
+ endpointCfg.setPort(DFLT_IPC_PORT + getTestGridIndex(gridName));
+
+ return endpointCfg;
+ }
+
+ /**
+ * Checks correct behaviour in case when we run out of system
+ * resources.
+ *
+ * @throws Exception If error occurred.
+ */
+ @SuppressWarnings("ThrowableResultOfMethodCallIgnored")
+ public void testOutOfResources() throws Exception {
+ final Collection<IpcEndpoint> eps = new LinkedList<>();
+
+ try {
+ IgniteCheckedException e = (IgniteCheckedException)GridTestUtils.assertThrows(log, new Callable<Object>() {
+ @SuppressWarnings("InfiniteLoopStatement")
+ @Override public Object call() throws Exception {
+ while (true) {
+ IpcEndpoint ep = IpcEndpointFactory.connectEndpoint("shmem:10500", log);
+
+ eps.add(ep);
+ }
+ }
+ }, IgniteCheckedException.class, null);
+
+ assertNotNull(e);
+
+ String msg = e.getMessage();
+
+ assertTrue("Invalid exception: " + X.getFullStackTrace(e),
+ msg.contains("(error code: 28)") ||
+ msg.contains("(error code: 24)") ||
+ msg.contains("(error code: 12)"));
+ }
+ finally {
+ for (IpcEndpoint ep : eps)
+ ep.close();
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemExternalToClientDualAsyncSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemExternalToClientDualAsyncSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemExternalToClientDualAsyncSelfTest.java
new file mode 100644
index 0000000..c3d692e
--- /dev/null
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemExternalToClientDualAsyncSelfTest.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.hadoop.impl.igfs;
+
+import static org.apache.ignite.igfs.IgfsMode.DUAL_ASYNC;
+
+/**
+ * IGFS Hadoop file system IPC shmem self test in PRIMARY mode.
+ */
+public class IgniteHadoopFileSystemShmemExternalToClientDualAsyncSelfTest
+ extends IgniteHadoopFileSystemShmemExternalToClientAbstractSelfTest {
+ /**
+ * Constructor.
+ */
+ public IgniteHadoopFileSystemShmemExternalToClientDualAsyncSelfTest() {
+ super(DUAL_ASYNC, true);
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemExternalToClientDualSyncSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemExternalToClientDualSyncSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemExternalToClientDualSyncSelfTest.java
new file mode 100644
index 0000000..e893e84
--- /dev/null
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemExternalToClientDualSyncSelfTest.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.hadoop.impl.igfs;
+
+import static org.apache.ignite.igfs.IgfsMode.DUAL_SYNC;
+
+/**
+ * IGFS Hadoop file system IPC shmem self test in PRIMARY mode.
+ */
+public class IgniteHadoopFileSystemShmemExternalToClientDualSyncSelfTest
+ extends IgniteHadoopFileSystemShmemExternalToClientAbstractSelfTest {
+ /**
+ * Constructor.
+ */
+ public IgniteHadoopFileSystemShmemExternalToClientDualSyncSelfTest() {
+ super(DUAL_SYNC, true);
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemExternalToClientPrimarySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemExternalToClientPrimarySelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemExternalToClientPrimarySelfTest.java
new file mode 100644
index 0000000..475c693
--- /dev/null
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemExternalToClientPrimarySelfTest.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.hadoop.impl.igfs;
+
+import static org.apache.ignite.igfs.IgfsMode.PRIMARY;
+
+/**
+ * IGFS Hadoop file system IPC shmem self test in PRIMARY mode.
+ */
+public class IgniteHadoopFileSystemShmemExternalToClientPrimarySelfTest
+ extends IgniteHadoopFileSystemShmemExternalToClientAbstractSelfTest {
+ /**
+ * Constructor.
+ */
+ public IgniteHadoopFileSystemShmemExternalToClientPrimarySelfTest() {
+ super(PRIMARY, true);
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemExternalToClientProxySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemExternalToClientProxySelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemExternalToClientProxySelfTest.java
new file mode 100644
index 0000000..8a15030
--- /dev/null
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemExternalToClientProxySelfTest.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.hadoop.impl.igfs;
+
+import static org.apache.ignite.igfs.IgfsMode.PROXY;
+
+/**
+ * IGFS Hadoop file system IPC shmem self test in PRIMARY mode.
+ */
+public class IgniteHadoopFileSystemShmemExternalToClientProxySelfTest
+ extends IgniteHadoopFileSystemShmemExternalToClientAbstractSelfTest {
+ /**
+ * Constructor.
+ */
+ public IgniteHadoopFileSystemShmemExternalToClientProxySelfTest() {
+ super(PROXY, true);
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteHadoopTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteHadoopTestSuite.java b/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteHadoopTestSuite.java
index 6c2d5c4..b012083 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteHadoopTestSuite.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteHadoopTestSuite.java
@@ -30,6 +30,15 @@ import org.apache.ignite.internal.processors.hadoop.impl.client.HadoopClientProt
import org.apache.ignite.internal.processors.hadoop.impl.HadoopTxConfigCacheTest;
import org.apache.ignite.internal.processors.hadoop.impl.fs.KerberosHadoopFileSystemFactorySelfTest;
import org.apache.ignite.internal.processors.hadoop.impl.igfs.Hadoop1OverIgfsProxyTest;
+import org.apache.ignite.internal.processors.hadoop.impl.igfs.IgniteHadoopFileSystemClientBasedDualAsyncSelfTest;
+import org.apache.ignite.internal.processors.hadoop.impl.igfs.IgniteHadoopFileSystemClientBasedDualSyncSelfTest;
+import org.apache.ignite.internal.processors.hadoop.impl.igfs.IgniteHadoopFileSystemClientBasedOpenTest;
+import org.apache.ignite.internal.processors.hadoop.impl.igfs.IgniteHadoopFileSystemClientBasedPrimarySelfTest;
+import org.apache.ignite.internal.processors.hadoop.impl.igfs.IgniteHadoopFileSystemClientBasedProxySelfTest;
+import org.apache.ignite.internal.processors.hadoop.impl.igfs.IgniteHadoopFileSystemLoopbackExternalToClientDualAsyncSelfTest;
+import org.apache.ignite.internal.processors.hadoop.impl.igfs.IgniteHadoopFileSystemLoopbackExternalToClientDualSyncSelfTest;
+import org.apache.ignite.internal.processors.hadoop.impl.igfs.IgniteHadoopFileSystemLoopbackExternalToClientPrimarySelfTest;
+import org.apache.ignite.internal.processors.hadoop.impl.igfs.IgniteHadoopFileSystemLoopbackExternalToClientProxySelfTest;
import org.apache.ignite.internal.processors.hadoop.impl.util.BasicUserNameMapperSelfTest;
import org.apache.ignite.internal.processors.hadoop.impl.util.ChainedUserNameMapperSelfTest;
import org.apache.ignite.internal.processors.hadoop.impl.util.KerberosUserNameMapperSelfTest;
@@ -147,6 +156,14 @@ public class IgniteHadoopTestSuite extends TestSuite {
suite.addTest(new TestSuite(ldr.loadClass(IgniteHadoopFileSystemLoopbackEmbeddedSecondarySelfTest.class.getName())));
suite.addTest(new TestSuite(ldr.loadClass(IgniteHadoopFileSystemLoopbackEmbeddedDualSyncSelfTest.class.getName())));
suite.addTest(new TestSuite(ldr.loadClass(IgniteHadoopFileSystemLoopbackEmbeddedDualAsyncSelfTest.class.getName())));
+ suite.addTest(new TestSuite(ldr.loadClass(IgniteHadoopFileSystemClientBasedPrimarySelfTest.class.getName())));
+ suite.addTest(new TestSuite(ldr.loadClass(IgniteHadoopFileSystemClientBasedDualAsyncSelfTest.class.getName())));
+ suite.addTest(new TestSuite(ldr.loadClass(IgniteHadoopFileSystemClientBasedDualSyncSelfTest.class.getName())));
+ suite.addTest(new TestSuite(ldr.loadClass(IgniteHadoopFileSystemClientBasedProxySelfTest.class.getName())));
+ suite.addTest(new TestSuite(ldr.loadClass(IgniteHadoopFileSystemLoopbackExternalToClientPrimarySelfTest.class.getName())));
+ suite.addTest(new TestSuite(ldr.loadClass(IgniteHadoopFileSystemLoopbackExternalToClientDualSyncSelfTest.class.getName())));
+ suite.addTest(new TestSuite(ldr.loadClass(IgniteHadoopFileSystemLoopbackExternalToClientDualAsyncSelfTest.class.getName())));
+ suite.addTest(new TestSuite(ldr.loadClass(IgniteHadoopFileSystemLoopbackExternalToClientProxySelfTest.class.getName())));
suite.addTest(new TestSuite(ldr.loadClass(IgniteHadoopFileSystemSecondaryFileSystemInitializationSelfTest.class.getName())));
@@ -206,7 +223,9 @@ public class IgniteHadoopTestSuite extends TestSuite {
suite.addTest(new TestSuite(ldr.loadClass(HadoopTxConfigCacheTest.class.getName())));
- return suite;
+ suite.addTest(new TestSuite(ldr.loadClass(IgniteHadoopFileSystemClientBasedOpenTest.class.getName())));
+
+ return suite;
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteIgfsLinuxAndMacOSTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteIgfsLinuxAndMacOSTestSuite.java b/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteIgfsLinuxAndMacOSTestSuite.java
index 21d78ab..5708a18 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteIgfsLinuxAndMacOSTestSuite.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteIgfsLinuxAndMacOSTestSuite.java
@@ -22,14 +22,14 @@ import org.apache.ignite.internal.processors.hadoop.HadoopTestClassLoader;
import org.apache.ignite.internal.processors.hadoop.impl.igfs.HadoopIgfs20FileSystemShmemPrimarySelfTest;
import org.apache.ignite.internal.processors.hadoop.impl.igfs.IgfsEventsTestSuite;
import org.apache.ignite.internal.processors.hadoop.impl.igfs.IgniteHadoopFileSystemIpcCacheSelfTest;
-import org.apache.ignite.internal.processors.hadoop.impl.igfs.IgniteHadoopFileSystemShmemEmbeddedDualAsyncSelfTest;
-import org.apache.ignite.internal.processors.hadoop.impl.igfs.IgniteHadoopFileSystemShmemEmbeddedDualSyncSelfTest;
-import org.apache.ignite.internal.processors.hadoop.impl.igfs.IgniteHadoopFileSystemShmemEmbeddedPrimarySelfTest;
-import org.apache.ignite.internal.processors.hadoop.impl.igfs.IgniteHadoopFileSystemShmemEmbeddedSecondarySelfTest;
import org.apache.ignite.internal.processors.hadoop.impl.igfs.IgniteHadoopFileSystemShmemExternalDualAsyncSelfTest;
import org.apache.ignite.internal.processors.hadoop.impl.igfs.IgniteHadoopFileSystemShmemExternalDualSyncSelfTest;
import org.apache.ignite.internal.processors.hadoop.impl.igfs.IgniteHadoopFileSystemShmemExternalPrimarySelfTest;
import org.apache.ignite.internal.processors.hadoop.impl.igfs.IgniteHadoopFileSystemShmemExternalSecondarySelfTest;
+import org.apache.ignite.internal.processors.hadoop.impl.igfs.IgniteHadoopFileSystemShmemExternalToClientDualAsyncSelfTest;
+import org.apache.ignite.internal.processors.hadoop.impl.igfs.IgniteHadoopFileSystemShmemExternalToClientDualSyncSelfTest;
+import org.apache.ignite.internal.processors.hadoop.impl.igfs.IgniteHadoopFileSystemShmemExternalToClientPrimarySelfTest;
+import org.apache.ignite.internal.processors.hadoop.impl.igfs.IgniteHadoopFileSystemShmemExternalToClientProxySelfTest;
import org.apache.ignite.internal.processors.igfs.IgfsServerManagerIpcEndpointRegistrationOnLinuxAndMacSelfTest;
import static org.apache.ignite.testsuites.IgniteHadoopTestSuite.downloadHadoop;
@@ -56,11 +56,10 @@ public class IgniteIgfsLinuxAndMacOSTestSuite extends TestSuite {
suite.addTest(new TestSuite(ldr.loadClass(IgniteHadoopFileSystemShmemExternalSecondarySelfTest.class.getName())));
suite.addTest(new TestSuite(ldr.loadClass(IgniteHadoopFileSystemShmemExternalDualSyncSelfTest.class.getName())));
suite.addTest(new TestSuite(ldr.loadClass(IgniteHadoopFileSystemShmemExternalDualAsyncSelfTest.class.getName())));
-
- suite.addTest(new TestSuite(ldr.loadClass(IgniteHadoopFileSystemShmemEmbeddedPrimarySelfTest.class.getName())));
- suite.addTest(new TestSuite(ldr.loadClass(IgniteHadoopFileSystemShmemEmbeddedSecondarySelfTest.class.getName())));
- suite.addTest(new TestSuite(ldr.loadClass(IgniteHadoopFileSystemShmemEmbeddedDualSyncSelfTest.class.getName())));
- suite.addTest(new TestSuite(ldr.loadClass(IgniteHadoopFileSystemShmemEmbeddedDualAsyncSelfTest.class.getName())));
+ suite.addTest(new TestSuite(ldr.loadClass(IgniteHadoopFileSystemShmemExternalToClientPrimarySelfTest.class.getName())));
+ suite.addTest(new TestSuite(ldr.loadClass(IgniteHadoopFileSystemShmemExternalToClientDualAsyncSelfTest.class.getName())));
+ suite.addTest(new TestSuite(ldr.loadClass(IgniteHadoopFileSystemShmemExternalToClientDualSyncSelfTest.class.getName())));
+ suite.addTest(new TestSuite(ldr.loadClass(IgniteHadoopFileSystemShmemExternalToClientProxySelfTest.class.getName())));
suite.addTest(new TestSuite(ldr.loadClass(IgniteHadoopFileSystemIpcCacheSelfTest.class.getName())));
[25/50] [abbrv] ignite git commit: IGNITE-4472 Minor UI fix.
Posted by vo...@apache.org.
IGNITE-4472 Minor UI fix.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/97c7ed7b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/97c7ed7b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/97c7ed7b
Branch: refs/heads/ignite-4565-ddl
Commit: 97c7ed7b36eb605f275df707ebe726b905b3db54
Parents: 06908d2
Author: Andrey Novikov <an...@gridgain.com>
Authored: Thu Feb 16 14:22:22 2017 +0700
Committer: Andrey Novikov <an...@gridgain.com>
Committed: Thu Feb 16 14:22:22 2017 +0700
----------------------------------------------------------------------
.../list-of-registered-users.column-defs.js | 8 ++--
.../list-of-registered-users.controller.js | 18 +++++++++
.../list-of-registered-users.jade | 16 +++++---
.../ui-grid-settings/ui-grid-settings.scss | 39 +++++++++++++++++---
4 files changed, 66 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/97c7ed7b/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.column-defs.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.column-defs.js b/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.column-defs.js
index 4dc4655..e6ba842 100644
--- a/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.column-defs.js
+++ b/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.column-defs.js
@@ -49,7 +49,7 @@ const ACTIONS_TEMPLATE = `
const EMAIL_TEMPLATE = '<div class="ui-grid-cell-contents"><a ng-href="mailto:{{ COL_FIELD }}">{{ COL_FIELD }}</a></div>';
export default [
- {displayName: 'Actions', categoryDisplayName: 'Actions', cellTemplate: ACTIONS_TEMPLATE, field: 'actions', minWidth: 70, width: 70, enableFiltering: false, enableSorting: false, pinnedLeft: true},
+ {displayName: 'Actions', categoryDisplayName: 'Actions', cellTemplate: ACTIONS_TEMPLATE, field: 'actions', minWidth: 65, width: 65, enableFiltering: false, enableSorting: false, pinnedLeft: true},
{displayName: 'User', categoryDisplayName: 'User', field: 'userName', cellTemplate: USER_TEMPLATE, minWidth: 160, enableFiltering: true, filter: { placeholder: 'Filter by name...' }, pinnedLeft: true},
{displayName: 'Email', categoryDisplayName: 'Email', field: 'email', cellTemplate: EMAIL_TEMPLATE, minWidth: 160, enableFiltering: true, filter: { placeholder: 'Filter by email...' }},
{displayName: 'Company', categoryDisplayName: 'Company', field: 'company', minWidth: 160, enableFiltering: true},
@@ -64,9 +64,9 @@ export default [
// Activities Total
{displayName: 'Cfg', categoryDisplayName: 'Total activities', field: 'activitiesTotal["configuration"] || 0', type: 'number', headerTooltip: 'Total count of configuration usages', minWidth: 50, width: 50, enableFiltering: false},
{displayName: 'Qry', categoryDisplayName: 'Total activities', field: 'activitiesTotal["queries"] || 0', type: 'number', headerTooltip: 'Total count of queries usages', minWidth: 50, width: 50, enableFiltering: false},
- {displayName: 'Demo', categoryDisplayName: 'Total activities', field: 'activitiesTotal["demo"] || 0', type: 'number', headerTooltip: 'Total count of demo startup', minWidth: 50, width: 50, enableFiltering: false},
- {displayName: 'Dnld', categoryDisplayName: 'Total activities', field: 'activitiesDetail["/agent/download"] || 0', type: 'number', headerTooltip: 'Total count of agent downloads', minWidth: 50, width: 50, enableFiltering: false},
- {displayName: 'Str', categoryDisplayName: 'Total activities', field: 'activitiesDetail["/agent/start"] || 0', type: 'number', headerTooltip: 'Total count of agent startup', minWidth: 50, width: 50, enableFiltering: false},
+ {displayName: 'Demo', categoryDisplayName: 'Total activities', field: 'activitiesTotal["demo"] || 0', type: 'number', headerTooltip: 'Total count of demo startup', minWidth: 60, width: 60, enableFiltering: false},
+ {displayName: 'Dnld', categoryDisplayName: 'Total activities', field: 'activitiesDetail["/agent/download"] || 0', type: 'number', headerTooltip: 'Total count of agent downloads', minWidth: 55, width: 55, enableFiltering: false},
+ {displayName: 'Starts', categoryDisplayName: 'Total activities', field: 'activitiesDetail["/agent/start"] || 0', type: 'number', headerTooltip: 'Total count of agent startup', minWidth: 60, width: 60, enableFiltering: false},
// Activities Configuration
{displayName: 'Clusters', categoryDisplayName: 'Configuration\'s activities', field: 'activitiesDetail["/configuration/clusters"] || 0', type: 'number', headerTooltip: 'Configuration clusters', minWidth: 50, width: 80, enableFiltering: false, visible: false},
{displayName: 'Model', categoryDisplayName: 'Configuration\'s activities', field: 'activitiesDetail["/configuration/domains"] || 0', type: 'number', headerTooltip: 'Configuration model', minWidth: 50, width: 80, enableFiltering: false, visible: false},
http://git-wip-us.apache.org/repos/asf/ignite/blob/97c7ed7b/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.controller.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.controller.js b/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.controller.js
index 1f2a348..5761073 100644
--- a/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.controller.js
+++ b/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.controller.js
@@ -96,6 +96,18 @@ export default class IgniteListOfRegisteredUsersCtrl {
return new ActivitiesUserDialog({ user });
};
+ const companiesExcludeFilter = (renderableRows) => {
+ if (_.isNil($ctrl.params.companiesExclude))
+ return renderableRows;
+
+ _.forEach(renderableRows, (row) => {
+ row.visible = _.isEmpty($ctrl.params.companiesExclude) ||
+ row.entity.company.toLowerCase().indexOf($ctrl.params.companiesExclude.toLowerCase()) === -1;
+ });
+
+ return renderableRows;
+ };
+
$ctrl.gridOptions = {
data: [],
columnVirtualizationThreshold: 30,
@@ -120,6 +132,8 @@ export default class IgniteListOfRegisteredUsersCtrl {
api.removeUser = removeUser;
api.toggleAdmin = toggleAdmin;
api.showActivities = showActivities;
+
+ api.grid.registerRowsProcessor(companiesExcludeFilter, 300);
}
};
@@ -153,6 +167,10 @@ export default class IgniteListOfRegisteredUsersCtrl {
.then((data) => $ctrl.adjustHeight(data.length));
};
+ $scope.$watch(() => $ctrl.params.companiesExclude, () => {
+ $ctrl.gridApi.grid.refreshRows();
+ });
+
$scope.$watch(() => $ctrl.params.startDate, (dt) => {
$ctrl.gridOptions.exporterCsvFilename = `web_console_users_${dtFilter(dt, 'yyyy_MM')}.csv`;
http://git-wip-us.apache.org/repos/asf/ignite/blob/97c7ed7b/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.jade
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.jade b/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.jade
index efed9c0..1195910 100644
--- a/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.jade
+++ b/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.jade
@@ -39,16 +39,20 @@ mixin grid-settings()
+grid-settings
label Total users:
strong {{ $ctrl.gridOptions.data.length }}
- label Showing users:
+ label Showing users:
strong {{ $ctrl.gridApi.grid.getVisibleRows().length }}
sub(ng-show='users.length === $ctrl.gridApi.grid.getVisibleRows().length') all
- div.ui-grid-settings-dateperiod
- form(ng-form=form novalidate)
- -var form = 'admin'
+ form.pull-right(ng-form=form novalidate)
+ -var form = 'admin'
+
+ button.btn.btn-primary(ng-click='$ctrl.exportCsv()' bs-tooltip data-title='Export table to csv') Export
+
+ .ui-grid-settings-dateperiod
+ignite-form-field-datepicker('Period:', '$ctrl.params.startDate', '"period"')
-
- button.btn.btn-primary(ng-click='$ctrl.exportCsv()' bs-tooltip data-title='Export table to csv') Export
+
+ .ui-grid-settings-filter
+ +ignite-form-field-text('Exclude:', '$ctrl.params.companiesExclude', '"exclude"', false, false, 'Exclude by company name...')
.panel-collapse
.grid.ui-grid--ignite(ui-grid='$ctrl.gridOptions' ui-grid-resize-columns ui-grid-selection ui-grid-exporter ui-grid-pinning)
http://git-wip-us.apache.org/repos/asf/ignite/blob/97c7ed7b/modules/web-console/frontend/app/components/ui-grid-settings/ui-grid-settings.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/ui-grid-settings/ui-grid-settings.scss b/modules/web-console/frontend/app/components/ui-grid-settings/ui-grid-settings.scss
index 3016488..bc16271 100644
--- a/modules/web-console/frontend/app/components/ui-grid-settings/ui-grid-settings.scss
+++ b/modules/web-console/frontend/app/components/ui-grid-settings/ui-grid-settings.scss
@@ -36,6 +36,40 @@
cursor: pointer;
}
+ .btn {
+ float: right;
+
+ line-height: 20px;
+ margin-right: 0;
+ }
+
+ &-filter {
+ float: right;
+
+ .ignite-form-field {
+ width: 260px;
+ margin-right: 10px;
+
+ &__label {
+ }
+
+ &__control {
+ }
+
+ &:nth-child(1) {
+ float: left;
+
+ .ignite-form-field__label {
+ width: 30%;
+ }
+
+ .ignite-form-field__control {
+ width: 70%;
+ }
+ }
+ }
+ }
+
&-dateperiod {
float: right;
@@ -61,10 +95,5 @@
}
}
}
-
- .btn {
- line-height: 20px;
- margin-right: 0;
- }
}
}
[47/50] [abbrv] ignite git commit: IGNITE-3625: IGFS: "meta" and
"data" caches are now configured inside IGFS bean. This closes #923. This
closes #972.
Posted by vo...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java
index a98c3a1..9636c7d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java
@@ -57,12 +57,6 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
/** Test IP finder. */
private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
- /** Meta-information cache name. */
- private static final String META_CACHE_NAME = "meta";
-
- /** Data cache name. */
- private static final String DATA_CACHE_NAME = "partitioned";
-
/** Groups count for data blocks. */
private static final int DATA_BLOCK_GROUP_CNT = 2;
@@ -95,8 +89,6 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- cfg.setCacheConfiguration(cacheConfiguration(META_CACHE_NAME), cacheConfiguration(DATA_CACHE_NAME));
-
TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
discoSpi.setIpFinder(IP_FINDER);
@@ -105,8 +97,8 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
- igfsCfg.setMetaCacheName(META_CACHE_NAME);
- igfsCfg.setDataCacheName(DATA_CACHE_NAME);
+ igfsCfg.setMetaCacheConfiguration(cacheConfiguration("meta"));
+ igfsCfg.setDataCacheConfiguration(cacheConfiguration("data"));
igfsCfg.setBlockSize(IGFS_BLOCK_SIZE);
igfsCfg.setName("igfs");
igfsCfg.setBlockSize(BLOCK_SIZE);
@@ -122,7 +114,7 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
cacheCfg.setName(cacheName);
- if (META_CACHE_NAME.equals(cacheName))
+ if ("meta".equals(cacheName))
cacheCfg.setCacheMode(REPLICATED);
else {
cacheCfg.setCacheMode(PARTITIONED);
@@ -141,9 +133,9 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
for (int i = 0; i < NODES_CNT; i++) {
- grid(i).cachex(META_CACHE_NAME).clear();
+ grid(i).cachex(grid(i).igfsx("igfs").configuration().getMetaCacheConfiguration().getName()).clear();
- grid(i).cachex(DATA_CACHE_NAME).clear();
+ grid(i).cachex(grid(i).igfsx("igfs").configuration().getDataCacheConfiguration().getName()).clear();
}
}
@@ -200,7 +192,8 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
fut.get(3000);
for (int j = 0; j < NODES_CNT; j++) {
- GridCacheContext<Object, Object> ctx = GridTestUtils.getFieldValue(grid(j).cachex(DATA_CACHE_NAME),
+ GridCacheContext<Object, Object> ctx = GridTestUtils.getFieldValue(
+ grid(j).cachex(grid(j).igfsx("igfs").configuration().getDataCacheConfiguration().getName()),
"ctx");
Collection<IgniteInternalTx> txs = ctx.tm().txs();
@@ -292,7 +285,8 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
fut.get(3000);
for (int j = 0; j < NODES_CNT; j++) {
- GridCacheContext<Object, Object> ctx = GridTestUtils.getFieldValue(grid(j).cachex(DATA_CACHE_NAME),
+ GridCacheContext<Object, Object> ctx = GridTestUtils.getFieldValue(grid(j).cachex(
+ grid(j).igfsx("igfs").configuration().getDataCacheConfiguration().getName()),
"ctx");
Collection<IgniteInternalTx> txs = ctx.tm().txs();
@@ -376,7 +370,8 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
fut.get(3000);
for (int j = 0; j < NODES_CNT; j++) {
- GridCacheContext<Object, Object> ctx = GridTestUtils.getFieldValue(grid(j).cachex(DATA_CACHE_NAME),
+ GridCacheContext<Object, Object> ctx = GridTestUtils.getFieldValue(
+ grid(j).cachex(grid(j).igfsx("igfs").configuration().getDataCacheConfiguration().getName()),
"ctx");
Collection<IgniteInternalTx> txs = ctx.tm().txs();
@@ -482,7 +477,8 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
do {
IgfsBlockKey key = new IgfsBlockKey(info.id(), null, false, block);
- ClusterNode affNode = grid(0).affinity(DATA_CACHE_NAME).mapKeyToNode(key);
+ ClusterNode affNode = grid(0).affinity(grid(0).igfsx("igfs").configuration()
+ .getDataCacheConfiguration().getName()).mapKeyToNode(key);
assertTrue("Failed to find node in affinity [dataMgr=" + loc.nodeIds() +
", nodeId=" + affNode.id() + ", block=" + block + ']', loc.nodeIds().contains(affNode.id()));
@@ -557,7 +553,8 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
IgfsBlockKey key = new IgfsBlockKey(info.id(),
info.fileMap().affinityKey(block * blockSize, false), false, block);
- ClusterNode affNode = grid(0).affinity(DATA_CACHE_NAME).mapKeyToNode(key);
+ ClusterNode affNode = grid(0).affinity(grid(0).igfsx("igfs").configuration()
+ .getDataCacheConfiguration().getName()).mapKeyToNode(key);
assertTrue("Failed to find node in affinity [dataMgr=" + loc.nodeIds() +
", nodeId=" + affNode.id() + ", block=" + block + ']', loc.nodeIds().contains(affNode.id()));
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMaxSizeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMaxSizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMaxSizeSelfTest.java
index c376c52..f3b777c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMaxSizeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMaxSizeSelfTest.java
@@ -41,8 +41,6 @@ public class IgfsMaxSizeSelfTest extends IgfsCommonAbstractTest {
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
- igfsCfg.setDataCacheName("dataCache");
- igfsCfg.setMetaCacheName("metaCache");
igfsCfg.setName("test");
if (maxSize > 0)
@@ -67,7 +65,9 @@ public class IgfsMaxSizeSelfTest extends IgfsCommonAbstractTest {
metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
metaCacheCfg.setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL);
- cfg.setCacheConfiguration(dataCacheCfg, metaCacheCfg);
+ igfsCfg.setDataCacheConfiguration(dataCacheCfg);
+ igfsCfg.setMetaCacheConfiguration(metaCacheCfg);
+
cfg.setFileSystemConfiguration(igfsCfg);
cfg.setGridName(gridName);
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java
index 01e1a2e..e8f66ad 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java
@@ -76,8 +76,6 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- cfg.setCacheConfiguration(cacheConfiguration(META_CACHE_NAME), cacheConfiguration(DATA_CACHE_NAME));
-
TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
discoSpi.setIpFinder(IP_FINDER);
@@ -86,8 +84,8 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest {
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
- igfsCfg.setMetaCacheName(META_CACHE_NAME);
- igfsCfg.setDataCacheName(DATA_CACHE_NAME);
+ igfsCfg.setMetaCacheConfiguration(cacheConfiguration(META_CACHE_NAME));
+ igfsCfg.setDataCacheConfiguration(cacheConfiguration(DATA_CACHE_NAME));
igfsCfg.setName("igfs");
cfg.setFileSystemConfiguration(igfsCfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsSelfTest.java
index 8d742fb..b3061c8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsSelfTest.java
@@ -120,8 +120,6 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest {
private IgniteConfiguration primaryConfiguration(int idx) throws Exception {
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
- igfsCfg.setDataCacheName("dataCache");
- igfsCfg.setMetaCacheName("metaCache");
igfsCfg.setName(IGFS_PRIMARY);
igfsCfg.setBlockSize(PRIMARY_BLOCK_SIZE);
igfsCfg.setDefaultMode(DUAL_SYNC);
@@ -135,7 +133,6 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest {
CacheConfiguration dataCacheCfg = defaultCacheConfiguration();
- dataCacheCfg.setName("dataCache");
dataCacheCfg.setCacheMode(PARTITIONED);
dataCacheCfg.setNearConfiguration(null);
dataCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
@@ -145,12 +142,14 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest {
CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
- metaCacheCfg.setName("metaCache");
metaCacheCfg.setCacheMode(REPLICATED);
metaCacheCfg.setNearConfiguration(null);
metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
+ igfsCfg.setMetaCacheConfiguration(metaCacheCfg);
+ igfsCfg.setDataCacheConfiguration(dataCacheCfg);
+
IgniteConfiguration cfg = new IgniteConfiguration();
cfg.setGridName("grid-" + idx);
@@ -160,7 +159,6 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest {
discoSpi.setIpFinder(IP_FINDER);
cfg.setDiscoverySpi(discoSpi);
- cfg.setCacheConfiguration(dataCacheCfg, metaCacheCfg);
cfg.setFileSystemConfiguration(igfsCfg);
cfg.setLocalHost("127.0.0.1");
@@ -177,8 +175,6 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest {
private void startSecondary() throws Exception {
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
- igfsCfg.setDataCacheName("dataCache");
- igfsCfg.setMetaCacheName("metaCache");
igfsCfg.setName(IGFS_SECONDARY);
igfsCfg.setBlockSize(SECONDARY_BLOCK_SIZE);
igfsCfg.setDefaultMode(PRIMARY);
@@ -186,7 +182,6 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest {
CacheConfiguration dataCacheCfg = defaultCacheConfiguration();
- dataCacheCfg.setName("dataCache");
dataCacheCfg.setCacheMode(PARTITIONED);
dataCacheCfg.setNearConfiguration(null);
dataCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
@@ -196,12 +191,14 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest {
CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
- metaCacheCfg.setName("metaCache");
metaCacheCfg.setCacheMode(REPLICATED);
metaCacheCfg.setNearConfiguration(null);
metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
+ igfsCfg.setMetaCacheConfiguration(metaCacheCfg);
+ igfsCfg.setDataCacheConfiguration(dataCacheCfg);
+
IgniteConfiguration cfg = new IgniteConfiguration();
cfg.setGridName("grid-secondary");
@@ -211,7 +208,6 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest {
discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true));
cfg.setDiscoverySpi(discoSpi);
- cfg.setCacheConfiguration(dataCacheCfg, metaCacheCfg);
cfg.setFileSystemConfiguration(igfsCfg);
cfg.setLocalHost("127.0.0.1");
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsModesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsModesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsModesSelfTest.java
index 5fcd8dd..c4d7835 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsModesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsModesSelfTest.java
@@ -98,8 +98,6 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest {
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
- igfsCfg.setDataCacheName("partitioned");
- igfsCfg.setMetaCacheName("replicated");
igfsCfg.setName("igfs");
igfsCfg.setBlockSize(512 * 1024);
igfsCfg.setInitializeDefaultPathModes(true);
@@ -114,23 +112,24 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest {
if (setSecondaryFs)
igfsCfg.setSecondaryFileSystem(igfsSecondary.asSecondary());
- CacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration dataCacheCfg = defaultCacheConfiguration();
- cacheCfg.setName("partitioned");
- cacheCfg.setCacheMode(PARTITIONED);
- cacheCfg.setNearConfiguration(null);
- cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- cacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(128));
- cacheCfg.setBackups(0);
- cacheCfg.setAtomicityMode(TRANSACTIONAL);
+ dataCacheCfg.setCacheMode(PARTITIONED);
+ dataCacheCfg.setNearConfiguration(null);
+ dataCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
+ dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(128));
+ dataCacheCfg.setBackups(0);
+ dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
- metaCacheCfg.setName("replicated");
metaCacheCfg.setCacheMode(REPLICATED);
metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
+ igfsCfg.setMetaCacheConfiguration(metaCacheCfg);
+ igfsCfg.setDataCacheConfiguration(dataCacheCfg);
+
IgniteConfiguration cfg = new IgniteConfiguration();
cfg.setGridName("igfs-grid");
@@ -140,7 +139,6 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest {
discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true));
cfg.setDiscoverySpi(discoSpi);
- cfg.setCacheConfiguration(metaCacheCfg, cacheCfg);
cfg.setFileSystemConfiguration(igfsCfg);
cfg.setLocalHost("127.0.0.1");
@@ -159,8 +157,6 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest {
private void startUpSecondary() throws Exception {
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
- igfsCfg.setDataCacheName("partitioned");
- igfsCfg.setMetaCacheName("replicated");
igfsCfg.setName("igfs-secondary");
igfsCfg.setBlockSize(512 * 1024);
igfsCfg.setDefaultMode(PRIMARY);
@@ -170,23 +166,24 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest {
endpointCfg.setType(IgfsIpcEndpointType.TCP);
endpointCfg.setPort(11500);
- CacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration dataCacheCfg = defaultCacheConfiguration();
- cacheCfg.setName("partitioned");
- cacheCfg.setCacheMode(PARTITIONED);
- cacheCfg.setNearConfiguration(null);
- cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- cacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(128));
- cacheCfg.setBackups(0);
- cacheCfg.setAtomicityMode(TRANSACTIONAL);
+ dataCacheCfg.setCacheMode(PARTITIONED);
+ dataCacheCfg.setNearConfiguration(null);
+ dataCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
+ dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(128));
+ dataCacheCfg.setBackups(0);
+ dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
- metaCacheCfg.setName("replicated");
metaCacheCfg.setCacheMode(REPLICATED);
metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
+ igfsCfg.setMetaCacheConfiguration(metaCacheCfg);
+ igfsCfg.setDataCacheConfiguration(dataCacheCfg);
+
IgniteConfiguration cfg = new IgniteConfiguration();
cfg.setGridName("igfs-grid-secondary");
@@ -196,7 +193,6 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest {
discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true));
cfg.setDiscoverySpi(discoSpi);
- cfg.setCacheConfiguration(metaCacheCfg, cacheCfg);
cfg.setFileSystemConfiguration(igfsCfg);
cfg.setLocalHost("127.0.0.1");
@@ -391,7 +387,7 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest {
startUp();
}
catch (IgniteException e) {
- errMsg = e.getCause().getCause().getMessage();
+ errMsg = e.getCause().getMessage();
}
assertTrue(errMsg.startsWith(
@@ -457,7 +453,7 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest {
startUp();
}
catch (IgniteException e) {
- errMsg = e.getCause().getCause().getMessage();
+ errMsg = e.getCause().getMessage();
}
assertTrue(errMsg.startsWith(
@@ -602,7 +598,8 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest {
assert !igfsSecondary.exists(file);
}
- int cacheSize = grid.cachex("partitioned").size();
+ int cacheSize = grid.cachex(grid.igfsx("igfs").configuration().getDataCacheConfiguration()
+ .getName()).size();
if (primaryNotUsed)
assert cacheSize == 0;
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsOneClientNodeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsOneClientNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsOneClientNodeTest.java
index c5f85bc..0cb797a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsOneClientNodeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsOneClientNodeTest.java
@@ -37,12 +37,6 @@ import static org.apache.ignite.cache.CacheMode.PARTITIONED;
* Test for igfs with one node in client mode.
*/
public class IgfsOneClientNodeTest extends GridCommonAbstractTest {
- /** Meta-information cache name. */
- private static final String META_CACHE_NAME = "meta";
-
- /** Data cache name. */
- private static final String DATA_CACHE_NAME = null;
-
/** Regular cache name. */
private static final String CACHE_NAME = "cache";
@@ -50,8 +44,7 @@ public class IgfsOneClientNodeTest extends GridCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- cfg.setCacheConfiguration(cacheConfiguration(META_CACHE_NAME), cacheConfiguration(DATA_CACHE_NAME),
- cacheConfiguration(CACHE_NAME));
+ cfg.setCacheConfiguration(cacheConfiguration(CACHE_NAME));
cfg.setClientMode(true);
@@ -61,9 +54,9 @@ public class IgfsOneClientNodeTest extends GridCommonAbstractTest {
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
- igfsCfg.setMetaCacheName(META_CACHE_NAME);
- igfsCfg.setDataCacheName(DATA_CACHE_NAME);
igfsCfg.setName("igfs");
+ igfsCfg.setMetaCacheConfiguration(cacheConfiguration(null));
+ igfsCfg.setDataCacheConfiguration(cacheConfiguration(null));
cfg.setFileSystemConfiguration(igfsCfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java
index c854970..3a735ae 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java
@@ -70,12 +70,6 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
/** Test IP finder. */
private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
- /** Meta-information cache name. */
- private static final String META_CACHE_NAME = "replicated";
-
- /** Data cache name. */
- public static final String DATA_CACHE_NAME = "data";
-
/** Random numbers generator. */
protected final SecureRandom rnd = new SecureRandom();
@@ -98,7 +92,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
assert cfgs.length == 1;
- metaCacheName = cfgs[0].getMetaCacheName();
+ metaCacheName = cfgs[0].getMetaCacheConfiguration().getName();
metaCache = ((IgniteKernal)grid).internalCache(metaCacheName);
}
@@ -124,7 +118,6 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- cfg.setCacheConfiguration(cacheConfiguration(META_CACHE_NAME), cacheConfiguration(DATA_CACHE_NAME));
TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
@@ -134,8 +127,8 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
- igfsCfg.setMetaCacheName(META_CACHE_NAME);
- igfsCfg.setDataCacheName(DATA_CACHE_NAME);
+ igfsCfg.setMetaCacheConfiguration(cacheConfiguration("meta"));
+ igfsCfg.setDataCacheConfiguration(cacheConfiguration("data"));
igfsCfg.setName("igfs");
cfg.setFileSystemConfiguration(igfsCfg);
@@ -149,7 +142,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
cacheCfg.setName(cacheName);
- if (META_CACHE_NAME.equals(cacheName))
+ if ("meta".equals(cacheName))
cacheCfg.setCacheMode(REPLICATED);
else {
cacheCfg.setCacheMode(PARTITIONED);
@@ -690,14 +683,17 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
public void testDeleteCacheConsistency() throws Exception {
IgfsPath path = new IgfsPath("/someFile");
+ String metaCacheName = grid(0).igfsx("igfs").configuration().getMetaCacheConfiguration().getName();
+ String dataCacheName = grid(0).igfsx("igfs").configuration().getDataCacheConfiguration().getName();
+
try (IgfsOutputStream out = igfs.create(path, true)) {
out.write(new byte[10 * 1024 * 1024]);
}
IgniteUuid fileId = U.field(igfs.info(path), "fileId");
- GridCacheAdapter<IgniteUuid, IgfsEntryInfo> metaCache = ((IgniteKernal)grid(0)).internalCache(META_CACHE_NAME);
- GridCacheAdapter<IgfsBlockKey, byte[]> dataCache = ((IgniteKernal)grid(0)).internalCache(DATA_CACHE_NAME);
+ GridCacheAdapter<IgniteUuid, IgfsEntryInfo> metaCache = ((IgniteKernal)grid(0)).internalCache(metaCacheName);
+ GridCacheAdapter<IgfsBlockKey, byte[]> dataCache = ((IgniteKernal)grid(0)).internalCache(dataCacheName);
IgfsEntryInfo info = metaCache.get(fileId);
@@ -785,7 +781,8 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
@Override public boolean apply() {
int metaSize = 0;
- for (Object metaId : grid(0).cachex(igfs.configuration().getMetaCacheName()).keySet()) {
+ for (Object metaId : grid(0).cachex(igfs.configuration().getMetaCacheConfiguration().getName())
+ .keySet()) {
if (!IgfsUtils.isRootOrTrashId((IgniteUuid)metaId))
metaSize++;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java
index 28ec1da..a31a81a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java
@@ -24,8 +24,8 @@ import org.apache.ignite.configuration.FileSystemConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper;
import org.apache.ignite.igfs.IgfsIpcEndpointConfiguration;
+import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.processors.cache.GridCacheDefaultAffinityKeyMapper;
-import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.G;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
@@ -46,7 +46,7 @@ import static org.apache.ignite.igfs.IgfsMode.PROXY;
* Tests for node validation logic in {@link IgfsProcessor}.
* <p>
* Tests starting with "testLocal" are checking
- * {@link IgfsProcessor#validateLocalIgfsConfigurations(org.apache.ignite.configuration.FileSystemConfiguration[])}.
+ * {@link IgfsUtils#validateLocalIgfsConfigurations(org.apache.ignite.configuration.IgniteConfiguration)}.
* <p>
* Tests starting with "testRemote" are checking {@link IgfsProcessor#checkIgfsOnRemoteNode(org.apache.ignite.cluster.ClusterNode)}.
*/
@@ -57,18 +57,6 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
/** Grid #1 config. */
private IgniteConfiguration g1Cfg;
- /** Data cache 1 name. */
- private static final String dataCache1Name = "dataCache1";
-
- /** Data cache 2 name. */
- private static final String dataCache2Name = "dataCache2";
-
- /** Meta cache 1 name. */
- private static final String metaCache1Name = "metaCache1";
-
- /** Meta cache 2 name. */
- private static final String metaCache2Name = "metaCache2";
-
/** First IGFS config in grid #1. */
private FileSystemConfiguration g1IgfsCfg1 = new FileSystemConfiguration();
@@ -91,12 +79,8 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
cfg.setDiscoverySpi(discoSpi);
g1IgfsCfg1.setName("g1IgfsCfg1");
- g1IgfsCfg1.setDataCacheName(dataCache1Name);
- g1IgfsCfg1.setMetaCacheName(metaCache1Name);
g1IgfsCfg2.setName("g1IgfsCfg2");
- g1IgfsCfg2.setDataCacheName(dataCache2Name);
- g1IgfsCfg2.setMetaCacheName(metaCache2Name);
cfg.setFileSystemConfiguration(g1IgfsCfg1, g1IgfsCfg2);
@@ -115,7 +99,7 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
*
* @param first the first array of elements to concatenate.
* @param second the second array of elements to concatenate.
- * @param cls
+ * @param cls Class of elements.
* @return Concatenated array.
*/
private <T> T[] concat(T[] first, T[] second, Class<?> cls) {
@@ -127,48 +111,18 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
return res.toArray((T[]) Array.newInstance(cls, res.size()));
}
-
- /**
- * @throws Exception If failed.
- */
- public void testLocalIfNoCacheIsConfigured() throws Exception {
- checkGridStartFails(g1Cfg, "Data cache is not configured locally for IGFS", true);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testLocalIfNoDataCacheIsConfigured() throws Exception {
- CacheConfiguration cc = defaultCacheConfiguration();
-
- cc.setName("someName");
-
- g1Cfg.setCacheConfiguration(cc);
-
- checkGridStartFails(g1Cfg, "Data cache is not configured locally for IGFS", true);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testLocalIfNoMetadataCacheIsConfigured() throws Exception {
- CacheConfiguration cc = defaultCacheConfiguration();
-
- cc.setName(dataCache1Name);
-
- g1Cfg.setCacheConfiguration(cc);
-
- checkGridStartFails(g1Cfg, "Metadata cache is not configured locally for IGFS", true);
- }
-
/**
* @throws Exception If failed.
*/
public void testLocalIfAffinityMapperIsWrongClass() throws Exception {
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
- for (CacheConfiguration cc : g1Cfg.getCacheConfiguration())
- cc.setAffinityMapper(new GridCacheDefaultAffinityKeyMapper());
+ for (FileSystemConfiguration igfsCfg : g1Cfg.getFileSystemConfiguration()) {
+ igfsCfg.setDataCacheConfiguration(dataCache(1024));
+ igfsCfg.setMetaCacheConfiguration(metaCache());
+
+ igfsCfg.getMetaCacheConfiguration().setAffinityMapper(new GridCacheDefaultAffinityKeyMapper());
+ igfsCfg.getDataCacheConfiguration().setAffinityMapper(new GridCacheDefaultAffinityKeyMapper());
+ }
checkGridStartFails(g1Cfg, "Invalid IGFS data cache configuration (key affinity mapper class should be", true);
}
@@ -176,9 +130,7 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testLocalIfIgfsConfigsHaveDifferentNames() throws Exception {
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
-
+ public void testLocalIfIgfsConfigsHaveDuplicatedNames() throws Exception {
String igfsCfgName = "igfs-cfg";
g1IgfsCfg1.setName(igfsCfgName);
@@ -191,11 +143,8 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
* @throws Exception If failed.
*/
public void testLocalIfQueryIndexingEnabledForDataCache() throws Exception {
- CacheConfiguration[] dataCaches = dataCaches(1024);
-
- dataCaches[0].setIndexedTypes(Integer.class, String.class);
-
- g1Cfg.setCacheConfiguration(concat(dataCaches, metaCaches(), CacheConfiguration.class));
+ g1IgfsCfg1.setDataCacheConfiguration(dataCache(1024));
+ g1IgfsCfg1.getDataCacheConfiguration().setIndexedTypes(Integer.class, String.class);
checkGridStartFails(g1Cfg, "IGFS data cache cannot start with enabled query indexing", true);
}
@@ -204,11 +153,9 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
* @throws Exception If failed.
*/
public void testLocalIfQueryIndexingEnabledForMetaCache() throws Exception {
- CacheConfiguration[] metaCaches = metaCaches();
-
- metaCaches[0].setIndexedTypes(Integer.class, String.class);
+ g1IgfsCfg1.setMetaCacheConfiguration(metaCache());
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches, CacheConfiguration.class));
+ g1IgfsCfg1.getMetaCacheConfiguration().setIndexedTypes(Integer.class, String.class);
checkGridStartFails(g1Cfg, "IGFS metadata cache cannot start with enabled query indexing", true);
}
@@ -218,8 +165,6 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
*/
@SuppressWarnings("NullableProblems")
public void testLocalNullIgfsNameIsSupported() throws Exception {
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
-
g1IgfsCfg1.setName(null);
assertFalse(G.start(g1Cfg).cluster().nodes().isEmpty());
@@ -229,8 +174,6 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
* @throws Exception If failed.
*/
public void testLocalIfNonPrimaryModeAndHadoopFileSystemUriIsNull() throws Exception {
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
-
g1IgfsCfg2.setDefaultMode(PROXY);
checkGridStartFails(g1Cfg, "secondaryFileSystem cannot be null when mode is not PRIMARY", true);
@@ -239,42 +182,9 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testLocalIfMetaCacheNameEquals() throws Exception {
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
-
- g1IgfsCfg1.setDataCacheName(dataCache1Name);
- g1IgfsCfg1.setMetaCacheName(metaCache1Name);
-
- g1IgfsCfg2.setDataCacheName(dataCache2Name);
- g1IgfsCfg2.setMetaCacheName(metaCache1Name);
-
- checkGridStartFails(g1Cfg, "Meta cache names should be different for different IGFS instances", true);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testLocalIfDataCacheNameEquals() throws Exception {
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
-
- g1IgfsCfg1.setDataCacheName(dataCache1Name);
- g1IgfsCfg1.setMetaCacheName(metaCache1Name);
-
- g1IgfsCfg2.setDataCacheName(dataCache1Name);
- g1IgfsCfg2.setMetaCacheName(metaCache2Name);
-
- checkGridStartFails(g1Cfg, "Data cache names should be different for different IGFS instances", true);
- }
-
- /**
- * @throws Exception If failed.
- */
public void testRemoteIfDataBlockSizeDiffers() throws Exception {
IgniteConfiguration g2Cfg = getConfiguration("g2");
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
- g2Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
-
FileSystemConfiguration g2IgfsCfg1 = new FileSystemConfiguration(g1IgfsCfg1);
g2IgfsCfg1.setBlockSize(g2IgfsCfg1.getBlockSize() + 100);
@@ -292,11 +202,11 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
public void testRemoteIfAffinityMapperGroupSizeDiffers() throws Exception {
IgniteConfiguration g2Cfg = getConfiguration("g2");
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
- g2Cfg.setCacheConfiguration(concat(dataCaches(4021), metaCaches(), CacheConfiguration.class));
-
G.start(g1Cfg);
+ for (FileSystemConfiguration igfsCfg : g2Cfg.getFileSystemConfiguration())
+ igfsCfg.setDataCacheConfiguration(dataCache(1000));
+
checkGridStartFails(g2Cfg, "Affinity mapper group size should be the same on all nodes in grid for IGFS",
false);
}
@@ -304,104 +214,6 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testRemoteIfMetaCacheNameDiffers() throws Exception {
- IgniteConfiguration g2Cfg = getConfiguration("g2");
-
- FileSystemConfiguration g2IgfsCfg1 = new FileSystemConfiguration(g1IgfsCfg1);
- FileSystemConfiguration g2IgfsCfg2 = new FileSystemConfiguration(g1IgfsCfg2);
-
- g2IgfsCfg1.setMetaCacheName("g2MetaCache1");
- g2IgfsCfg2.setMetaCacheName("g2MetaCache2");
-
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
- g2Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches("g2MetaCache1", "g2MetaCache2"),
- CacheConfiguration.class));
-
- g2Cfg.setFileSystemConfiguration(g2IgfsCfg1, g2IgfsCfg2);
-
- G.start(g1Cfg);
-
- checkGridStartFails(g2Cfg, "Meta cache name should be the same on all nodes in grid for IGFS", false);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testRemoteIfMetaCacheNameEquals() throws Exception {
- IgniteConfiguration g2Cfg = getConfiguration("g2");
-
- FileSystemConfiguration g2IgfsCfg1 = new FileSystemConfiguration(g1IgfsCfg1);
- FileSystemConfiguration g2IgfsCfg2 = new FileSystemConfiguration(g1IgfsCfg2);
-
- g2IgfsCfg1.setName("g2IgfsCfg1");
- g2IgfsCfg2.setName("g2IgfsCfg2");
-
- g2IgfsCfg1.setDataCacheName("g2DataCache1");
- g2IgfsCfg2.setDataCacheName("g2DataCache2");
-
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
- g2Cfg.setCacheConfiguration(concat(dataCaches(1024, "g2DataCache1", "g2DataCache2"), metaCaches(),
- CacheConfiguration.class));
-
- g2Cfg.setFileSystemConfiguration(g2IgfsCfg1, g2IgfsCfg2);
-
- G.start(g1Cfg);
-
- checkGridStartFails(g2Cfg, "Meta cache names should be different for different IGFS instances", false);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testRemoteIfDataCacheNameDiffers() throws Exception {
- IgniteConfiguration g2Cfg = getConfiguration("g2");
-
- FileSystemConfiguration g2IgfsCfg1 = new FileSystemConfiguration(g1IgfsCfg1);
- FileSystemConfiguration g2IgfsCfg2 = new FileSystemConfiguration(g1IgfsCfg2);
-
- g2IgfsCfg1.setDataCacheName("g2DataCache1");
- g2IgfsCfg2.setDataCacheName("g2DataCache2");
-
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
- g2Cfg.setCacheConfiguration(concat(dataCaches(1024, "g2DataCache1", "g2DataCache2"), metaCaches(),
- CacheConfiguration.class));
-
- g2Cfg.setFileSystemConfiguration(g2IgfsCfg1, g2IgfsCfg2);
-
- G.start(g1Cfg);
-
- checkGridStartFails(g2Cfg, "Data cache name should be the same on all nodes in grid for IGFS", false);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testRemoteIfDataCacheNameEquals() throws Exception {
- IgniteConfiguration g2Cfg = getConfiguration("g2");
-
- FileSystemConfiguration g2IgfsCfg1 = new FileSystemConfiguration(g1IgfsCfg1);
- FileSystemConfiguration g2IgfsCfg2 = new FileSystemConfiguration(g1IgfsCfg2);
-
- g2IgfsCfg1.setName("g2IgfsCfg1");
- g2IgfsCfg2.setName("g2IgfsCfg2");
-
- g2IgfsCfg1.setMetaCacheName("g2MetaCache1");
- g2IgfsCfg2.setMetaCacheName("g2MetaCache2");
-
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
- g2Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches("g2MetaCache1", "g2MetaCache2"),
- CacheConfiguration.class));
-
- g2Cfg.setFileSystemConfiguration(g2IgfsCfg1, g2IgfsCfg2);
-
- G.start(g1Cfg);
-
- checkGridStartFails(g2Cfg, "Data cache names should be different for different IGFS instances", false);
- }
-
- /**
- * @throws Exception If failed.
- */
public void testRemoteIfDefaultModeDiffers() throws Exception {
IgniteConfiguration g2Cfg = getConfiguration("g2");
@@ -414,9 +226,6 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
g2IgfsCfg1.setDefaultMode(DUAL_SYNC);
g2IgfsCfg2.setDefaultMode(DUAL_SYNC);
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
- g2Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
-
g2Cfg.setFileSystemConfiguration(g2IgfsCfg1, g2IgfsCfg2);
G.start(g1Cfg);
@@ -436,9 +245,6 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
g2IgfsCfg1.setPathModes(Collections.singletonMap("/somePath", DUAL_SYNC));
g2IgfsCfg2.setPathModes(Collections.singletonMap("/somePath", DUAL_SYNC));
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
- g2Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
-
g2Cfg.setFileSystemConfiguration(g2IgfsCfg1, g2IgfsCfg2);
G.start(g1Cfg);
@@ -450,21 +256,49 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
* @throws Exception If failed.
*/
public void testZeroEndpointTcpPort() throws Exception {
- checkIvalidPort(0);
+ checkInvalidPort(0);
}
/**
* @throws Exception If failed.
*/
public void testNegativeEndpointTcpPort() throws Exception {
- checkIvalidPort(-1);
+ checkInvalidPort(-1);
}
/**
* @throws Exception If failed.
*/
public void testTooBigEndpointTcpPort() throws Exception {
- checkIvalidPort(65536);
+ checkInvalidPort(65536);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testPreConfiguredCache() throws Exception {
+ FileSystemConfiguration igfsCfg1 = new FileSystemConfiguration(g1IgfsCfg1);
+ igfsCfg1.setName("igfs");
+
+ g1Cfg.setFileSystemConfiguration(igfsCfg1);
+
+ CacheConfiguration ccfgData = dataCache(1024);
+ ccfgData.setRebalanceTimeout(10001);
+
+ CacheConfiguration ccfgMeta = metaCache();
+ ccfgMeta.setRebalanceTimeout(10002);
+
+ igfsCfg1.setDataCacheConfiguration(ccfgData);
+ igfsCfg1.setMetaCacheConfiguration(ccfgMeta);
+
+ IgniteEx g = (IgniteEx)G.start(g1Cfg);
+
+ assertEquals(10001,
+ g.cachex(g.igfsx("igfs").configuration().getDataCacheConfiguration().getName())
+ .configuration().getRebalanceTimeout());
+ assertEquals(10002,
+ g.cachex(g.igfsx("igfs").configuration().getMetaCacheConfiguration().getName())
+ .configuration().getRebalanceTimeout());
}
/**
@@ -473,9 +307,8 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
* @param port Port.
* @throws Exception If failed.
*/
- private void checkIvalidPort(int port) throws Exception {
+ private void checkInvalidPort(int port) throws Exception {
final String failMsg = "IGFS endpoint TCP port is out of range";
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
final String igfsCfgName = "igfs-cfg";
final IgfsIpcEndpointConfiguration igfsEndpointCfg = new IgfsIpcEndpointConfiguration();
@@ -491,7 +324,6 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
*/
public void testInvalidEndpointThreadCount() throws Exception {
final String failMsg = "IGFS endpoint thread count must be positive";
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
final String igfsCfgName = "igfs-cfg";
final IgfsIpcEndpointConfiguration igfsEndpointCfg = new IgfsIpcEndpointConfiguration();
@@ -520,9 +352,10 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
}
catch (IgniteException e) {
if (testLoc) {
- if ("Failed to start processor: GridProcessorAdapter []".equals(e.getMessage()) &&
+ if (e.getMessage().contains(excMsgSnippet)
+ || ("Failed to start processor: GridProcessorAdapter []".equals(e.getMessage()) &&
(e.getCause().getMessage().contains(excMsgSnippet) ||
- e.getCause().getCause().getMessage().contains(excMsgSnippet)))
+ e.getCause().getCause().getMessage().contains(excMsgSnippet))))
return; // Expected exception.
}
else if (e.getMessage().contains(excMsgSnippet))
@@ -536,51 +369,26 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
/**
* @param grpSize Group size to use in {@link org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper}.
- * @param cacheNames 2 Optional caches names.
- * @return 2 preconfigured data caches.
+ * @return 2 preconfigured data cache.
*/
- private CacheConfiguration[] dataCaches(int grpSize, String... cacheNames) {
- assertTrue(F.isEmpty(cacheNames) || cacheNames.length == 2);
-
- if (F.isEmpty(cacheNames))
- cacheNames = new String[] {dataCache1Name, dataCache2Name};
+ private CacheConfiguration dataCache(int grpSize) {
- CacheConfiguration[] res = new CacheConfiguration[cacheNames.length];
+ CacheConfiguration dataCache = defaultCacheConfiguration();
- for (int i = 0; i < cacheNames.length; i++) {
- CacheConfiguration dataCache = defaultCacheConfiguration();
+ dataCache.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(grpSize));
+ dataCache.setAtomicityMode(TRANSACTIONAL);
- dataCache.setName(cacheNames[i]);
- dataCache.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(grpSize));
- dataCache.setAtomicityMode(TRANSACTIONAL);
-
- res[i] = dataCache;
- }
-
- return res;
+ return dataCache;
}
/**
- * @param cacheNames 2 Optional caches names.
- * @return 2 preconfigured meta caches.
+ * @return preconfigured meta cache.
*/
- private CacheConfiguration[] metaCaches(String... cacheNames) {
- assertTrue(F.isEmpty(cacheNames) || cacheNames.length == 2);
-
- if (F.isEmpty(cacheNames))
- cacheNames = new String[] {metaCache1Name, metaCache2Name};
+ private CacheConfiguration metaCache() {
+ CacheConfiguration metaCache = defaultCacheConfiguration();
- CacheConfiguration[] res = new CacheConfiguration[cacheNames.length];
-
- for (int i = 0; i < cacheNames.length; i++) {
- CacheConfiguration metaCache = defaultCacheConfiguration();
-
- metaCache.setName(cacheNames[i]);
- metaCache.setAtomicityMode(TRANSACTIONAL);
-
- res[i] = metaCache;
- }
+ metaCache.setAtomicityMode(TRANSACTIONAL);
- return res;
+ return metaCache;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemInjectionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemInjectionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemInjectionSelfTest.java
index d4187cb..c5df409 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemInjectionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemInjectionSelfTest.java
@@ -66,28 +66,26 @@ public class IgfsSecondaryFileSystemInjectionSelfTest extends GridCommonAbstract
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
- igfsCfg.setDataCacheName("dataCache");
- igfsCfg.setMetaCacheName("metaCache");
igfsCfg.setName(IGFS_NAME);
igfsCfg.setDefaultMode(IgfsMode.DUAL_SYNC);
igfsCfg.setSecondaryFileSystem(secondary);
CacheConfiguration dataCacheCfg = defaultCacheConfiguration();
- dataCacheCfg.setName("dataCache");
dataCacheCfg.setCacheMode(PARTITIONED);
dataCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
- metaCacheCfg.setName("metaCache");
metaCacheCfg.setCacheMode(REPLICATED);
metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
+ igfsCfg.setDataCacheConfiguration(dataCacheCfg);
+ igfsCfg.setMetaCacheConfiguration(metaCacheCfg);
+
cfg.setFileSystemConfiguration(igfsCfg);
- cfg.setCacheConfiguration(metaCacheCfg, dataCacheCfg);
return cfg;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java
index e58d503..1b74909 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java
@@ -240,11 +240,24 @@ public abstract class IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest e
FileSystemConfiguration igfsConfiguration = new FileSystemConfiguration();
- igfsConfiguration.setDataCacheName(dataCacheName);
- igfsConfiguration.setMetaCacheName(metaCacheName);
igfsConfiguration.setName("igfs" + UUID.randomUUID());
igfsConfiguration.setManagementPort(mgmtPort.getAndIncrement());
+ CacheConfiguration dataCacheCfg = defaultCacheConfiguration();
+
+ dataCacheCfg.setCacheMode(CacheMode.PARTITIONED);
+ dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(128));
+ dataCacheCfg.setBackups(0);
+ dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
+
+ CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
+
+ metaCacheCfg.setCacheMode(CacheMode.REPLICATED);
+ metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
+
+ igfsConfiguration.setMetaCacheConfiguration(metaCacheCfg);
+ igfsConfiguration.setDataCacheConfiguration(dataCacheCfg);
+
if (endPntCfg != null)
igfsConfiguration.setIpcEndpointConfiguration(endPntCfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java
index 266945f..7a1ccef 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java
@@ -72,14 +72,8 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
/** Block size. */
private static final int BLOCK_SIZE = 384;
- /** Cache name. */
- private static final String DATA_CACHE_NAME = "dataCache";
-
- /** Cache name. */
- private static final String META_CACHE_NAME = "metaCache";
-
/** IGFS name. */
- private static final String IGFS_NAME = "igfs";
+ private static final String IGFS_NAME = "test";
/** IP finder. */
private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
@@ -120,8 +114,6 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
- igfsCfg.setDataCacheName(DATA_CACHE_NAME);
- igfsCfg.setMetaCacheName(META_CACHE_NAME);
igfsCfg.setName(IGFS_NAME);
igfsCfg.setBlockSize(BLOCK_SIZE);
igfsCfg.setFragmentizerEnabled(false);
@@ -131,7 +123,6 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
CacheConfiguration dataCfg = defaultCacheConfiguration();
- dataCfg.setName(DATA_CACHE_NAME);
dataCfg.setCacheMode(cacheMode);
if (cacheMode == PARTITIONED) {
@@ -148,19 +139,20 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
CacheConfiguration metaCfg = defaultCacheConfiguration();
- metaCfg.setName(META_CACHE_NAME);
metaCfg.setCacheMode(REPLICATED);
metaCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
metaCfg.setRebalanceMode(SYNC);
metaCfg.setAtomicityMode(TRANSACTIONAL);
+ igfsCfg.setMetaCacheConfiguration(metaCfg);
+ igfsCfg.setDataCacheConfiguration(dataCfg);
+
TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
discoSpi.setIpFinder(IP_FINDER);
cfg.setDiscoverySpi(discoSpi);
- cfg.setCacheConfiguration(metaCfg, dataCfg);
cfg.setFileSystemConfiguration(igfsCfg);
return cfg;
@@ -284,7 +276,8 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
for (int i = 0; i < GRID_CNT; i++) {
IgniteEx g = grid(i);
- IgniteInternalCache cache = g.cachex(DATA_CACHE_NAME).cache();
+ IgniteInternalCache cache = g.cachex(g.igfsx(IGFS_NAME).configuration().getDataCacheConfiguration()
+ .getName()).cache();
assert cache.isIgfsDataCache();
}
@@ -547,7 +540,8 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
Collection<UUID> ids = new HashSet<>();
for (ClusterNode node : grid.cluster().nodes()) {
- if (grid.affinity(DATA_CACHE_NAME).isPrimaryOrBackup(node, key))
+ if (grid.affinity(grid.igfsx(IGFS_NAME).configuration().getDataCacheConfiguration().getName())
+ .isPrimaryOrBackup(node, key))
ids.add(node.id());
}
@@ -572,8 +566,9 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
* @return Data cache.
*/
private GridCacheAdapter<IgfsBlockKey, byte[]> cache(UUID nodeId) {
- return (GridCacheAdapter<IgfsBlockKey, byte[]>)((IgniteEx)G.ignite(nodeId)).cachex(DATA_CACHE_NAME)
- .<IgfsBlockKey, byte[]>cache();
+ IgniteEx g = (IgniteEx)G.ignite(nodeId);
+ return (GridCacheAdapter<IgfsBlockKey, byte[]>)g.cachex(g.igfsx(IGFS_NAME).configuration()
+ .getDataCacheConfiguration().getName()).<IgfsBlockKey, byte[]>cache();
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStartCacheTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStartCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStartCacheTest.java
index eff44f2..9be3814 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStartCacheTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStartCacheTest.java
@@ -24,6 +24,7 @@ import org.apache.ignite.configuration.FileSystemConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper;
import org.apache.ignite.igfs.IgfsPath;
+import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.IgniteKernal;
import org.apache.ignite.internal.processors.cache.GridCacheAdapter;
import org.apache.ignite.internal.util.typedef.G;
@@ -67,15 +68,12 @@ public class IgfsStartCacheTest extends IgfsCommonAbstractTest {
if (igfs) {
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
- igfsCfg.setDataCacheName("dataCache");
- igfsCfg.setMetaCacheName("metaCache");
igfsCfg.setName("igfs");
igfsCfg.setDefaultMode(PRIMARY);
igfsCfg.setFragmentizerEnabled(false);
CacheConfiguration dataCacheCfg = new CacheConfiguration();
- dataCacheCfg.setName("dataCache");
dataCacheCfg.setCacheMode(PARTITIONED);
dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
dataCacheCfg.setWriteSynchronizationMode(FULL_SYNC);
@@ -83,12 +81,13 @@ public class IgfsStartCacheTest extends IgfsCommonAbstractTest {
CacheConfiguration metaCacheCfg = new CacheConfiguration();
- metaCacheCfg.setName("metaCache");
metaCacheCfg.setCacheMode(REPLICATED);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
metaCacheCfg.setWriteSynchronizationMode(FULL_SYNC);
- cfg.setCacheConfiguration(dataCacheCfg, metaCacheCfg);
+ igfsCfg.setMetaCacheConfiguration(metaCacheCfg);
+ igfsCfg.setDataCacheConfiguration(dataCacheCfg);
+
cfg.setFileSystemConfiguration(igfsCfg);
}
@@ -110,11 +109,14 @@ public class IgfsStartCacheTest extends IgfsCommonAbstractTest {
public void testCacheStart() throws Exception {
Ignite g0 = G.start(config(true, 0));
- checkIgfsCaches(g0);
+ String dataCacheName = ((IgniteEx)g0).igfsx("igfs").configuration().getDataCacheConfiguration().getName();
+ String metaCacheName = ((IgniteEx)g0).igfsx("igfs").configuration().getMetaCacheConfiguration().getName();
+
+ checkIgfsCaches(g0, dataCacheName, metaCacheName);
Ignite g1 = G.start(config(false, 1));
- checkIgfsCaches(g1);
+ checkIgfsCaches(g1, dataCacheName, metaCacheName);
IgniteFileSystem igfs = g0.fileSystem("igfs");
@@ -130,11 +132,13 @@ public class IgfsStartCacheTest extends IgfsCommonAbstractTest {
/**
* @param ignite Ignite.
+ * @param dataCacheName Data cache name.
+ * @param metaCacheName Meta cache name.
*/
- private void checkIgfsCaches(final Ignite ignite) {
+ private void checkIgfsCaches(final Ignite ignite, final String dataCacheName, final String metaCacheName) {
GridTestUtils.assertThrows(log(), new Callable<Object>() {
@Override public Object call() throws Exception {
- ignite.cache("dataCache");
+ ignite.cache(dataCacheName);
return null;
}
@@ -142,14 +146,14 @@ public class IgfsStartCacheTest extends IgfsCommonAbstractTest {
GridTestUtils.assertThrows(log(), new Callable<Object>() {
@Override public Object call() throws Exception {
- ignite.cache("metaCache");
+ ignite.cache(metaCacheName);
return null;
}
}, IllegalStateException.class, null);
- checkCache(((IgniteKernal)ignite).internalCache("dataCache"));
- checkCache(((IgniteKernal)ignite).internalCache("metaCache"));
+ checkCache(((IgniteKernal)ignite).internalCache(dataCacheName));
+ checkCache(((IgniteKernal)ignite).internalCache(metaCacheName));
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java
index 8c6cf57..9c735f5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java
@@ -17,7 +17,6 @@
package org.apache.ignite.internal.processors.igfs;
-import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteFileSystem;
import org.apache.ignite.cache.CacheRebalanceMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
@@ -32,7 +31,6 @@ import org.apache.ignite.igfs.IgfsOutputStream;
import org.apache.ignite.igfs.IgfsPath;
import org.apache.ignite.internal.IgniteKernal;
import org.apache.ignite.internal.processors.cache.GridCacheAdapter;
-import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
import org.apache.ignite.internal.util.typedef.CAX;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.U;
@@ -67,12 +65,6 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest {
/** Test IP finder. */
private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
- /** Meta-information cache name. */
- private static final String META_CACHE_NAME = "replicated";
-
- /** Data cache name. */
- public static final String DATA_CACHE_NAME = "data";
-
/** Group size. */
public static final int CFG_GRP_SIZE = 128;
@@ -124,7 +116,7 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest {
IgniteConfiguration cfg = super.getConfiguration(gridName);
cfg.setLateAffinityAssignment(false);
- cfg.setCacheConfiguration(cacheConfiguration(META_CACHE_NAME), cacheConfiguration(DATA_CACHE_NAME));
+ cfg.setCacheConfiguration();
TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
@@ -134,8 +126,8 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest {
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
- igfsCfg.setMetaCacheName(META_CACHE_NAME);
- igfsCfg.setDataCacheName(DATA_CACHE_NAME);
+ igfsCfg.setMetaCacheConfiguration(cacheConfiguration("meta"));
+ igfsCfg.setDataCacheConfiguration(cacheConfiguration("data"));
igfsCfg.setName("igfs");
igfsCfg.setBlockSize(CFG_BLOCK_SIZE);
igfsCfg.setFragmentizerEnabled(true);
@@ -151,7 +143,7 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest {
cacheCfg.setName(cacheName);
- if (META_CACHE_NAME.equals(cacheName))
+ if ("meta".equals(cacheName))
cacheCfg.setCacheMode(REPLICATED);
else {
cacheCfg.setCacheMode(PARTITIONED);
@@ -168,24 +160,6 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest {
}
/**
- * Test IGFS construction.
- *
- * @throws IgniteCheckedException In case of exception.
- */
- public void testConfiguration() throws IgniteCheckedException {
- IgniteInternalCache metaCache = getFieldValue(fs, "meta", "metaCache");
- IgniteInternalCache dataCache = getFieldValue(fs, "data", "dataCache");
-
- assertNotNull(metaCache);
- assertEquals(META_CACHE_NAME, metaCache.name());
- assertEquals(REPLICATED, metaCache.configuration().getCacheMode());
-
- assertNotNull(dataCache);
- assertEquals(DATA_CACHE_NAME, dataCache.name());
- assertEquals(PARTITIONED, dataCache.configuration().getCacheMode());
- }
-
- /**
* Test file creation.
*
* @throws Exception In case of exception.
@@ -215,7 +189,8 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest {
while (true) {
affKey = new IgniteUuid(uuid, idx);
- if (grid(0).affinity(DATA_CACHE_NAME).mapKeyToNode(affKey).id().equals(grid(0).localNode().id()))
+ if (grid(0).affinity(grid(0).igfsx("igfs").configuration().getDataCacheConfiguration()
+ .getName()).mapKeyToNode(affKey).id().equals(grid(0).localNode().id()))
break;
idx++;
@@ -242,6 +217,9 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest {
/** @throws Exception If failed. */
public void testCreateFileFragmented() throws Exception {
IgfsEx impl = (IgfsEx)grid(0).fileSystem("igfs");
+ String metaCacheName = grid(0).igfsx("igfs").configuration().getMetaCacheConfiguration().getName();
+ final String dataCacheName = grid(0).igfsx("igfs").configuration().getDataCacheConfiguration()
+ .getName();
IgfsFragmentizerManager fragmentizer = impl.context().fragmentizer();
@@ -276,7 +254,7 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest {
// After this we should have first two block colocated with grid 0 and last block colocated with grid 1.
IgfsFileImpl fileImpl = (IgfsFileImpl)fs.info(path);
- GridCacheAdapter<Object, Object> metaCache = ((IgniteKernal)grid(0)).internalCache(META_CACHE_NAME);
+ GridCacheAdapter<Object, Object> metaCache = ((IgniteKernal)grid(0)).internalCache(metaCacheName);
IgfsEntryInfo fileInfo = (IgfsEntryInfo)metaCache.get(fileImpl.fileId());
@@ -311,7 +289,7 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest {
boolean hasData = false;
for (int i = 0; i < NODES_CNT; i++)
- hasData |= !grid(i).cachex(DATA_CACHE_NAME).isEmpty();
+ hasData |= !grid(i).cachex(dataCacheName).isEmpty();
assertTrue(hasData);
@@ -321,7 +299,7 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest {
GridTestUtils.retryAssert(log, ASSERT_RETRIES, ASSERT_RETRY_INTERVAL, new CAX() {
@Override public void applyx() {
for (int i = 0; i < NODES_CNT; i++)
- assertTrue(grid(i).cachex(DATA_CACHE_NAME).isEmpty());
+ assertTrue(grid(i).cachex(dataCacheName).isEmpty());
}
});
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsTaskSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsTaskSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsTaskSelfTest.java
index 7b972c3..b07c7b8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsTaskSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsTaskSelfTest.java
@@ -112,8 +112,6 @@ public class IgfsTaskSelfTest extends IgfsCommonAbstractTest {
private IgniteConfiguration config(int idx) {
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
- igfsCfg.setDataCacheName("dataCache");
- igfsCfg.setMetaCacheName("metaCache");
igfsCfg.setName("igfs");
igfsCfg.setBlockSize(BLOCK_SIZE);
igfsCfg.setDefaultMode(PRIMARY);
@@ -121,7 +119,6 @@ public class IgfsTaskSelfTest extends IgfsCommonAbstractTest {
CacheConfiguration dataCacheCfg = new CacheConfiguration();
- dataCacheCfg.setName("dataCache");
dataCacheCfg.setCacheMode(PARTITIONED);
dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
dataCacheCfg.setWriteSynchronizationMode(FULL_SYNC);
@@ -130,11 +127,13 @@ public class IgfsTaskSelfTest extends IgfsCommonAbstractTest {
CacheConfiguration metaCacheCfg = new CacheConfiguration();
- metaCacheCfg.setName("metaCache");
metaCacheCfg.setCacheMode(REPLICATED);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
+ igfsCfg.setMetaCacheConfiguration(metaCacheCfg);
+ igfsCfg.setDataCacheConfiguration(dataCacheCfg);
+
IgniteConfiguration cfg = new IgniteConfiguration();
TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
@@ -142,7 +141,6 @@ public class IgfsTaskSelfTest extends IgfsCommonAbstractTest {
discoSpi.setIpFinder(IP_FINDER);
cfg.setDiscoverySpi(discoSpi);
- cfg.setCacheConfiguration(dataCacheCfg, metaCacheCfg);
cfg.setFileSystemConfiguration(igfsCfg);
cfg.setGridName("node-" + idx);
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsAbstractRecordResolverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsAbstractRecordResolverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsAbstractRecordResolverSelfTest.java
index 77b6f44..f2b14a2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsAbstractRecordResolverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsAbstractRecordResolverSelfTest.java
@@ -58,15 +58,12 @@ public class IgfsAbstractRecordResolverSelfTest extends GridCommonAbstractTest {
@Override protected void beforeTestsStarted() throws Exception {
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
- igfsCfg.setDataCacheName("dataCache");
- igfsCfg.setMetaCacheName("metaCache");
igfsCfg.setName("igfs");
igfsCfg.setBlockSize(512);
igfsCfg.setDefaultMode(PRIMARY);
CacheConfiguration dataCacheCfg = new CacheConfiguration();
- dataCacheCfg.setName("dataCache");
dataCacheCfg.setCacheMode(PARTITIONED);
dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
dataCacheCfg.setNearConfiguration(new NearCacheConfiguration());
@@ -76,11 +73,13 @@ public class IgfsAbstractRecordResolverSelfTest extends GridCommonAbstractTest {
CacheConfiguration metaCacheCfg = new CacheConfiguration();
- metaCacheCfg.setName("metaCache");
metaCacheCfg.setCacheMode(REPLICATED);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
metaCacheCfg.setWriteSynchronizationMode(FULL_SYNC);
+ igfsCfg.setMetaCacheConfiguration(metaCacheCfg);
+ igfsCfg.setDataCacheConfiguration(dataCacheCfg);
+
IgniteConfiguration cfg = new IgniteConfiguration();
cfg.setGridName("grid");
@@ -90,7 +89,6 @@ public class IgfsAbstractRecordResolverSelfTest extends GridCommonAbstractTest {
discoSpi.setIpFinder(ipFinder);
cfg.setDiscoverySpi(discoSpi);
- cfg.setCacheConfiguration(dataCacheCfg, metaCacheCfg);
cfg.setFileSystemConfiguration(igfsCfg);
Ignite g = G.start(cfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNodeStartup.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNodeStartup.java b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNodeStartup.java
index 3314d7a..90dd556 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNodeStartup.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNodeStartup.java
@@ -60,22 +60,30 @@ public class IpcSharedMemoryNodeStartup {
igfsCfg.setIpcEndpointConfiguration(endpointCfg);
- igfsCfg.setDataCacheName("partitioned");
- igfsCfg.setMetaCacheName("partitioned");
igfsCfg.setName("igfs");
- cfg.setFileSystemConfiguration(igfsCfg);
+ CacheConfiguration metaCacheCfg = new CacheConfiguration();
+
+ metaCacheCfg.setName("partitioned");
+ metaCacheCfg.setCacheMode(PARTITIONED);
+ metaCacheCfg.setNearConfiguration(null);
+ metaCacheCfg.setWriteSynchronizationMode(FULL_SYNC);
+ metaCacheCfg.setEvictionPolicy(null);
+ metaCacheCfg.setBackups(0);
- CacheConfiguration cacheCfg = new CacheConfiguration();
+ CacheConfiguration dataCacheCfg = new CacheConfiguration();
- cacheCfg.setName("partitioned");
- cacheCfg.setCacheMode(PARTITIONED);
- cacheCfg.setNearConfiguration(null);
- cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
- cacheCfg.setEvictionPolicy(null);
- cacheCfg.setBackups(0);
+ dataCacheCfg.setName("partitioned");
+ dataCacheCfg.setCacheMode(PARTITIONED);
+ dataCacheCfg.setNearConfiguration(null);
+ dataCacheCfg.setWriteSynchronizationMode(FULL_SYNC);
+ dataCacheCfg.setEvictionPolicy(null);
+ dataCacheCfg.setBackups(0);
- cfg.setCacheConfiguration(cacheCfg);
+ igfsCfg.setMetaCacheConfiguration(metaCacheCfg);
+ igfsCfg.setDataCacheConfiguration(dataCacheCfg);
+
+ cfg.setFileSystemConfiguration(igfsCfg);
cfg.setIncludeEventTypes(EVT_TASK_FAILED, EVT_TASK_FINISHED, EVT_JOB_MAPPED);
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-0.xml
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-0.xml b/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-0.xml
index 072c6db..dd3da7c 100644
--- a/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-0.xml
+++ b/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-0.xml
@@ -59,39 +59,6 @@
</property>
<!--
- Configure caches where IGFS will store data.
- -->
- <property name="cacheConfiguration">
- <list>
- <!--
- Configure metadata cache where file system structure will be stored. It must be TRANSACTIONAL,
- and must have backups to maintain file system consistency in case of node crash.
- -->
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="replicated"/>
- <property name="cacheMode" value="REPLICATED"/>
- <property name="atomicityMode" value="TRANSACTIONAL"/>
- </bean>
-
- <!--
- Configure data cache where file's data will be stored.
- -->
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="partitioned"/>
- <property name="atomicityMode" value="TRANSACTIONAL"/>
- <property name="cacheMode" value="PARTITIONED"/>
- <property name="writeSynchronizationMode" value="FULL_SYNC"/>
-
- <property name="affinityMapper">
- <bean class="org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper">
- <property name="groupSize" value="128"/>
- </bean>
- </property>
- </bean>
- </list>
- </property>
-
- <!--
This port will be used by Apache Hadoop client to connect to Ignite node as if it was a job tracker.
-->
<property name="connectorConfiguration">
@@ -109,9 +76,27 @@
<!-- IGFS name you will use to access IGFS through Hadoop API. -->
<property name="name" value="igfs-0"/>
- <!-- Caches with these names must be configured. -->
- <property name="metaCacheName" value="replicated"/>
- <property name="dataCacheName" value="partitioned"/>
+ <!-- IGFS Caches. -->
+ <property name="metaCacheConfiguration">
+ <bean class="org.apache.ignite.configuration.CacheConfiguration">
+ <property name="cacheMode" value="REPLICATED"/>
+ <property name="atomicityMode" value="TRANSACTIONAL"/>
+ </bean>
+ </property>
+ <property name="dataCacheConfiguration">
+ <bean class="org.apache.ignite.configuration.CacheConfiguration">
+ <property name="atomicityMode" value="TRANSACTIONAL"/>
+ <property name="cacheMode" value="PARTITIONED"/>
+ <property name="writeSynchronizationMode" value="FULL_SYNC"/>
+
+ <property name="affinityMapper">
+ <bean class="org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper">
+ <property name="groupSize" value="128"/>
+ </bean>
+ </property>
+ </bean>
+ </property>
+
<property name="blockSize" value="524288"/>
<property name="defaultMode" value="PRIMARY"/>
<property name="ipcEndpointEnabled" value="false"/>
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-1.xml
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-1.xml b/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-1.xml
index e52921d..c577d28 100644
--- a/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-1.xml
+++ b/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-1.xml
@@ -59,39 +59,6 @@
</property>
<!--
- Configure caches where IGFS will store data.
- -->
- <property name="cacheConfiguration">
- <list>
- <!--
- Configure metadata cache where file system structure will be stored. It must be TRANSACTIONAL,
- and must have backups to maintain file system consistency in case of node crash.
- -->
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="replicated"/>
- <property name="cacheMode" value="REPLICATED"/>
- <property name="atomicityMode" value="TRANSACTIONAL"/>
- </bean>
-
- <!--
- Configure data cache where file's data will be stored.
- -->
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="partitioned"/>
- <property name="atomicityMode" value="TRANSACTIONAL"/>
- <property name="cacheMode" value="PARTITIONED"/>
- <property name="writeSynchronizationMode" value="FULL_SYNC"/>
-
- <property name="affinityMapper">
- <bean class="org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper">
- <property name="groupSize" value="128"/>
- </bean>
- </property>
- </bean>
- </list>
- </property>
-
- <!--
This port will be used by Apache Hadoop client to connect to Ignite node as if it was a job tracker.
-->
<property name="connectorConfiguration">
@@ -109,9 +76,27 @@
<!-- IGFS name you will use to access IGFS through Hadoop API. -->
<property name="name" value="igfs-1"/>
- <!-- Caches with these names must be configured. -->
- <property name="metaCacheName" value="replicated"/>
- <property name="dataCacheName" value="partitioned"/>
+ <!-- IGFS Caches. -->
+ <property name="metaCacheConfiguration">
+ <bean class="org.apache.ignite.configuration.CacheConfiguration">
+ <property name="cacheMode" value="REPLICATED"/>
+ <property name="atomicityMode" value="TRANSACTIONAL"/>
+ </bean>
+ </property>
+ <property name="dataCacheConfiguration">
+ <bean class="org.apache.ignite.configuration.CacheConfiguration">
+ <property name="atomicityMode" value="TRANSACTIONAL"/>
+ <property name="cacheMode" value="PARTITIONED"/>
+ <property name="writeSynchronizationMode" value="FULL_SYNC"/>
+
+ <property name="affinityMapper">
+ <bean class="org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper">
+ <property name="groupSize" value="128"/>
+ </bean>
+ </property>
+ </bean>
+ </property>
+
<property name="blockSize" value="524288"/>
<property name="defaultMode" value="PRIMARY"/>
<property name="ipcEndpointEnabled" value="false"/>
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-2.xml
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-2.xml b/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-2.xml
index 9344e99..1f7eaa3 100644
--- a/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-2.xml
+++ b/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-2.xml
@@ -59,39 +59,6 @@
</property>
<!--
- Configure caches where IGFS will store data.
- -->
- <property name="cacheConfiguration">
- <list>
- <!--
- Configure metadata cache where file system structure will be stored. It must be TRANSACTIONAL,
- and must have backups to maintain file system consistency in case of node crash.
- -->
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="replicated"/>
- <property name="cacheMode" value="REPLICATED"/>
- <property name="atomicityMode" value="TRANSACTIONAL"/>
- </bean>
-
- <!--
- Configure data cache where file's data will be stored.
- -->
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="partitioned"/>
- <property name="atomicityMode" value="TRANSACTIONAL"/>
- <property name="cacheMode" value="PARTITIONED"/>
- <property name="writeSynchronizationMode" value="FULL_SYNC"/>
-
- <property name="affinityMapper">
- <bean class="org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper">
- <property name="groupSize" value="128"/>
- </bean>
- </property>
- </bean>
- </list>
- </property>
-
- <!--
This port will be used by Apache Hadoop client to connect to Ignite node as if it was a job tracker.
-->
<property name="connectorConfiguration">
@@ -109,9 +76,27 @@
<!-- IGFS name you will use to access IGFS through Hadoop API. -->
<property name="name" value="igfs-2"/>
- <!-- Caches with these names must be configured. -->
- <property name="metaCacheName" value="replicated"/>
- <property name="dataCacheName" value="partitioned"/>
+ <!-- IGFS Caches. -->
+ <property name="metaCacheConfiguration">
+ <bean class="org.apache.ignite.configuration.CacheConfiguration">
+ <property name="cacheMode" value="REPLICATED"/>
+ <property name="atomicityMode" value="TRANSACTIONAL"/>
+ </bean>
+ </property>
+ <property name="dataCacheConfiguration">
+ <bean class="org.apache.ignite.configuration.CacheConfiguration">
+ <property name="atomicityMode" value="TRANSACTIONAL"/>
+ <property name="cacheMode" value="PARTITIONED"/>
+ <property name="writeSynchronizationMode" value="FULL_SYNC"/>
+
+ <property name="affinityMapper">
+ <bean class="org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper">
+ <property name="groupSize" value="128"/>
+ </bean>
+ </property>
+ </bean>
+ </property>
+
<property name="blockSize" value="524288"/>
<property name="defaultMode" value="PRIMARY"/>
<property name="ipcEndpointEnabled" value="false"/>
[49/50] [abbrv] ignite git commit: IGNITE-4755: Hadoop: print warning
in case JOB_SHARED_CLASSLOADER property is enabled. This closes #1579.
Posted by vo...@apache.org.
IGNITE-4755: Hadoop: print warning in case JOB_SHARED_CLASSLOADER property is enabled. This closes #1579.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/50f87419
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/50f87419
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/50f87419
Branch: refs/heads/ignite-4565-ddl
Commit: 50f87419e8876c79303d67008619a7d4796286c6
Parents: 3ca46d1
Author: iveselovskiy <iv...@gridgain.com>
Authored: Tue Feb 28 15:35:17 2017 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Tue Feb 28 15:35:17 2017 +0300
----------------------------------------------------------------------
.../internal/processors/hadoop/impl/v2/HadoopV2Job.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/50f87419/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2Job.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2Job.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2Job.java
index 5d3f22d..2a85cb8 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2Job.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2Job.java
@@ -124,6 +124,9 @@ public class HadoopV2Job extends HadoopJobEx {
/** File system cache map. */
private final HadoopLazyConcurrentMap<FsCacheKey, FileSystem> fsMap = createHadoopLazyConcurrentMap();
+ /** Logger. */
+ private final IgniteLogger log;
+
/** Shared class loader. */
private volatile HadoopClassLoader sharedClsLdr;
@@ -151,6 +154,7 @@ public class HadoopV2Job extends HadoopJobEx {
this.jobInfo = jobInfo;
this.libNames = libNames;
this.helper = helper;
+ this.log = log;
ClassLoader oldLdr = HadoopCommonUtils.setContextClassLoader(getClass().getClassLoader());
@@ -323,8 +327,12 @@ public class HadoopV2Job extends HadoopJobEx {
try {
rsrcMgr.prepareJobEnvironment(!external, jobLocalDir(igniteWorkDirectory(), locNodeId, jobId));
- if (HadoopJobProperty.get(jobInfo, JOB_SHARED_CLASSLOADER, true))
+ if (HadoopJobProperty.get(jobInfo, JOB_SHARED_CLASSLOADER, true)) {
+ U.warn(log, JOB_SHARED_CLASSLOADER.propertyName() + " job property is set to true; please disable " +
+ "it if job tasks rely on mutable static state.");
+
sharedClsLdr = createClassLoader(HadoopClassLoader.nameForJob(jobId));
+ }
}
finally {
HadoopCommonUtils.restoreContextClassLoader(oldLdr);
[31/50] [abbrv] ignite git commit: IGNITE-4472 Minor fix.
Posted by vo...@apache.org.
IGNITE-4472 Minor fix.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7cb3e687
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7cb3e687
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7cb3e687
Branch: refs/heads/ignite-4565-ddl
Commit: 7cb3e687efbbfe7e72a8d7b047d03235b8f7ba72
Parents: 7f74458
Author: Andrey Novikov <an...@gridgain.com>
Authored: Fri Feb 17 18:02:48 2017 +0700
Committer: Andrey Novikov <an...@gridgain.com>
Committed: Fri Feb 17 18:02:48 2017 +0700
----------------------------------------------------------------------
.../web-console/backend/services/activities.js | 7 +++--
.../list-of-registered-users.controller.js | 14 ++++------
.../configuration/configuration.module.js | 6 ++---
.../configuration/summary/summary.worker.js | 28 ++++++++++----------
.../console/agent/handlers/RestListener.java | 9 ++++++-
5 files changed, 33 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7cb3e687/modules/web-console/backend/services/activities.js
----------------------------------------------------------------------
diff --git a/modules/web-console/backend/services/activities.js b/modules/web-console/backend/services/activities.js
index 124c775..afde8e7 100644
--- a/modules/web-console/backend/services/activities.js
+++ b/modules/web-console/backend/services/activities.js
@@ -37,10 +37,10 @@ module.exports.factory = (_, mongo) => {
* @param {String} owner - User ID
* @param {String} action - Action string presentation.
* @param {String} group - Action group string presentation.
- * @param {Date} [date] - Optional date to save in activity.
+ * @param {Date} [now] - Optional date to save in activity.
* @returns {Promise.<mongo.ObjectId>} that resolve activity
*/
- static merge(owner, {action, group}, date = new Date()) {
+ static merge(owner, {action, group}, now = new Date()) {
mongo.Account.findById(owner)
.then((user) => {
user.lastActivity = new Date();
@@ -48,8 +48,7 @@ module.exports.factory = (_, mongo) => {
return user.save();
});
- date.setDate(1);
- date.setHours(0, 0, 0, 0);
+ const date = Date.UTC(now.getFullYear(), now.getMonth(), 1);
return mongo.Activities.findOne({owner, action, date}).exec()
.then((activity) => {
http://git-wip-us.apache.org/repos/asf/ignite/blob/7cb3e687/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.controller.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.controller.js b/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.controller.js
index 272681a..f65958b 100644
--- a/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.controller.js
+++ b/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.controller.js
@@ -44,9 +44,6 @@ export default class IgniteListOfRegisteredUsersCtrl {
startDate: new Date()
};
- $ctrl.params.startDate.setDate(1);
- $ctrl.params.startDate.setHours(0, 0, 0, 0);
-
const columnCompany = _.find(columnDefs, { displayName: 'Company' });
const columnCountry = _.find(columnDefs, { displayName: 'Country' });
@@ -151,7 +148,7 @@ export default class IgniteListOfRegisteredUsersCtrl {
};
/**
- * @param {{startDate: Date, endDate: Date}} params
+ * @param {{startDate: number, endDate: number}} params
*/
const reloadUsers = (params) => {
AdminData.loadUsers(params)
@@ -174,11 +171,10 @@ export default class IgniteListOfRegisteredUsersCtrl {
$scope.$watch(() => $ctrl.params.startDate, (dt) => {
$ctrl.gridOptions.exporterCsvFilename = `web_console_users_${dtFilter(dt, 'yyyy_MM')}.csv`;
- const endDate = new Date(dt);
-
- endDate.setMonth(endDate.getMonth() + 1);
+ const startDate = Date.UTC(dt.getFullYear(), dt.getMonth(), 1);
+ const endDate = Date.UTC(dt.getFullYear(), dt.getMonth() + 1, 1);
- reloadUsers({startDate: dtFilter(dt, 'yyyy-MM-dd'), endDate: dtFilter(endDate, 'yyyy-MM-dd')});
+ reloadUsers({ startDate, endDate });
});
}
@@ -234,6 +230,6 @@ export default class IgniteListOfRegisteredUsersCtrl {
}
exportCsv() {
- this.gridApi.exporter.csvExport('all', 'visible');
+ this.gridApi.exporter.csvExport('visible', 'visible');
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/7cb3e687/modules/web-console/frontend/app/modules/configuration/configuration.module.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/configuration/configuration.module.js b/modules/web-console/frontend/app/modules/configuration/configuration.module.js
index 4288ff7..51306c6 100644
--- a/modules/web-console/frontend/app/modules/configuration/configuration.module.js
+++ b/modules/web-console/frontend/app/modules/configuration/configuration.module.js
@@ -49,10 +49,10 @@ angular
])
.provider(...igniteSidebar)
.directive(...igniteSidebarDirective)
-.service('IgniteConfigurationGenerator', IgniteConfigurationGenerator)
+.service('IgniteConfigurationGenerator', () => IgniteConfigurationGenerator)
.service('IgnitePlatformGenerator', IgnitePlatformGenerator)
-.service('SpringTransformer', IgniteSpringTransformer)
-.service('JavaTransformer', IgniteJavaTransformer)
+.service('SpringTransformer', () => IgniteSpringTransformer)
+.service('JavaTransformer', () => IgniteJavaTransformer)
.service('IgniteSharpTransformer', SharpTransformer)
.service('IgniteVersion', IgniteVersion)
.service('IgniteEventGroups', IgniteEventGroups)
http://git-wip-us.apache.org/repos/asf/ignite/blob/7cb3e687/modules/web-console/frontend/app/modules/states/configuration/summary/summary.worker.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/states/configuration/summary/summary.worker.js b/modules/web-console/frontend/app/modules/states/configuration/summary/summary.worker.js
index 070b6ce..7ea1d5a 100644
--- a/modules/web-console/frontend/app/modules/states/configuration/summary/summary.worker.js
+++ b/modules/web-console/frontend/app/modules/states/configuration/summary/summary.worker.js
@@ -17,24 +17,24 @@
import JSZip from 'jszip';
-import MavenGenerator from 'app/modules/configuration/generator/Maven.service';
-import DockerGenerator from 'app/modules/configuration/generator/Docker.service';
-import ReadmeGenerator from 'app/modules/configuration/generator/Readme.service';
-import PropertiesGenerator from 'app/modules/configuration/generator/Properties.service';
-import ConfigurationGenerator from 'app/modules/configuration/generator/ConfigurationGenerator';
+import IgniteMavenGenerator from 'app/modules/configuration/generator/Maven.service';
+import IgniteDockerGenerator from 'app/modules/configuration/generator/Docker.service';
+import IgniteReadmeGenerator from 'app/modules/configuration/generator/Readme.service';
+import IgnitePropertiesGenerator from 'app/modules/configuration/generator/Properties.service';
+import IgniteConfigurationGenerator from 'app/modules/configuration/generator/ConfigurationGenerator';
-import JavaTransformer from 'app/modules/configuration/generator/JavaTransformer.service';
-import SpringTransformer from 'app/modules/configuration/generator/SpringTransformer.service';
+import IgniteJavaTransformer from 'app/modules/configuration/generator/JavaTransformer.service';
+import IgniteSpringTransformer from 'app/modules/configuration/generator/SpringTransformer.service';
-const maven = new MavenGenerator();
-const docker = new DockerGenerator();
-const readme = new ReadmeGenerator();
-const properties = new PropertiesGenerator();
+const maven = new IgniteMavenGenerator();
+const docker = new IgniteDockerGenerator();
+const readme = new IgniteReadmeGenerator();
+const properties = new IgnitePropertiesGenerator();
-const java = new JavaTransformer[0]();
-const spring = new SpringTransformer[0]();
+const java = IgniteJavaTransformer;
+const spring = IgniteSpringTransformer;
-const generator = new ConfigurationGenerator[0]();
+const generator = IgniteConfigurationGenerator;
const escapeFileName = (name) => name.replace(/[\\\/*\"\[\],\.:;|=<>?]/g, '-').replace(/ /g, '_');
http://git-wip-us.apache.org/repos/asf/ignite/blob/7cb3e687/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/RestListener.java
----------------------------------------------------------------------
diff --git a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/RestListener.java b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/RestListener.java
index 1e86549..fcacc88 100644
--- a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/RestListener.java
+++ b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/RestListener.java
@@ -38,6 +38,7 @@ import org.apache.http.client.utils.URIBuilder;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
import org.apache.ignite.console.agent.AgentConfiguration;
import org.apache.ignite.console.demo.AgentClusterDemo;
import org.apache.log4j.Logger;
@@ -65,7 +66,13 @@ public class RestListener extends AbstractListener {
this.cfg = cfg;
- httpClient = HttpClientBuilder.create().build();
+ // Create a connection manager with custom configuration.
+ PoolingHttpClientConnectionManager connMgr = new PoolingHttpClientConnectionManager();
+
+ connMgr.setDefaultMaxPerRoute(Integer.MAX_VALUE);
+ connMgr.setMaxTotal(Integer.MAX_VALUE);
+
+ httpClient = HttpClientBuilder.create().setConnectionManager(connMgr).build();
}
/** {@inheritDoc} */
[28/50] [abbrv] ignite git commit: ignite-4656 Added dynamic cache
start for IgniteCacheRandomOperationBenchmark.
Posted by vo...@apache.org.
ignite-4656 Added dynamic cache start for IgniteCacheRandomOperationBenchmark.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d3ccaf6d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d3ccaf6d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d3ccaf6d
Branch: refs/heads/ignite-4565-ddl
Commit: d3ccaf6d911ebf88b0abfc5e2495d1d1fe24fc55
Parents: d4efbf3
Author: oleg-ostanin <oo...@gridgain.com>
Authored: Thu Feb 16 16:51:08 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Feb 16 16:51:08 2017 +0300
----------------------------------------------------------------------
.../yardstick/IgniteBenchmarkArguments.java | 28 +++++++++--
.../org/apache/ignite/yardstick/IgniteNode.java | 2 +-
.../IgniteCacheRandomOperationBenchmark.java | 49 ++++++++++++++++++++
3 files changed, 75 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d3ccaf6d/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java
index 2d2da5a..6ccd04c 100644
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java
@@ -153,6 +153,14 @@ public class IgniteBenchmarkArguments {
private boolean keysPerThread;
/** */
+ @Parameter(names = {"-ac", "--additionalCachesNumber"}, description = "Number of additional caches")
+ private int additionalCachesNum;
+
+ /** */
+ @Parameter(names = {"-acn", "--additionalCachesName"}, description = "Template cache name for additional caches")
+ private String additionalCachesName;
+
+ /** */
@Parameter(names = {"-pp", "--printPartitionStats"}, description = "Print partition statistics")
private boolean printPartStats;
@@ -296,9 +304,9 @@ public class IgniteBenchmarkArguments {
/**
* @return Preload log printing interval in seconds.
*/
- public long preloadLogsInterval() {
- return preloadLogsInterval;
- }
+ public long preloadLogsInterval() {
+ return preloadLogsInterval;
+ }
/**
* @return Configuration file.
@@ -392,6 +400,20 @@ public class IgniteBenchmarkArguments {
}
/**
+ * @return Number of additional caches.
+ */
+ public int additionalCachesNumber() {
+ return additionalCachesNum;
+ }
+
+ /**
+ * @return Name of cache which will be taken as base for additional caches.
+ */
+ public String additionalCachesName() {
+ return additionalCachesName;
+ }
+
+ /**
* @return Description.
*/
public String description() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/d3ccaf6d/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
index a261b98..404bd68 100644
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
@@ -168,7 +168,7 @@ public class IgniteNode implements BenchmarkServer {
* @return Tuple with grid configuration and Spring application context.
* @throws Exception If failed.
*/
- private static IgniteBiTuple<IgniteConfiguration, ? extends ApplicationContext> loadConfiguration(String springCfgPath)
+ public static IgniteBiTuple<IgniteConfiguration, ? extends ApplicationContext> loadConfiguration(String springCfgPath)
throws Exception {
URL url;
http://git-wip-us.apache.org/repos/asf/ignite/blob/d3ccaf6d/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/load/IgniteCacheRandomOperationBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/load/IgniteCacheRandomOperationBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/load/IgniteCacheRandomOperationBenchmark.java
index 590b64f..c85595d 100644
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/load/IgniteCacheRandomOperationBenchmark.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/load/IgniteCacheRandomOperationBenchmark.java
@@ -33,6 +33,7 @@ import java.util.UUID;
import java.util.concurrent.Callable;
import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.atomic.AtomicLong;
+import javax.cache.CacheException;
import javax.cache.configuration.FactoryBuilder;
import javax.cache.event.CacheEntryEvent;
import javax.cache.event.CacheEntryListenerException;
@@ -69,8 +70,10 @@ import org.apache.ignite.transactions.TransactionConcurrency;
import org.apache.ignite.transactions.TransactionIsolation;
import org.apache.ignite.yardstick.IgniteAbstractBenchmark;
import org.apache.ignite.yardstick.IgniteBenchmarkUtils;
+import org.apache.ignite.yardstick.IgniteNode;
import org.apache.ignite.yardstick.cache.load.model.ModelUtil;
import org.jetbrains.annotations.NotNull;
+import org.springframework.beans.BeansException;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import org.yardstickframework.BenchmarkConfiguration;
@@ -135,14 +138,60 @@ public class IgniteCacheRandomOperationBenchmark extends IgniteAbstractBenchmark
@Override public void setUp(BenchmarkConfiguration cfg) throws Exception {
super.setUp(cfg);
+ if (args.additionalCachesNumber() > 0)
+ createAdditionalCaches();
+
searchCache();
preLoading();
}
+ /**
+ * Creates additional caches.
+ *
+ * @throws Exception If failed.
+ */
+ private void createAdditionalCaches() throws Exception {
+ Map<String, CacheConfiguration> cfgMap;
+
+ try {
+ // Loading spring application context and getting all of the caches configurations in the map.
+ cfgMap = IgniteNode.loadConfiguration(args.configuration()).get2().getBeansOfType(CacheConfiguration.class);
+ }
+ catch (BeansException e) {
+ throw new Exception("Failed to instantiate bean [type=" + CacheConfiguration.class + ", err=" +
+ e.getMessage() + ']', e);
+ }
+
+ if (cfgMap == null || cfgMap.isEmpty())
+ throw new Exception("Failed to find cache configurations in: " + args.configuration());
+
+ // Getting cache configuration from the map using name specified in property file.
+ CacheConfiguration<Object, Object> ccfg = cfgMap.get(args.additionalCachesName());
+
+ if (ccfg == null)
+ throw new Exception("Failed to find cache configuration [cache=" + args.additionalCachesName() +
+ ", cfg=" + args.configuration() + ']');
+
+ for (int i = 0; i < args.additionalCachesNumber(); i++) {
+ CacheConfiguration<Object, Object> newCfg = new CacheConfiguration<>(ccfg);
+
+ newCfg.setName("additional_" + args.additionalCachesName() + "_cache_" + i);
+
+ try {
+ ignite().createCache(newCfg);
+ }
+ catch (CacheException e) {
+ BenchmarkUtils.error("Failed to create additional cache [ name = " + args.additionalCachesName() +
+ ", err" + e.getMessage() + ']', e);
+ }
+ }
+ }
+
/** {@inheritDoc} */
@Override public void onException(Throwable e) {
BenchmarkUtils.error("The benchmark of random operation failed.", e);
+
super.onException(e);
}
[40/50] [abbrv] ignite git commit: IGNITE-4611 Write IgniteUuid with
BinaryMarshaller
Posted by vo...@apache.org.
IGNITE-4611 Write IgniteUuid with BinaryMarshaller
This closes #1551
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/53802d8b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/53802d8b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/53802d8b
Branch: refs/heads/ignite-4565-ddl
Commit: 53802d8b46f8ee09d51ba84267f65dc6f7e73a2f
Parents: ab1b685
Author: Vyacheslav Daradur <da...@gmail.com>
Authored: Mon Feb 20 11:22:49 2017 +0300
Committer: Pavel Tupitsyn <pt...@apache.org>
Committed: Mon Feb 20 11:22:49 2017 +0300
----------------------------------------------------------------------
.../ignite/internal/binary/BinaryContext.java | 3 +++
.../java/org/apache/ignite/lang/IgniteUuid.java | 25 +++++++++++++++++++-
.../binary/BinaryMarshallerSelfTest.java | 10 ++++++++
3 files changed, 37 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/53802d8b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
index ec2fc7b..4773e3b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
@@ -85,6 +85,7 @@ import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.T2;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgniteUuid;
import org.apache.ignite.marshaller.MarshallerContext;
import org.apache.ignite.marshaller.MarshallerUtils;
import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
@@ -194,6 +195,8 @@ public class BinaryContext {
sysClss.add(GridClosureProcessor.C4V2.class.getName());
sysClss.add(GridClosureProcessor.C4MLAV2.class.getName());
+ sysClss.add(IgniteUuid.class.getName());
+
if (BinaryUtils.wrapTrees()) {
sysClss.add(TreeMap.class.getName());
sysClss.add(TreeSet.class.getName());
http://git-wip-us.apache.org/repos/asf/ignite/blob/53802d8b/modules/core/src/main/java/org/apache/ignite/lang/IgniteUuid.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteUuid.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteUuid.java
index 7de389e..4b93261 100644
--- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteUuid.java
+++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteUuid.java
@@ -24,6 +24,12 @@ import java.io.ObjectOutput;
import java.util.Collections;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicLong;
+import org.apache.ignite.binary.BinaryObjectException;
+import org.apache.ignite.binary.BinaryRawReader;
+import org.apache.ignite.binary.BinaryRawWriter;
+import org.apache.ignite.binary.BinaryReader;
+import org.apache.ignite.binary.BinaryWriter;
+import org.apache.ignite.binary.Binarylizable;
import org.apache.ignite.internal.util.lang.GridIterator;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.A;
@@ -34,7 +40,7 @@ import org.apache.ignite.internal.util.typedef.internal.U;
* 10x time faster for ID creation. It uses extra memory for 8-byte counter additionally to
* internal UUID.
*/
-public final class IgniteUuid implements Comparable<IgniteUuid>, Iterable<IgniteUuid>, Cloneable, Externalizable {
+public final class IgniteUuid implements Comparable<IgniteUuid>, Iterable<IgniteUuid>, Cloneable, Externalizable, Binarylizable {
/** */
private static final long serialVersionUID = 0L;
@@ -203,6 +209,23 @@ public final class IgniteUuid implements Comparable<IgniteUuid>, Iterable<Ignite
}
/** {@inheritDoc} */
+ @Override public void writeBinary(BinaryWriter writer) throws BinaryObjectException {
+ BinaryRawWriter out = writer.rawWriter();
+
+ out.writeLong(locId);
+ out.writeLong(gid.getMostSignificantBits());
+ out.writeLong(gid.getLeastSignificantBits());
+ }
+
+ /** {@inheritDoc} */
+ @Override public void readBinary(BinaryReader reader) throws BinaryObjectException {
+ BinaryRawReader in = reader.rawReader();
+
+ locId = in.readLong();
+ gid = new UUID(in.readLong(), in.readLong());
+ }
+
+ /** {@inheritDoc} */
@Override public int hashCode() {
return 31 * gid.hashCode() + (int)(locId ^ (locId >>> 32));
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/53802d8b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
index 5bfc95c..1cac1a8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
@@ -86,6 +86,7 @@ import org.apache.ignite.internal.util.lang.GridMapEntry;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
import org.apache.ignite.logger.NullLogger;
import org.apache.ignite.marshaller.MarshallerContextTestImpl;
import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage;
@@ -294,6 +295,15 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ public void testIgniteUuid() throws Exception {
+ IgniteUuid uuid = IgniteUuid.randomUuid();
+
+ assertEquals(uuid, marshalUnmarshal(uuid));
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
public void testDate() throws Exception {
Date date = new Date();
[06/50] [abbrv] ignite git commit: IGNITE-4159: using logger instead
of system.out.println
Posted by vo...@apache.org.
IGNITE-4159: using logger instead of system.out.println
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b9bf77c1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b9bf77c1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b9bf77c1
Branch: refs/heads/ignite-4565-ddl
Commit: b9bf77c1a492951bd45abb8653469650d51c38a1
Parents: 37c0a22
Author: Denis Magda <dm...@gridgain.com>
Authored: Mon Feb 13 22:03:30 2017 -0800
Committer: Denis Magda <dm...@gridgain.com>
Committed: Mon Feb 13 22:03:30 2017 -0800
----------------------------------------------------------------------
modules/kubernetes/config/example-kube.xml | 2 +-
.../ipfinder/kubernetes/TcpDiscoveryKubernetesIpFinder.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b9bf77c1/modules/kubernetes/config/example-kube.xml
----------------------------------------------------------------------
diff --git a/modules/kubernetes/config/example-kube.xml b/modules/kubernetes/config/example-kube.xml
index bc04463..11309d8 100644
--- a/modules/kubernetes/config/example-kube.xml
+++ b/modules/kubernetes/config/example-kube.xml
@@ -41,4 +41,4 @@
</bean>
</property>
</bean>
-</beans>
+</beans>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/b9bf77c1/modules/kubernetes/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/kubernetes/TcpDiscoveryKubernetesIpFinder.java
----------------------------------------------------------------------
diff --git a/modules/kubernetes/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/kubernetes/TcpDiscoveryKubernetesIpFinder.java b/modules/kubernetes/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/kubernetes/TcpDiscoveryKubernetesIpFinder.java
index a5bd24f..f312195 100644
--- a/modules/kubernetes/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/kubernetes/TcpDiscoveryKubernetesIpFinder.java
+++ b/modules/kubernetes/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/kubernetes/TcpDiscoveryKubernetesIpFinder.java
@@ -52,7 +52,7 @@ import org.codehaus.jackson.map.ObjectMapper;
* cluster is required to be containerized as well. Applications and Ignite nodes running outside of Kubernetes will
* not be able to reach the containerized counterparts.
* <p>
- * The implementation is based on a dedicated Kubernetes service that has to be created and should be deployed prior
+ * The implementation is based on a distinct Kubernetes service that has to be created and should be deployed prior
* Ignite nodes startup. The service will maintain a list of all endpoints (internal IP addresses) of all containerized
* Ignite pods running so far. The name of the service must be equal to {@link #setServiceName(String)} which is
* `ignite` by default.
@@ -137,7 +137,7 @@ public class TcpDiscoveryKubernetesIpFinder extends TcpDiscoveryIpFinderAdapter
Collection<InetSocketAddress> addrs = new ArrayList<>();
try {
- System.out.println("Getting Apache Ignite endpoints from: " + url);
+ log.debug("Getting Apache Ignite endpoints from: " + url);
HttpsURLConnection conn = (HttpsURLConnection)url.openConnection();
@@ -159,7 +159,7 @@ public class TcpDiscoveryKubernetesIpFinder extends TcpDiscoveryIpFinderAdapter
for (Address address : subset.addresses) {
addrs.add(new InetSocketAddress(address.ip, 0));
- System.out.println("Added an address to the list: " + address.ip);
+ log.debug("Added an address to the list: " + address.ip);
}
}
}
[11/50] [abbrv] ignite git commit: IGNITE-4436 API for collecting
list of running queries and cancel them.
Posted by vo...@apache.org.
IGNITE-4436 API for collecting list of running queries and cancel them.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/49237343
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/49237343
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/49237343
Branch: refs/heads/ignite-4565-ddl
Commit: 49237343d53ee33d44e5599cd7fe7da868ee30a1
Parents: 8e12513
Author: AKuznetsov <ak...@gridgain.com>
Authored: Tue Feb 14 20:54:31 2017 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Tue Feb 14 20:54:31 2017 +0700
----------------------------------------------------------------------
.../processors/query/GridQueryIndexing.java | 17 +-
.../processors/query/GridQueryProcessor.java | 32 ++-
.../processors/query/GridRunningQueryInfo.java | 132 ++++++++++++
.../internal/visor/VisorMultiNodeTask.java | 2 +-
.../visor/query/VisorCancelQueriesTask.java | 72 +++++++
.../query/VisorCollectRunningQueriesTask.java | 96 +++++++++
.../internal/visor/query/VisorRunningQuery.java | 132 ++++++++++++
.../cache/query/GridCacheTwoStepQuery.java | 18 +-
.../processors/query/h2/IgniteH2Indexing.java | 81 +++++++-
.../query/h2/sql/GridSqlQuerySplitter.java | 4 +-
.../h2/twostep/GridReduceQueryExecutor.java | 60 +++++-
.../cache/CacheSqlQueryValueCopySelfTest.java | 208 +++++++++++++++++--
.../cache/GridCacheCrossCacheQuerySelfTest.java | 2 +-
.../h2/GridIndexingSpiAbstractSelfTest.java | 7 +
14 files changed, 823 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/49237343/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java
index ef39d96..ca04724 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java
@@ -241,7 +241,22 @@ public interface GridQueryIndexing {
public PreparedStatement prepareNativeStatement(String schema, String sql) throws SQLException;
/**
+ * Collect queries that already running more than specified duration.
+ *
+ * @param duration Duration to check.
+ * @return Collection of long running queries.
+ */
+ public Collection<GridRunningQueryInfo> runningQueries(long duration);
+
+ /**
+ * Cancel specified queries.
+ *
+ * @param queries Queries ID's to cancel.
+ */
+ public void cancelQueries(Collection<Long> queries);
+
+ /**
* Cancels all executing queries.
*/
public void cancelAllQueries();
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/49237343/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
index cb7c7e7..ee9224b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
@@ -44,7 +44,6 @@ import javax.cache.Cache;
import javax.cache.CacheException;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
-import org.apache.ignite.IgniteSystemProperties;
import org.apache.ignite.binary.BinaryField;
import org.apache.ignite.binary.BinaryObject;
import org.apache.ignite.binary.BinaryObjectBuilder;
@@ -119,7 +118,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
private static final int QRY_DETAIL_METRICS_EVICTION_FREQ = 3_000;
/** */
- private static Set<Class<?>> SQL_TYPES = new HashSet<>(F.<Class<?>>asList(
+ private static final Set<Class<?>> SQL_TYPES = new HashSet<>(F.<Class<?>>asList(
Integer.class,
Boolean.class,
Byte.class,
@@ -920,6 +919,29 @@ public class GridQueryProcessor extends GridProcessorAdapter {
}
/**
+ * Collect queries that already running more than specified duration.
+ *
+ * @param duration Duration to check.
+ * @return Collection of long running queries.
+ */
+ public Collection<GridRunningQueryInfo> runningQueries(long duration) {
+ if (moduleEnabled())
+ return idx.runningQueries(duration);
+
+ return Collections.emptyList();
+ }
+
+ /**
+ * Cancel specified queries.
+ *
+ * @param queries Queries ID's to cancel.
+ */
+ public void cancelQueries(Collection<Long> queries) {
+ if (moduleEnabled())
+ idx.cancelQueries(queries);
+ }
+
+ /**
* @param sqlQry Sql query.
* @param params Params.
*/
@@ -2731,7 +2753,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
}
/** Accessor that deals with fields. */
- private final static class FieldAccessor implements PropertyAccessor {
+ private static final class FieldAccessor implements PropertyAccessor {
/** Field to access. */
private final Field fld;
@@ -2774,7 +2796,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
}
/** Getter and setter methods based accessor. */
- private final static class MethodsAccessor implements PropertyAccessor {
+ private static final class MethodsAccessor implements PropertyAccessor {
/** */
private final Method getter;
@@ -2832,7 +2854,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
}
/** Accessor with getter only. */
- private final static class ReadOnlyMethodsAccessor implements PropertyAccessor {
+ private static final class ReadOnlyMethodsAccessor implements PropertyAccessor {
/** */
private final Method getter;
http://git-wip-us.apache.org/repos/asf/ignite/blob/49237343/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridRunningQueryInfo.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridRunningQueryInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridRunningQueryInfo.java
new file mode 100644
index 0000000..d77c8c0
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridRunningQueryInfo.java
@@ -0,0 +1,132 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.query;
+
+import org.apache.ignite.internal.processors.cache.query.GridCacheQueryType;
+
+/**
+ * Query descriptor.
+ */
+public class GridRunningQueryInfo {
+ /** */
+ private final long id;
+
+ /** */
+ private final String qry;
+
+ /** Query type. */
+ private final GridCacheQueryType qryType;
+
+ /** */
+ private final String cache;
+
+ /** */
+ private final long startTime;
+
+ /** */
+ private final GridQueryCancel cancel;
+
+ /** */
+ private final boolean loc;
+
+ /**
+ * @param id Query ID.
+ * @param qry Query text.
+ * @param qryType Query type.
+ * @param cache Cache where query was executed.
+ * @param startTime Query start time.
+ * @param cancel Query cancel.
+ * @param loc Local query flag.
+ */
+ public GridRunningQueryInfo(Long id, String qry, GridCacheQueryType qryType, String cache, long startTime,
+ GridQueryCancel cancel, boolean loc) {
+ this.id = id;
+ this.qry = qry;
+ this.qryType = qryType;
+ this.cache = cache;
+ this.startTime = startTime;
+ this.cancel = cancel;
+ this.loc = loc;
+ }
+
+ /**
+ * @return Query ID.
+ */
+ public Long id() {
+ return id;
+ }
+
+ /**
+ * @return Query text.
+ */
+ public String query() {
+ return qry;
+ }
+
+ /**
+ * @return Query type.
+ */
+ public GridCacheQueryType queryType() {
+ return qryType;
+ }
+
+ /**
+ * @return Cache where query was executed.
+ */
+ public String cache() {
+ return cache;
+ }
+
+ /**
+ * @return Query start time.
+ */
+ public long startTime() {
+ return startTime;
+ }
+
+ /**
+ * @param curTime Current time.
+ * @param duration Duration of long query.
+ * @return {@code true} if this query should be considered as long running query.
+ */
+ public boolean longQuery(long curTime, long duration) {
+ return curTime - startTime > duration;
+ }
+
+ /**
+ * Cancel query.
+ */
+ public void cancel() {
+ if (cancel != null)
+ cancel.cancel();
+ }
+
+ /**
+ * @return {@code true} if query can be cancelled.
+ */
+ public boolean cancelable() {
+ return cancel != null;
+ }
+
+ /**
+ * @return {@code true} if query is local.
+ */
+ public boolean local() {
+ return loc;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/49237343/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorMultiNodeTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorMultiNodeTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorMultiNodeTask.java
index 57f1346..ece1a17 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorMultiNodeTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorMultiNodeTask.java
@@ -130,4 +130,4 @@ public abstract class VisorMultiNodeTask<A, R, J> implements ComputeTask<VisorTa
logFinish(ignite.log(), getClass(), start);
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/49237343/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorCancelQueriesTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorCancelQueriesTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorCancelQueriesTask.java
new file mode 100644
index 0000000..a6f2d82
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorCancelQueriesTask.java
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.visor.query;
+
+import java.util.Collection;
+import java.util.List;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.visor.VisorJob;
+import org.apache.ignite.internal.visor.VisorOneNodeTask;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Task to cancel queries.
+ */
+@GridInternal
+public class VisorCancelQueriesTask extends VisorOneNodeTask<Collection<Long>, Void> {
+ /** */
+ private static final long serialVersionUID = 0L;
+
+ /** {@inheritDoc} */
+ @Override protected VisorCancelQueriesJob job(Collection<Long> arg) {
+ return new VisorCancelQueriesJob(arg, debug);
+ }
+
+ /** {@inheritDoc} */
+ @Nullable @Override protected Void reduce0(List<ComputeJobResult> results) throws IgniteException {
+ return null;
+ }
+
+ /**
+ * Job to cancel queries on node.
+ */
+ private static class VisorCancelQueriesJob extends VisorJob<Collection<Long>, Void> {
+ /** */
+ private static final long serialVersionUID = 0L;
+
+ /**
+ * Create job with specified argument.
+ *
+ * @param arg Job argument.
+ * @param debug Flag indicating whether debug information should be printed into node log.
+ */
+ protected VisorCancelQueriesJob(@Nullable Collection<Long> arg, boolean debug) {
+ super(arg, debug);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected Void run(@Nullable Collection<Long> queries) throws IgniteException {
+ ignite.context().query().cancelQueries(queries);
+
+ return null;
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/49237343/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorCollectRunningQueriesTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorCollectRunningQueriesTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorCollectRunningQueriesTask.java
new file mode 100644
index 0000000..2b40e61
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorCollectRunningQueriesTask.java
@@ -0,0 +1,96 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.visor.query;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.internal.processors.query.GridRunningQueryInfo;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.visor.VisorJob;
+import org.apache.ignite.internal.visor.VisorMultiNodeTask;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Task to collect currently running queries.
+ */
+@GridInternal
+public class VisorCollectRunningQueriesTask extends VisorMultiNodeTask<Long, Map<UUID, Collection<VisorRunningQuery>>, Collection<VisorRunningQuery>> {
+ /** */
+ private static final long serialVersionUID = 0L;
+
+ /** {@inheritDoc} */
+ @Override protected VisorCollectRunningQueriesJob job(Long arg) {
+ return new VisorCollectRunningQueriesJob(arg, debug);
+ }
+
+ /** {@inheritDoc} */
+ @Nullable @Override protected Map<UUID, Collection<VisorRunningQuery>> reduce0(List<ComputeJobResult> results) throws IgniteException {
+ Map<UUID, Collection<VisorRunningQuery>> map = new HashMap<>();
+
+ for (ComputeJobResult res : results)
+ if (res.getException() == null) {
+ Collection<VisorRunningQuery> queries = res.getData();
+
+ map.put(res.getNode().id(), queries);
+ }
+
+ return map;
+ }
+
+ /**
+ * Job to collect currently running queries from node.
+ */
+ private static class VisorCollectRunningQueriesJob extends VisorJob<Long, Collection<VisorRunningQuery>> {
+ /** */
+ private static final long serialVersionUID = 0L;
+
+ /**
+ * Create job with specified argument.
+ *
+ * @param arg Job argument.
+ * @param debug Flag indicating whether debug information should be printed into node log.
+ */
+ protected VisorCollectRunningQueriesJob(@Nullable Long arg, boolean debug) {
+ super(arg, debug);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected Collection<VisorRunningQuery> run(@Nullable Long duration) throws IgniteException {
+ Collection<GridRunningQueryInfo> queries = ignite.context().query()
+ .runningQueries(duration != null ? duration : 0);
+
+ Collection<VisorRunningQuery> res = new ArrayList<>(queries.size());
+
+ long curTime = U.currentTimeMillis();
+
+ for (GridRunningQueryInfo qry : queries)
+ res.add(new VisorRunningQuery(qry.id(), qry.query(), qry.queryType(), qry.cache(),
+ qry.startTime(), curTime - qry.startTime(),
+ qry.cancelable(), qry.local()));
+
+ return res;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/49237343/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorRunningQuery.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorRunningQuery.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorRunningQuery.java
new file mode 100644
index 0000000..fc6bc7a
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorRunningQuery.java
@@ -0,0 +1,132 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.visor.query;
+
+import java.io.Serializable;
+import org.apache.ignite.internal.processors.cache.query.GridCacheQueryType;
+
+/**
+ * Descriptor of running query.
+ */
+public class VisorRunningQuery implements Serializable {
+ /** */
+ private static final long serialVersionUID = 0L;
+
+ /** */
+ private long id;
+
+ /** Query text. */
+ private String qry;
+
+ /** Query type. */
+ private GridCacheQueryType qryType;
+
+ /** Cache name for query. */
+ private String cache;
+
+ /** */
+ private long startTime;
+
+ /** */
+ private long duration;
+
+ /** */
+ private boolean cancellable;
+
+ /** */
+ private boolean loc;
+
+ /**
+ * @param id Query ID.
+ * @param qry Query text.
+ * @param qryType Query type.
+ * @param cache Cache where query was executed.
+ * @param startTime Query start time.
+ * @param duration Query current duration.
+ * @param cancellable {@code true} if query can be canceled.
+ * @param loc {@code true} if query is local.
+ */
+ public VisorRunningQuery(long id, String qry, GridCacheQueryType qryType, String cache,
+ long startTime, long duration,
+ boolean cancellable, boolean loc) {
+ this.id = id;
+ this.qry = qry;
+ this.qryType = qryType;
+ this.cache = cache;
+ this.startTime = startTime;
+ this.duration = duration;
+ this.cancellable = cancellable;
+ this.loc = loc;
+ }
+
+ /**
+ * @return Query ID.
+ */
+ public long getId() {
+ return id;
+ }
+
+ /**
+ * @return Query txt.
+ */
+ public String getQuery() {
+ return qry;
+ }
+
+ /**
+ * @return Query type.
+ */
+ public GridCacheQueryType getQueryType() {
+ return qryType;
+ }
+
+ /**
+ * @return Cache name.
+ */
+ public String getCache() {
+ return cache;
+ }
+
+ /**
+ * @return Query start time.
+ */
+ public long getStartTime() {
+ return startTime;
+ }
+
+ /**
+ * @return Query duration.
+ */
+ public long getDuration() {
+ return duration;
+ }
+
+ /**
+ * @return {@code true} if query can be cancelled.
+ */
+ public boolean isCancelable() {
+ return cancellable;
+ }
+
+ /**
+ * @return {@code true} if query is local.
+ */
+ public boolean isLocal() {
+ return loc;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/49237343/modules/indexing/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheTwoStepQuery.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheTwoStepQuery.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheTwoStepQuery.java
index 8dcba2f..f53936f 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheTwoStepQuery.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheTwoStepQuery.java
@@ -46,6 +46,9 @@ public class GridCacheTwoStepQuery {
private boolean explain;
/** */
+ private String originalSql;
+
+ /** */
private Collection<String> spaces;
/** */
@@ -67,10 +70,12 @@ public class GridCacheTwoStepQuery {
private List<Integer> extraCaches;
/**
+ * @param originalSql Original query SQL.
* @param schemas Schema names in query.
* @param tbls Tables in query.
*/
- public GridCacheTwoStepQuery(Set<String> schemas, Set<String> tbls) {
+ public GridCacheTwoStepQuery(String originalSql, Set<String> schemas, Set<String> tbls) {
+ this.originalSql = originalSql;
this.schemas = schemas;
this.tbls = tbls;
}
@@ -196,6 +201,13 @@ public class GridCacheTwoStepQuery {
}
/**
+ * @return Original query SQL.
+ */
+ public String originalSql() {
+ return originalSql;
+ }
+
+ /**
* @return Spaces.
*/
public Collection<String> spaces() {
@@ -223,7 +235,7 @@ public class GridCacheTwoStepQuery {
public GridCacheTwoStepQuery copy(Object[] args) {
assert !explain;
- GridCacheTwoStepQuery cp = new GridCacheTwoStepQuery(schemas, tbls);
+ GridCacheTwoStepQuery cp = new GridCacheTwoStepQuery(originalSql, schemas, tbls);
cp.caches = caches;
cp.extraCaches = extraCaches;
@@ -250,4 +262,4 @@ public class GridCacheTwoStepQuery {
@Override public String toString() {
return S.toString(GridCacheTwoStepQuery.class, this);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/49237343/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index 9416621..e4b0c1f 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -52,6 +52,7 @@ import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
import javax.cache.Cache;
import javax.cache.CacheException;
import org.apache.ignite.IgniteCheckedException;
@@ -81,6 +82,7 @@ import org.apache.ignite.internal.processors.cache.QueryCursorImpl;
import org.apache.ignite.internal.processors.cache.query.GridCacheQueryMarshallable;
import org.apache.ignite.internal.processors.cache.query.GridCacheTwoStepQuery;
import org.apache.ignite.internal.processors.cache.query.IgniteQueryErrorCode;
+import org.apache.ignite.internal.processors.query.GridRunningQueryInfo;
import org.apache.ignite.internal.processors.query.GridQueryCancel;
import org.apache.ignite.internal.processors.query.GridQueryFieldMetadata;
import org.apache.ignite.internal.processors.query.GridQueryFieldsResult;
@@ -179,6 +181,9 @@ import static org.apache.ignite.IgniteSystemProperties.IGNITE_H2_INDEXING_CACHE_
import static org.apache.ignite.IgniteSystemProperties.IGNITE_H2_INDEXING_CACHE_THREAD_USAGE_TIMEOUT;
import static org.apache.ignite.IgniteSystemProperties.getInteger;
import static org.apache.ignite.IgniteSystemProperties.getString;
+import static org.apache.ignite.internal.processors.cache.query.GridCacheQueryType.SQL;
+import static org.apache.ignite.internal.processors.cache.query.GridCacheQueryType.SQL_FIELDS;
+import static org.apache.ignite.internal.processors.cache.query.GridCacheQueryType.TEXT;
import static org.apache.ignite.internal.processors.query.GridQueryIndexType.FULLTEXT;
import static org.apache.ignite.internal.processors.query.GridQueryIndexType.GEO_SPATIAL;
import static org.apache.ignite.internal.processors.query.GridQueryIndexType.SORTED;
@@ -286,9 +291,15 @@ public class IgniteH2Indexing implements GridQueryIndexing {
private final Map<String, String> space2schema = new ConcurrentHashMap8<>();
/** */
+ private AtomicLong qryIdGen;
+
+ /** */
private GridSpinBusyLock busyLock;
/** */
+ private final ConcurrentMap<Long, GridRunningQueryInfo> runs = new ConcurrentHashMap8<>();
+
+ /** */
private final ThreadLocal<ConnectionWrapper> connCache = new ThreadLocal<ConnectionWrapper>() {
@Nullable @Override public ConnectionWrapper get() {
ConnectionWrapper c = super.get();
@@ -773,8 +784,19 @@ public class IgniteH2Indexing implements GridQueryIndexing {
IndexingQueryFilter filters) throws IgniteCheckedException {
TableDescriptor tbl = tableDescriptor(spaceName, type);
- if (tbl != null && tbl.luceneIdx != null)
- return tbl.luceneIdx.query(qry, filters);
+ if (tbl != null && tbl.luceneIdx != null) {
+ GridRunningQueryInfo run = new GridRunningQueryInfo(qryIdGen.incrementAndGet(), qry, TEXT, spaceName,
+ U.currentTimeMillis(), null, true);
+
+ try {
+ runs.put(run.id(), run);
+
+ return tbl.luceneIdx.query(qry, filters);
+ }
+ finally {
+ runs.remove(run.id());
+ }
+ }
return new GridEmptyCloseableIterator<>();
}
@@ -832,6 +854,11 @@ public class IgniteH2Indexing implements GridQueryIndexing {
GridH2QueryContext.set(ctx);
+ GridRunningQueryInfo run = new GridRunningQueryInfo(qryIdGen.incrementAndGet(), qry, SQL_FIELDS,
+ spaceName, U.currentTimeMillis(), cancel, true);
+
+ runs.putIfAbsent(run.id(), run);
+
try {
ResultSet rs = executeSqlQueryWithTimer(spaceName, stmt, conn, qry, params, timeout, cancel);
@@ -839,6 +866,8 @@ public class IgniteH2Indexing implements GridQueryIndexing {
}
finally {
GridH2QueryContext.clearThreadLocal();
+
+ runs.remove(run.id());
}
}
};
@@ -1088,6 +1117,11 @@ public class IgniteH2Indexing implements GridQueryIndexing {
GridH2QueryContext.set(new GridH2QueryContext(nodeId, nodeId, 0, LOCAL).filter(filter).distributedJoins(false));
+ GridRunningQueryInfo run = new GridRunningQueryInfo(qryIdGen.incrementAndGet(), qry, SQL, spaceName,
+ U.currentTimeMillis(), null, true);
+
+ runs.put(run.id(), run);
+
try {
ResultSet rs = executeSqlQueryWithTimer(spaceName, conn, sql, params, true, 0, null);
@@ -1095,6 +1129,8 @@ public class IgniteH2Indexing implements GridQueryIndexing {
}
finally {
GridH2QueryContext.clearThreadLocal();
+
+ runs.remove(run.id());
}
}
@@ -1739,6 +1775,8 @@ public class IgniteH2Indexing implements GridQueryIndexing {
this.busyLock = busyLock;
+ qryIdGen = new AtomicLong();
+
if (SysProperties.serializeJavaObject) {
U.warn(log, "Serialization of Java objects in H2 was enabled.");
@@ -1793,7 +1831,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
marshaller = ctx.config().getMarshaller();
mapQryExec = new GridMapQueryExecutor(busyLock);
- rdcQryExec = new GridReduceQueryExecutor(busyLock);
+ rdcQryExec = new GridReduceQueryExecutor(qryIdGen, busyLock);
mapQryExec.start(ctx, this);
rdcQryExec.start(ctx, this);
@@ -2247,6 +2285,37 @@ public class IgniteH2Indexing implements GridQueryIndexing {
return cols;
}
+
+ /** {@inheritDoc} */
+ @Override public Collection<GridRunningQueryInfo> runningQueries(long duration) {
+ Collection<GridRunningQueryInfo> res = new ArrayList<>();
+
+ res.addAll(runs.values());
+ res.addAll(rdcQryExec.longRunningQueries(duration));
+
+ return res;
+ }
+
+ /** {@inheritDoc} */
+ @Override public void cancelQueries(Collection<Long> queries) {
+ if (!F.isEmpty(queries)) {
+ for (Long qryId : queries) {
+ GridRunningQueryInfo run = runs.get(qryId);
+
+ if (run != null)
+ run.cancel();
+ }
+
+ rdcQryExec.cancelQueries(queries);
+ }
+ }
+
+ /** {@inheritDoc} */
+ @Override public void cancelAllQueries() {
+ for (Connection conn : conns)
+ U.close(conn, log);
+ }
+
/**
* Wrapper to store connection and flag is schema set or not.
*/
@@ -3157,10 +3226,4 @@ public class IgniteH2Indexing implements GridQueryIndexing {
lastUsage = U.currentTimeMillis();
}
}
-
- /** {@inheritDoc} */
- @Override public void cancelAllQueries() {
- for (Connection conn : conns)
- U.close(conn, log);
- }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/49237343/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
index 09952cf..e164315 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
@@ -174,7 +174,7 @@ public class GridSqlQuerySplitter {
qry = collectAllTables(qry, schemas, tbls);
// Build resulting two step query.
- GridCacheTwoStepQuery res = new GridCacheTwoStepQuery(schemas, tbls);
+ GridCacheTwoStepQuery res = new GridCacheTwoStepQuery(qry.getSQL(), schemas, tbls);
// Map query will be direct reference to the original query AST.
// Thus all the modifications will be performed on the original AST, so we should be careful when
@@ -958,4 +958,4 @@ public class GridSqlQuerySplitter {
private static GridSqlFunction function(GridSqlFunctionType type) {
return new GridSqlFunction(type);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/49237343/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
index cbe1599..f54fab6 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
@@ -62,6 +62,7 @@ import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartit
import org.apache.ignite.internal.processors.cache.query.GridCacheQueryMarshallable;
import org.apache.ignite.internal.processors.cache.query.GridCacheSqlQuery;
import org.apache.ignite.internal.processors.cache.query.GridCacheTwoStepQuery;
+import org.apache.ignite.internal.processors.query.GridRunningQueryInfo;
import org.apache.ignite.internal.processors.query.GridQueryCacheObjectsIterator;
import org.apache.ignite.internal.processors.query.GridQueryCancel;
import org.apache.ignite.internal.processors.query.h2.IgniteH2Indexing;
@@ -98,6 +99,7 @@ import org.jetbrains.annotations.Nullable;
import org.jsr166.ConcurrentHashMap8;
import static org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion.NONE;
+import static org.apache.ignite.internal.processors.cache.query.GridCacheQueryType.SQL_FIELDS;
import static org.apache.ignite.internal.processors.query.h2.opt.GridH2QueryType.REDUCE;
/**
@@ -120,7 +122,7 @@ public class GridReduceQueryExecutor {
private IgniteLogger log;
/** */
- private final AtomicLong reqIdGen = new AtomicLong();
+ private final AtomicLong qryIdGen;
/** */
private final ConcurrentMap<Long, QueryRun> runs = new ConcurrentHashMap8<>();
@@ -167,9 +169,11 @@ public class GridReduceQueryExecutor {
};
/**
+ * @param qryIdGen Query ID generator.
* @param busyLock Busy lock.
*/
- public GridReduceQueryExecutor(GridSpinBusyLock busyLock) {
+ public GridReduceQueryExecutor(AtomicLong qryIdGen, GridSpinBusyLock busyLock) {
+ this.qryIdGen = qryIdGen;
this.busyLock = busyLock;
}
@@ -493,11 +497,13 @@ public class GridReduceQueryExecutor {
}
}
- final long qryReqId = reqIdGen.incrementAndGet();
+ final long qryReqId = qryIdGen.incrementAndGet();
final String space = cctx.name();
- final QueryRun r = new QueryRun(h2.connectionForSpace(space), qry.mapQueries().size(), qry.pageSize());
+ final QueryRun r = new QueryRun(qryReqId, qry.originalSql(), space,
+ h2.connectionForSpace(space), qry.mapQueries().size(), qry.pageSize(),
+ U.currentTimeMillis(), cancel);
AffinityTopologyVersion topVer = h2.readyTopologyVersion();
@@ -1303,10 +1309,46 @@ public class GridReduceQueryExecutor {
}
/**
+ * Collect queries that already running more than specified duration.
+ *
+ * @param duration Duration to check.
+ * @return Collection of IDs and statements of long running queries.
+ */
+ public Collection<GridRunningQueryInfo> longRunningQueries(long duration) {
+ Collection<GridRunningQueryInfo> res = new ArrayList<>();
+
+ long curTime = U.currentTimeMillis();
+
+ for (QueryRun run : runs.values()) {
+ if (run.qry.longQuery(curTime, duration))
+ res.add(run.qry);
+ }
+
+ return res;
+ }
+
+ /**
+ * Cancel specified queries.
+ *
+ * @param queries Queries IDs to cancel.
+ */
+ public void cancelQueries(Collection<Long> queries) {
+ for (Long qryId : queries) {
+ QueryRun run = runs.get(qryId);
+
+ if (run != null)
+ run.qry.cancel();
+ }
+ }
+
+ /**
* Query run.
*/
private static class QueryRun {
/** */
+ private final GridRunningQueryInfo qry;
+
+ /** */
private final List<GridMergeIndex> idxs;
/** */
@@ -1322,11 +1364,17 @@ public class GridReduceQueryExecutor {
private final AtomicReference<Object> state = new AtomicReference<>();
/**
+ * @param id Query ID.
+ * @param qry Query text.
+ * @param cache Cache where query was executed.
* @param conn Connection.
* @param idxsCnt Number of indexes.
* @param pageSize Page size.
+ * @param startTime Start time.
+ * @param cancel Query cancel handler.
*/
- private QueryRun(Connection conn, int idxsCnt, int pageSize) {
+ private QueryRun(Long id, String qry, String cache, Connection conn, int idxsCnt, int pageSize, long startTime, GridQueryCancel cancel) {
+ this.qry = new GridRunningQueryInfo(id, qry, SQL_FIELDS, cache, startTime, cancel, false);
this.conn = (JdbcConnection)conn;
this.idxs = new ArrayList<>(idxsCnt);
this.pageSize = pageSize > 0 ? pageSize : GridCacheTwoStepQuery.DFLT_PAGE_SIZE;
@@ -1384,4 +1432,4 @@ public class GridReduceQueryExecutor {
return copy(msg, n, partsMap);
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/49237343/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheSqlQueryValueCopySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheSqlQueryValueCopySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheSqlQueryValueCopySelfTest.java
index e47e893..66e7e4a 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheSqlQueryValueCopySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheSqlQueryValueCopySelfTest.java
@@ -17,15 +17,23 @@
package org.apache.ignite.internal.processors.cache;
+import java.util.Collection;
+import java.util.Collections;
import java.util.List;
import javax.cache.Cache;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.query.Query;
import org.apache.ignite.cache.query.QueryCursor;
import org.apache.ignite.cache.query.SqlFieldsQuery;
import org.apache.ignite.cache.query.SqlQuery;
+import org.apache.ignite.cache.query.annotations.QuerySqlField;
+import org.apache.ignite.cache.query.annotations.QuerySqlFunction;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.query.GridQueryProcessor;
+import org.apache.ignite.internal.processors.query.GridRunningQueryInfo;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
@@ -54,6 +62,7 @@ public class CacheSqlQueryValueCopySelfTest extends GridCommonAbstractTest {
cc.setCopyOnRead(true);
cc.setIndexedTypes(Integer.class, Value.class);
+ cc.setSqlFunctionClasses(TestSQLFunctions.class);
cfg.setCacheConfiguration(cc);
@@ -72,7 +81,7 @@ public class CacheSqlQueryValueCopySelfTest extends GridCommonAbstractTest {
IgniteCache<Integer, Value> cache = grid(0).cache(null);
for (int i = 0; i < KEYS; i++)
- cache.put(i, new Value("before"));
+ cache.put(i, new Value(i, "before-" + i));
}
/** {@inheritDoc} */
@@ -195,17 +204,148 @@ public class CacheSqlQueryValueCopySelfTest extends GridCommonAbstractTest {
check(cache);
}
- /** */
- private static class Value {
- /** */
- private String str;
+ /**
+ * Run specified query in separate thread.
+ *
+ * @param qry Query to execute.
+ */
+ private IgniteInternalFuture<?> runQueryAsync(final Query<?> qry) throws Exception {
+ return multithreadedAsync(new Runnable() {
+ @Override public void run() {
+ try {
+ log.info(">>> Query started");
+
+ grid(0).cache(null).query(qry).getAll();
+
+ log.info(">>> Query finished");
+ }
+ catch (Throwable e) {
+ e.printStackTrace();
+ }
+ }
+ }, 1, "run-query");
+ }
- /**
- * @param str String.
- */
- public Value(String str) {
- this.str = str;
+ /**
+ * Test collecting info about running.
+ *
+ * @throws Exception If failed.
+ */
+ public void testRunningSqlFieldsQuery() throws Exception {
+ IgniteInternalFuture<?> fut = runQueryAsync(new SqlFieldsQuery("select _val, sleep(1000) from Value limit 3"));
+
+ Thread.sleep(500);
+
+ GridQueryProcessor qryProc = grid(0).context().query();
+
+ Collection<GridRunningQueryInfo> queries = qryProc.runningQueries(0);
+
+ assertEquals(1, queries.size());
+
+ fut.get();
+
+ queries = qryProc.runningQueries(0);
+
+ assertEquals(0, queries.size());
+
+ SqlFieldsQuery qry = new SqlFieldsQuery("select _val, sleep(1000) from Value limit 3");
+ qry.setLocal(true);
+
+ fut = runQueryAsync(qry);
+
+ Thread.sleep(500);
+
+ queries = qryProc.runningQueries(0);
+
+ assertEquals(1, queries.size());
+
+ fut.get();
+
+ queries = qryProc.runningQueries(0);
+
+ assertEquals(0, queries.size());
+ }
+
+ /**
+ * Test collecting info about running.
+ *
+ * @throws Exception If failed.
+ */
+ public void testRunningSqlQuery() throws Exception {
+ IgniteInternalFuture<?> fut = runQueryAsync(new SqlQuery<Integer, Value>(Value.class, "id > sleep(100)"));
+
+ Thread.sleep(500);
+
+ GridQueryProcessor qryProc = grid(0).context().query();
+
+ Collection<GridRunningQueryInfo> queries = qryProc.runningQueries(0);
+
+ assertEquals(1, queries.size());
+
+ fut.get();
+
+ queries = qryProc.runningQueries(0);
+
+ assertEquals(0, queries.size());
+
+ SqlQuery<Integer, Value> qry = new SqlQuery<>(Value.class, "id > sleep(100)");
+ qry.setLocal(true);
+
+ fut = runQueryAsync(qry);
+
+ Thread.sleep(500);
+
+ queries = qryProc.runningQueries(0);
+
+ assertEquals(1, queries.size());
+
+ fut.get();
+
+ queries = qryProc.runningQueries(0);
+
+ assertEquals(0, queries.size());
+ }
+
+ /**
+ * Test collecting info about running.
+ *
+ * @throws Exception If failed.
+ */
+ public void testCancelingSqlFieldsQuery() throws Exception {
+ runQueryAsync(new SqlFieldsQuery("select * from (select _val, sleep(100) from Value limit 50)"));
+
+ Thread.sleep(500);
+
+ final GridQueryProcessor qryProc = grid(0).context().query();
+
+ Collection<GridRunningQueryInfo> queries = qryProc.runningQueries(0);
+
+ assertEquals(1, queries.size());
+
+ final Collection<GridRunningQueryInfo> finalQueries = queries;
+
+ for (GridRunningQueryInfo query : finalQueries)
+ qryProc.cancelQueries(Collections.singleton(query.id()));
+
+ int n = 100;
+
+ // Give cluster some time to cancel query and cleanup resources.
+ while (n > 0) {
+ Thread.sleep(100);
+
+ queries = qryProc.runningQueries(0);
+
+ if (queries.isEmpty())
+ break;
+
+ log.info(">>>> Wait for cancel: " + n);
+
+ n--;
}
+
+ queries = qryProc.runningQueries(0);
+
+ assertEquals(0, queries.size());
}
/**
@@ -218,9 +358,53 @@ public class CacheSqlQueryValueCopySelfTest extends GridCommonAbstractTest {
for (Cache.Entry<Integer, Value> entry : cache) {
cnt++;
- assertEquals("before", entry.getValue().str);
+ assertEquals("before-" + entry.getKey(), entry.getValue().str);
}
assertEquals(KEYS, cnt);
}
-}
\ No newline at end of file
+
+ /** */
+ private static class Value {
+ /** */
+ @QuerySqlField
+ private int id;
+
+ /** */
+ @QuerySqlField
+ private String str;
+
+ /**
+ * @param id ID.
+ * @param str String.
+ */
+ public Value(int id, String str) {
+ this.id = id;
+ this.str = str;
+ }
+ }
+
+ /**
+ * Utility class with custom SQL functions.
+ */
+ public static class TestSQLFunctions {
+ /**
+ * Sleep function to simulate long running queries.
+ *
+ * @param x Time to sleep.
+ * @return Return specified argument.
+ */
+ @QuerySqlFunction
+ public static long sleep(long x) {
+ if (x >= 0)
+ try {
+ Thread.sleep(x);
+ }
+ catch (InterruptedException ignored) {
+ // No-op.
+ }
+
+ return x;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/49237343/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
index 1f10593..01fefa3 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
@@ -477,4 +477,4 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest {
return storeId;
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/49237343/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java
index 12da5f7..52084c7 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java
@@ -106,6 +106,9 @@ public abstract class GridIndexingSpiAbstractSelfTest extends GridCommonAbstract
spi.registerCache(null, cacheCfg("B"));
}
+ /**
+ * @param name Name.
+ */
private CacheConfiguration cacheCfg(String name) {
CacheConfiguration<?,?> cfg = new CacheConfiguration<>();
@@ -114,6 +117,7 @@ public abstract class GridIndexingSpiAbstractSelfTest extends GridCommonAbstract
return cfg;
}
+ /** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
idx.stop();
@@ -182,6 +186,9 @@ public abstract class GridIndexingSpiAbstractSelfTest extends GridCommonAbstract
return idx;
}
+ /**
+ * @return {@code true} if OFF-HEAP mode should be tested.
+ */
protected boolean offheap() {
return false;
}
[18/50] [abbrv] ignite git commit: IGNITE-4685 Propagate platform
plugin configuration to Java
Posted by vo...@apache.org.
IGNITE-4685 Propagate platform plugin configuration to Java
This closes #1524
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bd988b71
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bd988b71
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bd988b71
Branch: refs/heads/ignite-4565-ddl
Commit: bd988b71d995cc509349b278b52d60c90ccaba44
Parents: 80825f7
Author: Pavel Tupitsyn <pt...@apache.org>
Authored: Wed Feb 15 15:44:25 2017 +0300
Committer: Pavel Tupitsyn <pt...@apache.org>
Committed: Wed Feb 15 15:44:25 2017 +0300
----------------------------------------------------------------------
.../utils/PlatformConfigurationUtils.java | 68 +++++++++++++++++++-
.../PlatformPluginConfigurationClosure.java | 30 +++++++++
...atformPluginConfigurationClosureFactory.java | 37 +++++++++++
...rm.PlatformPluginConfigurationClosureFactory | 1 +
.../plugin/PlatformTestPluginConfiguration.java | 63 ++++++++++++++++++
...rmTestPluginConfigurationClosureFactory.java | 61 ++++++++++++++++++
.../plugin/PlatformTestPluginExtension.java | 2 +-
.../plugin/PlatformTestPluginProvider.java | 8 +--
.../plugin/PlatformTestPluginTarget.java | 30 +++++++++
.../Plugin/PluginTest.cs | 47 ++++++++++++--
.../Plugin/TestIgnitePluginConfiguration.cs | 20 ++++++
.../Apache.Ignite.Core/IgniteConfiguration.cs | 28 ++++++++
.../IgniteConfigurationSection.xsd | 5 ++
.../Common/IgniteConfigurationXmlSerializer.cs | 7 ++
.../Plugin/IPluginConfiguration.cs | 15 ++++-
15 files changed, 406 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/bd988b71/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
index ea8f361..f295ff5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
@@ -17,6 +17,7 @@
package org.apache.ignite.internal.processors.platform.utils;
+import org.apache.ignite.IgniteException;
import org.apache.ignite.binary.BinaryArrayIdentityResolver;
import org.apache.ignite.binary.BinaryFieldIdentityResolver;
import org.apache.ignite.binary.BinaryIdentityResolver;
@@ -44,12 +45,19 @@ import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.configuration.NearCacheConfiguration;
import org.apache.ignite.configuration.TransactionConfiguration;
-import org.apache.ignite.internal.binary.*;
+import org.apache.ignite.internal.binary.BinaryRawReaderEx;
+import org.apache.ignite.internal.binary.BinaryRawWriterEx;
import org.apache.ignite.internal.processors.platform.cache.affinity.PlatformAffinityFunction;
import org.apache.ignite.internal.processors.platform.cache.expiry.PlatformExpiryPolicyFactory;
import org.apache.ignite.internal.processors.platform.plugin.cache.PlatformCachePluginConfiguration;
-import org.apache.ignite.platform.dotnet.*;
+import org.apache.ignite.platform.dotnet.PlatformDotNetAffinityFunction;
+import org.apache.ignite.platform.dotnet.PlatformDotNetBinaryConfiguration;
+import org.apache.ignite.platform.dotnet.PlatformDotNetBinaryTypeConfiguration;
+import org.apache.ignite.platform.dotnet.PlatformDotNetCacheStoreFactoryNative;
+import org.apache.ignite.platform.dotnet.PlatformDotNetConfiguration;
import org.apache.ignite.plugin.CachePluginConfiguration;
+import org.apache.ignite.plugin.platform.PlatformPluginConfigurationClosure;
+import org.apache.ignite.plugin.platform.PlatformPluginConfigurationClosureFactory;
import org.apache.ignite.spi.communication.CommunicationSpi;
import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpiMBean;
@@ -68,14 +76,17 @@ import javax.cache.configuration.Factory;
import javax.cache.expiry.ExpiryPolicy;
import java.lang.management.ManagementFactory;
import java.net.InetSocketAddress;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.ServiceLoader;
import java.util.Set;
-import java.util.HashSet;
/**
* Configuration utils.
@@ -647,6 +658,8 @@ public class PlatformConfigurationUtils {
default:
assert swapType == SWAP_TYP_NONE;
}
+
+ readPluginConfiguration(cfg, in);
}
/**
@@ -1263,6 +1276,55 @@ public class PlatformConfigurationUtils {
}
/**
+ * Reads the plugin configuration.
+ *
+ * @param cfg Ignite configuration to update.
+ * @param in Reader.
+ */
+ private static void readPluginConfiguration(IgniteConfiguration cfg, BinaryRawReader in) {
+ int cnt = in.readInt();
+
+ if (cnt == 0)
+ return;
+
+ for (int i = 0; i < cnt; i++) {
+ int plugCfgFactoryId = in.readInt();
+
+ PlatformPluginConfigurationClosure plugCfg = pluginConfiguration(plugCfgFactoryId);
+
+ plugCfg.apply(cfg, in);
+ }
+ }
+
+ /**
+ * Create PlatformPluginConfigurationClosure for the given factory ID.
+ *
+ * @param factoryId Factory ID.
+ * @return PlatformPluginConfigurationClosure.
+ */
+ private static PlatformPluginConfigurationClosure pluginConfiguration(final int factoryId) {
+ PlatformPluginConfigurationClosureFactory factory = AccessController.doPrivileged(
+ new PrivilegedAction<PlatformPluginConfigurationClosureFactory>() {
+ @Override public PlatformPluginConfigurationClosureFactory run() {
+ for (PlatformPluginConfigurationClosureFactory factory :
+ ServiceLoader.load(PlatformPluginConfigurationClosureFactory.class)) {
+ if (factory.id() == factoryId)
+ return factory;
+ }
+
+ return null;
+ }
+ });
+
+ if (factory == null) {
+ throw new IgniteException("PlatformPluginConfigurationClosureFactory is not found " +
+ "(did you put into the classpath?): " + factoryId);
+ }
+
+ return factory.create();
+ }
+
+ /**
* Private constructor.
*/
private PlatformConfigurationUtils() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/bd988b71/modules/core/src/main/java/org/apache/ignite/plugin/platform/PlatformPluginConfigurationClosure.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/platform/PlatformPluginConfigurationClosure.java b/modules/core/src/main/java/org/apache/ignite/plugin/platform/PlatformPluginConfigurationClosure.java
new file mode 100644
index 0000000..33770d9
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/platform/PlatformPluginConfigurationClosure.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.plugin.platform;
+
+import org.apache.ignite.binary.BinaryRawReader;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.lang.IgniteBiInClosure;
+
+/**
+ * Platform configuration handler:
+ * updates plugin configuration using data sent from platform code.
+ */
+public interface PlatformPluginConfigurationClosure extends IgniteBiInClosure<IgniteConfiguration, BinaryRawReader> {
+ // No-op.
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/bd988b71/modules/core/src/main/java/org/apache/ignite/plugin/platform/PlatformPluginConfigurationClosureFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/platform/PlatformPluginConfigurationClosureFactory.java b/modules/core/src/main/java/org/apache/ignite/plugin/platform/PlatformPluginConfigurationClosureFactory.java
new file mode 100644
index 0000000..7ec5adc
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/platform/PlatformPluginConfigurationClosureFactory.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.plugin.platform;
+
+/**
+ * Factory for @{@link PlatformPluginConfigurationClosure} with a unique id.
+ */
+public interface PlatformPluginConfigurationClosureFactory {
+ /**
+ * Gets the factory id.
+ *
+ * @return Factory id.
+ */
+ int id();
+
+ /**
+ * Creates configuration instance.
+ *
+ * @return Configuration instance.
+ */
+ PlatformPluginConfigurationClosure create();
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/bd988b71/modules/core/src/test/java/META-INF/services/org.apache.ignite.plugin.platform.PlatformPluginConfigurationClosureFactory
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/META-INF/services/org.apache.ignite.plugin.platform.PlatformPluginConfigurationClosureFactory b/modules/core/src/test/java/META-INF/services/org.apache.ignite.plugin.platform.PlatformPluginConfigurationClosureFactory
new file mode 100644
index 0000000..ef79fbe
--- /dev/null
+++ b/modules/core/src/test/java/META-INF/services/org.apache.ignite.plugin.platform.PlatformPluginConfigurationClosureFactory
@@ -0,0 +1 @@
+org.apache.ignite.platform.plugin.PlatformTestPluginConfigurationClosureFactory
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/bd988b71/modules/core/src/test/java/org/apache/ignite/platform/plugin/PlatformTestPluginConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/platform/plugin/PlatformTestPluginConfiguration.java b/modules/core/src/test/java/org/apache/ignite/platform/plugin/PlatformTestPluginConfiguration.java
new file mode 100644
index 0000000..b7fb36d
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/platform/plugin/PlatformTestPluginConfiguration.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.platform.plugin;
+
+import org.apache.ignite.binary.BinaryRawReader;
+import org.apache.ignite.plugin.PluginConfiguration;
+
+/**
+ * Test plugin configuration.
+ */
+public class PlatformTestPluginConfiguration implements PluginConfiguration {
+ /** */
+ private String pluginProperty;
+
+ /**
+ * Initializes a new instance of PlatformTestPluginConfiguration.
+ */
+ public PlatformTestPluginConfiguration() {
+ // No-op.
+ }
+
+ /**
+ * Initializes a new instance of PlatformTestPluginConfiguration.
+ *
+ * @param reader Reader.
+ */
+ public PlatformTestPluginConfiguration(BinaryRawReader reader) {
+ pluginProperty = reader.readString();
+ }
+
+ /**
+ * Gets the plugin property.
+ *
+ * @return Plugin property.
+ */
+ public String pluginProperty() {
+ return pluginProperty;
+ }
+
+ /**
+ * Sets the plugin property.
+ *
+ * @param pluginProperty Value.
+ */
+ public void setPluginProperty(String pluginProperty) {
+ this.pluginProperty = pluginProperty;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/bd988b71/modules/core/src/test/java/org/apache/ignite/platform/plugin/PlatformTestPluginConfigurationClosureFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/platform/plugin/PlatformTestPluginConfigurationClosureFactory.java b/modules/core/src/test/java/org/apache/ignite/platform/plugin/PlatformTestPluginConfigurationClosureFactory.java
new file mode 100644
index 0000000..e851384
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/platform/plugin/PlatformTestPluginConfigurationClosureFactory.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.platform.plugin;
+
+import org.apache.ignite.binary.BinaryRawReader;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.plugin.PluginConfiguration;
+import org.apache.ignite.plugin.platform.PlatformPluginConfigurationClosure;
+import org.apache.ignite.plugin.platform.PlatformPluginConfigurationClosureFactory;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.Collections;
+
+/**
+ * Test config factory.
+ */
+public class PlatformTestPluginConfigurationClosureFactory implements PlatformPluginConfigurationClosureFactory,
+ PlatformPluginConfigurationClosure {
+ /** {@inheritDoc} */
+ @Override public int id() {
+ return 0;
+ }
+
+ /** {@inheritDoc} */
+ @Override public PlatformPluginConfigurationClosure create() {
+ return this;
+ }
+
+ /** {@inheritDoc} */
+ @Override public void apply(@NotNull IgniteConfiguration cfg, @NotNull BinaryRawReader reader) {
+ ArrayList<PluginConfiguration> cfgs = new ArrayList<>();
+
+ if (cfg.getPluginConfigurations() != null) {
+ Collections.addAll(cfgs, cfg.getPluginConfigurations());
+ }
+
+ PlatformTestPluginConfiguration plugCfg = new PlatformTestPluginConfiguration();
+
+ plugCfg.setPluginProperty(reader.readString());
+
+ cfgs.add(plugCfg);
+
+ cfg.setPluginConfigurations(cfgs.toArray(new PluginConfiguration[cfgs.size()]));
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/bd988b71/modules/core/src/test/java/org/apache/ignite/platform/plugin/PlatformTestPluginExtension.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/platform/plugin/PlatformTestPluginExtension.java b/modules/core/src/test/java/org/apache/ignite/platform/plugin/PlatformTestPluginExtension.java
index 18d1595..597e9bc 100644
--- a/modules/core/src/test/java/org/apache/ignite/platform/plugin/PlatformTestPluginExtension.java
+++ b/modules/core/src/test/java/org/apache/ignite/platform/plugin/PlatformTestPluginExtension.java
@@ -46,6 +46,6 @@ public class PlatformTestPluginExtension implements PlatformPluginExtension {
/** {@inheritDoc} */
@Override public PlatformTarget createTarget() {
- return new PlatformTestPluginTarget(ignite.context().platform().context(), "");
+ return new PlatformTestPluginTarget(ignite.context().platform().context(), null);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/bd988b71/modules/core/src/test/java/org/apache/ignite/platform/plugin/PlatformTestPluginProvider.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/platform/plugin/PlatformTestPluginProvider.java b/modules/core/src/test/java/org/apache/ignite/platform/plugin/PlatformTestPluginProvider.java
index 298fa20..c8de1a3 100644
--- a/modules/core/src/test/java/org/apache/ignite/platform/plugin/PlatformTestPluginProvider.java
+++ b/modules/core/src/test/java/org/apache/ignite/platform/plugin/PlatformTestPluginProvider.java
@@ -30,7 +30,7 @@ import java.util.UUID;
/**
* Plugin provider for platform tests.
*/
-public class PlatformTestPluginProvider implements PluginProvider {
+public class PlatformTestPluginProvider implements PluginProvider<PlatformTestPluginConfiguration> {
/** {@inheritDoc} */
@Override public String name() {
return "TestPlatformPlugin";
@@ -86,12 +86,12 @@ public class PlatformTestPluginProvider implements PluginProvider {
}
/** {@inheritDoc} */
- @Nullable @Override public Object createComponent(PluginContext ctx, Class cls) {
+ @Nullable @Override public <T> T createComponent(PluginContext ctx, Class<T> cls) {
return null;
}
/** {@inheritDoc} */
- @Override public IgnitePlugin plugin() {
- return new PlatformTestPlugin();
+ @Override public <T extends IgnitePlugin> T plugin() {
+ return (T)new PlatformTestPlugin();
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/bd988b71/modules/core/src/test/java/org/apache/ignite/platform/plugin/PlatformTestPluginTarget.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/platform/plugin/PlatformTestPluginTarget.java b/modules/core/src/test/java/org/apache/ignite/platform/plugin/PlatformTestPluginTarget.java
index 42d8739..b893395 100644
--- a/modules/core/src/test/java/org/apache/ignite/platform/plugin/PlatformTestPluginTarget.java
+++ b/modules/core/src/test/java/org/apache/ignite/platform/plugin/PlatformTestPluginTarget.java
@@ -18,11 +18,13 @@
package org.apache.ignite.platform.plugin;
import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.binary.BinaryRawReaderEx;
import org.apache.ignite.internal.binary.BinaryRawWriterEx;
import org.apache.ignite.internal.processors.platform.PlatformAbstractTarget;
import org.apache.ignite.internal.processors.platform.PlatformContext;
import org.apache.ignite.internal.processors.platform.PlatformTarget;
+import org.apache.ignite.plugin.PluginConfiguration;
import org.jetbrains.annotations.Nullable;
/**
@@ -40,6 +42,15 @@ class PlatformTestPluginTarget extends PlatformAbstractTarget {
PlatformTestPluginTarget(PlatformContext platformCtx, String name) {
super(platformCtx);
+ if (name == null) {
+ // Initialize from configuration.
+ PlatformTestPluginConfiguration cfg = configuration(platformCtx.kernalContext().config());
+
+ assert cfg != null;
+
+ name = cfg.pluginProperty();
+ }
+
this.name = name;
}
@@ -87,4 +98,23 @@ class PlatformTestPluginTarget extends PlatformAbstractTarget {
@Override public PlatformTarget processOutObject(int type) throws IgniteCheckedException {
return new PlatformTestPluginTarget(platformCtx, name);
}
+
+ /**
+ * Gets the plugin config.
+ *
+ * @param igniteCfg Ignite config.
+ *
+ * @return Plugin config.
+ */
+ private PlatformTestPluginConfiguration configuration(IgniteConfiguration igniteCfg) {
+ if (igniteCfg.getPluginConfigurations() != null) {
+ for (PluginConfiguration pluginCfg : igniteCfg.getPluginConfigurations()) {
+ if (pluginCfg instanceof PlatformTestPluginConfiguration) {
+ return (PlatformTestPluginConfiguration) pluginCfg;
+ }
+ }
+ }
+
+ return null;
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/bd988b71/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/PluginTest.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/PluginTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/PluginTest.cs
index 25efce0..6fca03a 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/PluginTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/PluginTest.cs
@@ -20,6 +20,7 @@ namespace Apache.Ignite.Core.Tests.Plugin
using System;
using System.Collections.Generic;
using System.IO;
+ using Apache.Ignite.Core.Binary;
using Apache.Ignite.Core.Common;
using Apache.Ignite.Core.Interop;
using Apache.Ignite.Core.Plugin;
@@ -72,7 +73,7 @@ namespace Apache.Ignite.Core.Tests.Plugin
var extension = plugin.Provider.Context.GetExtension(0);
Assert.IsNotNull(extension);
- CheckPluginTarget(extension);
+ CheckPluginTarget(extension, "barbaz");
}
Assert.AreEqual(true, plugin.Provider.Stopped);
@@ -82,10 +83,10 @@ namespace Apache.Ignite.Core.Tests.Plugin
/// <summary>
/// Checks the plugin target operations.
/// </summary>
- private static void CheckPluginTarget(IPlatformTarget target)
+ private static void CheckPluginTarget(IPlatformTarget target, string expectedName)
{
// Returns name.
- Assert.AreEqual(string.Empty, target.OutStream(1, r => r.ReadString()));
+ Assert.AreEqual(expectedName, target.OutStream(1, r => r.ReadString()));
// Increments arg by one.
Assert.AreEqual(3, target.InLongOutLong(1, 2));
@@ -164,13 +165,29 @@ namespace Apache.Ignite.Core.Tests.Plugin
private class NoAttributeConfig : IPluginConfiguration
{
- // No-op.
+ public int? PluginConfigurationClosureFactoryId
+ {
+ get { return null; }
+ }
+
+ public void WriteBinary(IBinaryRawWriter writer)
+ {
+ throw new NotImplementedException();
+ }
}
[PluginProviderType(typeof(EmptyNamePluginProvider))]
private class EmptyNameConfig : IPluginConfiguration
{
- // No-op.
+ public int? PluginConfigurationClosureFactoryId
+ {
+ get { return null; }
+ }
+
+ public void WriteBinary(IBinaryRawWriter writer)
+ {
+ throw new NotImplementedException();
+ }
}
private class EmptyNamePluginProvider : IPluginProvider<EmptyNameConfig>
@@ -187,7 +204,15 @@ namespace Apache.Ignite.Core.Tests.Plugin
[PluginProviderType(typeof(ExceptionPluginProvider))]
private class ExceptionConfig : IPluginConfiguration
{
- // No-op.
+ public int? PluginConfigurationClosureFactoryId
+ {
+ get { return null; }
+ }
+
+ public void WriteBinary(IBinaryRawWriter writer)
+ {
+ throw new NotImplementedException();
+ }
}
private class ExceptionPluginProvider : IPluginProvider<ExceptionConfig>
@@ -221,7 +246,15 @@ namespace Apache.Ignite.Core.Tests.Plugin
[PluginProviderType(typeof(NormalPluginProvider))]
private class NormalConfig : IPluginConfiguration
{
- // No-op.
+ public int? PluginConfigurationClosureFactoryId
+ {
+ get { return null; }
+ }
+
+ public void WriteBinary(IBinaryRawWriter writer)
+ {
+ throw new NotImplementedException();
+ }
}
private class NormalPluginProvider : IPluginProvider<NormalConfig>
http://git-wip-us.apache.org/repos/asf/ignite/blob/bd988b71/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/TestIgnitePluginConfiguration.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/TestIgnitePluginConfiguration.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/TestIgnitePluginConfiguration.cs
index 4856ccb..fdf4a73 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/TestIgnitePluginConfiguration.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/TestIgnitePluginConfiguration.cs
@@ -17,6 +17,7 @@
namespace Apache.Ignite.Core.Tests.Plugin
{
+ using Apache.Ignite.Core.Binary;
using Apache.Ignite.Core.Plugin;
/// <summary>
@@ -29,5 +30,24 @@
/// Custom plugin property.
/// </summary>
public string PluginProperty { get; set; }
+
+ /** <inheritdoc /> */
+ public int? PluginConfigurationClosureFactoryId
+ {
+ get { return 0; }
+ // ReSharper disable once ValueParameterNotUsed
+ // ReSharper disable once UnusedMember.Global
+ set
+ {
+ // No-op.
+ // Needed to test configuration serialization.
+ }
+ }
+
+ /** <inheritdoc /> */
+ public void WriteBinary(IBinaryRawWriter writer)
+ {
+ writer.WriteString(PluginProperty);
+ }
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/bd988b71/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfiguration.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfiguration.cs b/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfiguration.cs
index 0676608..563eea0 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfiguration.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfiguration.cs
@@ -336,6 +336,34 @@
// Swap space
SwapSpaceSerializer.Write(writer, SwapSpaceSpi);
+
+ // Plugins
+ if (PluginConfigurations != null)
+ {
+ var pos = writer.Stream.Position;
+
+ writer.WriteInt(0); // reserve count
+
+ var cnt = 0;
+
+ foreach (var cfg in PluginConfigurations)
+ {
+ if (cfg.PluginConfigurationClosureFactoryId != null)
+ {
+ writer.WriteInt(cfg.PluginConfigurationClosureFactoryId.Value);
+
+ cfg.WriteBinary(writer);
+
+ cnt++;
+ }
+ }
+
+ writer.Stream.WriteInt(pos, cnt);
+ }
+ else
+ {
+ writer.WriteInt(0);
+ }
}
/// <summary>
http://git-wip-us.apache.org/repos/asf/ignite/blob/bd988b71/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd b/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd
index 2962951..5a49790 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd
@@ -1217,6 +1217,11 @@
<xs:documentation>Assembly-qualified type name.</xs:documentation>
</xs:annotation>
</xs:attribute>
+ <xs:attribute name="pluginConfigurationClosureFactoryId" type="xs:int">
+ <xs:annotation>
+ <xs:documentation>Id to locate PlatformPluginConfigurationClosureFactory on Java side.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
</xs:complexType>
</xs:element>
</xs:sequence>
http://git-wip-us.apache.org/repos/asf/ignite/blob/bd988b71/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Common/IgniteConfigurationXmlSerializer.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Common/IgniteConfigurationXmlSerializer.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Common/IgniteConfigurationXmlSerializer.cs
index 7ca654f..a87ff18 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Common/IgniteConfigurationXmlSerializer.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Common/IgniteConfigurationXmlSerializer.cs
@@ -344,6 +344,13 @@ namespace Apache.Ignite.Core.Impl.Common
var type = target.GetType();
var property = GetPropertyOrThrow(propName, propVal, type);
+ if (!property.CanWrite)
+ {
+ throw new ConfigurationErrorsException(string.Format(
+ "Invalid IgniteConfiguration attribute '{0}={1}', property '{2}.{3}' is not writeable",
+ propName, propVal, type, property.Name));
+ }
+
var converter = GetConverter(property, property.PropertyType);
var convertedVal = converter.ConvertFromInvariantString(propVal);
http://git-wip-us.apache.org/repos/asf/ignite/blob/bd988b71/modules/platforms/dotnet/Apache.Ignite.Core/Plugin/IPluginConfiguration.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Plugin/IPluginConfiguration.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Plugin/IPluginConfiguration.cs
index 09f3f4a..4d594f4 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Plugin/IPluginConfiguration.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Plugin/IPluginConfiguration.cs
@@ -18,6 +18,7 @@
namespace Apache.Ignite.Core.Plugin
{
using System.Diagnostics.CodeAnalysis;
+ using Apache.Ignite.Core.Binary;
/// <summary>
/// Plugin configuration marker interface.
@@ -43,6 +44,18 @@ namespace Apache.Ignite.Core.Plugin
[SuppressMessage("Microsoft.Design", "CA1040:AvoidEmptyInterfaces")]
public interface IPluginConfiguration
{
- // No-op.
+ /// <summary>
+ /// Gets the id to locate PlatformPluginConfigurationClosureFactory on Java side
+ /// and read the data written by <see cref="WriteBinary"/> method.
+ /// </summary>
+ int? PluginConfigurationClosureFactoryId { get; }
+
+ /// <summary>
+ /// Writes this instance to a raw writer.
+ /// This method will be called when <see cref="PluginConfigurationClosureFactoryId"/> is not null to propagate
+ /// configuration to the Java side.
+ /// </summary>
+ /// <param name="writer">The writer.</param>
+ void WriteBinary(IBinaryRawWriter writer);
}
}
\ No newline at end of file
[05/50] [abbrv] ignite git commit: Pinned dependencies versions
Posted by vo...@apache.org.
Pinned dependencies versions
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0bdcfb02
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0bdcfb02
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0bdcfb02
Branch: refs/heads/ignite-4565-ddl
Commit: 0bdcfb022b6755b082d7f0240934c83a07f0bf50
Parents: 37c0a22
Author: Andrey Novikov <an...@gridgain.com>
Authored: Tue Feb 14 11:16:23 2017 +0700
Committer: Andrey Novikov <an...@gridgain.com>
Committed: Tue Feb 14 11:16:23 2017 +0700
----------------------------------------------------------------------
modules/web-console/frontend/package.json | 182 ++++++++++++-------------
1 file changed, 91 insertions(+), 91 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bdcfb02/modules/web-console/frontend/package.json
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/package.json b/modules/web-console/frontend/package.json
index 651f496..0fde6d4 100644
--- a/modules/web-console/frontend/package.json
+++ b/modules/web-console/frontend/package.json
@@ -29,100 +29,100 @@
"win32"
],
"dependencies": {
- "angular": "~1.5.9",
- "angular-acl": "~0.1.7",
- "angular-animate": "~1.5.9",
- "angular-aria": "~1.5.9",
- "angular-cookies": "~1.5.9",
- "angular-drag-and-drop-lists": "~1.4.0",
- "angular-gridster": "~0.13.3",
- "angular-motion": "~0.4.4",
- "angular-nvd3": "~1.0.9",
- "angular-retina": "~0.3.13",
- "angular-sanitize": "~1.5.9",
- "angular-smart-table": "~2.1.8",
- "angular-socket-io": "~0.7.0",
- "angular-strap": "~2.3.8",
- "angular-touch": "~1.5.9",
- "angular-translate": "~2.13.1",
- "angular-tree-control": "~0.2.26",
- "angular-ui-grid": "~4.0.0",
- "angular-ui-router": "~0.3.1",
- "bootstrap-sass": "~3.3.6",
- "brace": "~0.8.0",
- "es6-promise": "~3.3.1",
- "file-saver": "~1.3.2",
- "font-awesome": "~4.7.0",
- "glob": "~7.1.1",
- "jquery": "~3.1.1",
- "jszip": "~3.1.3",
- "lodash": "~4.17.2",
+ "angular": "1.5.11",
+ "angular-acl": "0.1.7",
+ "angular-animate": "1.5.11",
+ "angular-aria": "1.5.11",
+ "angular-cookies": "1.5.11",
+ "angular-drag-and-drop-lists": "1.4.0",
+ "angular-gridster": "0.13.4",
+ "angular-motion": "0.4.4",
+ "angular-nvd3": "1.0.9",
+ "angular-retina": "0.4.0",
+ "angular-sanitize": "1.5.11",
+ "angular-smart-table": "2.1.8",
+ "angular-socket-io": "0.7.0",
+ "angular-strap": "2.3.12",
+ "angular-touch": "1.5.11",
+ "angular-translate": "2.14.0",
+ "angular-tree-control": "0.2.28",
+ "angular-ui-grid": "4.0.2",
+ "angular-ui-router": "0.4.2",
+ "bootstrap-sass": "3.3.7",
+ "brace": "0.8.0",
+ "es6-promise": "3.3.1",
+ "file-saver": "1.3.3",
+ "font-awesome": "4.7.0",
+ "glob": "7.1.1",
+ "jquery": "3.1.1",
+ "jszip": "3.1.3",
+ "lodash": "4.17.4",
"nvd3": "1.8.4",
- "raleway-webfont": "~3.0.1",
- "roboto-font": "~0.1.0",
- "socket.io-client": "~1.7.2",
- "ui-router-metatags": "~1.0.3"
+ "raleway-webfont": "3.0.1",
+ "roboto-font": "0.1.0",
+ "socket.io-client": "1.7.2",
+ "ui-router-metatags": "1.0.3"
},
"devDependencies": {
- "assets-webpack-plugin": "~3.5.0",
- "autoprefixer-core": "~6.0.1",
- "babel-core": "~6.20.0",
- "babel-eslint": "~7.0.0",
- "babel-loader": "~6.2.4",
- "babel-plugin-add-module-exports": "~0.2.1",
- "babel-plugin-transform-builtin-extend": "~1.1.0",
- "babel-plugin-transform-runtime": "~6.15.0",
- "babel-polyfill": "~6.20.0",
- "babel-preset-angular": "~6.0.15",
- "babel-preset-es2015": "~6.18.0",
- "babel-runtime": "~6.20.0",
- "chai": "~3.5.0",
- "cross-env": "~1.0.7",
- "css-loader": "~0.23.0",
- "eslint": "~3.12.2",
- "eslint-friendly-formatter": "~2.0.5",
- "eslint-loader": "~1.6.1",
- "expose-loader": "~0.7.1",
- "extract-text-webpack-plugin": "~1.0.1",
- "file-loader": "~0.9.0",
- "gulp": "~3.9.1",
- "gulp-eslint": "~3.0.0",
- "gulp-inject": "~4.1.0",
- "gulp-jade": "~1.1.0",
- "gulp-ll": "~1.0.4",
- "gulp-rimraf": "~0.2.0",
- "gulp-sequence": "~0.4.1",
- "gulp-util": "~3.0.7",
- "html-loader": "~0.4.3",
- "html-webpack-plugin": "~2.24.1",
- "jade": "~1.11.0",
+ "assets-webpack-plugin": "3.5.1",
+ "autoprefixer-core": "6.0.1",
+ "babel-core": "6.23.1",
+ "babel-eslint": "7.1.1",
+ "babel-loader": "6.2.10",
+ "babel-plugin-add-module-exports": "0.2.1",
+ "babel-plugin-transform-builtin-extend": "1.1.2",
+ "babel-plugin-transform-runtime": "6.23.0",
+ "babel-polyfill": "6.23.0",
+ "babel-preset-angular": "6.0.15",
+ "babel-preset-es2015": "6.22.0",
+ "babel-runtime": "6.22.0",
+ "chai": "3.5.0",
+ "cross-env": "1.0.8",
+ "css-loader": "0.26.1",
+ "eslint": "3.12.2",
+ "eslint-friendly-formatter": "2.0.7",
+ "eslint-loader": "1.6.1",
+ "expose-loader": "0.7.1",
+ "extract-text-webpack-plugin": "1.0.1",
+ "file-loader": "0.9.0",
+ "gulp": "3.9.1",
+ "gulp-eslint": "3.0.1",
+ "gulp-inject": "4.1.0",
+ "gulp-jade": "1.1.0",
+ "gulp-ll": "1.0.4",
+ "gulp-rimraf": "0.2.1",
+ "gulp-sequence": "0.4.6",
+ "gulp-util": "3.0.8",
+ "html-loader": "0.4.4",
+ "html-webpack-plugin": "2.24.1",
+ "jade": "1.11.0",
"jade-html-loader": "git://github.com/courcelan/jade-html-loader",
- "jasmine-core": "~2.5.2",
- "json-loader": "~0.5.4",
- "karma": "~0.13.22",
- "karma-babel-preprocessor": "~6.0.1",
- "karma-jasmine": "~1.1.0",
- "karma-mocha": "~1.3.0",
- "karma-mocha-reporter": "~2.2.0",
- "karma-phantomjs-launcher": "~1.0.0",
- "karma-teamcity-reporter": "~1.0.0",
- "karma-webpack": "~1.8.0",
- "mocha": "~2.5.3",
- "mocha-teamcity-reporter": "~1.1.1",
- "morgan": "~1.7.0",
- "ngtemplate-loader": "~1.3.1",
- "node-sass": "~3.13.1",
- "phantomjs-prebuilt": "~2.1.7",
- "postcss-loader": "~0.9.1",
- "progress-bar-webpack-plugin": "~1.9.0",
- "require-dir": "~0.3.0",
- "resolve-url-loader": "~1.6.1",
- "sass-loader": "~3.1.1",
- "style-loader": "~0.13.1",
- "url": "~0.11.0",
- "url-loader": "~0.5.6",
- "webpack": "~1.14.0",
- "webpack-dev-server": "~1.16.2",
- "worker-loader": "~0.7.1"
+ "jasmine-core": "2.5.2",
+ "json-loader": "0.5.4",
+ "karma": "0.13.22",
+ "karma-babel-preprocessor": "6.0.1",
+ "karma-jasmine": "1.1.0",
+ "karma-mocha": "1.3.0",
+ "karma-mocha-reporter": "2.2.2",
+ "karma-phantomjs-launcher": "1.0.2",
+ "karma-teamcity-reporter": "1.0.0",
+ "karma-webpack": "1.8.1",
+ "mocha": "2.5.3",
+ "mocha-teamcity-reporter": "1.1.1",
+ "morgan": "1.7.0",
+ "ngtemplate-loader": "1.3.1",
+ "node-sass": "3.13.1",
+ "phantomjs-prebuilt": "2.1.14",
+ "postcss-loader": "0.9.1",
+ "progress-bar-webpack-plugin": "1.9.3",
+ "require-dir": "0.3.1",
+ "resolve-url-loader": "1.6.1",
+ "sass-loader": "3.2.2",
+ "style-loader": "0.13.1",
+ "url": "0.11.0",
+ "url-loader": "0.5.7",
+ "webpack": "1.14.0",
+ "webpack-dev-server": "1.16.3",
+ "worker-loader": "0.7.1"
}
}
[30/50] [abbrv] ignite git commit: ignite-4710 More information in
IgniteTxOptimisticCheckedException message.
Posted by vo...@apache.org.
ignite-4710 More information in IgniteTxOptimisticCheckedException message.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7f744581
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7f744581
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7f744581
Branch: refs/heads/ignite-4565-ddl
Commit: 7f74458148268af5bd721fd308b66b57e9a3852b
Parents: d3ccaf6
Author: sboikov <sb...@gridgain.com>
Authored: Thu Feb 16 18:34:02 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Feb 16 18:34:02 2017 +0300
----------------------------------------------------------------------
.../distributed/dht/GridDhtTxPrepareFuture.java | 35 ++++++++++++++++++--
1 file changed, 32 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7f744581/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
index eadb69e..1227ba9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
@@ -1141,11 +1141,40 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
* @return Optimistic version check error.
*/
private IgniteTxOptimisticCheckedException versionCheckError(IgniteTxEntry entry) {
+ StringBuilder msg = new StringBuilder("Failed to prepare transaction, read/write conflict [");
+
GridCacheContext cctx = entry.context();
- return new IgniteTxOptimisticCheckedException("Failed to prepare transaction, " +
- "read/write conflict [key=" + entry.key().value(cctx.cacheObjectContext(), false) +
- ", cache=" + cctx.name() + ']');
+ try {
+ Object key = cctx.unwrapBinaryIfNeeded(entry.key(), entry.keepBinary(), false);
+
+ assert key != null : entry.key();
+
+ msg.append("key=").append(key.toString()).append(", keyCls=").append(key.getClass().getName());
+ }
+ catch (Exception e) {
+ msg.append("key=<failed to get key: ").append(e.toString()).append(">");
+ }
+
+ try {
+ GridCacheEntryEx entryEx = entry.cached();
+
+ CacheObject cacheVal = entryEx != null ? entryEx.rawGet() : null;
+
+ Object val = cacheVal != null ? cctx.unwrapBinaryIfNeeded(cacheVal, entry.keepBinary(), false) : null;
+
+ if (val != null)
+ msg.append(", val=").append(val.toString()).append(", valCls=").append(val.getClass().getName());
+ else
+ msg.append(", val=null");
+ }
+ catch (Exception e) {
+ msg.append(", val=<failed to get value: ").append(e.toString()).append(">");
+ }
+
+ msg.append(", cache=").append(cctx.name()).append(", thread=").append(Thread.currentThread()).append("]");
+
+ return new IgniteTxOptimisticCheckedException(msg.toString());
}
/**
[10/50] [abbrv] ignite git commit: IGNITE-4663: BinaryMarshaller:
class is no longer required when object is unmarshalled to BinaryObject w/o
deserialization. This closes #1507.
Posted by vo...@apache.org.
IGNITE-4663: BinaryMarshaller: class is no longer required when object is unmarshalled to BinaryObject w/o deserialization. This closes #1507.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/85b08c5a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/85b08c5a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/85b08c5a
Branch: refs/heads/ignite-4565-ddl
Commit: 85b08c5a546d79535cb9178677832ff8233034fd
Parents: 7d3c046
Author: tledkov-gridgain <tl...@gridgain.com>
Authored: Tue Feb 14 16:18:45 2017 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Tue Feb 14 16:18:45 2017 +0300
----------------------------------------------------------------------
.../ignite/internal/binary/BinaryUtils.java | 39 ++++++++++++++++++--
1 file changed, 36 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/85b08c5a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
index 2b55b6c..78bc31a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
@@ -1474,12 +1474,37 @@ public class BinaryUtils {
}
/**
- * @return Value.
+ * @param in Binary input stream.
+ * @param ctx Binary context.
+ * @param ldr Class loader.
+ * @return Class object specified at the input stream.
+ * @throws BinaryObjectException If failed.
*/
public static Class doReadClass(BinaryInputStream in, BinaryContext ctx, ClassLoader ldr)
throws BinaryObjectException {
+ return doReadClass(in, ctx, ldr, true);
+ }
+
+ /**
+ * @param in Binary input stream.
+ * @param ctx Binary context.
+ * @param ldr Class loader.
+ * @param deserialize Doesn't load the class when the flag is {@code false}. Class information is skipped.
+ * @return Class object specified at the input stream if {@code deserialize == true}. Otherwise returns {@code null}
+ * @throws BinaryObjectException If failed.
+ */
+ public static Class doReadClass(BinaryInputStream in, BinaryContext ctx, ClassLoader ldr, boolean deserialize)
+ throws BinaryObjectException {
int typeId = in.readInt();
+ if (!deserialize) {
+ // Skip class name at the stream.
+ if (typeId == GridBinaryMarshaller.UNREGISTERED_TYPE_ID)
+ doReadClassName(in);
+
+ return null;
+ }
+
return doReadClass(in, ctx, ldr, typeId);
}
@@ -1531,8 +1556,12 @@ public class BinaryUtils {
}
/**
+ * @param in Binary input stream.
+ * @param ctx Binary context.
+ * @param ldr Class loader.
* @param typeId Type id.
- * @return Value.
+ * @return Class object specified at the input stream.
+ * @throws BinaryObjectException If failed.
*/
public static Class doReadClass(BinaryInputStream in, BinaryContext ctx, ClassLoader ldr, int typeId)
throws BinaryObjectException {
@@ -1896,6 +1925,10 @@ public class BinaryUtils {
}
/**
+ * @param in Binary input stream.
+ * @param ctx Binary context.
+ * @param ldr Class loader.
+ * @param handles Holder for handles.
* @param deserialize Deep flag.
* @return Value.
* @throws BinaryObjectException In case of error.
@@ -1904,7 +1937,7 @@ public class BinaryUtils {
BinaryReaderHandlesHolder handles, boolean deserialize) throws BinaryObjectException {
int hPos = positionForHandle(in);
- Class compType = doReadClass(in, ctx, ldr);
+ Class compType = doReadClass(in, ctx, ldr, deserialize);
int len = in.readInt();
[29/50] [abbrv] ignite git commit: IGNITE-4628 Add Java callback
support for platform plugins
Posted by vo...@apache.org.
IGNITE-4628 Add Java callback support for platform plugins
This closes #1543
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f2328a45
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f2328a45
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f2328a45
Branch: refs/heads/ignite-4565-ddl
Commit: f2328a4593a6e4902dd3f4c946357fa054c3f1e2
Parents: f52ba0f
Author: Pavel Tupitsyn <pt...@apache.org>
Authored: Thu Feb 16 17:46:02 2017 +0300
Committer: Pavel Tupitsyn <pt...@apache.org>
Committed: Thu Feb 16 17:46:02 2017 +0300
----------------------------------------------------------------------
.../callback/PlatformCallbackGateway.java | 23 +++++
.../platform/callback/PlatformCallbackOp.java | 3 +
.../plugin/PlatformTestPluginTarget.java | 29 ++++++-
.../Plugin/PluginTest.cs | 10 ++-
.../Plugin/TestIgnitePluginProvider.cs | 14 ++++
.../Apache.Ignite.Core.csproj | 1 +
.../Impl/Plugin/PluginContext.cs | 8 ++
.../Impl/Plugin/PluginProcessor.cs | 88 ++++++++++++++++++++
.../Impl/Unmanaged/UnmanagedCallbackOp.cs | 3 +-
.../Impl/Unmanaged/UnmanagedCallbacks.cs | 6 ++
.../Apache.Ignite.Core/Plugin/IPluginContext.cs | 7 ++
.../Apache.Ignite.Core/Plugin/PluginCallback.cs | 29 +++++++
12 files changed, 215 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/f2328a45/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackGateway.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackGateway.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackGateway.java
index fc311da..aee14d7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackGateway.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackGateway.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.platform.callback;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
import org.apache.ignite.internal.processors.platform.PlatformTargetProxy;
+import org.apache.ignite.internal.processors.platform.memory.PlatformMemory;
import org.apache.ignite.internal.util.GridStripedSpinBusyLock;
/**
@@ -1223,6 +1224,28 @@ public class PlatformCallbackGateway {
}
/**
+ * Invoke plugin callback by id.
+ *
+ * @param callbackId Id of a callback registered in Platform.
+ * @param outMem Out memory (Java writes, platform reads).
+ * @param inMem In memory (platform writes, Java reads).
+ */
+ public void pluginCallback(long callbackId, PlatformMemory outMem, PlatformMemory inMem) {
+ enter();
+
+ try {
+ long outPtr = outMem == null ? 0 : outMem.pointer();
+ long inPtr = inMem == null ? 0 : inMem.pointer();
+
+ PlatformCallbackUtils.inLongLongLongObjectOutLong(envPtr,
+ PlatformCallbackOp.PluginCallbackInLongLongOutLong, callbackId, outPtr, inPtr, null);
+ }
+ finally {
+ leave();
+ }
+ }
+
+ /**
* Enter gateway.
*/
protected void enter() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/f2328a45/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackOp.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackOp.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackOp.java
index 500a4f3..d77d2d7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackOp.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackOp.java
@@ -221,4 +221,7 @@ class PlatformCallbackOp {
/** */
public static final int CachePluginIgniteStop = 67;
+
+ /** */
+ public static final int PluginCallbackInLongLongOutLong = 68;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f2328a45/modules/core/src/test/java/org/apache/ignite/platform/plugin/PlatformTestPluginTarget.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/platform/plugin/PlatformTestPluginTarget.java b/modules/core/src/test/java/org/apache/ignite/platform/plugin/PlatformTestPluginTarget.java
index 94a21a3..e80a23f 100644
--- a/modules/core/src/test/java/org/apache/ignite/platform/plugin/PlatformTestPluginTarget.java
+++ b/modules/core/src/test/java/org/apache/ignite/platform/plugin/PlatformTestPluginTarget.java
@@ -24,12 +24,15 @@ import org.apache.ignite.internal.binary.BinaryRawWriterEx;
import org.apache.ignite.internal.processors.platform.PlatformAbstractTarget;
import org.apache.ignite.internal.processors.platform.PlatformContext;
import org.apache.ignite.internal.processors.platform.PlatformTarget;
+import org.apache.ignite.internal.processors.platform.memory.PlatformMemory;
+import org.apache.ignite.internal.processors.platform.memory.PlatformOutputStream;
import org.apache.ignite.plugin.PluginConfiguration;
import org.jetbrains.annotations.Nullable;
/**
* Test target.
*/
+@SuppressWarnings("ConstantConditions")
class PlatformTestPluginTarget extends PlatformAbstractTarget {
/** */
private final String name;
@@ -87,11 +90,35 @@ class PlatformTestPluginTarget extends PlatformAbstractTarget {
throws IgniteCheckedException {
PlatformTestPluginTarget t = (PlatformTestPluginTarget)arg;
- writer.writeString(t.name);
+ writer.writeString(invokeCallback(t.name));
return new PlatformTestPluginTarget(platformCtx, t.name + reader.readString());
}
+ /**
+ * Invokes the platform callback.
+ *
+ * @param val Value to send.
+ * @return Result.
+ */
+ private String invokeCallback(String val) {
+ PlatformMemory outMem = platformCtx.memory().allocate();
+ PlatformMemory inMem = platformCtx.memory().allocate();
+
+ PlatformOutputStream outStream = outMem.output();
+ BinaryRawWriterEx writer = platformCtx.writer(outStream);
+
+ writer.writeString(val);
+
+ outStream.synchronize();
+
+ platformCtx.gateway().pluginCallback(1, outMem, inMem);
+
+ BinaryRawReaderEx reader = platformCtx.reader(inMem);
+
+ return reader.readString();
+ }
+
/** {@inheritDoc} */
@Override public void processOutStream(int type, BinaryRawWriterEx writer) throws IgniteCheckedException {
writer.writeString(name);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f2328a45/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/PluginTest.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/PluginTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/PluginTest.cs
index 0af7b10..efb14ff 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/PluginTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/PluginTest.cs
@@ -73,7 +73,7 @@ namespace Apache.Ignite.Core.Tests.Plugin
var extension = plugin.Provider.Context.GetExtension(0);
Assert.IsNotNull(extension);
- CheckPluginTarget(extension, "barbaz");
+ CheckPluginTarget(extension, "barbaz", plugin.Provider);
}
Assert.AreEqual(true, plugin.Provider.Stopped);
@@ -83,7 +83,8 @@ namespace Apache.Ignite.Core.Tests.Plugin
/// <summary>
/// Checks the plugin target operations.
/// </summary>
- private static void CheckPluginTarget(IPlatformTarget target, string expectedName)
+ private static void CheckPluginTarget(IPlatformTarget target, string expectedName,
+ TestIgnitePluginProvider provider)
{
// Returns name.
Assert.AreEqual(expectedName, target.OutStream(1, r => r.ReadString()));
@@ -104,12 +105,13 @@ namespace Apache.Ignite.Core.Tests.Plugin
var newTarget = target.InStreamOutObject(1, w => w.WriteString("name1"));
Assert.AreEqual("name1", newTarget.OutStream(1, r => r.ReadString()));
- // Returns target with specified name appended.
+ // Invokes callback to modify name, returns target with specified name appended.
var res = target.InObjectStreamOutObjectStream(1, newTarget, w => w.WriteString("_abc"),
(reader, t) => Tuple.Create(reader.ReadString(), t));
- Assert.AreEqual("name1", res.Item1); // Old name
+ Assert.AreEqual("NAME1", res.Item1); // Old name converted by callback.
Assert.AreEqual("name1_abc", res.Item2.OutStream(1, r => r.ReadString()));
+ Assert.AreEqual("name1", provider.CallbackResult); // Old name.
// Returns a copy with same name.
var resCopy = res.Item2.OutObject(1);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f2328a45/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/TestIgnitePluginProvider.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/TestIgnitePluginProvider.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/TestIgnitePluginProvider.cs
index d86750f..161d797 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/TestIgnitePluginProvider.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/TestIgnitePluginProvider.cs
@@ -18,6 +18,7 @@
namespace Apache.Ignite.Core.Tests.Plugin
{
using System;
+ using Apache.Ignite.Core.Common;
using Apache.Ignite.Core.Plugin;
using NUnit.Framework;
@@ -69,6 +70,17 @@ namespace Apache.Ignite.Core.Tests.Plugin
(className, message, inner, ignite) =>
new TestIgnitePluginException(className, message, ignite, inner));
+ context.RegisterCallback(1, (input, output) =>
+ {
+ CallbackResult = input.ReadString();
+ output.WriteString(CallbackResult.ToUpper());
+
+ return CallbackResult.Length;
+ });
+
+ var ex = Assert.Throws<IgniteException>(() => context.RegisterCallback(1, (input, output) => 0));
+ Assert.AreEqual("Plugin callback with id 1 is already registered", ex.Message);
+
Context = context;
EnsureIgniteWorks();
@@ -113,6 +125,8 @@ namespace Apache.Ignite.Core.Tests.Plugin
/// </summary>
public bool? IgniteStopped { get; set; }
+ public string CallbackResult { get; private set; }
+
/// <summary>
/// Gets the context.
/// </summary>
http://git-wip-us.apache.org/repos/asf/ignite/blob/f2328a45/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
index 7c86429..58002db 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
@@ -492,6 +492,7 @@
<Compile Include="Plugin\IPluginConfiguration.cs" />
<Compile Include="Plugin\IPluginContext.cs" />
<Compile Include="Plugin\IPluginProvider.cs" />
+ <Compile Include="Plugin\PluginCallback.cs" />
<Compile Include="Plugin\PluginNotFoundException.cs" />
<Compile Include="Plugin\PluginProviderTypeAttribute.cs" />
<Compile Include="Plugin\Cache\ICachePluginConfiguration.cs" />
http://git-wip-us.apache.org/repos/asf/ignite/blob/f2328a45/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Plugin/PluginContext.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Plugin/PluginContext.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Plugin/PluginContext.cs
index 0e01244..fd7033c 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Plugin/PluginContext.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Plugin/PluginContext.cs
@@ -79,5 +79,13 @@ namespace Apache.Ignite.Core.Impl.Plugin
_pluginProcessor.RegisterExceptionMapping(className, factory);
}
+
+ /** <inheritdoc /> */
+ public void RegisterCallback(long callbackId, PluginCallback callback)
+ {
+ IgniteArgumentCheck.NotNull(callback, "callback");
+
+ _pluginProcessor.RegisterCallback(callbackId, callback);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f2328a45/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Plugin/PluginProcessor.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Plugin/PluginProcessor.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Plugin/PluginProcessor.cs
index 7cafcc0..7ed7141 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Plugin/PluginProcessor.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Plugin/PluginProcessor.cs
@@ -21,8 +21,12 @@ namespace Apache.Ignite.Core.Impl.Plugin
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
+ using Apache.Ignite.Core.Binary;
using Apache.Ignite.Core.Common;
+ using Apache.Ignite.Core.Impl.Binary;
+ using Apache.Ignite.Core.Impl.Binary.IO;
using Apache.Ignite.Core.Impl.Common;
+ using Apache.Ignite.Core.Impl.Memory;
using Apache.Ignite.Core.Log;
using Apache.Ignite.Core.Plugin;
@@ -42,6 +46,10 @@ namespace Apache.Ignite.Core.Impl.Plugin
private readonly CopyOnWriteConcurrentDictionary<string, ExceptionFactory> _exceptionMappings
= new CopyOnWriteConcurrentDictionary<string, ExceptionFactory>();
+ /** Plugin callbacks. */
+ private readonly CopyOnWriteConcurrentDictionary<long, PluginCallback> _callbacks
+ = new CopyOnWriteConcurrentDictionary<long, PluginCallback>();
+
/** */
private readonly Ignite _ignite;
@@ -144,6 +152,86 @@ namespace Apache.Ignite.Core.Impl.Plugin
}
/// <summary>
+ /// Registers the callback.
+ /// </summary>
+ /// <param name="callbackId">Calback id.</param>
+ /// <param name="callback">Callback delegate</param>
+ public void RegisterCallback(long callbackId, PluginCallback callback)
+ {
+ Debug.Assert(callback != null);
+
+ var res = _callbacks.GetOrAdd(callbackId, _ => callback);
+
+ if (res != callback)
+ {
+ throw new IgniteException(string.Format(
+ "Plugin callback with id {0} is already registered", callbackId));
+ }
+ }
+
+ /// <summary>
+ /// Invokes the callback.
+ /// </summary>
+ public long InvokeCallback(long callbackId, long inPtr, long outPtr)
+ {
+ PluginCallback callback;
+
+ if (!_callbacks.TryGetValue(callbackId, out callback))
+ {
+ throw new IgniteException(string.Format(
+ "Plugin callback with id {0} is not registered", callbackId));
+ }
+
+ using (var inStream = GetStream(inPtr))
+ using (var outStream = GetStream(outPtr))
+ {
+ var reader = GetReader(inStream);
+ var writer = GetWriter(outStream);
+
+ var res = callback(reader, writer);
+
+ if (writer != null)
+ {
+ outStream.SynchronizeOutput();
+ writer.Marshaller.FinishMarshal(writer);
+ }
+
+ return res;
+ }
+ }
+
+ /// <summary>
+ /// Gets the stream.
+ /// </summary>
+ private static PlatformMemoryStream GetStream(long ptr)
+ {
+ return ptr == 0 ? null : IgniteManager.Memory.Get(ptr).GetStream();
+ }
+
+ /// <summary>
+ /// Gets the reader.
+ /// </summary>
+ private IBinaryRawReader GetReader(IBinaryStream stream)
+ {
+ return stream == null ? null : Ignite.Marshaller.StartUnmarshal(stream).GetRawReader();
+ }
+
+ /// <summary>
+ /// Gets the writer.
+ /// </summary>
+ private BinaryWriter GetWriter(IBinaryStream stream)
+ {
+ if (stream == null)
+ return null;
+
+ var res = Ignite.Marshaller.StartMarshal(stream);
+
+ res.GetRawWriter();
+
+ return res;
+ }
+
+ /// <summary>
/// Loads the plugins.
/// </summary>
private void LoadPlugins()
http://git-wip-us.apache.org/repos/asf/ignite/blob/f2328a45/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbackOp.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbackOp.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbackOp.cs
index 27d1124..91df822 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbackOp.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbackOp.cs
@@ -87,6 +87,7 @@ namespace Apache.Ignite.Core.Impl.Unmanaged
CachePluginCreate = 64,
CachePluginDestroy = 65,
CachePluginIgniteStart = 66,
- CachePluginIgniteStop = 67
+ CachePluginIgniteStop = 67,
+ PluginCallbackInLongLongOutLong = 68
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f2328a45/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbacks.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbacks.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbacks.cs
index 1d88f76..91ffabb 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbacks.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbacks.cs
@@ -246,6 +246,7 @@ namespace Apache.Ignite.Core.Impl.Unmanaged
AddHandler(UnmanagedCallbackOp.CachePluginDestroy, CachePluginDestroy);
AddHandler(UnmanagedCallbackOp.CachePluginIgniteStart, CachePluginIgniteStart);
AddHandler(UnmanagedCallbackOp.CachePluginIgniteStop, CachePluginIgniteStop);
+ AddHandler(UnmanagedCallbackOp.PluginCallbackInLongLongOutLong, PluginCallbackInLongLongOutLong);
}
/// <summary>
@@ -1285,6 +1286,11 @@ namespace Apache.Ignite.Core.Impl.Unmanaged
return 0;
}
+ private long PluginCallbackInLongLongOutLong(long callbackId, long inPtr, long outPtr, void* arg)
+ {
+ return _ignite.PluginProcessor.InvokeCallback(callbackId, inPtr, outPtr);
+ }
+
#endregion
#region HELPERS
http://git-wip-us.apache.org/repos/asf/ignite/blob/f2328a45/modules/platforms/dotnet/Apache.Ignite.Core/Plugin/IPluginContext.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Plugin/IPluginContext.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Plugin/IPluginContext.cs
index 97b566c..03d130b 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Plugin/IPluginContext.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Plugin/IPluginContext.cs
@@ -57,5 +57,12 @@ namespace Apache.Ignite.Core.Plugin
/// <param name="className">Name of the Java exception class to be mapped.</param>
/// <param name="factory">Exception factory delegate.</param>
void RegisterExceptionMapping(string className, ExceptionFactory factory);
+
+ /// <summary>
+ /// Registers Java->.NET callback.
+ /// </summary>
+ /// <param name="callbackId">Callback id.</param>
+ /// <param name="callback">Callback delegate.</param>
+ void RegisterCallback(long callbackId, PluginCallback callback);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/f2328a45/modules/platforms/dotnet/Apache.Ignite.Core/Plugin/PluginCallback.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Plugin/PluginCallback.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Plugin/PluginCallback.cs
new file mode 100644
index 0000000..5ba675e
--- /dev/null
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Plugin/PluginCallback.cs
@@ -0,0 +1,29 @@
+\ufeff/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Apache.Ignite.Core.Plugin
+{
+ using Apache.Ignite.Core.Binary;
+
+ /// <summary>
+ /// Plugin callback delegate.
+ /// </summary>
+ /// <param name="input">Input reader. May be null.</param>
+ /// <param name="output">Output writer. May be null.</param>
+ /// <returns>Result code.</returns>
+ public delegate long PluginCallback(IBinaryRawReader input, IBinaryRawWriter output);
+}
[43/50] [abbrv] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-2.0
Posted by vo...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into ignite-2.0
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
# modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0d2d5b36
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0d2d5b36
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0d2d5b36
Branch: refs/heads/ignite-4565-ddl
Commit: 0d2d5b365dd138b8fa56ddd1a594da3e6903f026
Parents: 53802d8 76f3060
Author: sboikov <sb...@gridgain.com>
Authored: Mon Feb 20 14:44:10 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Feb 20 14:44:10 2017 +0300
----------------------------------------------------------------------
examples/config/spark/example-shared-rdd.xml | 83 +++
examples/pom.xml | 27 +-
.../examples/java8/spark/SharedRDDExample.java | 110 ++++
.../examples/spark/ScalarSharedRDDExample.scala | 89 +++
.../examples/SharedRDDExampleSelfTest.java | 36 ++
.../IgniteExamplesJ8SelfTestSuite.java | 3 +
.../tests/examples/ScalarExamplesSelfTest.scala | 6 +
.../java/org/apache/ignite/IgniteMessaging.java | 11 +-
.../ignite/internal/GridKernalGatewayImpl.java | 25 +-
.../org/apache/ignite/internal/GridTopic.java | 2 +-
.../apache/ignite/internal/IgniteKernal.java | 48 +-
.../ignite/internal/IgniteMessagingImpl.java | 6 +-
.../internal/StripedExecutorMXBeanAdapter.java | 90 +++
.../client/util/GridClientConsistentHash.java | 14 +-
.../internal/managers/GridManagerAdapter.java | 2 +-
.../managers/communication/GridIoManager.java | 84 +--
.../discovery/GridDiscoveryManager.java | 267 +++------
.../eventstorage/GridEventStorageManager.java | 34 +-
.../affinity/GridAffinityAssignmentCache.java | 8 +-
.../cache/CacheAffinitySharedManager.java | 2 +-
.../cache/GridCacheEvictionManager.java | 60 +-
.../processors/cache/GridCacheGateway.java | 48 +-
.../processors/cache/GridCacheIoManager.java | 19 +-
.../processors/cache/GridCacheProcessor.java | 5 +
.../processors/cache/GridCacheUtils.java | 6 +-
.../cache/affinity/GridCacheAffinityImpl.java | 2 +-
.../dht/GridClientPartitionTopology.java | 13 +-
.../dht/GridDhtAssignmentFetchFuture.java | 5 +-
.../distributed/dht/GridDhtCacheAdapter.java | 23 +-
.../dht/GridDhtPartitionTopologyImpl.java | 14 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 35 +-
.../GridDhtAtomicAbstractUpdateFuture.java | 7 +-
.../GridDhtAtomicAbstractUpdateRequest.java | 2 +-
.../dht/atomic/GridDhtAtomicCache.java | 16 +-
.../atomic/GridDhtAtomicSingleUpdateFuture.java | 6 +-
.../GridDhtAtomicSingleUpdateRequest.java | 5 +-
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 6 +-
.../dht/atomic/GridDhtAtomicUpdateRequest.java | 10 +-
.../dht/atomic/GridDhtAtomicUpdateResponse.java | 31 +-
.../GridNearAtomicSingleUpdateFuture.java | 7 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 7 +-
.../atomic/GridNearAtomicUpdateResponse.java | 35 +-
.../dht/preloader/GridDhtPreloader.java | 39 +-
.../near/GridNearSingleGetRequest.java | 5 +
.../cache/query/GridCacheQueryManager.java | 97 ++--
.../cache/transactions/IgniteTxHandler.java | 4 +-
.../cache/version/GridCacheVersion.java | 2 +-
.../cache/version/GridCacheVersionManager.java | 2 +-
.../clock/GridClockSyncProcessor.java | 2 +-
.../processors/query/GridQueryIndexing.java | 17 +-
.../processors/query/GridQueryProcessor.java | 32 +-
.../processors/query/GridRunningQueryInfo.java | 132 +++++
.../ignite/internal/util/GridBusyLock.java | 2 +-
.../util/StripedCompositeReadWriteLock.java | 50 +-
.../ignite/internal/util/StripedExecutor.java | 65 ++-
.../nio/GridAbstractCommunicationClient.java | 37 +-
.../util/nio/GridCommunicationClient.java | 5 -
.../internal/visor/VisorMultiNodeTask.java | 2 +-
.../visor/cache/VisorCacheClearTask.java | 88 +--
.../visor/cache/VisorCacheTypeMetadata.java | 6 +
.../visor/compute/VisorGatewayTask.java | 30 +-
.../visor/query/VisorCancelQueriesTask.java | 72 +++
.../query/VisorCollectRunningQueriesTask.java | 96 ++++
.../internal/visor/query/VisorRunningQuery.java | 132 +++++
.../ignite/mxbean/StripedExecutorMXBean.java | 90 +++
.../communication/tcp/TcpCommunicationSpi.java | 9 +
.../org/apache/ignite/thread/IgniteThread.java | 26 +-
.../communication/GridIoManagerSelfTest.java | 6 +-
.../GridDiscoveryManagerAliveCacheSelfTest.java | 55 --
.../discovery/GridDiscoveryManagerSelfTest.java | 214 --------
.../cache/GridCacheLifecycleAwareSelfTest.java | 33 ++
.../processors/cache/GridCacheOffHeapTest.java | 274 ----------
...niteTopologyValidatorGridSplitCacheTest.java | 334 ++++++++++++
...niteMessagingConfigVariationFullApiTest.java | 195 +++++--
.../internal/util/StripedExecutorTest.java | 168 ++++++
.../ignite/messaging/GridMessagingSelfTest.java | 114 +++-
.../messaging/IgniteMessagingSendAsyncTest.java | 544 +++++++++++++++++++
.../junits/multijvm/IgniteProcessProxy.java | 5 +-
.../ignite/testsuites/IgniteBasicTestSuite.java | 2 +
.../testsuites/IgniteComputeGridTestSuite.java | 2 +
.../testsuites/IgniteKernalSelfTestSuite.java | 5 +-
.../IgniteTopologyValidatorTestSuit.java | 1 +
.../hadoop/shuffle/HadoopShuffle.java | 2 +-
.../cache/query/GridCacheTwoStepQuery.java | 18 +-
.../processors/query/h2/IgniteH2Indexing.java | 81 ++-
.../query/h2/sql/GridSqlQuerySplitter.java | 4 +-
.../h2/twostep/GridReduceQueryExecutor.java | 60 +-
.../cache/CacheSqlQueryValueCopySelfTest.java | 208 ++++++-
.../cache/GridCacheCrossCacheQuerySelfTest.java | 2 +-
.../h2/GridIndexingSpiAbstractSelfTest.java | 7 +
modules/kubernetes/DEVNOTES.txt | 63 +++
modules/kubernetes/README.txt | 33 ++
modules/kubernetes/config/Dockerfile | 45 ++
modules/kubernetes/config/example-kube.xml | 44 ++
.../kubernetes/config/ignite-deployment.yaml | 26 +
modules/kubernetes/config/ignite-service.yaml | 14 +
modules/kubernetes/config/run.sh | 50 ++
modules/kubernetes/licenses/apache-2.0.txt | 202 +++++++
modules/kubernetes/pom.xml | 93 ++++
.../TcpDiscoveryKubernetesIpFinder.java | 317 +++++++++++
.../tcp/ipfinder/kubernetes/package-info.java | 22 +
.../TcpDiscoveryKubernetesIpFinderSelfTest.java | 93 ++++
.../tcp/ipfinder/kubernetes/package-info.java | 22 +
.../testsuites/IgniteKubernetesTestSuite.java | 41 ++
.../apache/ignite/spark/JavaIgniteContext.scala | 6 +
.../ignite/tools/classgen/ClassesGenerator.java | 4 +-
.../web-console/backend/routes/activities.js | 7 -
modules/web-console/backend/routes/profile.js | 4 +-
.../web-console/backend/services/activities.js | 30 +-
.../web-console/backend/services/sessions.js | 6 +-
modules/web-console/backend/services/users.js | 7 +-
.../backend/test/unit/ActivitiesService.test.js | 131 +++++
modules/web-console/frontend/app/app.config.js | 4 +
.../activities-user-dialog.controller.js | 39 +-
.../activities-user-dialog.jade | 2 +-
.../components/activities-user-dialog/index.js | 5 +-
.../form-field-datepicker.jade | 4 +-
.../list-of-registered-users.column-defs.js | 26 +-
.../list-of-registered-users.controller.js | 56 +-
.../list-of-registered-users.jade | 16 +-
.../ui-grid-settings/ui-grid-settings.scss | 39 +-
.../app/core/activities/Activities.data.js | 5 -
modules/web-console/frontend/app/data/i18n.js | 1 +
.../ui-ace-pom/ui-ace-pom.controller.js | 4 +-
.../frontend/app/modules/agent/agent.module.js | 15 -
.../modules/configuration/Version.service.js | 35 +-
.../configuration/configuration.module.js | 6 +-
.../configuration/generator/Maven.service.js | 10 +-
.../configuration/summary/summary.worker.js | 34 +-
modules/web-console/frontend/package.json | 182 +++----
.../frontend/public/stylesheets/style.scss | 8 -
.../frontend/public/stylesheets/variables.scss | 1 -
.../frontend/test/unit/Version.test.js | 26 +-
.../views/templates/agent-download.jade | 10 +-
.../console/agent/handlers/RestListener.java | 9 +-
.../demo/service/DemoCachesLoadService.java | 2 +-
.../service/DemoRandomCacheLoadService.java | 2 +-
modules/yardstick/DEVNOTES-standalone.txt | 5 +-
modules/yardstick/README.txt | 85 +--
.../config/benchmark-atomic-win.properties | 2 +-
.../config/benchmark-atomic.properties | 35 +-
.../config/benchmark-bin-identity.properties | 16 +-
.../config/benchmark-cache-load-win.properties | 2 +-
.../config/benchmark-cache-load.properties | 4 +-
.../config/benchmark-client-mode.properties | 68 ++-
.../config/benchmark-compute-win.properties | 2 +-
.../config/benchmark-compute.properties | 30 +-
.../config/benchmark-failover.properties | 2 +-
.../yardstick/config/benchmark-full.properties | 62 +--
.../config/benchmark-multicast.properties | 107 ++--
.../config/benchmark-put-indexed-val.properties | 23 +-
.../benchmark-query-put-separated.properties | 3 +-
.../config/benchmark-query-win.properties | 2 +-
.../yardstick/config/benchmark-query.properties | 33 +-
.../config/benchmark-remote-sample.properties | 80 +++
.../config/benchmark-remote.properties | 119 ++++
.../config/benchmark-sample.properties | 22 +-
.../config/benchmark-sql-dml.properties | 36 +-
.../yardstick/config/benchmark-store.properties | 3 +-
.../config/benchmark-tx-win.properties | 2 +-
.../yardstick/config/benchmark-tx.properties | 33 +-
.../yardstick/config/benchmark-win.properties | 2 +-
modules/yardstick/config/benchmark.properties | 76 ++-
.../yardstick/config/ignite-remote-config.xml | 47 ++
.../test-max-int-values-offheap.properties | 3 +-
.../test-max-int-values-onheap.properties | 3 +-
.../config/test-max-int-values-swap.properties | 3 +-
modules/yardstick/pom-standalone.xml | 2 +-
modules/yardstick/pom.xml | 2 +-
.../yardstick/IgniteBenchmarkArguments.java | 28 +-
.../org/apache/ignite/yardstick/IgniteNode.java | 2 +-
.../IgniteCacheRandomOperationBenchmark.java | 49 ++
pom.xml | 6 +-
173 files changed, 5724 insertions(+), 1761 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0d2d5b36/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0d2d5b36/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 750c316,cdbe2e3..f6e47b7
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@@ -300,8 -299,8 +301,12 @@@ public class IgniteKernal implements Ig
/** */
@GridToStringExclude
+ private ObjectName qryExecSvcMBean;
+
++ /** */
++ @GridToStringExclude
+ private ObjectName stripedExecSvcMBean;
+
/** Kernal start timestamp. */
private long startTime = U.currentTimeMillis();
@@@ -978,7 -967,8 +983,8 @@@
// Register MBeans.
registerKernalMBean();
registerLocalNodeMBean();
- registerExecutorMBeans(execSvc, sysExecSvc, p2pExecSvc, mgmtExecSvc, restExecSvc);
+ registerExecutorMBeans(execSvc, sysExecSvc, p2pExecSvc, mgmtExecSvc, restExecSvc, qryExecSvc);
+ registerStripedExecutorMBean(stripedExecSvc);
// Lifecycle bean notifications.
notifyLifecycleBeans(AFTER_NODE_START);
@@@ -2063,7 -2086,7 +2102,8 @@@
unregisterMBean(kernalMBean) &
unregisterMBean(locNodeMBean) &
unregisterMBean(restExecSvcMBean) &
- unregisterMBean(qryExecSvcMBean)
++ unregisterMBean(qryExecSvcMBean) &
+ unregisterMBean(stripedExecSvcMBean)
))
errOnStop = false;
http://git-wip-us.apache.org/repos/asf/ignite/blob/0d2d5b36/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0d2d5b36/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0d2d5b36/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index 6646f4c,9ea707d..e0d4593
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@@ -17,7 -17,7 +17,8 @@@
package org.apache.ignite.internal.managers.discovery;
+ import java.io.Serializable;
+import java.io.Externalizable;
import java.lang.management.GarbageCollectorMXBean;
import java.lang.management.ManagementFactory;
import java.lang.management.MemoryMXBean;
@@@ -2595,13 -2554,9 +2561,11 @@@ public class GridDiscoveryManager exten
aliveSrvNodesWithCaches = new ConcurrentSkipListMap<>(GridNodeOrderComparator.INSTANCE);
nodesByVer = new TreeMap<>();
+ List<ClusterNode> aliveSrvNodesList = new ArrayList<>(allNodes.size());
+
long maxOrder0 = 0;
- Set<String> nearEnabledSet = new HashSet<>();
+ Set<Integer> nearEnabledSet = new HashSet<>();
List<ClusterNode> srvNodes = new ArrayList<>();
@@@ -2687,10 -2628,7 +2641,9 @@@
maxOrder = maxOrder0;
+ aliveSrvNodes = Collections.unmodifiableList(aliveSrvNodesList);
+
allCacheNodes = Collections.unmodifiableMap(cacheMap);
- rmtCacheNodes = Collections.unmodifiableMap(rmtCacheMap);
affCacheNodes = Collections.unmodifiableMap(dhtNodesMap);
allNodesWithCaches = Collections.unmodifiableCollection(nodesWithCaches);
this.rmtNodesWithCaches = Collections.unmodifiableCollection(rmtNodesWithCaches);
@@@ -2803,21 -2713,8 +2728,15 @@@
}
/**
- * Gets all nodes that have cache with given name and should participate in affinity calculation. With
- * partitioned cache nodes with near-only cache do not participate in affinity node calculation.
- *
- * @param cacheName Cache name.
- * @param topVer Topology version.
- * @return Collection of nodes.
++ * Gets all alive server nodes.
+ */
- Collection<ClusterNode> cacheAffinityNodes(@Nullable String cacheName, final long topVer) {
- return filter(topVer, affCacheNodes.get(cacheName));
++ Collection<ClusterNode> aliveSrvNodes() {
++ return aliveSrvNodes;
+ }
+
+ /**
- * Gets all alive nodes that have cache with given name.
+ * Gets all remote nodes that have at least one cache configured.
*
- * @param cacheName Cache name.
* @param topVer Topology version.
* @return Collection of nodes.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/0d2d5b36/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0d2d5b36/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0d2d5b36/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0d2d5b36/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0d2d5b36/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
index 4c89a7c,2664505..2664505
mode 100755,100644..100755
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
http://git-wip-us.apache.org/repos/asf/ignite/blob/0d2d5b36/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0d2d5b36/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0d2d5b36/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffle.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0d2d5b36/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0d2d5b36/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java
----------------------------------------------------------------------
[08/50] [abbrv] ignite git commit: IGNITE-1495 Uppercase index fields
in metadata. This closes #1474.
Posted by vo...@apache.org.
IGNITE-1495 Uppercase index fields in metadata. This closes #1474.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7d3c046e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7d3c046e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7d3c046e
Branch: refs/heads/ignite-4565-ddl
Commit: 7d3c046e58a160132655a7b8f90830d69a16e2ab
Parents: d8ad967
Author: Sergey Kalashnikov <sk...@gridgain.com>
Authored: Tue Feb 14 14:56:24 2017 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Tue Feb 14 14:56:24 2017 +0300
----------------------------------------------------------------------
.../cache/query/GridCacheQueryManager.java | 11 +++++++---
.../IgniteCacheAbstractFieldsQuerySelfTest.java | 21 ++++++++++++++++++++
2 files changed, 29 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7d3c046e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
index 2b31e2d..c434401 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
@@ -2484,12 +2484,17 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
// Add only SQL indexes.
if (desc.type() == GridQueryIndexType.SORTED) {
- Collection<String> idxFields = e.getValue().fields();
+ Collection<String> idxFields = new LinkedList<>();
Collection<String> descendings = new LinkedList<>();
- for (String idxField : idxFields)
+ for (String idxField : e.getValue().fields()) {
+ String idxFieldUpper = idxField.toUpperCase();
+
+ idxFields.add(idxFieldUpper);
+
if (desc.descending(idxField))
- descendings.add(idxField);
+ descendings.add(idxFieldUpper);
+ }
indexesCol.add(new CacheSqlIndexMetadata(e.getKey().toUpperCase(),
idxFields, descendings, false));
http://git-wip-us.apache.org/repos/asf/ignite/blob/7d3c046e/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
index d5f02eb..0170fc7 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
@@ -326,8 +326,29 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA
Collection<GridCacheSqlIndexMetadata> indexes = meta.indexes("Person");
+ assertNotNull("Indexes should be defined", indexes);
assertEquals(2, indexes.size());
+ Iterator<GridCacheSqlIndexMetadata> it = indexes.iterator();
+
+ Collection<String> indFlds = it.next().fields();
+
+ assertNotNull("Fields for first index should be defined", indFlds);
+ assertEquals("First index should have one field", indFlds.size(), 1);
+
+ Iterator<String> indFldIt = indFlds.iterator();
+
+ assertEquals(indFldIt.next(), "AGE");
+
+ indFlds = it.next().fields();
+
+ assertNotNull("Fields for second index should be defined", indFlds);
+ assertEquals("Second index should have one field", indFlds.size(), 1);
+
+ indFldIt = indFlds.iterator();
+
+ assertEquals(indFldIt.next(), "ORGID");
+
wasNull = true;
}
else if (CACHE.equals(meta.cacheName()))
[36/50] [abbrv] ignite git commit: ignite-4624 Scan query optimization
Posted by vo...@apache.org.
ignite-4624 Scan query optimization
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/260ec364
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/260ec364
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/260ec364
Branch: refs/heads/ignite-4565-ddl
Commit: 260ec364b8671b9c3315de423d3c9b546afa7ee1
Parents: 11bc058
Author: Andrey V. Mashenkov <an...@gmail.com>
Authored: Fri Feb 17 16:15:31 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Feb 17 16:15:31 2017 +0300
----------------------------------------------------------------------
.../distributed/dht/GridDhtCacheAdapter.java | 19 +++-
.../cache/query/GridCacheQueryManager.java | 97 ++++++++++----------
2 files changed, 64 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/260ec364/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
index 1cd3cfb..0e6d876 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
@@ -1242,14 +1242,27 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap
final boolean backup,
final boolean keepBinary,
final AffinityTopologyVersion topVer) {
+
+ return iterator(localEntriesIteratorEx(primary, backup, topVer), !keepBinary);
+ }
+
+ /**
+ * @param primary If {@code true} includes primary entries.
+ * @param backup If {@code true} includes backup entries.
+ * @param topVer Specified affinity topology version.
+ * @return Local entries iterator.
+ */
+ public Iterator<? extends GridCacheEntryEx> localEntriesIteratorEx(final boolean primary,
+ final boolean backup,
+ final AffinityTopologyVersion topVer) {
assert primary || backup;
if (primary && backup)
- return iterator(entries().iterator(), !keepBinary);
+ return entries().iterator();
else {
final Iterator<GridDhtLocalPartition> partIt = topology().currentLocalPartitions().iterator();
- Iterator<GridCacheMapEntry> it = new Iterator<GridCacheMapEntry>() {
+ return new Iterator<GridCacheMapEntry>() {
private GridCacheMapEntry next;
private Iterator<GridCacheMapEntry> curIt;
@@ -1306,8 +1319,6 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap
while (partIt.hasNext());
}
};
-
- return iterator(it, !keepBinary);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/260ec364/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
index 87ba87c..7af3485 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
@@ -1033,23 +1033,25 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
* @throws GridDhtUnreservedPartitionException If failed to reserve partition.
*/
private GridIterator<IgniteBiTuple<K, V>> onheapIterator(
- GridCacheQueryAdapter<?> qry,
+ final GridCacheQueryAdapter<?> qry,
AffinityTopologyVersion topVer,
final IgniteBiPredicate<K, V> keyValFilter,
- boolean backups,
+ final boolean backups,
final ExpiryPolicy plc,
final boolean locNode) throws GridDhtUnreservedPartitionException {
- Iterator<K> keyIter;
+ Iterator<? extends GridCacheEntryEx> entryIter;
GridDhtLocalPartition locPart = null;
Integer part = qry.partition();
- if (part == null || cctx.isLocal()) {
- // Performance optimization.
- if (locNode && plc == null && !cctx.isLocal()) {
- GridDhtCacheAdapter<K, V> cache = cctx.isNear() ? cctx.near().dht() : cctx.dht();
+ if (cctx.isLocal())
+ entryIter = cctx.local().allEntries().iterator();
+ else if (part == null) {
+ GridDhtCacheAdapter<K, V> cache = cctx.isNear() ? cctx.near().dht() : cctx.dht();
+ // Performance optimization.
+ if (locNode && plc == null) {
final Iterator<Cache.Entry<K, V>> iter = cache.localEntriesIterator(true,
backups, cache.context().keepBinary(), topVer);
@@ -1099,12 +1101,10 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
};
}
- IgniteInternalCache<K, V> keepBinaryCache = cctx.cache().keepBinary();
-
- keyIter = backups ? keepBinaryCache.keySetx().iterator() : keepBinaryCache.primaryKeySet().iterator();
+ entryIter = cache.localEntriesIteratorEx(true, backups, topVer);
}
else if (part < 0 || part >= cctx.affinity().partitions())
- keyIter = new GridEmptyIterator<>();
+ return new GridEmptyIterator<>();
else {
final GridDhtCacheAdapter dht = cctx.isNear() ? cctx.near().dht() : cctx.dht();
@@ -1115,28 +1115,12 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
throw new GridDhtUnreservedPartitionException(part, cctx.affinity().affinityTopologyVersion(),
"Partition can not be reserved.");
- final GridDhtLocalPartition locPart0 = locPart;
-
- keyIter = new Iterator<K>() {
- private Iterator<KeyCacheObject> iter0 = locPart0.keySet().iterator();
-
- @Override public boolean hasNext() {
- return iter0.hasNext();
- }
-
- @Override public K next() {
- return (K)iter0.next();
- }
-
- @Override public void remove() {
- iter0.remove();
- }
- };
+ entryIter = locPart.allEntries().iterator();
}
final GridDhtLocalPartition locPart0 = locPart;
- return new PeekValueExpiryAwareIterator(keyIter, plc, topVer, keyValFilter, qry.keepBinary(), locNode, true) {
+ return new PeekValueExpiryAwareIterator(entryIter, plc, topVer, keyValFilter, qry.keepBinary(), locNode, true) {
@Override protected void onClose() {
super.onClose();
@@ -1263,18 +1247,20 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
ExpiryPolicy expPlc,
final boolean keepBinary,
boolean locNode) {
- Iterator<K> keyIter = new Iterator<K>() {
+ Iterator<? extends GridCacheEntryEx> keyIter = new Iterator<GridCacheEntryEx>() {
/** {@inheritDoc} */
@Override public boolean hasNext() {
return it.hasNext();
}
/** {@inheritDoc} */
- @Override public K next() {
+ @Override public GridCacheEntryEx next() {
try {
KeyCacheObject key = cctx.toCacheKeyObject(it.next().getKey());
- return (K)cctx.unwrapBinaryIfNeeded(key, keepBinary);
+ final GridCacheEntryEx entryEx = cctx.cache().entryEx(key);
+
+ return entryEx;
}
catch (IgniteCheckedException e) {
throw new IgniteException(e);
@@ -2190,8 +2176,8 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
}
/**
- * Gets cache queries detailed metrics.
- * Detail metrics could be enabled by setting non-zero value via {@link CacheConfiguration#setQueryDetailMetricsSize(int)}
+ * Gets cache queries detailed metrics. Detail metrics could be enabled by setting non-zero value via {@link
+ * CacheConfiguration#setQueryDetailMetricsSize(int)}
*
* @return Cache queries metrics aggregated by query type and query text.
*/
@@ -3092,8 +3078,10 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
private abstract static class CachedResult<R> extends GridFutureAdapter<IgniteSpiCloseableIterator<R>> {
/** Absolute position of each recipient. */
private final Map<Object, QueueIterator> recipients = new GridLeanMap<>(1);
+
/** */
private CircularQueue<R> queue;
+
/** */
private int pruned;
@@ -3530,10 +3518,10 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
private IgniteCacheExpiryPolicy expiryPlc;
/** */
- private Iterator<K> keyIt;
+ private Iterator<? extends GridCacheEntryEx> entryIt;
/**
- * @param keyIt Key iterator.
+ * @param entryIter Key iterator.
* @param plc Expiry policy.
* @param topVer Topology version.
* @param keyValFilter Key-value filter.
@@ -3541,8 +3529,8 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
* @param locNode Local node.
* @param heapOnly Heap only.
*/
- private PeekValueExpiryAwareIterator(
- Iterator<K> keyIt,
+ PeekValueExpiryAwareIterator(
+ Iterator<? extends GridCacheEntryEx> entryIter,
ExpiryPolicy plc,
AffinityTopologyVersion topVer,
IgniteBiPredicate<K, V> keyValFilter,
@@ -3550,7 +3538,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
boolean locNode,
boolean heapOnly
) {
- this.keyIt = keyIt;
+ this.entryIt = entryIter;
this.plc = plc;
this.topVer = topVer;
this.keyValFilter = keyValFilter;
@@ -3594,15 +3582,27 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
private void advance() {
IgniteBiTuple<K, V> next0 = null;
- while (keyIt.hasNext()) {
+ while (entryIt.hasNext()) {
next0 = null;
- K key = keyIt.next();
+ GridCacheEntryEx entry = entryIt.next();
+
+ if (entry.deleted())
+ continue;
+ KeyCacheObject key = entry.key();
CacheObject val;
try {
- val = value(key);
+ if (heapOnly)
+ val = entry.peek(true, false, false, expiryPlc);
+ else
+ val = value(entry, entry.key());
+ }
+ catch (GridCacheEntryRemovedException ignore) {
+ assert heapOnly;
+
+ continue;
}
catch (IgniteCheckedException e) {
if (log.isDebugEnabled())
@@ -3665,23 +3665,24 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
}
/**
+ * @param entry Entry.
* @param key Key.
* @return Value.
* @throws IgniteCheckedException If failed to peek value.
*/
- private CacheObject value(K key) throws IgniteCheckedException {
+ private CacheObject value(GridCacheEntryEx entry, KeyCacheObject key) throws IgniteCheckedException {
while (true) {
try {
- GridCacheEntryEx entry = heapOnly ? cache.peekEx(key) : cache.entryEx(key);
+ if (entry == null)
+ entry = cache.entryEx(key);
- if (expiryPlc != null && !heapOnly)
+ if (expiryPlc != null)
entry.unswap();
- return entry != null ? entry.peek(true, !heapOnly, !heapOnly, topVer, expiryPlc) : null;
+ return entry.peek(true, true, true, topVer, expiryPlc);
}
catch (GridCacheEntryRemovedException ignore) {
- if (heapOnly)
- return null;
+ entry = null;
}
}
}
[21/50] [abbrv] ignite git commit: IGNITE-2356: Added
high-availability feature to IGFS client. From now on it is possible to
connect to IGFS through Ignite client. This way in case one server fails,
client will still be able to work with other nodes. Th
Posted by vo...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-0.xml
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-0.xml b/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-0.xml
new file mode 100644
index 0000000..072c6db
--- /dev/null
+++ b/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-0.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ 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.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!--
+ Ignite Spring configuration file.
+
+ When starting a standalone Ignite node, you need to execute the following command:
+ {IGNITE_HOME}/bin/ignite.{bat|sh} path-to-this-file/default-config.xml
+
+ When starting Ignite from Java IDE, pass path to this file into Ignition:
+ Ignition.start("path-to-this-file/default-config.xml");
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+ <!--
+ Optional description.
+ -->
+ <description>
+ Spring file for Ignite node configuration with IGFS and Apache Hadoop map-reduce support enabled.
+ Ignite node will start with this configuration by default.
+ </description>
+
+ <!--
+ Initialize property configurer so we can reference environment variables.
+ -->
+ <bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_FALLBACK"/>
+ <property name="searchSystemEnvironment" value="true"/>
+ </bean>
+
+ <!--
+ Configuration of Ignite node.
+ -->
+ <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration">
+ <property name="gridName" value="IGFS-cli-0"/>
+
+ <property name="marshaller">
+ <bean class="org.apache.ignite.marshaller.optimized.OptimizedMarshaller">
+ </bean>
+ </property>
+
+ <!--
+ Configure caches where IGFS will store data.
+ -->
+ <property name="cacheConfiguration">
+ <list>
+ <!--
+ Configure metadata cache where file system structure will be stored. It must be TRANSACTIONAL,
+ and must have backups to maintain file system consistency in case of node crash.
+ -->
+ <bean class="org.apache.ignite.configuration.CacheConfiguration">
+ <property name="name" value="replicated"/>
+ <property name="cacheMode" value="REPLICATED"/>
+ <property name="atomicityMode" value="TRANSACTIONAL"/>
+ </bean>
+
+ <!--
+ Configure data cache where file's data will be stored.
+ -->
+ <bean class="org.apache.ignite.configuration.CacheConfiguration">
+ <property name="name" value="partitioned"/>
+ <property name="atomicityMode" value="TRANSACTIONAL"/>
+ <property name="cacheMode" value="PARTITIONED"/>
+ <property name="writeSynchronizationMode" value="FULL_SYNC"/>
+
+ <property name="affinityMapper">
+ <bean class="org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper">
+ <property name="groupSize" value="128"/>
+ </bean>
+ </property>
+ </bean>
+ </list>
+ </property>
+
+ <!--
+ This port will be used by Apache Hadoop client to connect to Ignite node as if it was a job tracker.
+ -->
+ <property name="connectorConfiguration">
+ <bean class="org.apache.ignite.configuration.ConnectorConfiguration">
+ <property name="port" value="11211"/>
+ </bean>
+ </property>
+
+ <!--
+ Configure one IGFS file system instance named "igfs" on this node.
+ -->
+ <property name="fileSystemConfiguration">
+ <list>
+ <bean class="org.apache.ignite.configuration.FileSystemConfiguration">
+ <!-- IGFS name you will use to access IGFS through Hadoop API. -->
+ <property name="name" value="igfs-0"/>
+
+ <!-- Caches with these names must be configured. -->
+ <property name="metaCacheName" value="replicated"/>
+ <property name="dataCacheName" value="partitioned"/>
+ <property name="blockSize" value="524288"/>
+ <property name="defaultMode" value="PRIMARY"/>
+ <property name="ipcEndpointEnabled" value="false"/>
+
+ </bean>
+ </list>
+ </property>
+
+ <property name="discoverySpi">
+ <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">
+ <property name="ipFinder">
+ <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">
+ <property name="addresses">
+ <list>
+ <value>127.0.0.1:47500..47509</value>
+ </list>
+ </property>
+ </bean>
+ </property>
+ <property name="localAddress" value="127.0.0.1"/>
+ <property name="localPort" value="47500"/>
+ <property name="joinTimeout" value="5000"/>
+ </bean>
+ </property>
+
+ </bean>
+</beans>
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-1.xml
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-1.xml b/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-1.xml
new file mode 100644
index 0000000..e52921d
--- /dev/null
+++ b/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-1.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ 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.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!--
+ Ignite Spring configuration file.
+
+ When starting a standalone Ignite node, you need to execute the following command:
+ {IGNITE_HOME}/bin/ignite.{bat|sh} path-to-this-file/default-config.xml
+
+ When starting Ignite from Java IDE, pass path to this file into Ignition:
+ Ignition.start("path-to-this-file/default-config.xml");
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+ <!--
+ Optional description.
+ -->
+ <description>
+ Spring file for Ignite node configuration with IGFS and Apache Hadoop map-reduce support enabled.
+ Ignite node will start with this configuration by default.
+ </description>
+
+ <!--
+ Initialize property configurer so we can reference environment variables.
+ -->
+ <bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_FALLBACK"/>
+ <property name="searchSystemEnvironment" value="true"/>
+ </bean>
+
+ <!--
+ Configuration of Ignite node.
+ -->
+ <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration">
+ <property name="gridName" value="IGFS-cli-1"/>
+
+ <property name="marshaller">
+ <bean class="org.apache.ignite.marshaller.optimized.OptimizedMarshaller">
+ </bean>
+ </property>
+
+ <!--
+ Configure caches where IGFS will store data.
+ -->
+ <property name="cacheConfiguration">
+ <list>
+ <!--
+ Configure metadata cache where file system structure will be stored. It must be TRANSACTIONAL,
+ and must have backups to maintain file system consistency in case of node crash.
+ -->
+ <bean class="org.apache.ignite.configuration.CacheConfiguration">
+ <property name="name" value="replicated"/>
+ <property name="cacheMode" value="REPLICATED"/>
+ <property name="atomicityMode" value="TRANSACTIONAL"/>
+ </bean>
+
+ <!--
+ Configure data cache where file's data will be stored.
+ -->
+ <bean class="org.apache.ignite.configuration.CacheConfiguration">
+ <property name="name" value="partitioned"/>
+ <property name="atomicityMode" value="TRANSACTIONAL"/>
+ <property name="cacheMode" value="PARTITIONED"/>
+ <property name="writeSynchronizationMode" value="FULL_SYNC"/>
+
+ <property name="affinityMapper">
+ <bean class="org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper">
+ <property name="groupSize" value="128"/>
+ </bean>
+ </property>
+ </bean>
+ </list>
+ </property>
+
+ <!--
+ This port will be used by Apache Hadoop client to connect to Ignite node as if it was a job tracker.
+ -->
+ <property name="connectorConfiguration">
+ <bean class="org.apache.ignite.configuration.ConnectorConfiguration">
+ <property name="port" value="11212"/>
+ </bean>
+ </property>
+
+ <!--
+ Configure one IGFS file system instance named "igfs" on this node.
+ -->
+ <property name="fileSystemConfiguration">
+ <list>
+ <bean class="org.apache.ignite.configuration.FileSystemConfiguration">
+ <!-- IGFS name you will use to access IGFS through Hadoop API. -->
+ <property name="name" value="igfs-1"/>
+
+ <!-- Caches with these names must be configured. -->
+ <property name="metaCacheName" value="replicated"/>
+ <property name="dataCacheName" value="partitioned"/>
+ <property name="blockSize" value="524288"/>
+ <property name="defaultMode" value="PRIMARY"/>
+ <property name="ipcEndpointEnabled" value="false"/>
+
+ </bean>
+ </list>
+ </property>
+
+ <property name="discoverySpi">
+ <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">
+ <property name="ipFinder">
+ <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">
+ <property name="addresses">
+ <list>
+ <value>127.0.0.1:47600..47609</value>
+ </list>
+ </property>
+ </bean>
+ </property>
+ <property name="localAddress" value="127.0.0.1"/>
+ <property name="localPort" value="47600"/>
+ <property name="joinTimeout" value="5000"/>
+ </bean>
+ </property>
+
+ </bean>
+</beans>
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-2.xml
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-2.xml b/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-2.xml
new file mode 100644
index 0000000..9344e99
--- /dev/null
+++ b/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-2.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ 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.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!--
+ Ignite Spring configuration file.
+
+ When starting a standalone Ignite node, you need to execute the following command:
+ {IGNITE_HOME}/bin/ignite.{bat|sh} path-to-this-file/default-config.xml
+
+ When starting Ignite from Java IDE, pass path to this file into Ignition:
+ Ignition.start("path-to-this-file/default-config.xml");
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+ <!--
+ Optional description.
+ -->
+ <description>
+ Spring file for Ignite node configuration with IGFS and Apache Hadoop map-reduce support enabled.
+ Ignite node will start with this configuration by default.
+ </description>
+
+ <!--
+ Initialize property configurer so we can reference environment variables.
+ -->
+ <bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_FALLBACK"/>
+ <property name="searchSystemEnvironment" value="true"/>
+ </bean>
+
+ <!--
+ Configuration of Ignite node.
+ -->
+ <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration">
+ <property name="gridName" value="IGFS-cli-2"/>
+
+ <property name="marshaller">
+ <bean class="org.apache.ignite.marshaller.optimized.OptimizedMarshaller">
+ </bean>
+ </property>
+
+ <!--
+ Configure caches where IGFS will store data.
+ -->
+ <property name="cacheConfiguration">
+ <list>
+ <!--
+ Configure metadata cache where file system structure will be stored. It must be TRANSACTIONAL,
+ and must have backups to maintain file system consistency in case of node crash.
+ -->
+ <bean class="org.apache.ignite.configuration.CacheConfiguration">
+ <property name="name" value="replicated"/>
+ <property name="cacheMode" value="REPLICATED"/>
+ <property name="atomicityMode" value="TRANSACTIONAL"/>
+ </bean>
+
+ <!--
+ Configure data cache where file's data will be stored.
+ -->
+ <bean class="org.apache.ignite.configuration.CacheConfiguration">
+ <property name="name" value="partitioned"/>
+ <property name="atomicityMode" value="TRANSACTIONAL"/>
+ <property name="cacheMode" value="PARTITIONED"/>
+ <property name="writeSynchronizationMode" value="FULL_SYNC"/>
+
+ <property name="affinityMapper">
+ <bean class="org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper">
+ <property name="groupSize" value="128"/>
+ </bean>
+ </property>
+ </bean>
+ </list>
+ </property>
+
+ <!--
+ This port will be used by Apache Hadoop client to connect to Ignite node as if it was a job tracker.
+ -->
+ <property name="connectorConfiguration">
+ <bean class="org.apache.ignite.configuration.ConnectorConfiguration">
+ <property name="port" value="11213"/>
+ </bean>
+ </property>
+
+ <!--
+ Configure one IGFS file system instance named "igfs" on this node.
+ -->
+ <property name="fileSystemConfiguration">
+ <list>
+ <bean class="org.apache.ignite.configuration.FileSystemConfiguration">
+ <!-- IGFS name you will use to access IGFS through Hadoop API. -->
+ <property name="name" value="igfs-2"/>
+
+ <!-- Caches with these names must be configured. -->
+ <property name="metaCacheName" value="replicated"/>
+ <property name="dataCacheName" value="partitioned"/>
+ <property name="blockSize" value="524288"/>
+ <property name="defaultMode" value="PRIMARY"/>
+ <property name="ipcEndpointEnabled" value="false"/>
+
+ </bean>
+ </list>
+ </property>
+
+ <property name="discoverySpi">
+ <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">
+ <property name="ipFinder">
+ <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">
+ <property name="addresses">
+ <list>
+ <value>127.0.0.1:47700..47709</value>
+ </list>
+ </property>
+ </bean>
+ </property>
+ <property name="localAddress" value="127.0.0.1"/>
+ <property name="localPort" value="47700"/>
+ <property name="joinTimeout" value="5000"/>
+ </bean>
+ </property>
+
+ </bean>
+</beans>
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/hadoop/src/test/config/igfs-cli-config-dual-async.xml
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/config/igfs-cli-config-dual-async.xml b/modules/hadoop/src/test/config/igfs-cli-config-dual-async.xml
new file mode 100644
index 0000000..6fc38cd
--- /dev/null
+++ b/modules/hadoop/src/test/config/igfs-cli-config-dual-async.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ 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.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!--
+ Ignite Spring configuration file.
+
+ When starting a standalone Ignite node, you need to execute the following command:
+ {IGNITE_HOME}/bin/ignite.{bat|sh} path-to-this-file/default-config.xml
+
+ When starting Ignite from Java IDE, pass path to this file into Ignition:
+ Ignition.start("path-to-this-file/default-config.xml");
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+ <!--
+ Optional description.
+ -->
+ <description>
+ Spring file for Ignite node configuration with IGFS and Apache Hadoop map-reduce support enabled.
+ Ignite node will start with this configuration by default.
+ </description>
+
+ <!--
+ Initialize property configurer so we can reference environment variables.
+ -->
+ <bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_FALLBACK"/>
+ <property name="searchSystemEnvironment" value="true"/>
+ </bean>
+
+ <!--
+ Configuration of Ignite node.
+ -->
+ <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration">
+ <property name="clientMode" value="true"/>
+ <property name="gridName" value="test-IGFS-cli"/>
+
+ <property name="marshaller">
+ <bean class="org.apache.ignite.marshaller.optimized.OptimizedMarshaller">
+ </bean>
+ </property>
+
+ <!--
+ Configure caches where IGFS will store data.
+ -->
+ <property name="cacheConfiguration">
+ <list>
+ <!--
+ Configure metadata cache where file system structure will be stored. It must be TRANSACTIONAL,
+ and must have backups to maintain file system consistency in case of node crash.
+ -->
+ <bean class="org.apache.ignite.configuration.CacheConfiguration">
+ <property name="name" value="replicated"/>
+ <property name="cacheMode" value="REPLICATED"/>
+ <property name="atomicityMode" value="TRANSACTIONAL"/>
+ </bean>
+
+ <!--
+ Configure data cache where file's data will be stored.
+ -->
+ <bean class="org.apache.ignite.configuration.CacheConfiguration">
+ <property name="name" value="partitioned"/>
+ <property name="atomicityMode" value="TRANSACTIONAL"/>
+ <property name="cacheMode" value="PARTITIONED"/>
+ <property name="writeSynchronizationMode" value="FULL_SYNC"/>
+
+ <property name="affinityMapper">
+ <bean class="org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper">
+ <property name="groupSize" value="128"/>
+ </bean>
+ </property>
+ </bean>
+ </list>
+ </property>
+
+ <!--
+ This port will be used by Apache Hadoop client to connect to Ignite node as if it was a job tracker.
+ -->
+ <property name="connectorConfiguration">
+ <bean class="org.apache.ignite.configuration.ConnectorConfiguration">
+ <property name="port" value="11211"/>
+ </bean>
+ </property>
+
+ <property name="fileSystemConfiguration">
+ <list>
+ <!--
+ Configure PRIMARY IGFS file system instance named "igfs"
+ -->
+ <bean class="org.apache.ignite.configuration.FileSystemConfiguration">
+ <!-- IGFS name you will use to access IGFS through Hadoop API. -->
+ <property name="name" value="igfs"/>
+
+ <!-- Caches with these names must be configured. -->
+ <property name="metaCacheName" value="replicated"/>
+ <property name="dataCacheName" value="partitioned"/>
+ <property name="blockSize" value="524288"/>
+ <property name="defaultMode" value="DUAL_ASYNC"/>
+
+ <property name="secondaryFileSystem">
+ <bean class="org.apache.ignite.hadoop.fs.IgniteHadoopIgfsSecondaryFileSystem">
+ <property name="defaultUserName" value="secondary-default"/>
+
+ <property name="fileSystemFactory">
+ <bean class="org.apache.ignite.hadoop.fs.CachingHadoopFileSystemFactory">
+ <property name="uri" value="igfs://igfs_secondary@127.0.0.1:11500/"/>
+ <property name="configPaths" value="/work/core-site-test.xml"/>
+ </bean>
+ </property>
+ </bean>
+ </property>
+ </bean>
+ </list>
+ </property>
+
+ <property name="discoverySpi">
+ <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">
+ <property name="ipFinder">
+ <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">
+ <property name="addresses">
+ <list>
+ <value>127.0.0.1:47500..47509</value>
+ </list>
+ </property>
+ </bean>
+ </property>
+ </bean>
+ </property>
+
+ </bean>
+</beans>
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/hadoop/src/test/config/igfs-cli-config-dual-sync.xml
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/config/igfs-cli-config-dual-sync.xml b/modules/hadoop/src/test/config/igfs-cli-config-dual-sync.xml
new file mode 100644
index 0000000..fcd8d82
--- /dev/null
+++ b/modules/hadoop/src/test/config/igfs-cli-config-dual-sync.xml
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ 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.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!--
+ Ignite Spring configuration file.
+
+ When starting a standalone Ignite node, you need to execute the following command:
+ {IGNITE_HOME}/bin/ignite.{bat|sh} path-to-this-file/default-config.xml
+
+ When starting Ignite from Java IDE, pass path to this file into Ignition:
+ Ignition.start("path-to-this-file/default-config.xml");
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+ <!--
+ Optional description.
+ -->
+ <description>
+ Spring file for Ignite node configuration with IGFS and Apache Hadoop map-reduce support enabled.
+ Ignite node will start with this configuration by default.
+ </description>
+
+ <!--
+ Initialize property configurer so we can reference environment variables.
+ -->
+ <bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_FALLBACK"/>
+ <property name="searchSystemEnvironment" value="true"/>
+ </bean>
+
+ <!--
+ Configuration of Ignite node.
+ -->
+ <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration">
+ <property name="clientMode" value="true"/>
+ <property name="marshaller">
+ <bean class="org.apache.ignite.marshaller.optimized.OptimizedMarshaller">
+ </bean>
+ </property>
+
+ <!--
+ Configure caches where IGFS will store data.
+ -->
+ <property name="cacheConfiguration">
+ <list>
+ <!--
+ Configure metadata cache where file system structure will be stored. It must be TRANSACTIONAL,
+ and must have backups to maintain file system consistency in case of node crash.
+ -->
+ <bean class="org.apache.ignite.configuration.CacheConfiguration">
+ <property name="name" value="replicated"/>
+ <property name="cacheMode" value="REPLICATED"/>
+ <property name="atomicityMode" value="TRANSACTIONAL"/>
+ </bean>
+
+ <!--
+ Configure data cache where file's data will be stored.
+ -->
+ <bean class="org.apache.ignite.configuration.CacheConfiguration">
+ <property name="name" value="partitioned"/>
+ <property name="atomicityMode" value="TRANSACTIONAL"/>
+ <property name="cacheMode" value="PARTITIONED"/>
+ <property name="writeSynchronizationMode" value="FULL_SYNC"/>
+
+ <property name="affinityMapper">
+ <bean class="org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper">
+ <property name="groupSize" value="128"/>
+ </bean>
+ </property>
+ </bean>
+ </list>
+ </property>
+
+ <!--
+ This port will be used by Apache Hadoop client to connect to Ignite node as if it was a job tracker.
+ -->
+ <property name="connectorConfiguration">
+ <bean class="org.apache.ignite.configuration.ConnectorConfiguration">
+ <property name="port" value="11211"/>
+ </bean>
+ </property>
+
+ <property name="fileSystemConfiguration">
+ <list>
+ <!--
+ Configure PRIMARY IGFS file system instance named "igfs"
+ -->
+ <bean class="org.apache.ignite.configuration.FileSystemConfiguration">
+ <!-- IGFS name you will use to access IGFS through Hadoop API. -->
+ <property name="name" value="igfs"/>
+
+ <!-- Caches with these names must be configured. -->
+ <property name="metaCacheName" value="replicated"/>
+ <property name="dataCacheName" value="partitioned"/>
+ <property name="blockSize" value="524288"/>
+ <property name="defaultMode" value="DUAL_SYNC"/>
+
+ <property name="secondaryFileSystem">
+ <bean class="org.apache.ignite.hadoop.fs.IgniteHadoopIgfsSecondaryFileSystem">
+ <property name="defaultUserName" value="secondary-default"/>
+
+ <property name="fileSystemFactory">
+ <bean class="org.apache.ignite.hadoop.fs.CachingHadoopFileSystemFactory">
+ <property name="uri" value="igfs://igfs_secondary@127.0.0.1:11500/"/>
+ <property name="configPaths" value="/work/core-site-test.xml"/>
+ </bean>
+ </property>
+ </bean>
+ </property>
+ </bean>
+ </list>
+ </property>
+
+ <property name="discoverySpi">
+ <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">
+ <property name="ipFinder">
+ <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">
+ <property name="addresses">
+ <list>
+ <value>127.0.0.1:47500..47509</value>
+ </list>
+ </property>
+ </bean>
+ </property>
+ </bean>
+ </property>
+
+ </bean>
+</beans>
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/hadoop/src/test/config/igfs-cli-config-primary.xml
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/config/igfs-cli-config-primary.xml b/modules/hadoop/src/test/config/igfs-cli-config-primary.xml
new file mode 100644
index 0000000..cc066b2
--- /dev/null
+++ b/modules/hadoop/src/test/config/igfs-cli-config-primary.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ 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.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!--
+ Ignite Spring configuration file.
+
+ When starting a standalone Ignite node, you need to execute the following command:
+ {IGNITE_HOME}/bin/ignite.{bat|sh} path-to-this-file/default-config.xml
+
+ When starting Ignite from Java IDE, pass path to this file into Ignition:
+ Ignition.start("path-to-this-file/default-config.xml");
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+ <!--
+ Optional description.
+ -->
+ <description>
+ Spring file for Ignite node configuration with IGFS and Apache Hadoop map-reduce support enabled.
+ Ignite node will start with this configuration by default.
+ </description>
+
+ <!--
+ Initialize property configurer so we can reference environment variables.
+ -->
+ <bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_FALLBACK"/>
+ <property name="searchSystemEnvironment" value="true"/>
+ </bean>
+
+ <!--
+ Configuration of Ignite node.
+ -->
+ <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration">
+ <property name="clientMode" value="true"/>
+ <property name="gridName" value="test-IGFS-cli"/>
+
+ <property name="marshaller">
+ <bean class="org.apache.ignite.marshaller.optimized.OptimizedMarshaller">
+ </bean>
+ </property>
+
+ <!--
+ Configure caches where IGFS will store data.
+ -->
+ <property name="cacheConfiguration">
+ <list>
+ <!--
+ Configure metadata cache where file system structure will be stored. It must be TRANSACTIONAL,
+ and must have backups to maintain file system consistency in case of node crash.
+ -->
+ <bean class="org.apache.ignite.configuration.CacheConfiguration">
+ <property name="name" value="replicated"/>
+ <property name="cacheMode" value="REPLICATED"/>
+ <property name="atomicityMode" value="TRANSACTIONAL"/>
+ </bean>
+
+ <!--
+ Configure data cache where file's data will be stored.
+ -->
+ <bean class="org.apache.ignite.configuration.CacheConfiguration">
+ <property name="name" value="partitioned"/>
+ <property name="atomicityMode" value="TRANSACTIONAL"/>
+ <property name="cacheMode" value="PARTITIONED"/>
+ <property name="writeSynchronizationMode" value="FULL_SYNC"/>
+
+ <property name="affinityMapper">
+ <bean class="org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper">
+ <property name="groupSize" value="128"/>
+ </bean>
+ </property>
+ </bean>
+ </list>
+ </property>
+
+ <!--
+ This port will be used by Apache Hadoop client to connect to Ignite node as if it was a job tracker.
+ -->
+ <property name="connectorConfiguration">
+ <bean class="org.apache.ignite.configuration.ConnectorConfiguration">
+ <property name="port" value="11211"/>
+ </bean>
+ </property>
+
+ <!--
+ Configure one IGFS file system instance named "igfs" on this node.
+ -->
+ <property name="fileSystemConfiguration">
+ <list>
+ <bean class="org.apache.ignite.configuration.FileSystemConfiguration">
+ <!-- IGFS name you will use to access IGFS through Hadoop API. -->
+ <property name="name" value="igfs"/>
+
+ <!-- Caches with these names must be configured. -->
+ <property name="metaCacheName" value="replicated"/>
+ <property name="dataCacheName" value="partitioned"/>
+ <property name="blockSize" value="524288"/>
+ <property name="defaultMode" value="PRIMARY"/>
+ <property name="ipcEndpointEnabled" value="false"/>
+
+ </bean>
+ </list>
+ </property>
+
+ <property name="discoverySpi">
+ <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">
+ <property name="ipFinder">
+ <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">
+ <property name="addresses">
+ <list>
+ <value>127.0.0.1:47500..47509</value>
+ </list>
+ </property>
+ </bean>
+ </property>
+ </bean>
+ </property>
+
+ </bean>
+</beans>
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/hadoop/src/test/config/igfs-cli-config-proxy.xml
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/config/igfs-cli-config-proxy.xml b/modules/hadoop/src/test/config/igfs-cli-config-proxy.xml
new file mode 100644
index 0000000..f25fd50
--- /dev/null
+++ b/modules/hadoop/src/test/config/igfs-cli-config-proxy.xml
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ 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.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!--
+ Ignite Spring configuration file.
+
+ When starting a standalone Ignite node, you need to execute the following command:
+ {IGNITE_HOME}/bin/ignite.{bat|sh} path-to-this-file/default-config.xml
+
+ When starting Ignite from Java IDE, pass path to this file into Ignition:
+ Ignition.start("path-to-this-file/default-config.xml");
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+ <!--
+ Optional description.
+ -->
+ <description>
+ Spring file for Ignite node configuration with IGFS and Apache Hadoop map-reduce support enabled.
+ Ignite node will start with this configuration by default.
+ </description>
+
+ <!--
+ Initialize property configurer so we can reference environment variables.
+ -->
+ <bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_FALLBACK"/>
+ <property name="searchSystemEnvironment" value="true"/>
+ </bean>
+
+ <!--
+ Configuration of Ignite node.
+ -->
+ <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration">
+ <property name="clientMode" value="true"/>
+ <property name="marshaller">
+ <bean class="org.apache.ignite.marshaller.optimized.OptimizedMarshaller">
+ </bean>
+ </property>
+
+ <!--
+ Configure caches where IGFS will store data.
+ -->
+ <property name="cacheConfiguration">
+ <list>
+ <!--
+ Configure metadata cache where file system structure will be stored. It must be TRANSACTIONAL,
+ and must have backups to maintain file system consistency in case of node crash.
+ -->
+ <bean class="org.apache.ignite.configuration.CacheConfiguration">
+ <property name="name" value="replicated"/>
+ <property name="cacheMode" value="REPLICATED"/>
+ <property name="atomicityMode" value="TRANSACTIONAL"/>
+ </bean>
+
+ <!--
+ Configure data cache where file's data will be stored.
+ -->
+ <bean class="org.apache.ignite.configuration.CacheConfiguration">
+ <property name="name" value="partitioned"/>
+ <property name="atomicityMode" value="TRANSACTIONAL"/>
+ <property name="cacheMode" value="PARTITIONED"/>
+ <property name="writeSynchronizationMode" value="FULL_SYNC"/>
+
+ <property name="affinityMapper">
+ <bean class="org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper">
+ <property name="groupSize" value="128"/>
+ </bean>
+ </property>
+ </bean>
+ </list>
+ </property>
+
+ <!--
+ This port will be used by Apache Hadoop client to connect to Ignite node as if it was a job tracker.
+ -->
+ <property name="connectorConfiguration">
+ <bean class="org.apache.ignite.configuration.ConnectorConfiguration">
+ <property name="port" value="11211"/>
+ </bean>
+ </property>
+
+ <property name="fileSystemConfiguration">
+ <list>
+ <!--
+ Configure PRIMARY IGFS file system instance named "igfs"
+ -->
+ <bean class="org.apache.ignite.configuration.FileSystemConfiguration">
+ <!-- IGFS name you will use to access IGFS through Hadoop API. -->
+ <property name="name" value="igfs"/>
+
+ <!-- Caches with these names must be configured. -->
+ <property name="metaCacheName" value="replicated"/>
+ <property name="dataCacheName" value="partitioned"/>
+ <property name="blockSize" value="524288"/>
+ <property name="defaultMode" value="PROXY"/>
+
+ <property name="secondaryFileSystem">
+ <bean class="org.apache.ignite.hadoop.fs.IgniteHadoopIgfsSecondaryFileSystem">
+ <property name="defaultUserName" value="secondary-default"/>
+
+ <property name="fileSystemFactory">
+ <bean class="org.apache.ignite.hadoop.fs.CachingHadoopFileSystemFactory">
+ <property name="uri" value="igfs://igfs_secondary@127.0.0.1:11500/"/>
+ <property name="configPaths" value="/work/core-site-test.xml"/>
+ </bean>
+ </property>
+ </bean>
+ </property>
+ </bean>
+ </list>
+ </property>
+
+ <property name="discoverySpi">
+ <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">
+ <property name="ipFinder">
+ <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">
+ <property name="addresses">
+ <list>
+ <value>127.0.0.1:47500..47509</value>
+ </list>
+ </property>
+ </bean>
+ </property>
+ </bean>
+ </property>
+
+ </bean>
+</beans>
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemAbstractSelfTest.java
index 1bcbdaa..4d4f68b 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemAbstractSelfTest.java
@@ -17,6 +17,30 @@
package org.apache.ignite.internal.processors.hadoop.impl.igfs;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.reflect.Field;
+import java.net.URI;
+import java.security.PrivilegedExceptionAction;
+import java.util.ArrayDeque;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Deque;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.BlockLocation;
import org.apache.hadoop.fs.ContentSummary;
@@ -53,6 +77,7 @@ import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.G;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
@@ -60,30 +85,6 @@ import org.apache.ignite.testframework.GridTestUtils;
import org.jetbrains.annotations.Nullable;
import org.jsr166.ThreadLocalRandom8;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.lang.reflect.Field;
-import java.net.URI;
-import java.security.PrivilegedExceptionAction;
-import java.util.ArrayDeque;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.Deque;
-import java.util.LinkedList;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.CyclicBarrier;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
-
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheMode.REPLICATED;
@@ -102,7 +103,7 @@ public abstract class IgniteHadoopFileSystemAbstractSelfTest extends IgfsCommonA
private static final String PRIMARY_AUTHORITY = "igfs@";
/** Primary file systme URI. */
- private static final String PRIMARY_URI = "igfs://" + PRIMARY_AUTHORITY + "/";
+ protected static final String PRIMARY_URI = "igfs://" + PRIMARY_AUTHORITY + "/";
/** Secondary file system authority. */
private static final String SECONDARY_AUTHORITY = "igfs_secondary@127.0.0.1:11500";
@@ -122,6 +123,9 @@ public abstract class IgniteHadoopFileSystemAbstractSelfTest extends IgfsCommonA
/** Group size. */
public static final int GRP_SIZE = 128;
+ /** Group size. */
+ public static final int GRID_COUNT = 4;
+
/** Path to the default hadoop configuration. */
public static final String HADOOP_FS_CFG = "examples/config/filesystem/core-site.xml";
@@ -135,7 +139,7 @@ public abstract class IgniteHadoopFileSystemAbstractSelfTest extends IgfsCommonA
private static CyclicBarrier barrier;
/** File system. */
- private static FileSystem fs;
+ protected static FileSystem fs;
/** Default IGFS mode. */
protected final IgfsMode mode;
@@ -187,6 +191,8 @@ public abstract class IgniteHadoopFileSystemAbstractSelfTest extends IgfsCommonA
this.skipLocShmem = skipLocShmem;
endpoint = skipLocShmem ? "127.0.0.1:10500" : "shmem:10500";
+
+ ((TcpDiscoveryVmIpFinder)IP_FINDER).setAddresses(Collections.singleton("127.0.0.1:47500..47509"));
}
/**
@@ -199,7 +205,7 @@ public abstract class IgniteHadoopFileSystemAbstractSelfTest extends IgfsCommonA
/** {@inheritDoc} */
@Override protected void beforeTestsStarted() throws Exception {
- Configuration secondaryConf = configuration(SECONDARY_AUTHORITY, true, true);
+ Configuration secondaryConf = configurationSecondary(SECONDARY_AUTHORITY);
secondaryConf.setInt("fs.igfs.block.size", 1024);
@@ -220,11 +226,22 @@ public abstract class IgniteHadoopFileSystemAbstractSelfTest extends IgfsCommonA
}
/**
+ * @throws Exception
+ */
+ protected void stopNodes() throws Exception {
+ for (int i = 0; i < GRID_COUNT; ++i)
+ stopGrid(i);
+
+ G.stop("grid_secondary", false);
+
+ Thread.sleep(500);
+ }
+ /**
* Starts the nodes for this test.
*
* @throws Exception If failed.
*/
- private void startNodes() throws Exception {
+ protected void startNodes() throws Exception {
if (mode != PRIMARY) {
// Start secondary IGFS.
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
@@ -258,8 +275,10 @@ public abstract class IgniteHadoopFileSystemAbstractSelfTest extends IgfsCommonA
cfg.setGridName("grid_secondary");
TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
+ discoSpi.setLocalPort(47510);
- discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true));
+ TcpDiscoveryVmIpFinder finder = new TcpDiscoveryVmIpFinder(true);
+ discoSpi.setIpFinder(finder);
cfg.setDiscoverySpi(discoSpi);
cfg.setCacheConfiguration(metaCacheCfg, cacheCfg);
@@ -269,7 +288,10 @@ public abstract class IgniteHadoopFileSystemAbstractSelfTest extends IgfsCommonA
G.start(cfg);
}
- startGrids(4);
+ for (int i = 1; i < GRID_COUNT; ++i)
+ startGrid(i);
+
+ startGrid(0);
}
/** {@inheritDoc} */
@@ -329,12 +351,14 @@ public abstract class IgniteHadoopFileSystemAbstractSelfTest extends IgfsCommonA
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ IgniteConfiguration cfg = new IgniteConfiguration();
TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
discoSpi.setIpFinder(IP_FINDER);
+ cfg.setGridName(gridName);
+ cfg.setMarshaller(new OptimizedMarshaller());
cfg.setDiscoverySpi(discoSpi);
cfg.setCacheConfiguration(cacheConfiguration(gridName));
cfg.setFileSystemConfiguration(igfsConfiguration(gridName));
@@ -2049,7 +2073,7 @@ public abstract class IgniteHadoopFileSystemAbstractSelfTest extends IgfsCommonA
final FSDataOutputStream s = fs.create(filePath); // Open the stream before stopping IGFS.
try {
- G.stopAll(true); // Stop the server.
+ stopNodes();
startNodes(); // Start server again.
@@ -2095,7 +2119,7 @@ public abstract class IgniteHadoopFileSystemAbstractSelfTest extends IgfsCommonA
for (int i = 0; i < nClients; i++)
q.add(FileSystem.get(primaryFsUri, cfg));
- G.stopAll(true); // Stop the server.
+ stopNodes();
startNodes(); // Start server again.
@@ -2414,7 +2438,7 @@ public abstract class IgniteHadoopFileSystemAbstractSelfTest extends IgfsCommonA
* @param skipLocShmem Whether to skip local shmem mode.
* @return Configuration.
*/
- private static Configuration configuration(String authority, boolean skipEmbed, boolean skipLocShmem) {
+ protected Configuration configuration(String authority, boolean skipEmbed, boolean skipLocShmem) {
Configuration cfg = new Configuration();
cfg.set("fs.defaultFS", "igfs://" + authority + "/");
@@ -2432,4 +2456,29 @@ public abstract class IgniteHadoopFileSystemAbstractSelfTest extends IgfsCommonA
return cfg;
}
+
+ /**
+ * Create configuration for test.
+ *
+ * @param authority Authority.
+ * @param skipEmbed Whether to skip embedded mode.
+ * @param skipLocShmem Whether to skip local shmem mode.
+ * @return Configuration.
+ */
+ protected Configuration configurationSecondary(String authority) {
+ Configuration cfg = new Configuration();
+
+ cfg.set("fs.defaultFS", "igfs://" + authority + "/");
+ cfg.set("fs.igfs.impl", IgniteHadoopFileSystem.class.getName());
+ cfg.set("fs.AbstractFileSystem.igfs.impl",
+ org.apache.ignite.hadoop.fs.v2.IgniteHadoopFileSystem.class.getName());
+
+ cfg.setBoolean("fs.igfs.impl.disable.cache", true);
+
+ cfg.setBoolean(String.format(HadoopIgfsUtils.PARAM_IGFS_ENDPOINT_NO_EMBED, authority), true);
+
+ cfg.setBoolean(String.format(HadoopIgfsUtils.PARAM_IGFS_ENDPOINT_NO_LOCAL_SHMEM, authority), true);
+
+ return cfg;
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientBasedAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientBasedAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientBasedAbstractSelfTest.java
new file mode 100644
index 0000000..8198cd3
--- /dev/null
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientBasedAbstractSelfTest.java
@@ -0,0 +1,193 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.hadoop.impl.igfs;
+
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FSDataOutputStream;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.configuration.FileSystemConfiguration;
+import org.apache.ignite.hadoop.fs.v1.IgniteHadoopFileSystem;
+import org.apache.ignite.igfs.IgfsIpcEndpointConfiguration;
+import org.apache.ignite.igfs.IgfsMode;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.testframework.GridTestUtils;
+
+/**
+ * IGFS Hadoop file system Ignite client -based self test.
+ */
+public abstract class IgniteHadoopFileSystemClientBasedAbstractSelfTest extends IgniteHadoopFileSystemAbstractSelfTest {
+ /** Alive node index. */
+ private static final int ALIVE_NODE_IDX = GRID_COUNT - 1;
+
+ /**
+ * Constructor.
+ *
+ * @param mode IGFS mode.
+ */
+ IgniteHadoopFileSystemClientBasedAbstractSelfTest(IgfsMode mode) {
+ super(mode, true, true);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected IgfsIpcEndpointConfiguration primaryIpcEndpointConfiguration(final String gridName) {
+ return null;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected FileSystemConfiguration igfsConfiguration(String gridName) throws IgniteCheckedException {
+ FileSystemConfiguration cfg = super.igfsConfiguration(gridName);
+
+ cfg.setIpcEndpointEnabled(false);
+
+ return cfg;
+ }
+
+ /**
+ * @return Path to Ignite client node configuration.
+ */
+ protected abstract String getClientConfig();
+
+ /** {@inheritDoc} */
+ @Override protected Configuration configuration(String authority, boolean skipEmbed, boolean skipLocShmem) {
+ Configuration cfg = new Configuration();
+
+ cfg.set("fs.defaultFS", "igfs://" + authority + "/");
+ cfg.set("fs.igfs.impl", IgniteHadoopFileSystem.class.getName());
+ cfg.set("fs.AbstractFileSystem.igfs.impl",
+ org.apache.ignite.hadoop.fs.v2.IgniteHadoopFileSystem.class.getName());
+
+ cfg.setBoolean("fs.igfs.impl.disable.cache", true);
+ cfg.setBoolean(String.format(HadoopIgfsUtils.PARAM_IGFS_ENDPOINT_NO_EMBED, authority), true);
+ cfg.setBoolean(String.format(HadoopIgfsUtils.PARAM_IGFS_ENDPOINT_NO_LOCAL_SHMEM, authority), true);
+ cfg.setBoolean(String.format(HadoopIgfsUtils.PARAM_IGFS_ENDPOINT_NO_LOCAL_TCP, authority), true);
+ cfg.setBoolean(String.format(HadoopIgfsUtils.PARAM_IGFS_ENDPOINT_NO_REMOTE_TCP, authority), true);
+ cfg.setStrings(String.format(HadoopIgfsUtils.PARAM_IGFS_ENDPOINT_IGNITE_CFG_PATH, authority),
+ getClientConfig());
+
+ return cfg;
+ }
+
+ /** {@inheritDoc} */
+ @Override public void testClientReconnect() throws Exception {
+ Path filePath = new Path(PRIMARY_URI, "file1");
+
+ final FSDataOutputStream s = fs.create(filePath); // Open the stream before stopping IGFS.
+
+ try {
+ restartServerNodesExceptOne();
+
+ // Check that client is again operational.
+ assertTrue(fs.mkdirs(new Path(PRIMARY_URI, "dir1/dir2")));
+
+ s.write("test".getBytes());
+
+ s.flush(); // Flush data to the broken output stream.
+
+ assertTrue(fs.exists(filePath));
+ }
+ finally {
+ U.closeQuiet(s); // Safety.
+ }
+ }
+
+ /**
+ * Verifies that client reconnects after connection to the server has been lost (multithreaded mode).
+ *
+ * @throws Exception If error occurs.
+ */
+ @Override public void testClientReconnectMultithreaded() throws Exception {
+ final ConcurrentLinkedQueue<FileSystem> q = new ConcurrentLinkedQueue<>();
+
+ Configuration cfg = new Configuration();
+
+ for (Map.Entry<String, String> entry : primaryFsCfg)
+ cfg.set(entry.getKey(), entry.getValue());
+
+ cfg.setBoolean("fs.igfs.impl.disable.cache", true);
+
+ final int nClients = 1;
+
+ // Initialize clients.
+ for (int i = 0; i < nClients; i++)
+ q.add(FileSystem.get(primaryFsUri, cfg));
+
+ restartServerNodesExceptOne();
+
+ GridTestUtils.runMultiThreaded(new Callable<Object>() {
+ @Override public Object call() throws Exception {
+ FileSystem fs = q.poll();
+
+ try {
+ // Check that client is again operational.
+ assertTrue(fs.mkdirs(new Path("/" + Thread.currentThread().getName())));
+
+ return true;
+ }
+ finally {
+ U.closeQuiet(fs);
+ }
+ }
+ }, nClients, "test-client");
+ }
+
+ /**
+ *
+ * @throws Exception If failed.
+ */
+ private void restartServerNodesExceptOne() throws Exception {
+ stopAllNodesExcept(ALIVE_NODE_IDX);
+
+ Thread.sleep(500);
+
+ startAllNodesExcept(ALIVE_NODE_IDX); // Start server again.
+
+ Thread.sleep(500);
+
+ stopGrid(ALIVE_NODE_IDX);
+
+ Thread.sleep(500);
+
+ startGrid(ALIVE_NODE_IDX);
+
+ Thread.sleep(500);
+ }
+
+ /**
+ * @param nodeIdx Node index to not stop
+ */
+ private void stopAllNodesExcept(int nodeIdx) {
+ for (int i = 0; i < GRID_COUNT; ++i)
+ if (i != nodeIdx)
+ stopGrid(i);
+ }
+
+ /**
+ * @param nodeIdx Node index to not stop
+ * @throws Exception If failed.
+ */
+ private void startAllNodesExcept(int nodeIdx) throws Exception {
+ for (int i = 0; i < GRID_COUNT; ++i)
+ if (i != nodeIdx)
+ startGrid(i);
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientBasedDualAsyncSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientBasedDualAsyncSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientBasedDualAsyncSelfTest.java
new file mode 100644
index 0000000..3bd61b5
--- /dev/null
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientBasedDualAsyncSelfTest.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.hadoop.impl.igfs;
+
+import org.apache.ignite.igfs.IgfsMode;
+
+/**
+ * IGFS Hadoop file system Ignite client -based self test for DUAL_ASYNC mode.
+ */
+public class IgniteHadoopFileSystemClientBasedDualAsyncSelfTest
+ extends IgniteHadoopFileSystemClientBasedAbstractSelfTest {
+ /**
+ * Constructor.
+ */
+ public IgniteHadoopFileSystemClientBasedDualAsyncSelfTest() {
+ super(IgfsMode.DUAL_ASYNC);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected String getClientConfig() {
+ return "modules/hadoop/src/test/config/igfs-cli-config-dual-async.xml";
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientBasedDualSyncSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientBasedDualSyncSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientBasedDualSyncSelfTest.java
new file mode 100644
index 0000000..c7e97d7
--- /dev/null
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientBasedDualSyncSelfTest.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.hadoop.impl.igfs;
+
+import org.apache.ignite.igfs.IgfsMode;
+
+/**
+ * IGFS Hadoop file system Ignite client -based self test for DUAL_SYNC mode.
+ */
+public class IgniteHadoopFileSystemClientBasedDualSyncSelfTest
+ extends IgniteHadoopFileSystemClientBasedAbstractSelfTest {
+ /**
+ * Constructor.
+ */
+ public IgniteHadoopFileSystemClientBasedDualSyncSelfTest() {
+ super(IgfsMode.DUAL_SYNC);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected String getClientConfig() {
+ return "modules/hadoop/src/test/config/igfs-cli-config-dual-sync.xml";
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientBasedOpenTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientBasedOpenTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientBasedOpenTest.java
new file mode 100644
index 0000000..6091dca
--- /dev/null
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientBasedOpenTest.java
@@ -0,0 +1,304 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.hadoop.impl.igfs;
+
+import java.net.URI;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FSDataOutputStream;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.hadoop.fs.v1.IgniteHadoopFileSystem;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.IgnitionEx;
+import org.apache.ignite.internal.processors.resource.GridSpringResourceContext;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+/**
+ * IGFS Hadoop file system Ignite client -based self test for PROXY mode.
+ */
+public class IgniteHadoopFileSystemClientBasedOpenTest extends GridCommonAbstractTest {
+ /** Config root path. */
+ private static final String [] CONFIGS = {
+ "modules/hadoop/src/test/config/hadoop-fs-open-test/grid-0.xml",
+ "modules/hadoop/src/test/config/hadoop-fs-open-test/grid-1.xml",
+ "modules/hadoop/src/test/config/hadoop-fs-open-test/grid-2.xml"
+ };
+
+ /** Nodes types. */
+ private static NodeType[][] nodesTypes = new NodeType[][] {
+ {NodeType.REMOTE, NodeType.REMOTE, NodeType.REMOTE},
+ {NodeType.LOCAL, NodeType.REMOTE, NodeType.REMOTE},
+ {NodeType.REMOTE, NodeType.LOCAL, NodeType.REMOTE},
+ {NodeType.LOCAL, NodeType.LOCAL, NodeType.REMOTE},
+ {NodeType.REMOTE, NodeType.REMOTE, NodeType.LOCAL},
+ {NodeType.LOCAL, NodeType.REMOTE, NodeType.LOCAL},
+ {NodeType.REMOTE, NodeType.LOCAL, NodeType.LOCAL},
+ {NodeType.LOCAL, NodeType.LOCAL, NodeType.LOCAL},
+
+ {NodeType.LOCAL_SAME_NAME, NodeType.REMOTE, NodeType.REMOTE},
+ {NodeType.REMOTE, NodeType.LOCAL_SAME_NAME, NodeType.REMOTE},
+ {NodeType.LOCAL_SAME_NAME, NodeType.LOCAL_SAME_NAME, NodeType.REMOTE},
+ {NodeType.REMOTE, NodeType.REMOTE, NodeType.LOCAL_SAME_NAME},
+ {NodeType.LOCAL_SAME_NAME, NodeType.REMOTE, NodeType.LOCAL_SAME_NAME},
+ {NodeType.REMOTE, NodeType.LOCAL_SAME_NAME, NodeType.LOCAL_SAME_NAME},
+ {NodeType.LOCAL_SAME_NAME, NodeType.LOCAL_SAME_NAME, NodeType.LOCAL_SAME_NAME},
+ };
+
+ /** Test threads count. */
+ private static final int THREADS_COUNT = 20;
+
+ /** Iterations count. */
+ private static final int ITERATIONS = 10;
+
+ /** Iterations count. */
+ private static boolean skipInProc;
+
+ /**
+ * @param idx Grid index.
+ * @return Path to Ignite config file.
+ */
+ private static String cfgPath(int idx) {
+ return CONFIGS[idx];
+ }
+
+ /**
+ * @param idx Grid index.
+ * @return Path to Ignite config file.
+ */
+ private static String uri(int idx) {
+ return "igfs://" + authority(idx) + '/';
+ }
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+ IgniteBiTuple<IgniteConfiguration, GridSpringResourceContext> cfgPair =
+ IgnitionEx.loadConfiguration(cfgPath(getTestGridIndex(gridName)));
+
+ IgniteConfiguration cfg = cfgPair.get1();
+
+ cfg.setGridName(gridName);
+
+ return cfg;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTestsStopped() throws Exception {
+ stopAllGrids();
+
+ super.afterTestsStopped();
+ }
+
+ /** {@inheritDoc} */
+ @Override protected long getTestTimeout() {
+ return 15 * 60_000;
+ }
+
+ /**
+ * Create configuration for test.
+ *
+ * @param idx Grid index.
+ * @return Configuration.
+ */
+ protected Configuration configuration(int idx) {
+ Configuration cfg = new Configuration();
+
+ cfg.set("fs.defaultFS", "igfs://" + authority(idx) + '/');
+ cfg.set("fs.igfs.impl", IgniteHadoopFileSystem.class.getName());
+ cfg.set("fs.AbstractFileSystem.igfs.impl",
+ org.apache.ignite.hadoop.fs.v2.IgniteHadoopFileSystem.class.getName());
+
+ cfg.setBoolean("fs.igfs.impl.disable.cache", true);
+
+ cfg.setStrings(String.format(HadoopIgfsUtils.PARAM_IGFS_ENDPOINT_IGNITE_CFG_PATH, authority(idx)),
+ cfgPath(idx));
+
+ if (skipInProc)
+ cfg.setBoolean(String.format(HadoopIgfsUtils.PARAM_IGFS_ENDPOINT_NO_EMBED, authority(idx)), true);
+
+ return cfg;
+ }
+
+ /**
+ * Create configuration for test.
+ *
+ * @return Configuration.
+ */
+ protected Configuration configurationWrongIgfs() {
+ Configuration cfg = new Configuration();
+
+ cfg.set("fs.defaultFS", "igfs://igfs-wrong-name@/");
+ cfg.set("fs.igfs.impl", IgniteHadoopFileSystem.class.getName());
+ cfg.set("fs.AbstractFileSystem.igfs.impl",
+ org.apache.ignite.hadoop.fs.v2.IgniteHadoopFileSystem.class.getName());
+
+ cfg.setBoolean("fs.igfs.impl.disable.cache", true);
+
+ cfg.setStrings(String.format(HadoopIgfsUtils.PARAM_IGFS_ENDPOINT_IGNITE_CFG_PATH, "igfs-wrong-name@"),
+ cfgPath(0));
+
+ return cfg;
+ }
+
+ /**
+ * @param idx Grid index.
+ * @return IGFS authority.
+ */
+ private static String authority(int idx) {
+ return "igfs-" + idx + "@";
+ }
+
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testFsOpenMultithreaded() throws Exception {
+ skipInProc = false;
+
+ checkFsOpenWithAllNodesTypes();
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ private void checkFsOpenWithAllNodesTypes() throws Exception {
+ for (int i = 0; i < nodesTypes.length; ++i) {
+ log.info("Begin test case for nodes: " + S.arrayToString(NodeType.class, nodesTypes[i]));
+
+ startNodes(nodesTypes[i]);
+
+ // Await clusters start
+ Thread.sleep(10_000);
+
+ try {
+ checkFsOpenMultithreaded();
+ } finally {
+ stopAllGrids();
+ }
+ }
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testFsOpenMultithreadedSkipInProc() throws Exception {
+ skipInProc = true;
+
+ checkFsOpenWithAllNodesTypes();
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testIgniteClientWithIgfsMisconfigure() throws Exception {
+ startNodes(new NodeType[] {NodeType.REMOTE, NodeType.REMOTE, NodeType.REMOTE});
+
+ // Await clusters start
+ Thread.sleep(10_000);
+
+ try {
+ try (FileSystem fs = FileSystem.get(new URI("igfs://igfs-wrong-name@"), configurationWrongIgfs())) {
+ FSDataOutputStream out = fs.create(new Path("igfs://igfs-wrong-name@/file"), true);
+
+ assert false : "Exception must be thrown";
+ }
+ catch (Exception e) {
+ assertTrue(e.getMessage().contains("Cannot find IGFS 'igfs-wrong-name' at the node"));
+ }
+ } finally {
+ stopAllGrids();
+ }
+ }
+
+ /**
+ * @param nodeTypes Types of server nodes.
+ * @throws Exception If failed.
+ */
+ public void startNodes(NodeType[] nodeTypes) throws Exception {
+ assert nodeTypes.length == CONFIGS.length;
+
+ for (int i = 0; i < CONFIGS.length; i++) {
+ String name = getTestGridName(i);
+
+ switch (nodeTypes[i]) {
+ case REMOTE:
+ startRemoteGrid(name, getConfiguration(name),
+ null, null, false);
+ break;
+
+ case LOCAL:
+ startGrid(name, getConfiguration(name));
+ break;
+
+ case LOCAL_SAME_NAME:
+ startGrid("IGFS-cli-" + i, getConfiguration(name));
+ break;
+ }
+ }
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void checkFsOpenMultithreaded() throws Exception {
+ X.println("Start hadoop client file system open test");
+
+ final AtomicInteger fileIdx = new AtomicInteger();
+
+ IgniteInternalFuture fut = multithreadedAsync(new Runnable() {
+ @Override public void run() {
+ for (int iter = 0; iter < ITERATIONS; iter++) {
+ for (int i = 0; i < CONFIGS.length; i++) {
+ try (FileSystem fs = FileSystem.get(new URI(uri(i)), configuration(i))) {
+ FSDataOutputStream out = fs.create(new Path(uri(i) + "file" +
+ fileIdx.getAndIncrement()), true);
+
+ out.close();
+ }
+ catch (Exception e) {
+ e.printStackTrace();
+
+ assert false : "Unexpected exception";
+ }
+ }
+ }
+ }
+ }, THREADS_COUNT);
+
+ fut.get();
+ }
+
+ /**
+ * Node type.
+ */
+ enum NodeType {
+ /** Remote node. */
+ REMOTE,
+
+ /** Node in the test VM. */
+ LOCAL,
+
+ /** Node in the test VM with the name equals to client node config. */
+ LOCAL_SAME_NAME
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientBasedPrimarySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientBasedPrimarySelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientBasedPrimarySelfTest.java
new file mode 100644
index 0000000..e2995fa
--- /dev/null
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientBasedPrimarySelfTest.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.hadoop.impl.igfs;
+
+import org.apache.ignite.igfs.IgfsMode;
+
+/**
+ * IGFS Hadoop file system Ignite client -based self test for PRIMARY mode.
+ */
+public class IgniteHadoopFileSystemClientBasedPrimarySelfTest
+ extends IgniteHadoopFileSystemClientBasedAbstractSelfTest {
+ /**
+ * Constructor.
+ */
+ public IgniteHadoopFileSystemClientBasedPrimarySelfTest() {
+ super(IgfsMode.PRIMARY);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected String getClientConfig() {
+ return "modules/hadoop/src/test/config/igfs-cli-config-primary.xml";
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientBasedProxySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientBasedProxySelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientBasedProxySelfTest.java
new file mode 100644
index 0000000..4293b3b
--- /dev/null
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientBasedProxySelfTest.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.hadoop.impl.igfs;
+
+import org.apache.ignite.igfs.IgfsMode;
+
+/**
+ * IGFS Hadoop file system Ignite client -based self test for PROXY mode.
+ */
+public class IgniteHadoopFileSystemClientBasedProxySelfTest extends IgniteHadoopFileSystemClientBasedAbstractSelfTest {
+ /**
+ * Constructor.
+ */
+ public IgniteHadoopFileSystemClientBasedProxySelfTest() {
+ super(IgfsMode.PROXY);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected String getClientConfig() {
+ return "modules/hadoop/src/test/config/igfs-cli-config-proxy.xml";
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdff2c3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemLoopbackExternalToClientAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemLoopbackExternalToClientAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemLoopbackExternalToClientAbstractSelfTest.java
new file mode 100644
index 0000000..b3c1681
--- /dev/null
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemLoopbackExternalToClientAbstractSelfTest.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.hadoop.impl.igfs;
+
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.igfs.IgfsIpcEndpointConfiguration;
+import org.apache.ignite.igfs.IgfsIpcEndpointType;
+import org.apache.ignite.igfs.IgfsMode;
+
+import static org.apache.ignite.internal.util.ipc.shmem.IpcSharedMemoryServerEndpoint.DFLT_IPC_PORT;
+
+/**
+ * IGFS Hadoop file system IPC loopback self test.
+ */
+public abstract class IgniteHadoopFileSystemLoopbackExternalToClientAbstractSelfTest extends
+ IgniteHadoopFileSystemAbstractSelfTest {
+
+ /**
+ * Constructor.
+ *
+ * @param mode IGFS mode.
+ */
+ protected IgniteHadoopFileSystemLoopbackExternalToClientAbstractSelfTest(IgfsMode mode) {
+ super(mode, true, true);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected IgfsIpcEndpointConfiguration primaryIpcEndpointConfiguration(final String gridName) {
+ IgfsIpcEndpointConfiguration endpointCfg = new IgfsIpcEndpointConfiguration();
+
+ endpointCfg.setType(IgfsIpcEndpointType.TCP);
+ endpointCfg.setPort(DFLT_IPC_PORT + getTestGridIndex(gridName));
+
+ return endpointCfg;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+ if (getTestGridIndex(gridName) == 0)
+ cfg.setClientMode(true);
+
+ return cfg;
+ }
+}
\ No newline at end of file
[19/50] [abbrv] ignite git commit: IGNITE-4693 Add possibility to
wrap Java plugin exceptions to .NET plugin exceptions
Posted by vo...@apache.org.
IGNITE-4693 Add possibility to wrap Java plugin exceptions to .NET plugin exceptions
This closes #1530
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4a783410
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4a783410
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4a783410
Branch: refs/heads/ignite-4565-ddl
Commit: 4a783410e2555584bc69b752f955d7e0d9066ebd
Parents: bd988b7
Author: Pavel Tupitsyn <pt...@apache.org>
Authored: Wed Feb 15 16:08:35 2017 +0300
Committer: Pavel Tupitsyn <pt...@apache.org>
Committed: Wed Feb 15 16:08:35 2017 +0300
----------------------------------------------------------------------
.../plugin/PlatformTestPluginException.java | 34 ++++++++
.../plugin/PlatformTestPluginTarget.java | 3 +
.../Apache.Ignite.Core.Tests.csproj | 1 +
.../Plugin/PluginTest.cs | 13 +++
.../Plugin/TestIgnitePluginException.cs | 64 ++++++++++++++
.../Plugin/TestIgnitePluginProvider.cs | 4 +
.../Apache.Ignite.Core.csproj | 1 +
.../Common/ExceptionFactory.cs | 31 +++++++
.../Apache.Ignite.Core/Impl/ExceptionUtils.cs | 92 +++++++++++---------
.../Impl/Plugin/PluginContext.cs | 11 +++
.../Impl/Plugin/PluginProcessor.cs | 28 ++++++
.../Apache.Ignite.Core/Plugin/IPluginContext.cs | 9 ++
12 files changed, 251 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/4a783410/modules/core/src/test/java/org/apache/ignite/platform/plugin/PlatformTestPluginException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/platform/plugin/PlatformTestPluginException.java b/modules/core/src/test/java/org/apache/ignite/platform/plugin/PlatformTestPluginException.java
new file mode 100644
index 0000000..3d71dda
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/platform/plugin/PlatformTestPluginException.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.platform.plugin;
+
+import org.apache.ignite.IgniteCheckedException;
+
+/**
+ * Custom plugin exception
+ */
+public class PlatformTestPluginException extends IgniteCheckedException {
+ /**
+ * Ctor.
+ *
+ * @param msg Message.
+ */
+ public PlatformTestPluginException(String msg) {
+ super(msg);
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/4a783410/modules/core/src/test/java/org/apache/ignite/platform/plugin/PlatformTestPluginTarget.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/platform/plugin/PlatformTestPluginTarget.java b/modules/core/src/test/java/org/apache/ignite/platform/plugin/PlatformTestPluginTarget.java
index b893395..94a21a3 100644
--- a/modules/core/src/test/java/org/apache/ignite/platform/plugin/PlatformTestPluginTarget.java
+++ b/modules/core/src/test/java/org/apache/ignite/platform/plugin/PlatformTestPluginTarget.java
@@ -56,6 +56,9 @@ class PlatformTestPluginTarget extends PlatformAbstractTarget {
/** {@inheritDoc} */
@Override public long processInLongOutLong(int type, long val) throws IgniteCheckedException {
+ if (type == -1)
+ throw new PlatformTestPluginException("Baz");
+
return val + 1;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/4a783410/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
index 3e0641b..71b0593 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
@@ -94,6 +94,7 @@
<Compile Include="Plugin\PluginTest.cs" />
<Compile Include="Plugin\TestIgnitePlugin.cs" />
<Compile Include="Plugin\TestIgnitePluginConfiguration.cs" />
+ <Compile Include="Plugin\TestIgnitePluginException.cs" />
<Compile Include="Plugin\TestIgnitePluginProvider.cs" />
<Compile Include="Plugin\Cache\CachePlugin.cs" />
<Compile Include="Plugin\Cache\CachePluginConfiguration.cs" />
http://git-wip-us.apache.org/repos/asf/ignite/blob/4a783410/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/PluginTest.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/PluginTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/PluginTest.cs
index 6fca03a..0af7b10 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/PluginTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/PluginTest.cs
@@ -114,6 +114,19 @@ namespace Apache.Ignite.Core.Tests.Plugin
// Returns a copy with same name.
var resCopy = res.Item2.OutObject(1);
Assert.AreEqual("name1_abc", resCopy.OutStream(1, r => r.ReadString()));
+
+ // Throws custom mapped exception.
+ var ex = Assert.Throws<TestIgnitePluginException>(() => target.InLongOutLong(-1, 0));
+ Assert.AreEqual("Baz", ex.Message);
+ Assert.AreEqual(Ignition.GetIgnite(null), ex.Ignite);
+ Assert.AreEqual("org.apache.ignite.platform.plugin.PlatformTestPluginException", ex.ClassName);
+
+ var javaEx = ex.InnerException as JavaException;
+ Assert.IsNotNull(javaEx);
+ Assert.AreEqual("Baz", javaEx.JavaMessage);
+ Assert.AreEqual("org.apache.ignite.platform.plugin.PlatformTestPluginException", javaEx.JavaClassName);
+ Assert.IsTrue(javaEx.Message.Contains(
+ "at org.apache.ignite.platform.plugin.PlatformTestPluginTarget.processInLongOutLong"));
}
/// <summary>
http://git-wip-us.apache.org/repos/asf/ignite/blob/4a783410/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/TestIgnitePluginException.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/TestIgnitePluginException.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/TestIgnitePluginException.cs
new file mode 100644
index 0000000..c0805d1
--- /dev/null
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/TestIgnitePluginException.cs
@@ -0,0 +1,64 @@
+\ufeff/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Apache.Ignite.Core.Tests.Plugin
+{
+ using System;
+ using Apache.Ignite.Core.Common;
+
+ /// <summary>
+ /// Test custom-mapped plugin exception.
+ /// </summary>
+ public class TestIgnitePluginException : IgniteException
+ {
+ /** */
+ private readonly string _className;
+
+ /** */
+ private readonly IIgnite _ignite;
+
+ /// <summary>
+ /// Initializes a new instance of the <see cref="TestIgnitePluginException" /> class.
+ /// </summary>
+ /// <param name="className">Name of the class.</param>
+ /// <param name="message">Message.</param>
+ /// <param name="ignite">Ignite.</param>
+ /// <param name="cause">Cause.</param>
+ public TestIgnitePluginException(string className, string message, IIgnite ignite, Exception cause)
+ : base(message, cause)
+ {
+ _className = className;
+ _ignite = ignite;
+ }
+
+ /// <summary>
+ /// Gets the name of the class.
+ /// </summary>
+ public string ClassName
+ {
+ get { return _className; }
+ }
+
+ /// <summary>
+ /// Gets the ignite.
+ /// </summary>
+ public IIgnite Ignite
+ {
+ get { return _ignite; }
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/4a783410/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/TestIgnitePluginProvider.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/TestIgnitePluginProvider.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/TestIgnitePluginProvider.cs
index bc21540..d86750f 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/TestIgnitePluginProvider.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/TestIgnitePluginProvider.cs
@@ -65,6 +65,10 @@ namespace Apache.Ignite.Core.Tests.Plugin
/** <inheritdoc /> */
public void Start(IPluginContext<TestIgnitePluginConfiguration> context)
{
+ context.RegisterExceptionMapping("org.apache.ignite.platform.plugin.PlatformTestPluginException",
+ (className, message, inner, ignite) =>
+ new TestIgnitePluginException(className, message, ignite, inner));
+
Context = context;
EnsureIgniteWorks();
http://git-wip-us.apache.org/repos/asf/ignite/blob/4a783410/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
index 1499104..7c86429 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
@@ -92,6 +92,7 @@
</ItemGroup>
<ItemGroup>
<Compile Include="Binary\BinaryArrayEqualityComparer.cs" />
+ <Compile Include="Common\ExceptionFactory.cs" />
<Compile Include="Impl\Binary\BinaryFieldEqualityComparer.cs" />
<Compile Include="Binary\BinaryReflectiveSerializer.cs" />
<Compile Include="Common\JavaException.cs" />
http://git-wip-us.apache.org/repos/asf/ignite/blob/4a783410/modules/platforms/dotnet/Apache.Ignite.Core/Common/ExceptionFactory.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Common/ExceptionFactory.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Common/ExceptionFactory.cs
new file mode 100644
index 0000000..e93ee78
--- /dev/null
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Common/ExceptionFactory.cs
@@ -0,0 +1,31 @@
+\ufeff/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Apache.Ignite.Core.Common
+{
+ using System;
+
+ /// <summary>
+ /// Exception factory delegate.
+ /// </summary>
+ /// <param name="className">Exception class name.</param>
+ /// <param name="message">Exception message.</param>
+ /// <param name="inner">Inner exception.</param>
+ /// <param name="ignite">Ignite instance.</param>
+ /// <returns>Exception.</returns>
+ public delegate Exception ExceptionFactory(string className, string message, Exception inner, IIgnite ignite);
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/4a783410/modules/platforms/dotnet/Apache.Ignite.Core/Impl/ExceptionUtils.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/ExceptionUtils.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/ExceptionUtils.cs
index 4534e91..e2d61d7 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/ExceptionUtils.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/ExceptionUtils.cs
@@ -48,10 +48,7 @@ namespace Apache.Ignite.Core.Impl
private const string ClsCachePartialUpdateErr = "org.apache.ignite.internal.processors.platform.cache.PlatformCachePartialUpdateException";
/** Map with predefined exceptions. */
- private static readonly IDictionary<string, ExceptionFactoryDelegate> Exs = new Dictionary<string, ExceptionFactoryDelegate>();
-
- /** Exception factory delegate. */
- private delegate Exception ExceptionFactoryDelegate(IIgnite ignite, string msg, Exception innerEx);
+ private static readonly IDictionary<string, ExceptionFactory> Exs = new Dictionary<string, ExceptionFactory>();
/** Inner class regex. */
private static readonly Regex InnerClassRegex = new Regex(@"class ([^\s]+): (.*)", RegexOptions.Compiled);
@@ -64,50 +61,50 @@ namespace Apache.Ignite.Core.Impl
static ExceptionUtils()
{
// Common Java exceptions mapped to common .NET exceptions.
- Exs["java.lang.IllegalArgumentException"] = (i, m, e) => new ArgumentException(m, e);
- Exs["java.lang.IllegalStateException"] = (i, m, e) => new InvalidOperationException(m, e);
- Exs["java.lang.UnsupportedOperationException"] = (i, m, e) => new NotSupportedException(m, e);
- Exs["java.lang.InterruptedException"] = (i, m, e) => new ThreadInterruptedException(m, e);
+ Exs["java.lang.IllegalArgumentException"] = (c, m, e, i) => new ArgumentException(m, e);
+ Exs["java.lang.IllegalStateException"] = (c, m, e, i) => new InvalidOperationException(m, e);
+ Exs["java.lang.UnsupportedOperationException"] = (c, m, e, i) => new NotSupportedException(m, e);
+ Exs["java.lang.InterruptedException"] = (c, m, e, i) => new ThreadInterruptedException(m, e);
// Generic Ignite exceptions.
- Exs["org.apache.ignite.IgniteException"] = (i, m, e) => new IgniteException(m, e);
- Exs["org.apache.ignite.IgniteCheckedException"] = (i, m, e) => new IgniteException(m, e);
- Exs["org.apache.ignite.IgniteClientDisconnectedException"] = (i, m, e) => new ClientDisconnectedException(m, e, i.GetCluster().ClientReconnectTask);
- Exs["org.apache.ignite.internal.IgniteClientDisconnectedCheckedException"] = (i, m, e) => new ClientDisconnectedException(m, e, i.GetCluster().ClientReconnectTask);
- Exs["org.apache.ignite.binary.BinaryObjectException"] = (i, m, e) => new BinaryObjectException(m, e);
+ Exs["org.apache.ignite.IgniteException"] = (c, m, e, i) => new IgniteException(m, e);
+ Exs["org.apache.ignite.IgniteCheckedException"] = (c, m, e, i) => new IgniteException(m, e);
+ Exs["org.apache.ignite.IgniteClientDisconnectedException"] = (c, m, e, i) => new ClientDisconnectedException(m, e, i.GetCluster().ClientReconnectTask);
+ Exs["org.apache.ignite.internal.IgniteClientDisconnectedCheckedException"] = (c, m, e, i) => new ClientDisconnectedException(m, e, i.GetCluster().ClientReconnectTask);
+ Exs["org.apache.ignite.binary.BinaryObjectException"] = (c, m, e, i) => new BinaryObjectException(m, e);
// Cluster exceptions.
- Exs["org.apache.ignite.cluster.ClusterGroupEmptyException"] = (i, m, e) => new ClusterGroupEmptyException(m, e);
- Exs["org.apache.ignite.cluster.ClusterTopologyException"] = (i, m, e) => new ClusterTopologyException(m, e);
+ Exs["org.apache.ignite.cluster.ClusterGroupEmptyException"] = (c, m, e, i) => new ClusterGroupEmptyException(m, e);
+ Exs["org.apache.ignite.cluster.ClusterTopologyException"] = (c, m, e, i) => new ClusterTopologyException(m, e);
// Compute exceptions.
- Exs["org.apache.ignite.compute.ComputeExecutionRejectedException"] = (i, m, e) => new ComputeExecutionRejectedException(m, e);
- Exs["org.apache.ignite.compute.ComputeJobFailoverException"] = (i, m, e) => new ComputeJobFailoverException(m, e);
- Exs["org.apache.ignite.compute.ComputeTaskCancelledException"] = (i, m, e) => new ComputeTaskCancelledException(m, e);
- Exs["org.apache.ignite.compute.ComputeTaskTimeoutException"] = (i, m, e) => new ComputeTaskTimeoutException(m, e);
- Exs["org.apache.ignite.compute.ComputeUserUndeclaredException"] = (i, m, e) => new ComputeUserUndeclaredException(m, e);
+ Exs["org.apache.ignite.compute.ComputeExecutionRejectedException"] = (c, m, e, i) => new ComputeExecutionRejectedException(m, e);
+ Exs["org.apache.ignite.compute.ComputeJobFailoverException"] = (c, m, e, i) => new ComputeJobFailoverException(m, e);
+ Exs["org.apache.ignite.compute.ComputeTaskCancelledException"] = (c, m, e, i) => new ComputeTaskCancelledException(m, e);
+ Exs["org.apache.ignite.compute.ComputeTaskTimeoutException"] = (c, m, e, i) => new ComputeTaskTimeoutException(m, e);
+ Exs["org.apache.ignite.compute.ComputeUserUndeclaredException"] = (c, m, e, i) => new ComputeUserUndeclaredException(m, e);
// Cache exceptions.
- Exs["javax.cache.CacheException"] = (i, m, e) => new CacheException(m, e);
- Exs["javax.cache.integration.CacheLoaderException"] = (i, m, e) => new CacheStoreException(m, e);
- Exs["javax.cache.integration.CacheWriterException"] = (i, m, e) => new CacheStoreException(m, e);
- Exs["javax.cache.processor.EntryProcessorException"] = (i, m, e) => new CacheEntryProcessorException(m, e);
- Exs["org.apache.ignite.cache.CacheAtomicUpdateTimeoutException"] = (i, m, e) => new CacheAtomicUpdateTimeoutException(m, e);
+ Exs["javax.cache.CacheException"] = (c, m, e, i) => new CacheException(m, e);
+ Exs["javax.cache.integration.CacheLoaderException"] = (c, m, e, i) => new CacheStoreException(m, e);
+ Exs["javax.cache.integration.CacheWriterException"] = (c, m, e, i) => new CacheStoreException(m, e);
+ Exs["javax.cache.processor.EntryProcessorException"] = (c, m, e, i) => new CacheEntryProcessorException(m, e);
+ Exs["org.apache.ignite.cache.CacheAtomicUpdateTimeoutException"] = (c, m, e, i) => new CacheAtomicUpdateTimeoutException(m, e);
// Transaction exceptions.
- Exs["org.apache.ignite.transactions.TransactionOptimisticException"] = (i, m, e) => new TransactionOptimisticException(m, e);
- Exs["org.apache.ignite.transactions.TransactionTimeoutException"] = (i, m, e) => new TransactionTimeoutException(m, e);
- Exs["org.apache.ignite.transactions.TransactionRollbackException"] = (i, m, e) => new TransactionRollbackException(m, e);
- Exs["org.apache.ignite.transactions.TransactionHeuristicException"] = (i, m, e) => new TransactionHeuristicException(m, e);
- Exs["org.apache.ignite.transactions.TransactionDeadlockException"] = (i, m, e) => new TransactionDeadlockException(m, e);
+ Exs["org.apache.ignite.transactions.TransactionOptimisticException"] = (c, m, e, i) => new TransactionOptimisticException(m, e);
+ Exs["org.apache.ignite.transactions.TransactionTimeoutException"] = (c, m, e, i) => new TransactionTimeoutException(m, e);
+ Exs["org.apache.ignite.transactions.TransactionRollbackException"] = (c, m, e, i) => new TransactionRollbackException(m, e);
+ Exs["org.apache.ignite.transactions.TransactionHeuristicException"] = (c, m, e, i) => new TransactionHeuristicException(m, e);
+ Exs["org.apache.ignite.transactions.TransactionDeadlockException"] = (c, m, e, i) => new TransactionDeadlockException(m, e);
// Security exceptions.
- Exs["org.apache.ignite.IgniteAuthenticationException"] = (i, m, e) => new SecurityException(m, e);
- Exs["org.apache.ignite.plugin.security.GridSecurityException"] = (i, m, e) => new SecurityException(m, e);
+ Exs["org.apache.ignite.IgniteAuthenticationException"] = (c, m, e, i) => new SecurityException(m, e);
+ Exs["org.apache.ignite.plugin.security.GridSecurityException"] = (c, m, e, i) => new SecurityException(m, e);
// Future exceptions
- Exs["org.apache.ignite.lang.IgniteFutureCancelledException"] = (i, m, e) => new IgniteFutureCancelledException(m, e);
- Exs["org.apache.ignite.internal.IgniteFutureCancelledCheckedException"] = (i, m, e) => new IgniteFutureCancelledException(m, e);
+ Exs["org.apache.ignite.lang.IgniteFutureCancelledException"] = (c, m, e, i) => new IgniteFutureCancelledException(m, e);
+ Exs["org.apache.ignite.internal.IgniteFutureCancelledCheckedException"] = (c, m, e, i) => new IgniteFutureCancelledException(m, e);
}
/// <summary>
@@ -120,25 +117,28 @@ namespace Apache.Ignite.Core.Impl
/// <param name="reader">Error data reader.</param>
/// <param name="innerException">Inner exception.</param>
/// <returns>Exception.</returns>
- public static Exception GetException(IIgnite ignite, string clsName, string msg, string stackTrace,
+ public static Exception GetException(Ignite ignite, string clsName, string msg, string stackTrace,
BinaryReader reader = null, Exception innerException = null)
{
// Set JavaException as inner only if there is no InnerException.
if (innerException == null)
innerException = new JavaException(clsName, msg, stackTrace);
- ExceptionFactoryDelegate ctor;
+ ExceptionFactory ctor;
if (Exs.TryGetValue(clsName, out ctor))
{
var match = InnerClassRegex.Match(msg ?? string.Empty);
- ExceptionFactoryDelegate innerCtor;
+ ExceptionFactory innerCtor;
if (match.Success && Exs.TryGetValue(match.Groups[1].Value, out innerCtor))
- return ctor(ignite, msg, innerCtor(ignite, match.Groups[2].Value, innerException));
+ {
+ return ctor(clsName, msg,
+ innerCtor(match.Groups[1].Value, match.Groups[2].Value, innerException, ignite), ignite);
+ }
- return ctor(ignite, msg, innerException);
+ return ctor(clsName, msg, innerException, ignite);
}
if (ClsNoClsDefFoundErr.Equals(clsName, StringComparison.OrdinalIgnoreCase))
@@ -152,6 +152,18 @@ namespace Apache.Ignite.Core.Impl
if (ClsCachePartialUpdateErr.Equals(clsName, StringComparison.OrdinalIgnoreCase))
return ProcessCachePartialUpdateException(ignite, msg, stackTrace, reader);
+ // Predefined mapping not found - check plugins.
+ if (ignite != null)
+ {
+ ctor = ignite.PluginProcessor.GetExceptionMapping(clsName);
+
+ if (ctor != null)
+ {
+ return ctor(clsName, msg, innerException, ignite);
+ }
+ }
+
+ // Return default exception.
return new IgniteException(string.Format("Java exception occurred [class={0}, message={1}]", clsName, msg),
innerException);
}
@@ -165,7 +177,7 @@ namespace Apache.Ignite.Core.Impl
/// <param name="reader">Reader.</param>
/// <returns>CachePartialUpdateException.</returns>
[SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")]
- private static Exception ProcessCachePartialUpdateException(IIgnite ignite, string msg, string stackTrace,
+ private static Exception ProcessCachePartialUpdateException(Ignite ignite, string msg, string stackTrace,
BinaryReader reader)
{
if (reader == null)
http://git-wip-us.apache.org/repos/asf/ignite/blob/4a783410/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Plugin/PluginContext.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Plugin/PluginContext.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Plugin/PluginContext.cs
index 1aa4fab..0e01244 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Plugin/PluginContext.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Plugin/PluginContext.cs
@@ -17,6 +17,8 @@
namespace Apache.Ignite.Core.Impl.Plugin
{
+ using Apache.Ignite.Core.Common;
+ using Apache.Ignite.Core.Impl.Common;
using Apache.Ignite.Core.Impl.Unmanaged;
using Apache.Ignite.Core.Interop;
using Apache.Ignite.Core.Plugin;
@@ -68,5 +70,14 @@ namespace Apache.Ignite.Core.Impl.Plugin
return new PlatformTarget(ext, ignite.Marshaller);
}
+
+ /** <inheritdoc /> */
+ public void RegisterExceptionMapping(string className, ExceptionFactory factory)
+ {
+ IgniteArgumentCheck.NotNull(className, "className");
+ IgniteArgumentCheck.NotNull(factory, "factory");
+
+ _pluginProcessor.RegisterExceptionMapping(className, factory);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/4a783410/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Plugin/PluginProcessor.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Plugin/PluginProcessor.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Plugin/PluginProcessor.cs
index 78b750b..7cafcc0 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Plugin/PluginProcessor.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Plugin/PluginProcessor.cs
@@ -22,6 +22,7 @@ namespace Apache.Ignite.Core.Impl.Plugin
using System.Diagnostics;
using System.Linq;
using Apache.Ignite.Core.Common;
+ using Apache.Ignite.Core.Impl.Common;
using Apache.Ignite.Core.Log;
using Apache.Ignite.Core.Plugin;
@@ -37,6 +38,10 @@ namespace Apache.Ignite.Core.Impl.Plugin
private readonly Dictionary<string, IPluginProviderProxy> _pluginProvidersByName
= new Dictionary<string, IPluginProviderProxy>();
+ /** Plugin exception mappings. */
+ private readonly CopyOnWriteConcurrentDictionary<string, ExceptionFactory> _exceptionMappings
+ = new CopyOnWriteConcurrentDictionary<string, ExceptionFactory>();
+
/** */
private readonly Ignite _ignite;
@@ -116,6 +121,29 @@ namespace Apache.Ignite.Core.Impl.Plugin
}
/// <summary>
+ /// Gets the exception factory.
+ /// </summary>
+ public ExceptionFactory GetExceptionMapping(string className)
+ {
+ Debug.Assert(className != null);
+
+ ExceptionFactory res;
+
+ return _exceptionMappings.TryGetValue(className, out res) ? res : null;
+ }
+
+ /// <summary>
+ /// Registers the exception mapping.
+ /// </summary>
+ public void RegisterExceptionMapping(string className, ExceptionFactory factory)
+ {
+ Debug.Assert(className != null);
+ Debug.Assert(factory != null);
+
+ _exceptionMappings.GetOrAdd(className, _ => factory);
+ }
+
+ /// <summary>
/// Loads the plugins.
/// </summary>
private void LoadPlugins()
http://git-wip-us.apache.org/repos/asf/ignite/blob/4a783410/modules/platforms/dotnet/Apache.Ignite.Core/Plugin/IPluginContext.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Plugin/IPluginContext.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Plugin/IPluginContext.cs
index edaa7c3..97b566c 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Plugin/IPluginContext.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Plugin/IPluginContext.cs
@@ -17,6 +17,7 @@
namespace Apache.Ignite.Core.Plugin
{
+ using Apache.Ignite.Core.Common;
using Apache.Ignite.Core.Interop;
/// <summary>
@@ -48,5 +49,13 @@ namespace Apache.Ignite.Core.Plugin
/// <param name="id">Extension id. Equal to PlatformExtension.id().</param>
/// <returns>Reference to a plugin extension on Java side.</returns>
IPlatformTarget GetExtension(int id);
+
+ /// <summary>
+ /// Registers custom exception mapping: when Java exception of specified class occurs, it will be mapped
+ /// using provided factory delegate.
+ /// </summary>
+ /// <param name="className">Name of the Java exception class to be mapped.</param>
+ /// <param name="factory">Exception factory delegate.</param>
+ void RegisterExceptionMapping(string className, ExceptionFactory factory);
}
}
\ No newline at end of file
[14/50] [abbrv] ignite git commit: Minor fix: missing toString()
method.
Posted by vo...@apache.org.
Minor fix: missing toString() method.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/571586cd
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/571586cd
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/571586cd
Branch: refs/heads/ignite-4565-ddl
Commit: 571586cdc7d6271b671c76404075be3793cd1ac9
Parents: b461cb4
Author: Vasiliy Sisko <vs...@gridgain.com>
Authored: Wed Feb 15 11:08:23 2017 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Wed Feb 15 11:08:23 2017 +0700
----------------------------------------------------------------------
.../ignite/internal/visor/cache/VisorCacheTypeMetadata.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/571586cd/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheTypeMetadata.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheTypeMetadata.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheTypeMetadata.java
index f17e588..c87ad05 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheTypeMetadata.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheTypeMetadata.java
@@ -32,6 +32,7 @@ import org.apache.ignite.cache.store.jdbc.JdbcType;
import org.apache.ignite.cache.store.jdbc.JdbcTypeField;
import org.apache.ignite.internal.LessNamingBean;
import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteBiTuple;
@@ -372,4 +373,9 @@ public class VisorCacheTypeMetadata implements Serializable, LessNamingBean {
public Map<String, LinkedHashMap<String, IgniteBiTuple<String, Boolean>>> grps() {
return grps;
}
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(VisorCacheTypeMetadata.class, this);
+ }
}
[03/50] [abbrv] ignite git commit: IGNITE-4692 .NET: Add ClassName
and Message to JavaException
Posted by vo...@apache.org.
IGNITE-4692 .NET: Add ClassName and Message to JavaException
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d8ad967c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d8ad967c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d8ad967c
Branch: refs/heads/ignite-4565-ddl
Commit: d8ad967c85fb56810ee7fab76494b176f443d773
Parents: 00dd3d8
Author: Pavel Tupitsyn <pt...@apache.org>
Authored: Mon Feb 13 19:34:34 2017 +0300
Committer: Pavel Tupitsyn <pt...@apache.org>
Committed: Mon Feb 13 19:34:34 2017 +0300
----------------------------------------------------------------------
.../Apache.Ignite.Core.Tests/ExceptionsTest.cs | 28 +++++++++
.../Apache.Ignite.Core/Common/JavaException.cs | 62 +++++++++++++++++++-
.../Apache.Ignite.Core/Impl/ExceptionUtils.cs | 4 +-
3 files changed, 91 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d8ad967c/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ExceptionsTest.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ExceptionsTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ExceptionsTest.cs
index 8c23ab7..7afb10f 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ExceptionsTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ExceptionsTest.cs
@@ -111,6 +111,34 @@ namespace Apache.Ignite.Core.Tests
Assert.IsNotNull(javaEx);
Assert.IsTrue(javaEx.Message.Contains("at " + ExceptionTask));
+ Assert.AreEqual(name, javaEx.JavaMessage);
+ Assert.IsTrue(javaEx.JavaClassName.EndsWith("." + name));
+
+ // Check serialization.
+ var formatter = new BinaryFormatter();
+ using (var ms = new MemoryStream())
+ {
+ formatter.Serialize(ms, ex);
+
+ ms.Seek(0, SeekOrigin.Begin);
+
+ var res = (T) formatter.Deserialize(ms);
+
+ Assert.AreEqual(ex.Message, res.Message);
+ Assert.AreEqual(ex.Source, res.Source);
+ Assert.AreEqual(ex.StackTrace, res.StackTrace);
+ Assert.AreEqual(ex.HelpLink, res.HelpLink);
+
+ var resJavaEx = res.InnerException as JavaException;
+
+ Assert.IsNotNull(resJavaEx);
+ Assert.AreEqual(javaEx.Message, resJavaEx.Message);
+ Assert.AreEqual(javaEx.JavaClassName, resJavaEx.JavaClassName);
+ Assert.AreEqual(javaEx.JavaMessage, resJavaEx.JavaMessage);
+ Assert.AreEqual(javaEx.StackTrace, resJavaEx.StackTrace);
+ Assert.AreEqual(javaEx.Source, resJavaEx.Source);
+ Assert.AreEqual(javaEx.HelpLink, resJavaEx.HelpLink);
+ }
}
/// <summary>
http://git-wip-us.apache.org/repos/asf/ignite/blob/d8ad967c/modules/platforms/dotnet/Apache.Ignite.Core/Common/JavaException.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Common/JavaException.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Common/JavaException.cs
index 5f7ba66..1988335 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Common/JavaException.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Common/JavaException.cs
@@ -26,6 +26,18 @@ namespace Apache.Ignite.Core.Common
[Serializable]
public class JavaException : IgniteException
{
+ /** JavaClassName field. */
+ private const string JavaClassNameField = "JavaClassName";
+
+ /** JavaMessage field. */
+ private const string JavaMessageField = "JavaMessage";
+
+ /** Java exception class name. */
+ private readonly string _javaClassName;
+
+ /** Java exception message. */
+ private readonly string _javaMessage;
+
/// <summary>
/// Initializes a new instance of the <see cref="JavaException"/> class.
/// </summary>
@@ -44,6 +56,21 @@ namespace Apache.Ignite.Core.Common
}
/// <summary>
+ /// Initializes a new instance of the <see cref="JavaException" /> class.
+ /// </summary>
+ /// <param name="javaClassName">Java exception class name.</param>
+ /// <param name="javaMessage">Java exception message.</param>
+ /// <param name="stackTrace">Java stack trace.</param>
+ public JavaException(string javaClassName, string javaMessage, string stackTrace)
+ : base(stackTrace ?? javaMessage)
+ {
+ // Send stackTrace to base ctor because it has all information, including class names and messages.
+ // Store ClassName and Message separately for mapping purposes.
+ _javaClassName = javaClassName;
+ _javaMessage = javaMessage;
+ }
+
+ /// <summary>
/// Initializes a new instance of the <see cref="JavaException"/> class.
/// </summary>
/// <param name="message">The message.</param>
@@ -60,7 +87,40 @@ namespace Apache.Ignite.Core.Common
/// <param name="ctx">Streaming context.</param>
protected JavaException(SerializationInfo info, StreamingContext ctx) : base(info, ctx)
{
- // No-op.
+ _javaClassName = info.GetString(JavaClassNameField);
+ _javaMessage = info.GetString(JavaMessageField);
+ }
+
+ /// <summary>
+ /// When overridden in a derived class, sets the <see cref="SerializationInfo" />
+ /// with information about the exception.
+ /// </summary>
+ /// <param name="info">The <see cref="SerializationInfo" /> that holds the serialized object data
+ /// about the exception being thrown.</param>
+ /// <param name="context">The <see cref="StreamingContext" /> that contains contextual information
+ /// about the source or destination.</param>
+ public override void GetObjectData(SerializationInfo info, StreamingContext context)
+ {
+ base.GetObjectData(info, context);
+
+ info.AddValue(JavaClassNameField, _javaClassName);
+ info.AddValue(JavaMessageField, _javaMessage);
+ }
+
+ /// <summary>
+ /// Gets the Java exception class name.
+ /// </summary>
+ public string JavaClassName
+ {
+ get { return _javaClassName; }
+ }
+
+ /// <summary>
+ /// Gets the Java exception message.
+ /// </summary>
+ public string JavaMessage
+ {
+ get { return _javaMessage; }
}
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/d8ad967c/modules/platforms/dotnet/Apache.Ignite.Core/Impl/ExceptionUtils.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/ExceptionUtils.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/ExceptionUtils.cs
index 64f3ccc..4534e91 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/ExceptionUtils.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/ExceptionUtils.cs
@@ -124,8 +124,8 @@ namespace Apache.Ignite.Core.Impl
BinaryReader reader = null, Exception innerException = null)
{
// Set JavaException as inner only if there is no InnerException.
- if (innerException == null && !string.IsNullOrEmpty(stackTrace))
- innerException = new JavaException(stackTrace);
+ if (innerException == null)
+ innerException = new JavaException(clsName, msg, stackTrace);
ExceptionFactoryDelegate ctor;
[12/50] [abbrv] ignite git commit: IGNITE-4472 UI fix, minor fixes
Posted by vo...@apache.org.
IGNITE-4472 UI fix, minor fixes
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/79e1e536
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/79e1e536
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/79e1e536
Branch: refs/heads/ignite-4565-ddl
Commit: 79e1e536e5a6ee366da94f563355429635cbfdd2
Parents: 4923734
Author: Andrey Novikov <an...@gridgain.com>
Authored: Tue Feb 14 23:28:06 2017 +0700
Committer: Andrey Novikov <an...@gridgain.com>
Committed: Tue Feb 14 23:28:06 2017 +0700
----------------------------------------------------------------------
.../web-console/backend/routes/activities.js | 7 -
.../web-console/backend/services/activities.js | 27 +---
.../backend/test/unit/ActivitiesService.test.js | 131 +++++++++++++++++++
modules/web-console/frontend/app/app.config.js | 4 +
.../activities-user-dialog.controller.js | 39 +-----
.../activities-user-dialog.jade | 2 +-
.../components/activities-user-dialog/index.js | 5 +-
.../form-field-datepicker.jade | 4 +-
.../list-of-registered-users.column-defs.js | 26 ++--
.../list-of-registered-users.controller.js | 32 +++--
.../app/core/activities/Activities.data.js | 5 -
modules/web-console/frontend/app/data/i18n.js | 1 +
.../ui-ace-pom/ui-ace-pom.controller.js | 4 +-
.../frontend/app/modules/agent/agent.module.js | 15 ---
.../modules/configuration/Version.service.js | 13 +-
.../configuration/generator/Maven.service.js | 10 +-
.../configuration/summary/summary.worker.js | 6 +-
modules/web-console/frontend/package.json | 14 +-
.../frontend/public/stylesheets/style.scss | 8 --
.../frontend/public/stylesheets/variables.scss | 1 -
.../views/templates/agent-download.jade | 6 +-
21 files changed, 206 insertions(+), 154 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/79e1e536/modules/web-console/backend/routes/activities.js
----------------------------------------------------------------------
diff --git a/modules/web-console/backend/routes/activities.js b/modules/web-console/backend/routes/activities.js
index 08c27cf..ad0e469 100644
--- a/modules/web-console/backend/routes/activities.js
+++ b/modules/web-console/backend/routes/activities.js
@@ -33,13 +33,6 @@ module.exports.factory = function(express, activitiesService) {
return new Promise((factoryResolve) => {
const router = new express.Router();
- // Get user activities.
- router.get('/user/:userId', (req, res) => {
- activitiesService.listByUser(req.params.userId, req.query)
- .then(res.api.ok)
- .catch(res.api.error);
- });
-
// Post user activities to page.
router.post('/page', (req, res) => {
activitiesService.merge(req.user._id, req.body)
http://git-wip-us.apache.org/repos/asf/ignite/blob/79e1e536/modules/web-console/backend/services/activities.js
----------------------------------------------------------------------
diff --git a/modules/web-console/backend/services/activities.js b/modules/web-console/backend/services/activities.js
index 7f3a777..124c775 100644
--- a/modules/web-console/backend/services/activities.js
+++ b/modules/web-console/backend/services/activities.js
@@ -35,10 +35,12 @@ module.exports.factory = (_, mongo) => {
* Update page activities.
*
* @param {String} owner - User ID
- * @param {Object} page - The page
+ * @param {String} action - Action string presentation.
+ * @param {String} group - Action group string presentation.
+ * @param {Date} [date] - Optional date to save in activity.
* @returns {Promise.<mongo.ObjectId>} that resolve activity
*/
- static merge(owner, {action, group}) {
+ static merge(owner, {action, group}, date = new Date()) {
mongo.Account.findById(owner)
.then((user) => {
user.lastActivity = new Date();
@@ -46,8 +48,6 @@ module.exports.factory = (_, mongo) => {
return user.save();
});
- const date = new Date();
-
date.setDate(1);
date.setHours(0, 0, 0, 0);
@@ -63,25 +63,6 @@ module.exports.factory = (_, mongo) => {
});
}
- /**
- * Get user activities
- * @param {String} owner - User ID
- * @returns {Promise.<mongo.ObjectId>} that resolve activities
- */
- static listByUser(owner, {startDate, endDate}) {
- const $match = {owner};
-
- if (startDate)
- $match.date = {$gte: new Date(startDate)};
-
- if (endDate) {
- $match.date = $match.date || {};
- $match.date.$lt = new Date(endDate);
- }
-
- return mongo.Activities.find($match);
- }
-
static total({startDate, endDate}) {
const $match = {};
http://git-wip-us.apache.org/repos/asf/ignite/blob/79e1e536/modules/web-console/backend/test/unit/ActivitiesService.test.js
----------------------------------------------------------------------
diff --git a/modules/web-console/backend/test/unit/ActivitiesService.test.js b/modules/web-console/backend/test/unit/ActivitiesService.test.js
new file mode 100644
index 0000000..40088bf
--- /dev/null
+++ b/modules/web-console/backend/test/unit/ActivitiesService.test.js
@@ -0,0 +1,131 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+const assert = require('chai').assert;
+const injector = require('../injector');
+const testAccounts = require('../data/accounts.json');
+
+let activitiesService;
+let mongo;
+let db;
+
+const owner = testAccounts[0]._id;
+const group = 'test';
+const action1 = '/test/activity1';
+const action2 = '/test/activity2';
+
+suite('ActivitiesServiceTestsSuite', () => {
+ suiteSetup(() => {
+ return Promise.all([
+ injector('services/activities'),
+ injector('mongo'),
+ injector('dbHelper')
+ ])
+ .then(([_activitiesService, _mongo, _db]) => {
+ mongo = _mongo;
+ activitiesService = _activitiesService;
+ db = _db;
+ });
+ });
+
+ setup(() => db.init());
+
+ test('Activities creation and update', (done) => {
+ activitiesService.merge(owner, { group, action: action1 })
+ .then((activity) => {
+ assert.isNotNull(activity);
+ assert.equal(activity.amount, 1);
+
+ return mongo.Activities.findById(activity._id);
+ })
+ .then((activityDoc) => {
+ assert.isNotNull(activityDoc);
+ assert.equal(activityDoc.amount, 1);
+ })
+ .then(() => activitiesService.merge(owner, { group, action: action1 }))
+ .then((activity) => {
+ assert.isNotNull(activity);
+ assert.equal(activity.amount, 2);
+
+ return mongo.Activities.findById(activity._id);
+ })
+ .then((activityDoc) => {
+ assert.isNotNull(activityDoc);
+ assert.equal(activityDoc.amount, 2);
+ })
+ .then(done)
+ .catch(done);
+ });
+
+ test('Activities total and detail information', (done) => {
+ const startDate = new Date();
+
+ startDate.setDate(1);
+ startDate.setHours(0, 0, 0, 0);
+
+ const endDate = new Date(startDate);
+ endDate.setMonth(endDate.getMonth() + 1);
+
+ Promise.all([
+ activitiesService.merge(owner, {group, action: action1}),
+ activitiesService.merge(owner, {group, action: action2})
+ ])
+ .then(() => activitiesService.total(owner, {startDate, endDate}))
+ .then((activities) =>
+ assert.equal(activities[owner].test, 2)
+ )
+ .then(() => activitiesService.detail(owner, {startDate, endDate}))
+ .then((activities) =>
+ assert.deepEqual(activities[owner], {
+ '/test/activity2': 1, '/test/activity1': 1
+ })
+ )
+ .then(done)
+ .catch(done);
+ });
+
+ test('Activities periods', (done) => {
+ const startDate = new Date();
+
+ startDate.setDate(1);
+ startDate.setHours(0, 0, 0, 0);
+
+ const nextMonth = (baseDate) => {
+ const date = new Date(baseDate);
+
+ date.setMonth(date.getMonth() + 1);
+
+ return date;
+ };
+
+ const borderDate = nextMonth(startDate);
+ const endDate = nextMonth(borderDate);
+
+ activitiesService.merge(owner, { group, action: action1 })
+ .then(() => activitiesService.merge(owner, { group, action: action1 }, borderDate))
+ .then(() => activitiesService.total({ startDate, endDate: borderDate }))
+ .then((activities) =>
+ assert.equal(activities[owner].test, 1)
+ )
+ .then(() => activitiesService.total({ startDate: borderDate, endDate }))
+ .then((activities) =>
+ assert.equal(activities[owner].test, 1)
+ )
+ .then(done)
+ .catch(done);
+ });
+});
http://git-wip-us.apache.org/repos/asf/ignite/blob/79e1e536/modules/web-console/frontend/app/app.config.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/app.config.js b/modules/web-console/frontend/app/app.config.js
index 0e85711..39d761f 100644
--- a/modules/web-console/frontend/app/app.config.js
+++ b/modules/web-console/frontend/app/app.config.js
@@ -103,3 +103,7 @@ igniteConsoleCfg.config(['$datepickerProvider', ($datepickerProvider) => {
iconRight: 'icon-datepicker-right'
});
}]);
+
+igniteConsoleCfg.config(['$translateProvider', ($translateProvider) => {
+ $translateProvider.useSanitizeValueStrategy('sanitize');
+}]);
http://git-wip-us.apache.org/repos/asf/ignite/blob/79e1e536/modules/web-console/frontend/app/components/activities-user-dialog/activities-user-dialog.controller.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/activities-user-dialog/activities-user-dialog.controller.js b/modules/web-console/frontend/app/components/activities-user-dialog/activities-user-dialog.controller.js
index 46853b2..078f725 100644
--- a/modules/web-console/frontend/app/components/activities-user-dialog/activities-user-dialog.controller.js
+++ b/modules/web-console/frontend/app/components/activities-user-dialog/activities-user-dialog.controller.js
@@ -15,46 +15,13 @@
* limitations under the License.
*/
-const COLUMNS_DEFS = [
- {displayName: 'Action', field: 'action', minWidth: 65 },
- {displayName: 'Description', field: 'title', minWidth: 65 },
- {displayName: 'Visited', field: 'amount', minWidth: 65 }
-];
-
export default class ActivitiesCtrl {
- static $inject = ['$state', 'user', 'params', 'IgniteActivitiesData'];
+ static $inject = ['user'];
- constructor($state, user, params, ActivitiesData) {
+ constructor(user) {
const $ctrl = this;
- const userId = user._id;
$ctrl.user = user;
-
- $ctrl.gridOptions = {
- data: [],
- columnVirtualizationThreshold: 30,
- columnDefs: COLUMNS_DEFS,
- categories: [
- {name: 'Action', visible: true, selectable: true},
- {name: 'Description', visible: true, selectable: true},
- {name: 'Visited', visible: true, selectable: true}
- ],
- enableRowSelection: false,
- enableRowHeaderSelection: false,
- enableColumnMenus: false,
- multiSelect: false,
- modifierKeysToMultiSelect: true,
- noUnselect: true,
- flatEntityAccess: true,
- fastWatch: true,
- onRegisterApi: (api) => {
- $ctrl.gridApi = api;
- }
- };
-
- ActivitiesData.listByUser(userId, params)
- .then((data) => {
- $ctrl.data = data;
- });
+ $ctrl.data = _.map(user.activitiesDetail, (amount, action) => ({ action, amount }));
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/79e1e536/modules/web-console/frontend/app/components/activities-user-dialog/activities-user-dialog.jade
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/activities-user-dialog/activities-user-dialog.jade b/modules/web-console/frontend/app/components/activities-user-dialog/activities-user-dialog.jade
index 2c55ebd..074851c 100644
--- a/modules/web-console/frontend/app/components/activities-user-dialog/activities-user-dialog.jade
+++ b/modules/web-console/frontend/app/components/activities-user-dialog/activities-user-dialog.jade
@@ -24,7 +24,7 @@
.modal-body.modal-body-with-scroll(id='activities-user-dialog')
table.table.table-striped.table-bordered.table-hover(scrollable-container='#activities-user-dialog' st-table='displayedRows' st-safe-src='ctrl.data')
thead
- th.text-center(st-sort='title') Description
+ th.text-center(st-sort='action | translate') Description
th.text-center(st-sort='action') Action
th.text-center(st-sort='amount') Visited
tbody
http://git-wip-us.apache.org/repos/asf/ignite/blob/79e1e536/modules/web-console/frontend/app/components/activities-user-dialog/index.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/activities-user-dialog/index.js b/modules/web-console/frontend/app/components/activities-user-dialog/index.js
index 03d3585..dca6ba9 100644
--- a/modules/web-console/frontend/app/components/activities-user-dialog/index.js
+++ b/modules/web-console/frontend/app/components/activities-user-dialog/index.js
@@ -18,13 +18,12 @@
import controller from './activities-user-dialog.controller';
import templateUrl from './activities-user-dialog.jade';
- export default ['$modal', ($modal) => ({ show = true, user, params }) => {
+ export default ['$modal', ($modal) => ({ show = true, user }) => {
const ActivitiesUserDialog = $modal({
templateUrl,
show,
resolve: {
- user: () => user,
- params: () => params
+ user: () => user
},
placement: 'center',
controller,
http://git-wip-us.apache.org/repos/asf/ignite/blob/79e1e536/modules/web-console/frontend/app/components/form-field-datepicker/form-field-datepicker.jade
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/form-field-datepicker/form-field-datepicker.jade b/modules/web-console/frontend/app/components/form-field-datepicker/form-field-datepicker.jade
index 6792977..2578cf4 100644
--- a/modules/web-console/frontend/app/components/form-field-datepicker/form-field-datepicker.jade
+++ b/modules/web-console/frontend/app/components/form-field-datepicker/form-field-datepicker.jade
@@ -28,8 +28,8 @@ mixin ignite-form-field-datepicker(label, model, name, disabled, required, place
data-ng-disabled=disabled && '#{disabled}'
bs-datepicker
- data-date-format='MMM yyyy'
- data-start-view='1'
+ data-date-format='MMM yyyy'
+ data-start-view='1'
data-min-view='1'
data-max-date='today'
http://git-wip-us.apache.org/repos/asf/ignite/blob/79e1e536/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.column-defs.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.column-defs.js b/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.column-defs.js
index 61e1bd8..4dc4655 100644
--- a/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.column-defs.js
+++ b/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.column-defs.js
@@ -49,7 +49,7 @@ const ACTIONS_TEMPLATE = `
const EMAIL_TEMPLATE = '<div class="ui-grid-cell-contents"><a ng-href="mailto:{{ COL_FIELD }}">{{ COL_FIELD }}</a></div>';
export default [
- {displayName: 'Actions', categoryDisplayName: 'Actions', cellTemplate: ACTIONS_TEMPLATE, field: 'test', minWidth: 70, width: 70, enableFiltering: false, enableSorting: false, pinnedLeft: true},
+ {displayName: 'Actions', categoryDisplayName: 'Actions', cellTemplate: ACTIONS_TEMPLATE, field: 'actions', minWidth: 70, width: 70, enableFiltering: false, enableSorting: false, pinnedLeft: true},
{displayName: 'User', categoryDisplayName: 'User', field: 'userName', cellTemplate: USER_TEMPLATE, minWidth: 160, enableFiltering: true, filter: { placeholder: 'Filter by name...' }, pinnedLeft: true},
{displayName: 'Email', categoryDisplayName: 'Email', field: 'email', cellTemplate: EMAIL_TEMPLATE, minWidth: 160, enableFiltering: true, filter: { placeholder: 'Filter by email...' }},
{displayName: 'Company', categoryDisplayName: 'Company', field: 'company', minWidth: 160, enableFiltering: true},
@@ -62,19 +62,19 @@ export default [
{displayName: 'Caches count', categoryDisplayName: 'Configurations', headerCellTemplate: CACHE_HEADER_TEMPLATE, field: 'counters.caches', type: 'number', headerTooltip: 'Caches count', minWidth: 50, width: 50, enableFiltering: false, visible: false},
{displayName: 'IGFS count', categoryDisplayName: 'Configurations', headerCellTemplate: IGFS_HEADER_TEMPLATE, field: 'counters.igfs', type: 'number', headerTooltip: 'IGFS count', minWidth: 50, width: 50, enableFiltering: false, visible: false},
// Activities Total
- {displayName: 'Cfg', categoryDisplayName: 'Total activities', field: 'activitiesTotal["configuration"] || 0', type: 'number', headerTooltip: 'Configuration', minWidth: 50, width: 50, enableFiltering: false},
- {displayName: 'Qry', categoryDisplayName: 'Total activities', field: 'activitiesTotal["queries"] || 0', type: 'number', headerTooltip: 'Queries', minWidth: 50, width: 50, enableFiltering: false},
- {displayName: 'Demo', categoryDisplayName: 'Total activities', field: 'activitiesTotal["demo"] || 0', type: 'number', headerTooltip: 'Demo', minWidth: 50, width: 50, enableFiltering: false},
- {displayName: 'AD', categoryDisplayName: 'Total activities', field: 'activitiesDetail["/agent/download"] || 0', type: 'number', headerTooltip: 'Agent Download', minWidth: 50, width: 50, enableFiltering: false},
- {displayName: 'AS', categoryDisplayName: 'Total activities', field: 'activitiesDetail["/agent/start"] || 0', type: 'number', headerTooltip: 'Agent Start', minWidth: 50, width: 50, enableFiltering: false},
+ {displayName: 'Cfg', categoryDisplayName: 'Total activities', field: 'activitiesTotal["configuration"] || 0', type: 'number', headerTooltip: 'Total count of configuration usages', minWidth: 50, width: 50, enableFiltering: false},
+ {displayName: 'Qry', categoryDisplayName: 'Total activities', field: 'activitiesTotal["queries"] || 0', type: 'number', headerTooltip: 'Total count of queries usages', minWidth: 50, width: 50, enableFiltering: false},
+ {displayName: 'Demo', categoryDisplayName: 'Total activities', field: 'activitiesTotal["demo"] || 0', type: 'number', headerTooltip: 'Total count of demo startup', minWidth: 50, width: 50, enableFiltering: false},
+ {displayName: 'Dnld', categoryDisplayName: 'Total activities', field: 'activitiesDetail["/agent/download"] || 0', type: 'number', headerTooltip: 'Total count of agent downloads', minWidth: 50, width: 50, enableFiltering: false},
+ {displayName: 'Str', categoryDisplayName: 'Total activities', field: 'activitiesDetail["/agent/start"] || 0', type: 'number', headerTooltip: 'Total count of agent startup', minWidth: 50, width: 50, enableFiltering: false},
// Activities Configuration
- {displayName: 'Clusters', categoryDisplayName: 'Configuration\'s activities', field: 'activitiesDetail["/configuration/clusters"] || 0', type: 'number', headerTooltip: 'Configuration Clusters', minWidth: 50, width: 80, enableFiltering: false, visible: false},
- {displayName: 'Model', categoryDisplayName: 'Configuration\'s activities', field: 'activitiesDetail["/configuration/domains"] || 0', type: 'number', headerTooltip: 'Configuration Model', minWidth: 50, width: 80, enableFiltering: false, visible: false},
- {displayName: 'Caches', categoryDisplayName: 'Configuration\'s activities', field: 'activitiesDetail["/configuration/caches"] || 0', type: 'number', headerTooltip: 'Configuration Caches', minWidth: 50, width: 80, enableFiltering: false, visible: false},
+ {displayName: 'Clusters', categoryDisplayName: 'Configuration\'s activities', field: 'activitiesDetail["/configuration/clusters"] || 0', type: 'number', headerTooltip: 'Configuration clusters', minWidth: 50, width: 80, enableFiltering: false, visible: false},
+ {displayName: 'Model', categoryDisplayName: 'Configuration\'s activities', field: 'activitiesDetail["/configuration/domains"] || 0', type: 'number', headerTooltip: 'Configuration model', minWidth: 50, width: 80, enableFiltering: false, visible: false},
+ {displayName: 'Caches', categoryDisplayName: 'Configuration\'s activities', field: 'activitiesDetail["/configuration/caches"] || 0', type: 'number', headerTooltip: 'Configuration caches', minWidth: 50, width: 80, enableFiltering: false, visible: false},
{displayName: 'IGFS', categoryDisplayName: 'Configuration\'s activities', field: 'activitiesDetail["/configuration/igfs"] || 0', type: 'number', headerTooltip: 'Configuration IGFS', minWidth: 50, width: 80, enableFiltering: false, visible: false},
- {displayName: 'Summary', categoryDisplayName: 'Configuration\'s activities', field: 'activitiesDetail["/configuration/summary"] || 0', type: 'number', headerTooltip: 'Configuration Summary', minWidth: 50, width: 80, enableFiltering: false, visible: false},
+ {displayName: 'Summary', categoryDisplayName: 'Configuration\'s activities', field: 'activitiesDetail["/configuration/summary"] || 0', type: 'number', headerTooltip: 'Configuration summary', minWidth: 50, width: 80, enableFiltering: false, visible: false},
// Activities Queries
- {displayName: 'Execute', categoryDisplayName: 'Queries\' activities', field: 'activitiesDetail["/queries/execute"] || 0', type: 'number', headerTooltip: 'Query execute', minWidth: 50, width: 80, enableFiltering: false, visible: false},
- {displayName: 'Explain', categoryDisplayName: 'Queries\' activities', field: 'activitiesDetail["/queries/explain"] || 0', type: 'number', headerTooltip: 'Query explain', minWidth: 50, width: 80, enableFiltering: false, visible: false},
- {displayName: 'Scan', categoryDisplayName: 'Queries\' activities', field: 'activitiesDetail["/queries/scan"] || 0', type: 'number', headerTooltip: 'Scan', minWidth: 50, width: 80, enableFiltering: false, visible: false}
+ {displayName: 'Execute', categoryDisplayName: 'Queries\' activities', field: 'activitiesDetail["/queries/execute"] || 0', type: 'number', headerTooltip: 'Query executions', minWidth: 50, width: 80, enableFiltering: false, visible: false},
+ {displayName: 'Explain', categoryDisplayName: 'Queries\' activities', field: 'activitiesDetail["/queries/explain"] || 0', type: 'number', headerTooltip: 'Query explain executions', minWidth: 50, width: 80, enableFiltering: false, visible: false},
+ {displayName: 'Scan', categoryDisplayName: 'Queries\' activities', field: 'activitiesDetail["/queries/scan"] || 0', type: 'number', headerTooltip: 'Scan query executions', minWidth: 50, width: 80, enableFiltering: false, visible: false}
];
http://git-wip-us.apache.org/repos/asf/ignite/blob/79e1e536/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.controller.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.controller.js b/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.controller.js
index 19f7921..1f2a348 100644
--- a/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.controller.js
+++ b/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.controller.js
@@ -20,15 +20,26 @@ import headerTemplate from 'app/components/ui-grid-header/ui-grid-header.jade';
import columnDefs from './list-of-registered-users.column-defs';
import categories from './list-of-registered-users.categories';
+const rowTemplate = `<div
+ ng-repeat="(colRenderIndex, col) in colContainer.renderedColumns track by col.uid"
+ ng-mouseover="grid.api.selection.selectRow(row.entity);"
+ ui-grid-one-bind-id-grid="rowRenderIndex + '-' + col.uid + '-cell'"
+ class="ui-grid-cell"
+ ng-class="{ 'ui-grid-row-header-cell': col.isRowHeader }"
+ role="{{col.isRowHeader ? 'rowheader' : 'gridcell'}}"
+ ui-grid-cell/>`;
+
export default class IgniteListOfRegisteredUsersCtrl {
- static $inject = ['$scope', '$state', '$templateCache', 'User', 'uiGridConstants', 'IgniteAdminData', 'IgniteNotebookData', 'IgniteConfirm', 'IgniteActivitiesUserDialog'];
+ static $inject = ['$scope', '$state', '$filter', '$templateCache', 'User', 'uiGridConstants', 'IgniteAdminData', 'IgniteNotebookData', 'IgniteConfirm', 'IgniteActivitiesUserDialog'];
- constructor($scope, $state, $templateCache, User, uiGridConstants, AdminData, NotebookData, Confirm, ActivitiesUserDialog) {
+ constructor($scope, $state, $filter, $templateCache, User, uiGridConstants, AdminData, NotebookData, Confirm, ActivitiesUserDialog) {
const $ctrl = this;
const companySelectOptions = [];
const countrySelectOptions = [];
+ const dtFilter = $filter('date');
+
$ctrl.params = {
startDate: new Date()
};
@@ -82,7 +93,7 @@ export default class IgniteListOfRegisteredUsersCtrl {
};
const showActivities = (user) => {
- return new ActivitiesUserDialog({ user, params: $ctrl.params });
+ return new ActivitiesUserDialog({ user });
};
$ctrl.gridOptions = {
@@ -91,14 +102,17 @@ export default class IgniteListOfRegisteredUsersCtrl {
columnDefs,
categories,
headerTemplate: $templateCache.get(headerTemplate),
+ rowTemplate,
enableFiltering: true,
- enableRowSelection: false,
+ enableRowSelection: true,
enableRowHeaderSelection: false,
enableColumnMenus: false,
multiSelect: false,
modifierKeysToMultiSelect: true,
noUnselect: true,
fastWatch: true,
+ exporterSuppressColumns: ['actions'],
+ exporterCsvColumnSeparator: ';',
onRegisterApi: (api) => {
$ctrl.gridApi = api;
@@ -139,14 +153,14 @@ export default class IgniteListOfRegisteredUsersCtrl {
.then((data) => $ctrl.adjustHeight(data.length));
};
- $scope.$watch(() => $ctrl.params.startDate, () => {
- const endDate = new Date($ctrl.params.startDate);
+ $scope.$watch(() => $ctrl.params.startDate, (dt) => {
+ $ctrl.gridOptions.exporterCsvFilename = `web_console_users_${dtFilter(dt, 'yyyy_MM')}.csv`;
- endDate.setMonth(endDate.getMonth() + 1);
+ const endDate = new Date(dt);
- $ctrl.params.endDate = endDate;
+ endDate.setMonth(endDate.getMonth() + 1);
- reloadUsers($ctrl.params);
+ reloadUsers({startDate: dtFilter(dt, 'yyyy-MM-dd'), endDate: dtFilter(endDate, 'yyyy-MM-dd')});
});
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/79e1e536/modules/web-console/frontend/app/core/activities/Activities.data.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/core/activities/Activities.data.js b/modules/web-console/frontend/app/core/activities/Activities.data.js
index 8a67a97..8d9447c 100644
--- a/modules/web-console/frontend/app/core/activities/Activities.data.js
+++ b/modules/web-console/frontend/app/core/activities/Activities.data.js
@@ -31,9 +31,4 @@ export default class ActivitiesData {
return this.$http.post('/api/v1/activities/page', { group, action });
}
-
- listByUser(userId, params) {
- return this.$http.get(`/api/v1/activities/user/${userId}`, { params })
- .then(({ data }) => data);
- }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/79e1e536/modules/web-console/frontend/app/data/i18n.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/data/i18n.js b/modules/web-console/frontend/app/data/i18n.js
index bc8c700..3385f60 100644
--- a/modules/web-console/frontend/app/data/i18n.js
+++ b/modules/web-console/frontend/app/data/i18n.js
@@ -23,6 +23,7 @@ export default {
'/configuration/domains': 'Configure domain model',
'/configuration/igfs': 'Configure IGFS',
'/configuration/summary': 'Configurations summary',
+ '/configuration/download': 'Download project',
'/demo/resume': 'Demo resume',
'/demo/reset': 'Demo reset',
'/queries/execute': 'Query execute',
http://git-wip-us.apache.org/repos/asf/ignite/blob/79e1e536/modules/web-console/frontend/app/directives/ui-ace-pom/ui-ace-pom.controller.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/directives/ui-ace-pom/ui-ace-pom.controller.js b/modules/web-console/frontend/app/directives/ui-ace-pom/ui-ace-pom.controller.js
index 477cf20..0ae1269 100644
--- a/modules/web-console/frontend/app/directives/ui-ace-pom/ui-ace-pom.controller.js
+++ b/modules/web-console/frontend/app/directives/ui-ace-pom/ui-ace-pom.controller.js
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-export default ['$scope', 'IgniteMavenGenerator', 'IgniteVersion', function($scope, maven, Version) {
+export default ['$scope', 'IgniteMavenGenerator', function($scope, maven) {
const ctrl = this;
// Watchers definition.
@@ -25,7 +25,7 @@ export default ['$scope', 'IgniteMavenGenerator', 'IgniteVersion', function($sco
if (!value)
return;
- ctrl.data = maven.generate($scope.cluster, Version.productVersion().ignite).asString();
+ ctrl.data = maven.generate($scope.cluster);
};
// Setup watchers.
http://git-wip-us.apache.org/repos/asf/ignite/blob/79e1e536/modules/web-console/frontend/app/modules/agent/agent.module.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/agent/agent.module.js b/modules/web-console/frontend/app/modules/agent/agent.module.js
index d6fc863..7ac39d1 100644
--- a/modules/web-console/frontend/app/modules/agent/agent.module.js
+++ b/modules/web-console/frontend/app/modules/agent/agent.module.js
@@ -62,21 +62,6 @@ class IgniteAgentMonitor {
this._scope.$$postDigest(() => $state.go(this._scope.backState));
};
- this._scope.downloadAgent = () => {
- const lnk = document.createElement('a');
-
- lnk.setAttribute('href', '/api/v1/agent/download/zip');
- lnk.setAttribute('target', '_self');
- lnk.setAttribute('download', null);
- lnk.style.display = 'none';
-
- document.body.appendChild(lnk);
-
- lnk.click();
-
- document.body.removeChild(lnk);
- };
-
this._scope.hasAgents = null;
this._scope.showModal = false;
http://git-wip-us.apache.org/repos/asf/ignite/blob/79e1e536/modules/web-console/frontend/app/modules/configuration/Version.service.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/configuration/Version.service.js b/modules/web-console/frontend/app/modules/configuration/Version.service.js
index f0e9c4c..746b1ed 100644
--- a/modules/web-console/frontend/app/modules/configuration/Version.service.js
+++ b/modules/web-console/frontend/app/modules/configuration/Version.service.js
@@ -23,6 +23,9 @@ const VERSION_MATCHER = /(\d+)\.(\d+)\.(\d+)([-.]([^0123456789][^-]+)(-SNAPSHOT)
const numberComparator = (a, b) => a > b ? 1 : a < b ? -1 : 0;
export default class IgniteVersion {
+ /** Current product version. */
+ static ignite = '1.8.0';
+
/**
* Tries to parse product version from it's string representation.
*
@@ -74,16 +77,6 @@ export default class IgniteVersion {
}
/**
- * Return current product version.
- * @returns {{ignite: string}}
- */
- productVersion() {
- return {
- ignite: '1.8.0'
- };
- }
-
- /**
* Check if node version is newer or same
* @param {String} nodeVer
* @param {String} sinceVer
http://git-wip-us.apache.org/repos/asf/ignite/blob/79e1e536/modules/web-console/frontend/app/modules/configuration/generator/Maven.service.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/configuration/generator/Maven.service.js b/modules/web-console/frontend/app/modules/configuration/generator/Maven.service.js
index 2e01761..23a9c4e 100644
--- a/modules/web-console/frontend/app/modules/configuration/generator/Maven.service.js
+++ b/modules/web-console/frontend/app/modules/configuration/generator/Maven.service.js
@@ -16,6 +16,7 @@
*/
import StringBuilder from './StringBuilder';
+import IgniteVersion from 'app/modules/configuration/Version.service';
// Java built-in class names.
import POM_DEPENDENCIES from 'app/data/pom-dependencies.json';
@@ -142,11 +143,10 @@ export default class IgniteMavenGenerator {
* Generate pom.xml.
*
* @param cluster Cluster to take info about dependencies.
- * @param version Ignite version for Ignite dependencies.
- * @param sb Resulting output with generated pom.
+ * @param version Version for Ignite dependencies.
* @returns {string} Generated content.
*/
- generate(cluster, version, sb = new StringBuilder()) {
+ generate(cluster, version = IgniteVersion.ignite) {
const caches = cluster.caches;
const deps = [];
const storeDeps = [];
@@ -162,6 +162,8 @@ export default class IgniteMavenGenerator {
this.addDependency(deps, 'org.apache.ignite', 'ignite-extdata-p2p', version);
});
+ const sb = new StringBuilder();
+
sb.append('<?xml version="1.0" encoding="UTF-8"?>');
sb.emptyLine();
@@ -229,6 +231,6 @@ export default class IgniteMavenGenerator {
this.build(sb, cluster, excludeGroupIds);
- return sb;
+ return sb.asString();
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/79e1e536/modules/web-console/frontend/app/modules/states/configuration/summary/summary.worker.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/states/configuration/summary/summary.worker.js b/modules/web-console/frontend/app/modules/states/configuration/summary/summary.worker.js
index 6b24001..070b6ce 100644
--- a/modules/web-console/frontend/app/modules/states/configuration/summary/summary.worker.js
+++ b/modules/web-console/frontend/app/modules/states/configuration/summary/summary.worker.js
@@ -17,8 +17,6 @@
import JSZip from 'jszip';
-import IgniteVersion from 'app/modules/configuration/Version.service';
-
import MavenGenerator from 'app/modules/configuration/generator/Maven.service';
import DockerGenerator from 'app/modules/configuration/generator/Docker.service';
import ReadmeGenerator from 'app/modules/configuration/generator/Readme.service';
@@ -28,8 +26,6 @@ import ConfigurationGenerator from 'app/modules/configuration/generator/Configur
import JavaTransformer from 'app/modules/configuration/generator/JavaTransformer.service';
import SpringTransformer from 'app/modules/configuration/generator/SpringTransformer.service';
-const Version = new IgniteVersion();
-
const maven = new MavenGenerator();
const docker = new DockerGenerator();
const readme = new ReadmeGenerator();
@@ -100,7 +96,7 @@ onmessage = function(e) {
zip.file(`${startupPath}/ClientNodeCodeStartup.java`, java.nodeStartup(cluster, 'startup.ClientNodeCodeStartup',
'ClientConfigurationFactory.createConfiguration()', 'config.ClientConfigurationFactory', clientNearCaches));
- zip.file('pom.xml', maven.generate(cluster, Version.productVersion().ignite).asString());
+ zip.file('pom.xml', maven.generate(cluster));
zip.file('README.txt', readme.generate());
zip.file('jdbc-drivers/README.txt', readme.generateJDBC());
http://git-wip-us.apache.org/repos/asf/ignite/blob/79e1e536/modules/web-console/frontend/package.json
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/package.json b/modules/web-console/frontend/package.json
index 0fde6d4..2d12655 100644
--- a/modules/web-console/frontend/package.json
+++ b/modules/web-console/frontend/package.json
@@ -35,7 +35,7 @@
"angular-aria": "1.5.11",
"angular-cookies": "1.5.11",
"angular-drag-and-drop-lists": "1.4.0",
- "angular-gridster": "0.13.4",
+ "angular-gridster": "0.13.14",
"angular-motion": "0.4.4",
"angular-nvd3": "1.0.9",
"angular-retina": "0.4.0",
@@ -66,16 +66,16 @@
"devDependencies": {
"assets-webpack-plugin": "3.5.1",
"autoprefixer-core": "6.0.1",
- "babel-core": "6.23.1",
- "babel-eslint": "7.1.1",
+ "babel-core": "6.20.0",
+ "babel-eslint": "7.0.0",
"babel-loader": "6.2.10",
"babel-plugin-add-module-exports": "0.2.1",
"babel-plugin-transform-builtin-extend": "1.1.2",
- "babel-plugin-transform-runtime": "6.23.0",
- "babel-polyfill": "6.23.0",
+ "babel-plugin-transform-runtime": "6.15.0",
+ "babel-polyfill": "6.20.0",
"babel-preset-angular": "6.0.15",
- "babel-preset-es2015": "6.22.0",
- "babel-runtime": "6.22.0",
+ "babel-preset-es2015": "6.18.0",
+ "babel-runtime": "6.20.0",
"chai": "3.5.0",
"cross-env": "1.0.8",
"css-loader": "0.26.1",
http://git-wip-us.apache.org/repos/asf/ignite/blob/79e1e536/modules/web-console/frontend/public/stylesheets/style.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/public/stylesheets/style.scss b/modules/web-console/frontend/public/stylesheets/style.scss
index 67cfed1..ab7e3dd 100644
--- a/modules/web-console/frontend/public/stylesheets/style.scss
+++ b/modules/web-console/frontend/public/stylesheets/style.scss
@@ -2331,14 +2331,6 @@ html,body,.splash-screen {
.ui-grid-cell-contents > i {
line-height: $line-height-base;
}
-
- .ui-grid-row:nth-child(odd):hover .ui-grid-cell {
- background: $ignite-row-hover;
- }
-
- .ui-grid-row:nth-child(even):hover .ui-grid-cell {
- background: $ignite-row-hover;
- }
}
.datepicker.dropdown-menu {
http://git-wip-us.apache.org/repos/asf/ignite/blob/79e1e536/modules/web-console/frontend/public/stylesheets/variables.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/public/stylesheets/variables.scss b/modules/web-console/frontend/public/stylesheets/variables.scss
index e30bbdd..8500eac 100644
--- a/modules/web-console/frontend/public/stylesheets/variables.scss
+++ b/modules/web-console/frontend/public/stylesheets/variables.scss
@@ -26,4 +26,3 @@ $ignite-border-bottom-color: $brand-primary;
$ignite-background-color: #fff;
$ignite-header-color: #555;
$ignite-invalid-color: $brand-primary;
-$ignite-row-hover: #c9dde1;
http://git-wip-us.apache.org/repos/asf/ignite/blob/79e1e536/modules/web-console/frontend/views/templates/agent-download.jade
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/views/templates/agent-download.jade b/modules/web-console/frontend/views/templates/agent-download.jade
index f57bf1d..f5a6ba0 100644
--- a/modules/web-console/frontend/views/templates/agent-download.jade
+++ b/modules/web-console/frontend/views/templates/agent-download.jade
@@ -23,10 +23,10 @@
span(ng-if='!hasAgents') Connection to Ignite Web Agent is not established
span(ng-if='hasAgents') Connection to Ignite Node is not established
.agent-download(ng-if='!hasAgents')
- p Please download and run #[a(href='javascript:void(0)' ng-click='downloadAgent()') ignite-web-agent] in order to {{::agentGoal}}
+ p Please download and run #[a(href='/api/v1/agent/download/zip' target='_self') ignite-web-agent] in order to {{::agentGoal}}
p For run:
ul
- li Download and unzip #[a(href='javascript:void(0)' ng-click='downloadAgent()') ignite-web-agent] archive
+ li Download and unzip #[a(href='/api/v1/agent/download/zip' target='_self') ignite-web-agent] archive
li Run shell file #[b ignite-web-agent.{sh|bat}]
p Refer to #[b README.txt] in agent folder for more information
.modal-advanced-options
@@ -47,4 +47,4 @@
li Refer to #[b README.txt] in agent folder for more information
.modal-footer
button.btn.btn-default(ng-click='back()') {{::backText}}
- button.btn.btn-primary(ng-if='!hasAgents' ng-click='downloadAgent()') Download agent
+ a.btn.btn-primary(ng-if='!hasAgents' href='/api/v1/agent/download/zip' target='_self') Download agent
[13/50] [abbrv] ignite git commit: IGNITE-4526: Add Spark Shared RDD
examples Reviewed by Denis Magda
Posted by vo...@apache.org.
IGNITE-4526: Add Spark Shared RDD examples
Reviewed by Denis Magda <dm...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b461cb47
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b461cb47
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b461cb47
Branch: refs/heads/ignite-4565-ddl
Commit: b461cb47882861356ede58775bd9e253dcf26202
Parents: 79e1e53
Author: Manish Mishra <ma...@knoldus.com>
Authored: Tue Feb 14 16:54:11 2017 -0800
Committer: Denis Magda <dm...@gridgain.com>
Committed: Tue Feb 14 16:54:11 2017 -0800
----------------------------------------------------------------------
examples/config/spark/example-shared-rdd.xml | 83 ++++++++++++++
examples/pom.xml | 27 ++++-
.../examples/java8/spark/SharedRDDExample.java | 110 +++++++++++++++++++
.../examples/spark/ScalarSharedRDDExample.scala | 89 +++++++++++++++
.../examples/SharedRDDExampleSelfTest.java | 36 ++++++
.../IgniteExamplesJ8SelfTestSuite.java | 3 +
.../tests/examples/ScalarExamplesSelfTest.scala | 6 +
.../apache/ignite/spark/JavaIgniteContext.scala | 6 +
8 files changed, 359 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b461cb47/examples/config/spark/example-shared-rdd.xml
----------------------------------------------------------------------
diff --git a/examples/config/spark/example-shared-rdd.xml b/examples/config/spark/example-shared-rdd.xml
new file mode 100644
index 0000000..83de6a3
--- /dev/null
+++ b/examples/config/spark/example-shared-rdd.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ 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.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!--
+ Ignite Spring configuration file to startup Ignite cache.
+
+ This file demonstrates how to configure cache using Spring. Provided cache
+ will be created on node startup.
+
+ When starting a standalone node, you need to execute the following command:
+ {IGNITE_HOME}/bin/ignite.{bat|sh} examples/config/example-shared-rdd.xml
+
+ When starting Ignite from Java IDE, pass path to this file to Ignition:
+ Ignition.start("examples/config/example-shared-rdd.xml");
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+ <bean id="ignite.cfg" class="org.apache.ignite.configuration.IgniteConfiguration">
+ <property name="cacheConfiguration">
+ <!-- SharedRDD cache example configuration (Atomic mode). -->
+ <bean class="org.apache.ignite.configuration.CacheConfiguration">
+ <!-- Set a cache name. -->
+ <property name="name" value="sharedRDD"/>
+ <!-- Set a cache mode. -->
+ <property name="cacheMode" value="PARTITIONED"/>
+ <!-- Index Integer pairs used in the example. -->
+ <property name="indexedTypes">
+ <list>
+ <value>java.lang.Integer</value>
+ <value>java.lang.Integer</value>
+ </list>
+ </property>
+ <!-- Set atomicity mode. -->
+ <property name="atomicityMode" value="ATOMIC"/>
+ <!-- Configure a number of backups. -->
+ <property name="backups" value="1"/>
+ </bean>
+ </property>
+
+ <!-- Explicitly configure TCP discovery SPI to provide list of initial nodes. -->
+ <property name="discoverySpi">
+ <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">
+ <property name="ipFinder">
+ <!--
+ Ignite provides several options for automatic discovery that can be used
+ instead os static IP based discovery. For information on all options refer
+ to our documentation: http://apacheignite.readme.io/docs/cluster-config
+ -->
+ <!-- Uncomment static IP finder to enable static-based discovery of initial nodes. -->
+ <!--<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">-->
+ <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder">
+ <property name="addresses">
+ <list>
+ <!-- In distributed environment, replace with actual host IP address. -->
+ <value>127.0.0.1:47500..47509</value>
+ </list>
+ </property>
+ </bean>
+ </property>
+ </bean>
+ </property>
+ </bean>
+</beans>
http://git-wip-us.apache.org/repos/asf/ignite/blob/b461cb47/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 3a6a026..1c4ad25 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -17,7 +17,8 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -138,6 +139,18 @@
</exclusion>
</exclusions>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.ignite</groupId>
+ <artifactId>ignite-spark</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.netty</groupId>
+ <artifactId>netty</artifactId>
+ <version>3.2.9.Final</version>
+ </dependency>
</dependencies>
<build>
@@ -172,6 +185,18 @@
</exclusion>
</exclusions>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.ignite</groupId>
+ <artifactId>ignite-spark_2.10</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.netty</groupId>
+ <artifactId>netty</artifactId>
+ <version>3.2.9.Final</version>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/ignite/blob/b461cb47/examples/src/main/java8/org/apache/ignite/examples/java8/spark/SharedRDDExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java8/org/apache/ignite/examples/java8/spark/SharedRDDExample.java b/examples/src/main/java8/org/apache/ignite/examples/java8/spark/SharedRDDExample.java
new file mode 100644
index 0000000..392180d
--- /dev/null
+++ b/examples/src/main/java8/org/apache/ignite/examples/java8/spark/SharedRDDExample.java
@@ -0,0 +1,110 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.examples.java8.spark;
+
+import org.apache.ignite.spark.JavaIgniteContext;
+import org.apache.ignite.spark.JavaIgniteRDD;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.apache.spark.SparkConf;
+import org.apache.spark.api.java.JavaPairRDD;
+import org.apache.spark.api.java.JavaRDD;
+import org.apache.spark.api.java.JavaSparkContext;
+import org.apache.spark.api.java.function.PairFunction;
+import org.apache.spark.sql.DataFrame;
+import scala.Tuple2;
+
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+/**
+ * This example demonstrates how to create an JavaIgnitedRDD and share it with multiple spark workers. The goal of this
+ * particular example is to provide the simplest code example of this logic.
+ * <p>
+ * This example will start Ignite in the embedded mode and will start an JavaIgniteContext on each Spark worker node.
+ * <p>
+ * The example can work in the standalone mode as well that can be enabled by setting JavaIgniteContext's
+ * {@code standalone} property to {@code true} and running an Ignite node separately with
+ * `examples/config/spark/example-shared-rdd.xml` config.
+ */
+public class SharedRDDExample {
+ /**
+ * Executes the example.
+ * @param args Command line arguments, none required.
+ */
+ public static void main(String args[]) {
+ // Spark Configuration.
+ SparkConf sparkConf = new SparkConf()
+ .setAppName("JavaIgniteRDDExample")
+ .setMaster("local")
+ .set("spark.executor.instances", "2");
+
+ // Spark context.
+ JavaSparkContext sparkContext = new JavaSparkContext(sparkConf);
+
+ // Adjust the logger to exclude the logs of no interest.
+ Logger.getRootLogger().setLevel(Level.ERROR);
+ Logger.getLogger("org.apache.ignite").setLevel(Level.INFO);
+
+ // Creates Ignite context with specific configuration and runs Ignite in the embedded mode.
+ JavaIgniteContext<Integer, Integer> igniteContext = new JavaIgniteContext<Integer, Integer>(
+ sparkContext,"examples/config/spark/example-shared-rdd.xml", false);
+
+ // Create a Java Ignite RDD of Type (Int,Int) Integer Pair.
+ JavaIgniteRDD<Integer, Integer> sharedRDD = igniteContext.<Integer, Integer>fromCache("sharedRDD");
+
+ // Define data to be stored in the Ignite RDD (cache).
+ List<Integer> data = IntStream.range(0, 20).boxed().collect(Collectors.toList());
+
+ // Preparing a Java RDD.
+ JavaRDD<Integer> javaRDD = sparkContext.<Integer>parallelize(data);
+
+ // Fill the Ignite RDD in with Int pairs. Here Pairs are represented as Scala Tuple2.
+ sharedRDD.savePairs(javaRDD.<Integer, Integer>mapToPair(new PairFunction<Integer, Integer, Integer>() {
+ @Override public Tuple2<Integer, Integer> call(Integer val) throws Exception {
+ return new Tuple2<Integer, Integer>(val, val);
+ }
+ }));
+
+ System.out.println(">>> Iterating over Ignite Shared RDD...");
+
+ // Iterate over the Ignite RDD.
+ sharedRDD.foreach((x) -> System.out.println("(" + x._1 + "," + x._2 + ")"));
+
+ System.out.println(">>> Transforming values stored in Ignite Shared RDD...");
+
+ // Filter out even values as a transformed RDD.
+ JavaPairRDD<Integer, Integer> transformedValues =
+ sharedRDD.filter((Tuple2<Integer, Integer> pair) -> pair._2() % 2 == 0);
+
+ // Print out the transformed values.
+ transformedValues.foreach((x) -> System.out.println("(" + x._1 + "," + x._2 + ")"));
+
+ System.out.println(">>> Executing SQL query over Ignite Shared RDD...");
+
+ // Execute SQL query over the Ignite RDD.
+ DataFrame df = sharedRDD.sql("select _val from Integer where _key < 9");
+
+ // Show the result of the execution.
+ df.show();
+
+ // Close IgniteContext on all the workers.
+ igniteContext.close(true);
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/b461cb47/examples/src/main/scala/org/apache/ignite/scalar/examples/spark/ScalarSharedRDDExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/spark/ScalarSharedRDDExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/spark/ScalarSharedRDDExample.scala
new file mode 100644
index 0000000..18662e8
--- /dev/null
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/spark/ScalarSharedRDDExample.scala
@@ -0,0 +1,89 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.scalar.examples.spark
+
+import org.apache.ignite.spark.{IgniteContext, IgniteRDD}
+import org.apache.log4j.{Level, Logger}
+import org.apache.spark.{SparkConf, SparkContext}
+
+/**
+ * This example demonstrates how to create an IgnitedRDD and share it with multiple spark workers.
+ * The goal of this particular example is to provide the simplest code example of this logic.
+ * <p>
+ * This example will start Ignite in the embedded mode and will start an IgniteContext on each Spark worker node.
+ * <p>
+ * The example can work in the standalone mode as well that can be enabled by setting IgniteContext's {@code isClient}
+ * property to {@code true} and running an Ignite node separately with `examples/config/spark/
+ * example-shared-rdd.xml` config.
+ * <p>
+ */
+object ScalarSharedRDDExample extends App {
+ // Spark Configuration.
+ private val conf = new SparkConf()
+ .setAppName("IgniteRDDExample")
+ .setMaster("local")
+ .set("spark.executor.instances", "2")
+
+ // Spark context.
+ val sparkContext = new SparkContext(conf)
+
+ // Adjust the logger to exclude the logs of no interest.
+ Logger.getRootLogger.setLevel(Level.ERROR)
+ Logger.getLogger("org.apache.ignite").setLevel(Level.INFO)
+
+ // Defines spring cache Configuration path.
+ private val CONFIG = "examples/config/spark/example-shared-rdd.xml"
+
+ // Creates Ignite context with above configuration.
+ val igniteContext = new IgniteContext(sparkContext, CONFIG, false)
+
+ // Creates an Ignite Shared RDD of Type (Int,Int) Integer Pair.
+ val sharedRDD: IgniteRDD[Int, Int] = igniteContext.fromCache[Int, Int]("sharedRDD")
+
+ // Fill the Ignite Shared RDD in with Int pairs.
+ sharedRDD.savePairs(sparkContext.parallelize(1 to 100000, 10).map(i => (i, i)))
+
+ // Transforming Pairs to contain their Squared value.
+ sharedRDD.mapValues(x => (x * x))
+
+ // Retrieve sharedRDD back from the Cache.
+ val transformedValues: IgniteRDD[Int, Int] = igniteContext.fromCache("sharedRDD")
+
+ // Perform some transformations on IgniteRDD and print.
+ val squareAndRootPair = transformedValues.map { case (x, y) => (x, Math.sqrt(y.toDouble)) }
+
+ println(">>> Transforming values stored in Ignite Shared RDD...")
+
+ // Filter out pairs which square roots are less than 100 and
+ // take the first five elements from the transformed IgniteRDD and print them.
+ squareAndRootPair.filter(_._2 < 100.0).take(5).foreach(println)
+
+ println(">>> Executing SQL query over Ignite Shared RDD...")
+
+ // Execute a SQL query over the Ignite Shared RDD.
+ val df = transformedValues.sql("select _val from Integer where _val < 100 and _val > 9 ")
+
+ // Show ten rows from the result set.
+ df.show(10)
+
+ // Close IgniteContext on all workers.
+ igniteContext.close(true)
+
+ // Stop SparkContext.
+ sparkContext.stop()
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/b461cb47/examples/src/test/java8/org/apache/ignite/java8/examples/SharedRDDExampleSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/SharedRDDExampleSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/SharedRDDExampleSelfTest.java
new file mode 100644
index 0000000..0fafb4d
--- /dev/null
+++ b/examples/src/test/java8/org/apache/ignite/java8/examples/SharedRDDExampleSelfTest.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.java8.examples;
+
+import org.apache.ignite.examples.java8.spark.SharedRDDExample;
+import org.junit.Test;
+
+/**
+ * SharedRDD examples self test.
+ */
+public class SharedRDDExampleSelfTest {
+ static final String[] EMPTY_ARGS = new String[0];
+ /**
+ * @throws Exception If failed.
+ */
+ @Test
+ public void testSharedRDDExample() throws Exception {
+ SharedRDDExample.main(EMPTY_ARGS);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/b461cb47/examples/src/test/java8/org/apache/ignite/java8/testsuites/IgniteExamplesJ8SelfTestSuite.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java8/org/apache/ignite/java8/testsuites/IgniteExamplesJ8SelfTestSuite.java b/examples/src/test/java8/org/apache/ignite/java8/testsuites/IgniteExamplesJ8SelfTestSuite.java
index 949324c..c32339f 100644
--- a/examples/src/test/java8/org/apache/ignite/java8/testsuites/IgniteExamplesJ8SelfTestSuite.java
+++ b/examples/src/test/java8/org/apache/ignite/java8/testsuites/IgniteExamplesJ8SelfTestSuite.java
@@ -26,6 +26,7 @@ import org.apache.ignite.java8.examples.EventsExamplesMultiNodeSelfTest;
import org.apache.ignite.java8.examples.EventsExamplesSelfTest;
import org.apache.ignite.java8.examples.IndexingBridgeMethodTest;
import org.apache.ignite.java8.examples.MessagingExamplesSelfTest;
+import org.apache.ignite.java8.examples.SharedRDDExampleSelfTest;
import org.apache.ignite.testframework.GridTestUtils;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_OVERRIDE_MCAST_GRP;
@@ -49,6 +50,8 @@ public class IgniteExamplesJ8SelfTestSuite extends TestSuite {
suite.addTest(new TestSuite(IndexingBridgeMethodTest.class));
suite.addTest(new TestSuite(CacheExamplesSelfTest.class));
suite.addTest(new TestSuite(BasicExamplesSelfTest.class));
+ suite.addTest(new TestSuite(SharedRDDExampleSelfTest.class));
+
// suite.addTest(new TestSuite(ContinuationExamplesSelfTest.class));
// suite.addTest(new TestSuite(ContinuousMapperExamplesSelfTest.class));
// suite.addTest(new TestSuite(DeploymentExamplesSelfTest.class));
http://git-wip-us.apache.org/repos/asf/ignite/blob/b461cb47/examples/src/test/scala/org/apache/ignite/scalar/tests/examples/ScalarExamplesSelfTest.scala
----------------------------------------------------------------------
diff --git a/examples/src/test/scala/org/apache/ignite/scalar/tests/examples/ScalarExamplesSelfTest.scala b/examples/src/test/scala/org/apache/ignite/scalar/tests/examples/ScalarExamplesSelfTest.scala
index 94c41ad..28e509e 100644
--- a/examples/src/test/scala/org/apache/ignite/scalar/tests/examples/ScalarExamplesSelfTest.scala
+++ b/examples/src/test/scala/org/apache/ignite/scalar/tests/examples/ScalarExamplesSelfTest.scala
@@ -18,6 +18,7 @@
package org.apache.ignite.scalar.tests.examples
import org.apache.ignite.scalar.examples._
+import org.apache.ignite.scalar.examples.spark._
import org.apache.ignite.scalar.scalar
import org.apache.ignite.testframework.junits.common.GridAbstractExamplesTest
import org.scalatest.junit.JUnitSuiteLike
@@ -95,4 +96,9 @@ class ScalarExamplesSelfTest extends GridAbstractExamplesTest with JUnitSuiteLik
def testScalarSnowflakeSchemaExample() {
ScalarSnowflakeSchemaExample.main(EMPTY_ARGS)
}
+
+ /** */
+ def testScalarSharedRDDExample() {
+ ScalarSharedRDDExample.main(EMPTY_ARGS)
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/b461cb47/modules/spark/src/main/scala/org/apache/ignite/spark/JavaIgniteContext.scala
----------------------------------------------------------------------
diff --git a/modules/spark/src/main/scala/org/apache/ignite/spark/JavaIgniteContext.scala b/modules/spark/src/main/scala/org/apache/ignite/spark/JavaIgniteContext.scala
index 689a22d..d8a521b 100644
--- a/modules/spark/src/main/scala/org/apache/ignite/spark/JavaIgniteContext.scala
+++ b/modules/spark/src/main/scala/org/apache/ignite/spark/JavaIgniteContext.scala
@@ -51,6 +51,12 @@ class JavaIgniteContext[K, V](
})
}
+ def this(sc: JavaSparkContext, springUrl: String, standalone: Boolean) {
+ this(sc, new IgniteOutClosure[IgniteConfiguration] {
+ override def apply() = IgnitionEx.loadConfiguration(springUrl).get1()
+ }, standalone)
+ }
+
def fromCache(cacheName: String): JavaIgniteRDD[K, V] =
JavaIgniteRDD.fromIgniteRDD(new IgniteRDD[K, V](ic, cacheName, null, false))
[17/50] [abbrv] ignite git commit: IGNITE-4673: Fixed type ID used
for "java.lang.Object[]" in BinaryMarshaller. This closes #1512.
Posted by vo...@apache.org.
IGNITE-4673: Fixed type ID used for "java.lang.Object[]" in BinaryMarshaller. This closes #1512.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/80825f78
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/80825f78
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/80825f78
Branch: refs/heads/ignite-4565-ddl
Commit: 80825f7862065ba67d2f75fe0b9192562cc73c25
Parents: 85b08c5
Author: tledkov-gridgain <tl...@gridgain.com>
Authored: Wed Feb 15 14:55:57 2017 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Wed Feb 15 14:55:57 2017 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/internal/binary/BinaryContext.java | 1 +
.../java/org/apache/ignite/internal/binary/BinaryUtils.java | 6 ------
.../apache/ignite/internal/binary/GridBinaryMarshaller.java | 2 +-
3 files changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/80825f78/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
index 6d4cedd..ec2fc7b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
@@ -278,6 +278,7 @@ public class BinaryContext {
// IDs range from [0..200] is used by Java SDK API and GridGain legacy API
+ registerPredefinedType(Object.class, GridBinaryMarshaller.OBJECT);
registerPredefinedType(Byte.class, GridBinaryMarshaller.BYTE);
registerPredefinedType(Boolean.class, GridBinaryMarshaller.BOOLEAN);
registerPredefinedType(Short.class, GridBinaryMarshaller.SHORT);
http://git-wip-us.apache.org/repos/asf/ignite/blob/80825f78/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
index 78bc31a..24c2f72 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
@@ -1567,9 +1567,6 @@ public class BinaryUtils {
throws BinaryObjectException {
Class cls;
- if (typeId == GridBinaryMarshaller.OBJECT_TYPE_ID)
- return Object.class;
-
if (typeId != GridBinaryMarshaller.UNREGISTERED_TYPE_ID)
cls = ctx.descriptorForTypeId(true, typeId, ldr, false).describedClass();
else {
@@ -1602,9 +1599,6 @@ public class BinaryUtils {
@Nullable ClassLoader ldr, boolean deserialize) {
Class cls;
- if (typeId == GridBinaryMarshaller.OBJECT_TYPE_ID)
- return Object.class;
-
if (typeId != GridBinaryMarshaller.UNREGISTERED_TYPE_ID)
cls = ctx.descriptorForTypeId(true, typeId, ldr, deserialize).describedClass();
else {
http://git-wip-us.apache.org/repos/asf/ignite/blob/80825f78/modules/core/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
index 8616155..d4b0ff4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
@@ -190,7 +190,7 @@ public class GridBinaryMarshaller {
public static final byte PLATFORM_JAVA_OBJECT_FACTORY_PROXY = 99;
/** */
- public static final int OBJECT_TYPE_ID = -1;
+ public static final int OBJECT = -1;
/** */
public static final int UNREGISTERED_TYPE_ID = 0;
[33/50] [abbrv] ignite git commit: Performance optimizations.
Posted by vo...@apache.org.
Performance optimizations.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b02ad0de
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b02ad0de
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b02ad0de
Branch: refs/heads/ignite-4565-ddl
Commit: b02ad0deaae78424356f9a4b1748fc43b21eac03
Parents: 7cb3e68
Author: yzhdanov <yz...@apache.org>
Authored: Fri Feb 17 14:10:20 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Feb 17 14:10:20 2017 +0300
----------------------------------------------------------------------
.../ignite/internal/GridKernalGatewayImpl.java | 25 +-
.../org/apache/ignite/internal/GridTopic.java | 2 +-
.../client/util/GridClientConsistentHash.java | 14 +-
.../managers/communication/GridIoManager.java | 29 ++-
.../discovery/GridDiscoveryManager.java | 258 +++++--------------
.../eventstorage/GridEventStorageManager.java | 34 ++-
.../affinity/GridAffinityAssignmentCache.java | 8 +-
.../cache/CacheAffinitySharedManager.java | 2 +-
.../cache/GridCacheEvictionManager.java | 60 +++--
.../processors/cache/GridCacheGateway.java | 48 ++--
.../processors/cache/GridCacheIoManager.java | 19 +-
.../processors/cache/GridCacheUtils.java | 6 +-
.../cache/affinity/GridCacheAffinityImpl.java | 2 +-
.../dht/GridClientPartitionTopology.java | 13 +-
.../dht/GridDhtAssignmentFetchFuture.java | 5 +-
.../distributed/dht/GridDhtCacheAdapter.java | 4 +-
.../dht/GridDhtPartitionTopologyImpl.java | 14 +-
.../GridDhtAtomicAbstractUpdateFuture.java | 7 +-
.../GridDhtAtomicAbstractUpdateRequest.java | 2 +-
.../dht/atomic/GridDhtAtomicCache.java | 16 +-
.../atomic/GridDhtAtomicSingleUpdateFuture.java | 6 +-
.../GridDhtAtomicSingleUpdateRequest.java | 5 +-
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 6 +-
.../dht/atomic/GridDhtAtomicUpdateRequest.java | 10 +-
.../dht/atomic/GridDhtAtomicUpdateResponse.java | 31 ++-
.../GridNearAtomicSingleUpdateFuture.java | 7 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 7 +-
.../atomic/GridNearAtomicUpdateResponse.java | 35 ++-
.../dht/preloader/GridDhtPreloader.java | 39 ++-
.../near/GridNearSingleGetRequest.java | 5 +
.../cache/transactions/IgniteTxHandler.java | 4 +-
.../cache/version/GridCacheVersion.java | 2 +-
.../cache/version/GridCacheVersionManager.java | 2 +-
.../clock/GridClockSyncProcessor.java | 2 +-
.../ignite/internal/util/GridBusyLock.java | 2 +-
.../util/StripedCompositeReadWriteLock.java | 50 +++-
.../ignite/internal/util/StripedExecutor.java | 10 +-
.../nio/GridAbstractCommunicationClient.java | 37 +--
.../util/nio/GridCommunicationClient.java | 5 -
.../communication/tcp/TcpCommunicationSpi.java | 9 +
.../org/apache/ignite/thread/IgniteThread.java | 26 +-
.../GridDiscoveryManagerAliveCacheSelfTest.java | 55 ----
.../discovery/GridDiscoveryManagerSelfTest.java | 214 ---------------
.../testsuites/IgniteKernalSelfTestSuite.java | 5 +-
.../ignite/tools/classgen/ClassesGenerator.java | 4 +-
45 files changed, 462 insertions(+), 684 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b02ad0de/modules/core/src/main/java/org/apache/ignite/internal/GridKernalGatewayImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalGatewayImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalGatewayImpl.java
index fe8c580..7cbf84a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalGatewayImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalGatewayImpl.java
@@ -22,9 +22,11 @@ import java.io.Serializable;
import java.io.StringWriter;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReadWriteLock;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteClientDisconnectedException;
-import org.apache.ignite.internal.util.GridSpinReadWriteLock;
+import org.apache.ignite.internal.util.StripedCompositeReadWriteLock;
import org.apache.ignite.internal.util.future.GridFutureAdapter;
import org.apache.ignite.internal.util.future.IgniteFutureImpl;
import org.apache.ignite.internal.util.tostring.GridToStringExclude;
@@ -40,7 +42,8 @@ public class GridKernalGatewayImpl implements GridKernalGateway, Serializable {
/** */
@GridToStringExclude
- private final GridSpinReadWriteLock rwLock = new GridSpinReadWriteLock();
+ private final ReadWriteLock rwLock =
+ new StripedCompositeReadWriteLock(Runtime.getRuntime().availableProcessors());
/** */
@GridToStringExclude
@@ -73,13 +76,15 @@ public class GridKernalGatewayImpl implements GridKernalGateway, Serializable {
if (stackTrace == null)
stackTrace = stackTrace();
- rwLock.readLock();
+ Lock lock = rwLock.readLock();
+
+ lock.lock();
GridKernalState state = this.state.get();
if (state != GridKernalState.STARTED) {
// Unlock just acquired lock.
- rwLock.readUnlock();
+ lock.unlock();
if (state == GridKernalState.DISCONNECTED) {
assert reconnectFut != null;
@@ -96,7 +101,7 @@ public class GridKernalGatewayImpl implements GridKernalGateway, Serializable {
if (stackTrace == null)
stackTrace = stackTrace();
- rwLock.readLock();
+ rwLock.readLock().lock();
if (state.get() == GridKernalState.DISCONNECTED)
throw new IgniteClientDisconnectedException(reconnectFut, "Client node disconnected: " + gridName);
@@ -104,7 +109,7 @@ public class GridKernalGatewayImpl implements GridKernalGateway, Serializable {
/** {@inheritDoc} */
@Override public void readUnlock() {
- rwLock.readUnlock();
+ rwLock.readLock().unlock();
}
/** {@inheritDoc} */
@@ -118,7 +123,7 @@ public class GridKernalGatewayImpl implements GridKernalGateway, Serializable {
// Busy wait is intentional.
while (true)
try {
- if (rwLock.tryWriteLock(200, TimeUnit.MILLISECONDS))
+ if (rwLock.writeLock().tryLock(200, TimeUnit.MILLISECONDS))
break;
else
Thread.sleep(200);
@@ -135,7 +140,7 @@ public class GridKernalGatewayImpl implements GridKernalGateway, Serializable {
/** {@inheritDoc} */
@Override public boolean tryWriteLock(long timeout) throws InterruptedException {
- boolean acquired = rwLock.tryWriteLock(timeout, TimeUnit.MILLISECONDS);
+ boolean acquired = rwLock.writeLock().tryLock(timeout, TimeUnit.MILLISECONDS);
if (acquired) {
if (stackTrace == null)
@@ -194,7 +199,7 @@ public class GridKernalGatewayImpl implements GridKernalGateway, Serializable {
/** {@inheritDoc} */
@Override public void writeUnlock() {
- rwLock.writeUnlock();
+ rwLock.writeLock().unlock();
}
/** {@inheritDoc} */
@@ -222,4 +227,4 @@ public class GridKernalGatewayImpl implements GridKernalGateway, Serializable {
@Override public String toString() {
return S.toString(GridKernalGatewayImpl.class, this);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/b02ad0de/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java b/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java
index 2962540..c2e0452 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java
@@ -769,4 +769,4 @@ public enum GridTopic {
return S.toString(T8.class, this);
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/b02ad0de/modules/core/src/main/java/org/apache/ignite/internal/client/util/GridClientConsistentHash.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/util/GridClientConsistentHash.java b/modules/core/src/main/java/org/apache/ignite/internal/client/util/GridClientConsistentHash.java
index 8134906..0c9a3fb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/util/GridClientConsistentHash.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/util/GridClientConsistentHash.java
@@ -439,13 +439,9 @@ public class GridClientConsistentHash<N> {
/** {@inheritDoc} */
@Override public String toString() {
- StringBuilder sb = new StringBuilder(getClass().getSimpleName());
-
- sb.append(" [affSeed=").append(affSeed).
- append(", circle=").append(circle).
- append(", nodesComp=").append(nodesComp).
- append(", nodes=").append(nodes).append("]");
-
- return sb.toString();
+ return getClass().getSimpleName() + " [affSeed=" + affSeed +
+ ", circle=" + circle +
+ ", nodesComp=" + nodesComp +
+ ", nodes=" + nodes + "]";
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/b02ad0de/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
index 84b4543..108ecd5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
@@ -35,6 +35,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.apache.ignite.IgniteCheckedException;
@@ -57,7 +58,7 @@ import org.apache.ignite.internal.processors.platform.message.PlatformMessageFil
import org.apache.ignite.internal.processors.pool.PoolProcessor;
import org.apache.ignite.internal.processors.timeout.GridTimeoutObject;
import org.apache.ignite.internal.util.GridBoundedConcurrentLinkedHashSet;
-import org.apache.ignite.internal.util.GridSpinReadWriteLock;
+import org.apache.ignite.internal.util.StripedCompositeReadWriteLock;
import org.apache.ignite.internal.util.future.GridFinishedFuture;
import org.apache.ignite.internal.util.future.GridFutureAdapter;
import org.apache.ignite.internal.util.lang.GridTuple3;
@@ -160,7 +161,8 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
private final Marshaller marsh;
/** Busy lock. */
- private final GridSpinReadWriteLock busyLock = new GridSpinReadWriteLock();
+ private final ReadWriteLock busyLock =
+ new StripedCompositeReadWriteLock(Runtime.getRuntime().availableProcessors());
/** Lock to sync maps access. */
private final ReadWriteLock lock = new ReentrantReadWriteLock();
@@ -577,7 +579,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
// Busy wait is intentional.
while (true) {
try {
- if (busyLock.tryWriteLock(200, TimeUnit.MILLISECONDS))
+ if (busyLock.writeLock().tryLock(200, TimeUnit.MILLISECONDS))
break;
else
Thread.sleep(200);
@@ -601,7 +603,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
stopping = true;
}
finally {
- busyLock.writeUnlock();
+ busyLock.writeLock().unlock();
}
}
@@ -623,7 +625,9 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
assert nodeId != null;
assert msg != null;
- busyLock.readLock();
+ Lock busyLock0 = busyLock.readLock();
+
+ busyLock0.lock();
try {
if (stopping) {
@@ -712,7 +716,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
U.error(log, "Failed to process message (will ignore): " + msg, e);
}
finally {
- busyLock.readUnlock();
+ busyLock0.unlock();
}
}
@@ -798,11 +802,12 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
if (msg.topicOrdinal() == TOPIC_IO_TEST.ordinal()) {
IgniteIoTestMessage msg0 = (IgniteIoTestMessage)msg.message();
- if (msg0.processFromNioThread()) {
+ if (msg0.processFromNioThread())
c.run();
+ else
+ ctx.getStripedExecutorService().execute(-1, c);
- return;
- }
+ return;
}
if (ctx.config().getStripedPoolSize() > 0 &&
@@ -2173,7 +2178,9 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
return;
}
- busyLock.readLock();
+ Lock lock = busyLock.readLock();
+
+ lock.lock();
try {
if (stopping) {
@@ -2251,7 +2258,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
}
}
finally {
- busyLock.readUnlock();
+ lock.unlock();
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/b02ad0de/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index 71d8ad9..9ea707d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -17,7 +17,6 @@
package org.apache.ignite.internal.managers.discovery;
-import java.io.Externalizable;
import java.io.Serializable;
import java.lang.management.GarbageCollectorMXBean;
import java.lang.management.ManagementFactory;
@@ -74,6 +73,7 @@ import org.apache.ignite.internal.managers.communication.GridIoManager;
import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.processors.cache.CacheAffinitySharedManager;
+import org.apache.ignite.internal.processors.cache.DynamicCacheDescriptor;
import org.apache.ignite.internal.processors.cache.GridCacheAdapter;
import org.apache.ignite.internal.processors.jobmetrics.GridJobMetrics;
import org.apache.ignite.internal.processors.security.SecurityContext;
@@ -144,9 +144,6 @@ import static org.apache.ignite.plugin.segmentation.SegmentationPolicy.NOOP;
* Discovery SPI manager.
*/
public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
- /** Fake key for {@code null}-named caches. Used inside {@link DiscoCache}. */
- private static final String NULL_CACHE_NAME = UUID.randomUUID().toString();
-
/** Metrics update frequency. */
private static final long METRICS_UPDATE_FREQ = 3000;
@@ -1577,7 +1574,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
* @return Collection of cache nodes.
*/
public Collection<ClusterNode> nodes(AffinityTopologyVersion topVer) {
- return resolveDiscoCache(null, topVer).allNodes();
+ return resolveDiscoCache(CU.cacheId(null), topVer).allNodes();
}
/**
@@ -1585,7 +1582,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
* @return All server nodes for given topology version.
*/
public List<ClusterNode> serverNodes(AffinityTopologyVersion topVer) {
- return resolveDiscoCache(null, topVer).srvNodes;
+ return resolveDiscoCache(CU.cacheId(null), topVer).srvNodes;
}
/**
@@ -1596,7 +1593,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
* @return Node.
*/
public ClusterNode node(AffinityTopologyVersion topVer, UUID id) {
- return resolveDiscoCache(null, topVer).node(id);
+ return resolveDiscoCache(CU.cacheId(null), topVer).node(id);
}
/**
@@ -1607,49 +1604,38 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
* @return Collection of cache nodes.
*/
public Collection<ClusterNode> cacheNodes(@Nullable String cacheName, AffinityTopologyVersion topVer) {
- return resolveDiscoCache(cacheName, topVer).cacheNodes(cacheName, topVer.topologyVersion());
+ return resolveDiscoCache(CU.cacheId(cacheName), topVer).cacheNodes(cacheName, topVer.topologyVersion());
}
/**
- * Gets all nodes with at least one cache configured.
+ * Gets cache nodes for cache with given ID.
*
+ * @param cacheId Cache ID.
* @param topVer Topology version.
* @return Collection of cache nodes.
*/
- public Collection<ClusterNode> cacheNodes(AffinityTopologyVersion topVer) {
- return resolveDiscoCache(null, topVer).allNodesWithCaches(topVer.topologyVersion());
+ public Collection<ClusterNode> cacheNodes(int cacheId, AffinityTopologyVersion topVer) {
+ return resolveDiscoCache(cacheId, topVer).cacheNodes(cacheId, topVer.topologyVersion());
}
/**
- * Gets cache remote nodes for cache with given name.
- *
- * @param topVer Topology version.
- * @return Collection of cache nodes.
- */
- public Collection<ClusterNode> remoteCacheNodes(AffinityTopologyVersion topVer) {
- return resolveDiscoCache(null, topVer).remoteCacheNodes(topVer.topologyVersion());
- }
-
- /**
- * Gets cache nodes for cache with given name.
+ * Gets all nodes with at least one cache configured.
*
- * @param cacheName Cache name.
* @param topVer Topology version.
* @return Collection of cache nodes.
*/
- Collection<ClusterNode> aliveCacheNodes(@Nullable String cacheName, AffinityTopologyVersion topVer) {
- return resolveDiscoCache(cacheName, topVer).aliveCacheNodes(cacheName, topVer.topologyVersion());
+ public Collection<ClusterNode> cacheNodes(AffinityTopologyVersion topVer) {
+ return resolveDiscoCache(CU.cacheId(null), topVer).allNodesWithCaches(topVer.topologyVersion());
}
/**
* Gets cache remote nodes for cache with given name.
*
- * @param cacheName Cache name.
* @param topVer Topology version.
* @return Collection of cache nodes.
*/
- Collection<ClusterNode> aliveRemoteCacheNodes(@Nullable String cacheName, AffinityTopologyVersion topVer) {
- return resolveDiscoCache(cacheName, topVer).aliveRemoteCacheNodes(cacheName, topVer.topologyVersion());
+ public Collection<ClusterNode> remoteCacheNodes(AffinityTopologyVersion topVer) {
+ return resolveDiscoCache(CU.cacheId(null), topVer).remoteCacheNodes(topVer.topologyVersion());
}
/**
@@ -1657,7 +1643,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
* @return Oldest alive server nodes with at least one cache configured.
*/
@Nullable public ClusterNode oldestAliveCacheServerNode(AffinityTopologyVersion topVer) {
- DiscoCache cache = resolveDiscoCache(null, topVer);
+ DiscoCache cache = resolveDiscoCache(CU.cacheId(null), topVer);
Map.Entry<ClusterNode, Boolean> e = cache.aliveSrvNodesWithCaches.firstEntry();
@@ -1672,7 +1658,20 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
* @return Collection of cache affinity nodes.
*/
public Collection<ClusterNode> cacheAffinityNodes(@Nullable String cacheName, AffinityTopologyVersion topVer) {
- return resolveDiscoCache(cacheName, topVer).cacheAffinityNodes(cacheName, topVer.topologyVersion());
+ int cacheId = CU.cacheId(cacheName);
+
+ return resolveDiscoCache(cacheId, topVer).cacheAffinityNodes(cacheId, topVer.topologyVersion());
+ }
+
+ /**
+ * Gets cache nodes for cache with given ID that participate in affinity calculation.
+ *
+ * @param cacheId Cache ID.
+ * @param topVer Topology version.
+ * @return Collection of cache affinity nodes.
+ */
+ public Collection<ClusterNode> cacheAffinityNodes(int cacheId, AffinityTopologyVersion topVer) {
+ return resolveDiscoCache(cacheId, topVer).cacheAffinityNodes(cacheId, topVer.topologyVersion());
}
/**
@@ -1742,31 +1741,34 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
}
/**
- * Checks if cache with given name has at least one node with near cache enabled.
+ * Checks if cache with given ID has at least one node with near cache enabled.
*
- * @param cacheName Cache name.
+ * @param cacheId Cache ID.
* @param topVer Topology version.
* @return {@code True} if cache with given name has at least one node with near cache enabled.
*/
- public boolean hasNearCache(@Nullable String cacheName, AffinityTopologyVersion topVer) {
- return resolveDiscoCache(cacheName, topVer).hasNearCache(cacheName);
+ public boolean hasNearCache(int cacheId, AffinityTopologyVersion topVer) {
+ return resolveDiscoCache(cacheId, topVer).hasNearCache(cacheId);
}
/**
* Gets discovery cache for given topology version.
*
- * @param cacheName Cache name (participates in exception message).
+ * @param cacheId Cache ID (participates in exception message).
* @param topVer Topology version.
* @return Discovery cache.
*/
- private DiscoCache resolveDiscoCache(@Nullable String cacheName, AffinityTopologyVersion topVer) {
+ private DiscoCache resolveDiscoCache(int cacheId, AffinityTopologyVersion topVer) {
Snapshot snap = topSnap.get();
DiscoCache cache = AffinityTopologyVersion.NONE.equals(topVer) || topVer.equals(snap.topVer) ?
snap.discoCache : discoCacheHist.get(topVer);
if (cache == null) {
- throw new IgniteException("Failed to resolve nodes topology [cacheName=" + cacheName +
+ DynamicCacheDescriptor desc = ctx.cache().cacheDescriptor(cacheId);
+
+ throw new IgniteException("Failed to resolve nodes topology [" +
+ "cacheName=" + (desc != null ? desc.cacheConfiguration().getName() : "N/A") +
", topVer=" + topVer +
", history=" + discoCacheHist.keySet() +
", snap=" + snap +
@@ -2093,19 +2095,6 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
evts.add(new GridTuple5<>(type, topVer, node, topSnapshot, data));
}
- /**
- * @param node Node to get a short description for.
- * @return Short description for the node to be used in 'quiet' mode.
- */
- private String quietNode(ClusterNode node) {
- assert node != null;
-
- return "nodeId8=" + node.id().toString().substring(0, 8) + ", " +
- "addrs=" + U.addressesAsString(node) + ", " +
- "order=" + node.order() + ", " +
- "CPUs=" + node.metrics().getTotalCpus();
- }
-
/** {@inheritDoc} */
@Override protected void body() throws InterruptedException {
while (!isCancelled()) {
@@ -2415,11 +2404,6 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
/** Topology await version. */
private long awaitVer;
- /** Empty constructor required by {@link Externalizable}. */
- private DiscoTopologyFuture() {
- // No-op.
- }
-
/**
* @param ctx Context.
* @param awaitVer Await version.
@@ -2509,19 +2493,15 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
/** Cache nodes by cache name. */
@GridToStringInclude
- private final Map<String, Collection<ClusterNode>> allCacheNodes;
-
- /** Remote cache nodes by cache name. */
- @GridToStringInclude
- private final Map<String, Collection<ClusterNode>> rmtCacheNodes;
+ private final Map<Integer, Collection<ClusterNode>> allCacheNodes;
/** Cache nodes by cache name. */
@GridToStringInclude
- private final Map<String, Collection<ClusterNode>> affCacheNodes;
+ private final Map<Integer, Collection<ClusterNode>> affCacheNodes;
/** Caches where at least one node has near cache enabled. */
@GridToStringInclude
- private final Set<String> nearEnabledCaches;
+ private final Set<Integer> nearEnabledCaches;
/** Nodes grouped by version. */
private final NavigableMap<IgniteProductVersion, Collection<ClusterNode>> nodesByVer;
@@ -2539,18 +2519,6 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
private final long maxOrder;
/**
- * Cached alive nodes list. As long as this collection doesn't accept {@code null}s use {@link
- * #maskNull(String)} before passing raw cache names to it.
- */
- private final ConcurrentMap<String, Collection<ClusterNode>> aliveCacheNodes;
-
- /**
- * Cached alive remote nodes list. As long as this collection doesn't accept {@code null}s use {@link
- * #maskNull(String)} before passing raw cache names to it.
- */
- private final ConcurrentMap<String, Collection<ClusterNode>> aliveRmtCacheNodes;
-
- /**
* Cached alive server remote nodes with caches.
*/
private final ConcurrentSkipListMap<ClusterNode, Boolean> aliveSrvNodesWithCaches;
@@ -2578,20 +2546,17 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
allNodes = Collections.unmodifiableList(all);
- Map<String, Collection<ClusterNode>> cacheMap = new HashMap<>(allNodes.size(), 1.0f);
- Map<String, Collection<ClusterNode>> rmtCacheMap = new HashMap<>(allNodes.size(), 1.0f);
- Map<String, Collection<ClusterNode>> dhtNodesMap = new HashMap<>(allNodes.size(), 1.0f);
- Collection<ClusterNode> nodesWithCaches = new HashSet<>(allNodes.size());
- Collection<ClusterNode> rmtNodesWithCaches = new HashSet<>(allNodes.size());
+ Map<Integer, Collection<ClusterNode>> cacheMap = U.newHashMap(allNodes.size());
+ Map<Integer, Collection<ClusterNode>> dhtNodesMap = U.newHashMap(allNodes.size());
+ Collection<ClusterNode> nodesWithCaches = U.newHashSet(allNodes.size());
+ Collection<ClusterNode> rmtNodesWithCaches = U.newHashSet(allNodes.size());
- aliveCacheNodes = new ConcurrentHashMap8<>(allNodes.size(), 1.0f);
- aliveRmtCacheNodes = new ConcurrentHashMap8<>(allNodes.size(), 1.0f);
aliveSrvNodesWithCaches = new ConcurrentSkipListMap<>(GridNodeOrderComparator.INSTANCE);
nodesByVer = new TreeMap<>();
long maxOrder0 = 0;
- Set<String> nearEnabledSet = new HashSet<>();
+ Set<Integer> nearEnabledSet = new HashSet<>();
List<ClusterNode> srvNodes = new ArrayList<>();
@@ -2620,21 +2585,11 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
addToMap(cacheMap, cacheName, node);
- if (alive(node.id()))
- addToMap(aliveCacheNodes, maskNull(cacheName), node);
-
if (filter.dataNode(node))
addToMap(dhtNodesMap, cacheName, node);
if (filter.nearNode(node))
- nearEnabledSet.add(cacheName);
-
- if (!loc.id().equals(node.id())) {
- addToMap(rmtCacheMap, cacheName, node);
-
- if (alive(node.id()))
- addToMap(aliveRmtCacheNodes, maskNull(cacheName), node);
- }
+ nearEnabledSet.add(CU.cacheId(cacheName));
hasCaches = true;
}
@@ -2674,7 +2629,6 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
maxOrder = maxOrder0;
allCacheNodes = Collections.unmodifiableMap(cacheMap);
- rmtCacheNodes = Collections.unmodifiableMap(rmtCacheMap);
affCacheNodes = Collections.unmodifiableMap(dhtNodesMap);
allNodesWithCaches = Collections.unmodifiableCollection(nodesWithCaches);
this.rmtNodesWithCaches = Collections.unmodifiableCollection(rmtNodesWithCaches);
@@ -2684,7 +2638,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
daemonNodes = Collections.unmodifiableList(new ArrayList<>(
F.view(F.concat(false, loc, rmts), F0.not(FILTER_DAEMON))));
- Map<UUID, ClusterNode> nodeMap = new HashMap<>(allNodes().size() + daemonNodes.size(), 1.0f);
+ Map<UUID, ClusterNode> nodeMap = U.newHashMap(allNodes().size() + daemonNodes.size());
for (ClusterNode n : F.concat(false, allNodes(), daemonNodes()))
nodeMap.put(n.id(), n);
@@ -2699,13 +2653,13 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
* @param cacheName Cache name.
* @param rich Node to add
*/
- private void addToMap(Map<String, Collection<ClusterNode>> cacheMap, String cacheName, ClusterNode rich) {
- Collection<ClusterNode> cacheNodes = cacheMap.get(cacheName);
+ private void addToMap(Map<Integer, Collection<ClusterNode>> cacheMap, String cacheName, ClusterNode rich) {
+ Collection<ClusterNode> cacheNodes = cacheMap.get(CU.cacheId(cacheName));
if (cacheNodes == null) {
cacheNodes = new ArrayList<>(allNodes.size());
- cacheMap.put(cacheName, cacheNodes);
+ cacheMap.put(CU.cacheId(cacheName), cacheNodes);
}
cacheNodes.add(rich);
@@ -2727,28 +2681,6 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
}
/**
- * Gets collection of nodes which have version equal or greater than {@code ver}.
- *
- * @param ver Version to check.
- * @return Collection of nodes with version equal or greater than {@code ver}.
- */
- Collection<ClusterNode> elderNodes(IgniteProductVersion ver) {
- Map.Entry<IgniteProductVersion, Collection<ClusterNode>> entry = nodesByVer.ceilingEntry(ver);
-
- if (entry == null)
- return Collections.emptyList();
-
- return entry.getValue();
- }
-
- /**
- * @return Versions map.
- */
- NavigableMap<IgniteProductVersion, Collection<ClusterNode>> versionsMap() {
- return nodesByVer;
- }
-
- /**
* Gets collection of nodes with at least one cache configured.
*
* @param topVer Topology version (maximum allowed node order).
@@ -2766,61 +2698,50 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
* @return Collection of nodes.
*/
Collection<ClusterNode> cacheNodes(@Nullable String cacheName, final long topVer) {
- return filter(topVer, allCacheNodes.get(cacheName));
+ return filter(topVer, allCacheNodes.get(CU.cacheId(cacheName)));
}
/**
- * Gets all remote nodes that have at least one cache configured.
+ * Gets all nodes that have cache with given ID.
*
+ * @param cacheId Cache ID.
* @param topVer Topology version.
* @return Collection of nodes.
*/
- Collection<ClusterNode> remoteCacheNodes(final long topVer) {
- return filter(topVer, rmtNodesWithCaches);
- }
-
- /**
- * Gets all nodes that have cache with given name and should participate in affinity calculation. With
- * partitioned cache nodes with near-only cache do not participate in affinity node calculation.
- *
- * @param cacheName Cache name.
- * @param topVer Topology version.
- * @return Collection of nodes.
- */
- Collection<ClusterNode> cacheAffinityNodes(@Nullable String cacheName, final long topVer) {
- return filter(topVer, affCacheNodes.get(cacheName));
+ Collection<ClusterNode> cacheNodes(Integer cacheId, final long topVer) {
+ return filter(topVer, allCacheNodes.get(cacheId));
}
/**
- * Gets all alive nodes that have cache with given name.
+ * Gets all remote nodes that have at least one cache configured.
*
- * @param cacheName Cache name.
* @param topVer Topology version.
* @return Collection of nodes.
*/
- Collection<ClusterNode> aliveCacheNodes(@Nullable String cacheName, final long topVer) {
- return filter(topVer, aliveCacheNodes.get(maskNull(cacheName)));
+ Collection<ClusterNode> remoteCacheNodes(final long topVer) {
+ return filter(topVer, rmtNodesWithCaches);
}
/**
- * Gets all alive remote nodes that have cache with given name.
+ * Gets all nodes that have cache with given ID and should participate in affinity calculation. With
+ * partitioned cache nodes with near-only cache do not participate in affinity node calculation.
*
- * @param cacheName Cache name.
+ * @param cacheId Cache ID.
* @param topVer Topology version.
* @return Collection of nodes.
*/
- Collection<ClusterNode> aliveRemoteCacheNodes(@Nullable String cacheName, final long topVer) {
- return filter(topVer, aliveRmtCacheNodes.get(maskNull(cacheName)));
+ Collection<ClusterNode> cacheAffinityNodes(int cacheId, final long topVer) {
+ return filter(topVer, affCacheNodes.get(cacheId));
}
/**
- * Checks if cache with given name has at least one node with near cache enabled.
+ * Checks if cache with given ID has at least one node with near cache enabled.
*
- * @param cacheName Cache name.
+ * @param cacheId Cache ID.
* @return {@code True} if cache with given name has at least one node with near cache enabled.
*/
- boolean hasNearCache(@Nullable String cacheName) {
- return nearEnabledCaches.contains(cacheName);
+ boolean hasNearCache(int cacheId) {
+ return nearEnabledCaches.contains(cacheId);
}
/**
@@ -2832,51 +2753,10 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
if (leftNode.order() > maxOrder)
return;
- filterNodeMap(aliveCacheNodes, leftNode);
-
- filterNodeMap(aliveRmtCacheNodes, leftNode);
-
aliveSrvNodesWithCaches.remove(leftNode);
}
/**
- * Creates a copy of nodes map without the given node.
- *
- * @param map Map to copy.
- * @param exclNode Node to exclude.
- */
- private void filterNodeMap(ConcurrentMap<String, Collection<ClusterNode>> map, final ClusterNode exclNode) {
- for (String cacheName : registeredCaches.keySet()) {
- String maskedName = maskNull(cacheName);
-
- while (true) {
- Collection<ClusterNode> oldNodes = map.get(maskedName);
-
- if (oldNodes == null || oldNodes.isEmpty())
- break;
-
- Collection<ClusterNode> newNodes = new ArrayList<>(oldNodes);
-
- if (!newNodes.remove(exclNode))
- break;
-
- if (map.replace(maskedName, oldNodes, newNodes))
- break;
- }
- }
- }
-
- /**
- * Replaces {@code null} with {@code NULL_CACHE_NAME}.
- *
- * @param cacheName Cache name.
- * @return Masked name.
- */
- private String maskNull(@Nullable String cacheName) {
- return cacheName == null ? NULL_CACHE_NAME : cacheName;
- }
-
- /**
* @param topVer Topology version.
* @param nodes Nodes.
* @return Filtered collection (potentially empty, but never {@code null}).
http://git-wip-us.apache.org/repos/asf/ignite/blob/b02ad0de/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
index 607bb96..b5d5ee2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
@@ -100,6 +100,9 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi>
/** Events of these types should be recorded. */
private volatile int[] inclEvtTypes;
+ /** */
+ private boolean stopped;
+
/**
* Maps event type to boolean ({@code true} for recordable events).
* This array is used for listeners notification. It may be wider,
@@ -212,7 +215,16 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi>
* @return {@code true} if entered to busy state.
*/
private boolean enterBusy() {
- return busyLock.readLock().tryLock();
+ if (!busyLock.readLock().tryLock())
+ return false;
+
+ if (stopped) {
+ busyLock.readLock().unlock();
+
+ return false;
+ }
+
+ return true;
}
/**
@@ -225,15 +237,23 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi>
/** {@inheritDoc} */
@SuppressWarnings({"LockAcquiredButNotSafelyReleased"})
@Override public void onKernalStop0(boolean cancel) {
- // Acquire write lock so that any new thread could not be started.
busyLock.writeLock().lock();
- if (msgLsnr != null)
- ctx.io().removeMessageListener(TOPIC_EVENT, msgLsnr);
+ try {
+ if (msgLsnr != null)
+ ctx.io().removeMessageListener(
+ TOPIC_EVENT,
+ msgLsnr);
+
+ msgLsnr = null;
- msgLsnr = null;
+ lsnrs.clear();
- lsnrs.clear();
+ stopped = true;
+ }
+ finally {
+ busyLock.writeLock().unlock();
+ }
}
/** {@inheritDoc} */
@@ -1203,4 +1223,4 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi>
return lsnr.hashCode();
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/b02ad0de/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
index a388c7a..144b162 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
@@ -63,7 +63,7 @@ public class GridAffinityAssignmentCache {
private final String cacheName;
/** */
- private final Integer cacheId;
+ private final int cacheId;
/** Number of backups. */
private final int backups;
@@ -169,7 +169,7 @@ public class GridAffinityAssignmentCache {
/**
* @return Cache ID.
*/
- public Integer cacheId() {
+ public int cacheId() {
return cacheId;
}
@@ -266,7 +266,7 @@ public class GridAffinityAssignmentCache {
List<ClusterNode> sorted;
if (!locCache) {
- sorted = new ArrayList<>(ctx.discovery().cacheAffinityNodes(cacheName, topVer));
+ sorted = new ArrayList<>(ctx.discovery().cacheAffinityNodes(cacheId(), topVer));
Collections.sort(sorted, GridNodeOrderComparator.INSTANCE);
}
@@ -617,4 +617,4 @@ public class GridAffinityAssignmentCache {
return S.toString(AffinityReadyFuture.class, this);
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/b02ad0de/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
index 2890887..7bf5fd8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
@@ -843,7 +843,7 @@ public class CacheAffinitySharedManager<K, V> extends GridCacheSharedManagerAdap
return true;
// If local node did not initiate exchange or local node is the only cache node in grid.
- Collection<ClusterNode> affNodes = cctx.discovery().cacheAffinityNodes(aff.cacheName(), fut.topologyVersion());
+ Collection<ClusterNode> affNodes = cctx.discovery().cacheAffinityNodes(aff.cacheId(), fut.topologyVersion());
DynamicCacheDescriptor cacheDesc = registeredCaches.get(aff.cacheId());
http://git-wip-us.apache.org/repos/asf/ignite/blob/b02ad0de/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
index f8722d6..9284143 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
@@ -160,6 +160,9 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter {
/** Stopping flag. */
private volatile boolean stopping;
+ /** Stopped flag. */
+ private boolean stopped;
+
/** Current future. */
private final AtomicReference<EvictionFuture> curEvictFut = new AtomicReference<>();
@@ -311,19 +314,28 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter {
busyLock.block();
- // Stop backup worker.
- if (evictSync && !cctx.isNear() && backupWorker != null) {
- backupWorker.cancel();
+ try {
+ // Stop backup worker.
+ if (evictSync && !cctx.isNear() && backupWorker != null) {
+ backupWorker.cancel();
- U.join(backupWorkerThread, log);
- }
+ U.join(
+ backupWorkerThread,
+ log);
+ }
- // Cancel all active futures.
- for (EvictionFuture fut : futs.values())
- fut.cancel();
+ // Cancel all active futures.
+ for (EvictionFuture fut : futs.values())
+ fut.cancel();
- if (log.isDebugEnabled())
- log.debug("Eviction manager stopped on node: " + cctx.nodeId());
+ if (log.isDebugEnabled())
+ log.debug("Eviction manager stopped on node: " + cctx.nodeId());
+ }
+ finally {
+ stopped = true;
+
+ busyLock.unblock();
+ }
}
/**
@@ -345,7 +357,7 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter {
log.debug("Processing eviction response [node=" + nodeId + ", localNode=" + cctx.nodeId() +
", res=" + res + ']');
- if (!busyLock.enterBusy())
+ if (!enterBusy())
return;
try {
@@ -363,6 +375,22 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter {
}
/**
+ * @return {@code True} if entered busy.
+ */
+ private boolean enterBusy() {
+ if (!busyLock.enterBusy())
+ return false;
+
+ if (stopped) {
+ busyLock.leaveBusy();
+
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
* @param nodeId Sender node ID.
* @param req Request.
*/
@@ -370,7 +398,7 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter {
assert nodeId != null;
assert req != null;
- if (!busyLock.enterBusy())
+ if (!enterBusy())
return;
try {
@@ -811,7 +839,7 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter {
if (!cctx.isNear() && evictSync && !cctx.affinity().primaryByPartition(cctx.localNode(), e.partition(), topVer))
return;
- if (!busyLock.enterBusy())
+ if (!enterBusy())
return;
try {
@@ -1145,7 +1173,7 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter {
fut.listen(new CI1<IgniteInternalFuture<?>>() {
@Override public void apply(IgniteInternalFuture<?> f) {
- if (!busyLock.enterBusy()) {
+ if (!enterBusy()) {
if (log.isDebugEnabled())
log.debug("Will not notify eviction future completion (grid is stopping): " +
f);
@@ -1187,7 +1215,7 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter {
* @param topVer Topology version on future complete.
*/
private void onFutureCompleted(EvictionFuture fut, AffinityTopologyVersion topVer) {
- if (!busyLock.enterBusy())
+ if (!enterBusy())
return;
try {
@@ -1366,7 +1394,7 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter {
if (!evictSyncAgr)
return;
- if (!busyLock.enterBusy())
+ if (!enterBusy())
return;
try {
http://git-wip-us.apache.org/repos/asf/ignite/blob/b02ad0de/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
index 1562d70..1bf9468 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
@@ -17,13 +17,15 @@
package org.apache.ignite.internal.processors.cache;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.locks.Lock;
import javax.cache.CacheException;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteClientDisconnectedException;
import org.apache.ignite.IgniteException;
import org.apache.ignite.internal.IgniteInterruptedCheckedException;
-import org.apache.ignite.internal.util.GridSpinReadWriteLock;
+import org.apache.ignite.internal.util.StripedCompositeReadWriteLock;
import org.apache.ignite.internal.util.tostring.GridToStringExclude;
import org.apache.ignite.internal.util.typedef.internal.CU;
import org.apache.ignite.internal.util.typedef.internal.U;
@@ -45,7 +47,8 @@ public class GridCacheGateway<K, V> {
private IgniteFuture<?> reconnectFut;
/** */
- private GridSpinReadWriteLock rwLock = new GridSpinReadWriteLock();
+ private StripedCompositeReadWriteLock rwLock =
+ new StripedCompositeReadWriteLock(Runtime.getRuntime().availableProcessors());
/**
* @param ctx Cache context.
@@ -63,7 +66,7 @@ public class GridCacheGateway<K, V> {
if (ctx.deploymentEnabled())
ctx.deploy().onEnter();
- rwLock.readLock();
+ rwLock.readLock().lock();
checkState(true, true);
}
@@ -78,7 +81,7 @@ public class GridCacheGateway<K, V> {
if (state != State.STARTED) {
if (lock)
- rwLock.readUnlock();
+ rwLock.readLock().unlock();
if (state == State.STOPPED) {
if (stopErr)
@@ -106,7 +109,7 @@ public class GridCacheGateway<K, V> {
onEnter();
// Must unlock in case of unexpected errors to avoid deadlocks during kernal stop.
- rwLock.readLock();
+ rwLock.readLock().lock();
return checkState(true, false);
}
@@ -139,10 +142,10 @@ public class GridCacheGateway<K, V> {
*/
public void leave() {
try {
- leaveNoLock();
+ leaveNoLock();
}
finally {
- rwLock.readUnlock();
+ rwLock.readLock().unlock();
}
}
@@ -168,7 +171,9 @@ public class GridCacheGateway<K, V> {
onEnter();
- rwLock.readLock();
+ Lock lock = rwLock.readLock();
+
+ lock.lock();
checkState(true, true);
@@ -178,7 +183,7 @@ public class GridCacheGateway<K, V> {
return setOperationContextPerCall(opCtx);
}
catch (Throwable e) {
- rwLock.readUnlock();
+ lock.unlock();
throw e;
}
@@ -219,7 +224,7 @@ public class GridCacheGateway<K, V> {
leaveNoLock(prev);
}
finally {
- rwLock.readUnlock();
+ rwLock.readLock().unlock();
}
}
@@ -269,14 +274,14 @@ public class GridCacheGateway<K, V> {
*
*/
public void writeLock(){
- rwLock.writeLock();
+ rwLock.writeLock().lock();
}
/**
*
*/
public void writeUnlock() {
- rwLock.writeUnlock();
+ rwLock.writeLock().unlock();
}
/**
@@ -295,15 +300,14 @@ public class GridCacheGateway<K, V> {
boolean interrupted = false;
while (true) {
- if (rwLock.tryWriteLock())
- break;
- else {
- try {
+ try {
+ if (rwLock.writeLock().tryLock(200, TimeUnit.MILLISECONDS))
+ break;
+ else
U.sleep(200);
- }
- catch (IgniteInterruptedCheckedException ignore) {
- interrupted = true;
- }
+ }
+ catch (IgniteInterruptedCheckedException | InterruptedException ignore) {
+ interrupted = true;
}
}
@@ -314,7 +318,7 @@ public class GridCacheGateway<K, V> {
state.set(State.STOPPED);
}
finally {
- rwLock.writeUnlock();
+ rwLock.writeLock().unlock();
}
}
@@ -331,4 +335,4 @@ public class GridCacheGateway<K, V> {
/** */
STOPPED
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/b02ad0de/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
index 924ce79..d20310b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
@@ -26,6 +26,7 @@ import java.util.UUID;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.locks.Lock;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteLogger;
@@ -74,7 +75,7 @@ import org.apache.ignite.internal.processors.cache.transactions.IgniteTxStateAwa
import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
import org.apache.ignite.internal.util.F0;
import org.apache.ignite.internal.util.GridLeanSet;
-import org.apache.ignite.internal.util.GridSpinReadWriteLock;
+import org.apache.ignite.internal.util.StripedCompositeReadWriteLock;
import org.apache.ignite.internal.util.typedef.CI1;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.P1;
@@ -120,7 +121,8 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter {
private boolean stopping;
/** Mutex. */
- private final GridSpinReadWriteLock rw = new GridSpinReadWriteLock();
+ private final StripedCompositeReadWriteLock rw =
+ new StripedCompositeReadWriteLock(Runtime.getRuntime().availableProcessors());
/** Deployment enabled. */
private boolean depEnabled;
@@ -316,7 +318,7 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter {
// Busy wait is intentional.
while (true) {
try {
- if (rw.tryWriteLock(200, TimeUnit.MILLISECONDS))
+ if (rw.writeLock().tryLock(200, TimeUnit.MILLISECONDS))
break;
else
Thread.sleep(200);
@@ -335,7 +337,7 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter {
stopping = true;
}
finally {
- rw.writeUnlock();
+ rw.writeLock().unlock();
}
}
@@ -347,7 +349,9 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter {
@SuppressWarnings({"unchecked", "ConstantConditions", "ThrowableResultOfMethodCallIgnored"})
private void onMessage0(final UUID nodeId, final GridCacheMessage cacheMsg,
final IgniteBiInClosure<UUID, GridCacheMessage> c) {
- rw.readLock();
+ Lock lock = rw.readLock();
+
+ lock.lock();
try {
if (stopping) {
@@ -378,7 +382,7 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter {
if (depEnabled)
cctx.deploy().ignoreOwnership(false);
- rw.readUnlock();
+ lock.unlock();
}
}
@@ -821,9 +825,6 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter {
*/
private void processMessage(UUID nodeId, GridCacheMessage msg, IgniteBiInClosure<UUID, GridCacheMessage> c) {
try {
- // We will not end up with storing a bunch of new UUIDs
- // in each cache entry, since node ID is stored in NIO session
- // on handshake.
c.apply(nodeId, msg);
if (log.isDebugEnabled())
http://git-wip-us.apache.org/repos/asf/ignite/blob/b02ad0de/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
index e274485..1c59390 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
@@ -454,7 +454,7 @@ public class GridCacheUtils {
* that may have already left).
*/
public static Collection<ClusterNode> allNodes(GridCacheContext ctx, AffinityTopologyVersion topOrder) {
- return ctx.discovery().cacheNodes(ctx.namex(), topOrder);
+ return ctx.discovery().cacheNodes(ctx.cacheId(), topOrder);
}
/**
@@ -487,7 +487,7 @@ public class GridCacheUtils {
* @return All nodes on which cache with the same name is started.
*/
public static Collection<ClusterNode> affinityNodes(final GridCacheContext ctx) {
- return ctx.discovery().cacheAffinityNodes(ctx.namex(), AffinityTopologyVersion.NONE);
+ return ctx.discovery().cacheAffinityNodes(ctx.cacheId(), AffinityTopologyVersion.NONE);
}
/**
@@ -498,7 +498,7 @@ public class GridCacheUtils {
* @return Affinity nodes.
*/
public static Collection<ClusterNode> affinityNodes(GridCacheContext ctx, AffinityTopologyVersion topOrder) {
- return ctx.discovery().cacheAffinityNodes(ctx.namex(), topOrder);
+ return ctx.discovery().cacheAffinityNodes(ctx.cacheId(), topOrder);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/b02ad0de/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/affinity/GridCacheAffinityImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/affinity/GridCacheAffinityImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/affinity/GridCacheAffinityImpl.java
index 11361a2..41b3281 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/affinity/GridCacheAffinityImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/affinity/GridCacheAffinityImpl.java
@@ -196,7 +196,7 @@ public class GridCacheAffinityImpl<K, V> implements Affinity<K> {
int nodesCnt;
if (!cctx.isLocal())
- nodesCnt = cctx.discovery().cacheAffinityNodes(cctx.name(), topVer).size();
+ nodesCnt = cctx.discovery().cacheAffinityNodes(cctx.cacheId(), topVer).size();
else
nodesCnt = 1;
http://git-wip-us.apache.org/repos/asf/ignite/blob/b02ad0de/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java
index 7c1f760..a1fbd72 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java
@@ -88,7 +88,7 @@ public class GridClientPartitionTopology implements GridDhtPartitionTopology {
private volatile boolean stopping;
/** A future that will be completed when topology with version topVer will be ready to use. */
- private GridDhtTopologyFuture topReadyFut;
+ private volatile GridDhtTopologyFuture topReadyFut;
/** */
private final GridAtomicLong updateSeq = new GridAtomicLong(1);
@@ -216,16 +216,9 @@ public class GridClientPartitionTopology implements GridDhtPartitionTopology {
/** {@inheritDoc} */
@Override public GridDhtTopologyFuture topologyVersionFuture() {
- lock.readLock().lock();
-
- try {
- assert topReadyFut != null;
+ assert topReadyFut != null;
- return topReadyFut;
- }
- finally {
- lock.readLock().unlock();
- }
+ return topReadyFut;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/b02ad0de/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAssignmentFetchFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAssignmentFetchFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAssignmentFetchFuture.java
index d1e3780..b5cb5cf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAssignmentFetchFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAssignmentFetchFuture.java
@@ -78,9 +78,10 @@ public class GridDhtAssignmentFetchFuture extends GridFutureAdapter<GridDhtAffin
AffinityTopologyVersion topVer
) {
this.ctx = ctx;
- this.key = new T2<>(CU.cacheId(cacheName), topVer);
+ int cacheId = CU.cacheId(cacheName);
+ this.key = new T2<>(cacheId, topVer);
- Collection<ClusterNode> availableNodes = ctx.discovery().cacheAffinityNodes(cacheName, topVer);
+ Collection<ClusterNode> availableNodes = ctx.discovery().cacheAffinityNodes(cacheId, topVer);
LinkedList<ClusterNode> tmp = new LinkedList<>();
http://git-wip-us.apache.org/repos/asf/ignite/blob/b02ad0de/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
index f5865e6..1cd3cfb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
@@ -1199,8 +1199,8 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap
if (expVer.equals(curVer))
return false;
- Collection<ClusterNode> cacheNodes0 = ctx.discovery().cacheAffinityNodes(ctx.name(), expVer);
- Collection<ClusterNode> cacheNodes1 = ctx.discovery().cacheAffinityNodes(ctx.name(), curVer);
+ Collection<ClusterNode> cacheNodes0 = ctx.discovery().cacheAffinityNodes(ctx.cacheId(), expVer);
+ Collection<ClusterNode> cacheNodes1 = ctx.discovery().cacheAffinityNodes(ctx.cacheId(), curVer);
if (!cacheNodes0.equals(cacheNodes1) || ctx.affinity().affinityTopologyVersion().compareTo(curVer) < 0)
return true;
http://git-wip-us.apache.org/repos/asf/ignite/blob/b02ad0de/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
index 75a275c..966a186 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
@@ -99,7 +99,7 @@ class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology {
private volatile boolean stopping;
/** A future that will be completed when topology with version topVer will be ready to use. */
- private GridDhtTopologyFuture topReadyFut;
+ private volatile GridDhtTopologyFuture topReadyFut;
/** */
private final GridAtomicLong updateSeq = new GridAtomicLong(1);
@@ -311,16 +311,9 @@ class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology {
/** {@inheritDoc} */
@Override public GridDhtTopologyFuture topologyVersionFuture() {
- lock.readLock().lock();
-
- try {
- assert topReadyFut != null;
+ assert topReadyFut != null;
- return topReadyFut;
- }
- finally {
- lock.readLock().unlock();
- }
+ return topReadyFut;
}
/** {@inheritDoc} */
@@ -752,6 +745,7 @@ class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology {
if (part != null)
list.add(part);
}
+
return list;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/b02ad0de/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java
index 1b175d0..4cb113e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java
@@ -111,10 +111,13 @@ public abstract class GridDhtAtomicAbstractUpdateFuture extends GridFutureAdapte
CI2<GridNearAtomicAbstractUpdateRequest, GridNearAtomicUpdateResponse> completionCb,
GridCacheVersion writeVer,
GridNearAtomicAbstractUpdateRequest updateReq,
- GridNearAtomicUpdateResponse updateRes) {
+ GridNearAtomicUpdateResponse updateRes
+ ) {
this.cctx = cctx;
- futVer = cctx.versions().next(updateReq.topologyVersion());
+ this.futVer = cctx.isLocalNode(updateRes.nodeId()) ?
+ cctx.versions().next(updateReq.topologyVersion()) : // Generate new if request mapped to local.
+ updateReq.futureVersion();
this.updateReq = updateReq;
this.completionCb = completionCb;
this.updateRes = updateRes;
http://git-wip-us.apache.org/repos/asf/ignite/blob/b02ad0de/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateRequest.java
index f0bea07..deb9ce4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateRequest.java
@@ -134,7 +134,7 @@ public abstract class GridDhtAtomicAbstractUpdateRequest extends GridCacheMessag
boolean addPrevVal,
int partId,
@Nullable CacheObject prevVal,
- @Nullable Long updateCntr
+ long updateCntr
);
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/b02ad0de/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index 1b6179e..4745ff7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -23,7 +23,6 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -1775,6 +1774,8 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
GridNearAtomicUpdateResponse res = new GridNearAtomicUpdateResponse(ctx.cacheId(), nodeId, req.futureVersion(),
ctx.deploymentEnabled());
+ res.partition(req.partition());
+
assert !req.returnValue() || (req.operation() == TRANSFORM || req.size() == 1);
GridDhtAtomicAbstractUpdateFuture dhtFut = null;
@@ -2435,7 +2436,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
AffinityTopologyVersion topVer = req.topologyVersion();
- boolean checkReaders = hasNear || ctx.discovery().hasNearCache(name(), topVer);
+ boolean checkReaders = hasNear || ctx.discovery().hasNearCache(ctx.cacheId(), topVer);
boolean readersOnly = false;
@@ -2670,7 +2671,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
AffinityTopologyVersion topVer = req.topologyVersion();
- boolean checkReaders = hasNear || ctx.discovery().hasNearCache(name(), topVer);
+ boolean checkReaders = hasNear || ctx.discovery().hasNearCache(ctx.cacheId(), topVer);
CacheStorePartialUpdateException storeErr = null;
@@ -2996,7 +2997,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
for (GridCacheMapEntry entry : locked) {
if (entry != null && entry.deleted()) {
if (skip == null)
- skip = new HashSet<>(locked.size(), 1.0f);
+ skip = U.newHashSet(locked.size());
skip.add(entry.key());
}
@@ -3142,7 +3143,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
AffinityTopologyVersion topVer = updateReq.topologyVersion();
- Collection<ClusterNode> nodes = ctx.kernalContext().discovery().cacheAffinityNodes(name(), topVer);
+ Collection<ClusterNode> nodes = ctx.kernalContext().discovery().cacheAffinityNodes(ctx.cacheId(), topVer);
// We are on primary node for some key.
assert !nodes.isEmpty() : "Failed to find affinity nodes [name=" + name() + ", topVer=" + topVer +
@@ -3186,7 +3187,8 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
@SuppressWarnings("unchecked")
private void processNearAtomicUpdateResponse(UUID nodeId, GridNearAtomicUpdateResponse res) {
if (msgLog.isDebugEnabled())
- msgLog.debug("Received near atomic update response [futId" + res.futureVersion() + ", node=" + nodeId + ']');
+ msgLog.debug("Received near atomic update response " +
+ "[futId=" + res.futureVersion() + ", node=" + nodeId + ']');
res.nodeId(ctx.localNodeId());
@@ -3217,6 +3219,8 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
GridDhtAtomicUpdateResponse res = new GridDhtAtomicUpdateResponse(ctx.cacheId(), req.futureVersion(),
ctx.deploymentEnabled());
+ res.partition(req.partition());
+
Boolean replicate = ctx.isDrEnabled();
boolean intercept = req.forceTransformBackups() && ctx.config().getInterceptor() != null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/b02ad0de/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateFuture.java
index 20d6e90..0dc2754 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateFuture.java
@@ -67,7 +67,11 @@ class GridDhtAtomicSingleUpdateFuture extends GridDhtAtomicAbstractUpdateFuture
GridNearAtomicAbstractUpdateRequest updateReq,
GridNearAtomicUpdateResponse updateRes
) {
- super(cctx, completionCb, writeVer, updateReq, updateRes);
+ super(cctx,
+ completionCb,
+ writeVer,
+ updateReq,
+ updateRes);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/b02ad0de/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateRequest.java
index 0af7cf5..a7e6c24 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateRequest.java
@@ -161,7 +161,7 @@ public class GridDhtAtomicSingleUpdateRequest extends GridDhtAtomicAbstractUpdat
boolean addPrevVal,
int partId,
@Nullable CacheObject prevVal,
- @Nullable Long updateCntr
+ long updateCntr
) {
assert entryProcessor == null;
assert ttl <= 0 : ttl;
@@ -177,8 +177,7 @@ public class GridDhtAtomicSingleUpdateRequest extends GridDhtAtomicAbstractUpdat
if (addPrevVal)
this.prevVal = prevVal;
- if (updateCntr != null)
- this.updateCntr = updateCntr;
+ this.updateCntr = updateCntr;
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/b02ad0de/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
index efb35c4..5429adc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
@@ -66,7 +66,11 @@ class GridDhtAtomicUpdateFuture extends GridDhtAtomicAbstractUpdateFuture {
GridNearAtomicAbstractUpdateRequest updateReq,
GridNearAtomicUpdateResponse updateRes
) {
- super(cctx, completionCb, writeVer, updateReq, updateRes);
+ super(cctx,
+ completionCb,
+ writeVer,
+ updateReq,
+ updateRes);
keys = new ArrayList<>(updateReq.size());
mappings = U.newHashMap(updateReq.size());
http://git-wip-us.apache.org/repos/asf/ignite/blob/b02ad0de/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
index 1854e52..7144963 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
@@ -227,7 +227,7 @@ public class GridDhtAtomicUpdateRequest extends GridDhtAtomicAbstractUpdateReque
boolean addPrevVal,
int partId,
@Nullable CacheObject prevVal,
- @Nullable Long updateCntr
+ long updateCntr
) {
keys.add(key);
@@ -248,12 +248,10 @@ public class GridDhtAtomicUpdateRequest extends GridDhtAtomicAbstractUpdateReque
prevVals.add(prevVal);
}
- if (updateCntr != null) {
- if (updateCntrs == null)
- updateCntrs = new GridLongList();
+ if (updateCntrs == null)
+ updateCntrs = new GridLongList();
- updateCntrs.add(updateCntr);
- }
+ updateCntrs.add(updateCntr);
// In case there is no conflict, do not create the list.
if (conflictVer != null) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/b02ad0de/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
index ff12af0..c3d3ca9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
@@ -69,6 +69,9 @@ public class GridDhtAtomicUpdateResponse extends GridCacheMessage implements Gri
@GridDirectCollection(KeyCacheObject.class)
private List<KeyCacheObject> nearEvicted;
+ /** */
+ private int partId = -1;
+
/**
* Empty constructor required by {@link Externalizable}.
*/
@@ -157,6 +160,18 @@ public class GridDhtAtomicUpdateResponse extends GridCacheMessage implements Gri
nearEvicted.add(key);
}
+ /**
+ * @param partId Partition ID to set.
+ */
+ public void partition(int partId) {
+ this.partId = partId;
+ }
+
+ /** {@inheritDoc} */
+ @Override public int partition() {
+ return partId;
+ }
+
/** {@inheritDoc} */
@Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException {
super.prepareMarshal(ctx);
@@ -234,6 +249,12 @@ public class GridDhtAtomicUpdateResponse extends GridCacheMessage implements Gri
writer.incrementState();
+ case 7:
+ if (!writer.writeInt("partId", partId))
+ return false;
+
+ writer.incrementState();
+
}
return true;
@@ -282,6 +303,14 @@ public class GridDhtAtomicUpdateResponse extends GridCacheMessage implements Gri
reader.incrementState();
+ case 7:
+ partId = reader.readInt("partId");
+
+ if (!reader.isLastRead())
+ return false;
+
+ reader.incrementState();
+
}
return reader.afterMessageRead(GridDhtAtomicUpdateResponse.class);
@@ -294,7 +323,7 @@ public class GridDhtAtomicUpdateResponse extends GridCacheMessage implements Gri
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 7;
+ return 8;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/b02ad0de/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
index 891a20c..0a816a7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
@@ -379,12 +379,11 @@ public class GridNearAtomicSingleUpdateFuture extends GridNearAtomicAbstractUpda
/** {@inheritDoc} */
@Override protected void mapOnTopology() {
- cache.topology().readLock();
-
AffinityTopologyVersion topVer;
-
GridCacheVersion futVer;
+ cache.topology().readLock();
+
try {
if (cache.topology().stopping()) {
onDone(new IgniteCheckedException("Failed to perform cache operation (cache is stopped): " +
@@ -454,7 +453,7 @@ public class GridNearAtomicSingleUpdateFuture extends GridNearAtomicAbstractUpda
updVer = this.updVer;
if (updVer == null) {
- updVer = cctx.versions().next(topVer);
+ updVer = futVer;
if (log.isDebugEnabled())
log.debug("Assigned fast-map version for update on near node: " + updVer);
http://git-wip-us.apache.org/repos/asf/ignite/blob/b02ad0de/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
index 2315a18..f182ecb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
@@ -488,12 +488,11 @@ public class GridNearAtomicUpdateFuture extends GridNearAtomicAbstractUpdateFutu
/** {@inheritDoc} */
@Override protected void mapOnTopology() {
- cache.topology().readLock();
-
AffinityTopologyVersion topVer;
-
GridCacheVersion futVer;
+ cache.topology().readLock();
+
try {
if (cache.topology().stopping()) {
onDone(new IgniteCheckedException("Failed to perform cache operation (cache is stopped): " +
@@ -628,7 +627,7 @@ public class GridNearAtomicUpdateFuture extends GridNearAtomicAbstractUpdateFutu
updVer = this.updVer;
if (updVer == null) {
- updVer = cctx.versions().next(topVer);
+ updVer = futVer;
if (log.isDebugEnabled())
log.debug("Assigned fast-map version for update on near node: " + updVer);
http://git-wip-us.apache.org/repos/asf/ignite/blob/b02ad0de/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
index 2e38733..22e01ae 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
@@ -105,6 +105,9 @@ public class GridNearAtomicUpdateResponse extends GridCacheMessage implements Gr
/** Near expire times. */
private GridLongList nearExpireTimes;
+ /** Partition ID. */
+ private int partId = -1;
+
/**
* Empty constructor required by {@link Externalizable}.
*/
@@ -154,6 +157,13 @@ public class GridNearAtomicUpdateResponse extends GridCacheMessage implements Gr
}
/**
+ * @param partId Partition ID for proper striping on near node.
+ */
+ public void partition(int partId) {
+ this.partId = partId;
+ }
+
+ /**
* Sets update error.
*
* @param err Error.
@@ -431,6 +441,11 @@ public class GridNearAtomicUpdateResponse extends GridCacheMessage implements Gr
}
/** {@inheritDoc} */
+ @Override public int partition() {
+ return partId;
+ }
+
+ /** {@inheritDoc} */
@Override public boolean addDeploymentInfo() {
return addDepInfo;
}
@@ -510,12 +525,18 @@ public class GridNearAtomicUpdateResponse extends GridCacheMessage implements Gr
writer.incrementState();
case 12:
- if (!writer.writeCollection("remapKeys", remapKeys, MessageCollectionItemType.MSG))
+ if (!writer.writeInt("partId", partId))
return false;
writer.incrementState();
case 13:
+ if (!writer.writeCollection("remapKeys", remapKeys, MessageCollectionItemType.MSG))
+ return false;
+
+ writer.incrementState();
+
+ case 14:
if (!writer.writeMessage("ret", ret))
return false;
@@ -610,7 +631,7 @@ public class GridNearAtomicUpdateResponse extends GridCacheMessage implements Gr
reader.incrementState();
case 12:
- remapKeys = reader.readCollection("remapKeys", MessageCollectionItemType.MSG);
+ partId = reader.readInt("partId");
if (!reader.isLastRead())
return false;
@@ -618,6 +639,14 @@ public class GridNearAtomicUpdateResponse extends GridCacheMessage implements Gr
reader.incrementState();
case 13:
+ remapKeys = reader.readCollection("remapKeys", MessageCollectionItemType.MSG);
+
+ if (!reader.isLastRead())
+ return false;
+
+ reader.incrementState();
+
+ case 14:
ret = reader.readMessage("ret");
if (!reader.isLastRead())
@@ -637,7 +666,7 @@ public class GridNearAtomicUpdateResponse extends GridCacheMessage implements Gr
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 14;
+ return 15;
}
/** {@inheritDoc} */
[50/50] [abbrv] ignite git commit: Merge branch 'ignite-2.0' into
ignite-4565-ddl
Posted by vo...@apache.org.
Merge branch 'ignite-2.0' into ignite-4565-ddl
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/796c933a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/796c933a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/796c933a
Branch: refs/heads/ignite-4565-ddl
Commit: 796c933ac70d751111f4f642f5b351abc762effd
Parents: fcadf67 50f8741
Author: devozerov <vo...@gridgain.com>
Authored: Thu Mar 2 14:29:53 2017 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Thu Mar 2 14:29:53 2017 +0300
----------------------------------------------------------------------
NOTICE | 2 +-
assembly/LICENSE_FABRIC | 35 +-
assembly/LICENSE_HADOOP | 17 +-
assembly/NOTICE_FABRIC | 2 +-
assembly/NOTICE_HADOOP | 2 +-
config/hadoop/default-config.xml | 29 -
examples/config/filesystem/example-igfs.xml | 27 -
examples/config/spark/example-shared-rdd.xml | 83 +++
examples/pom.xml | 27 +-
examples/schema-import/bin/h2-server.bat | 2 +-
examples/schema-import/bin/h2-server.sh | 4 +-
.../schema-import/bin/schema-import.properties | 2 +-
.../examples/java8/spark/SharedRDDExample.java | 110 ++++
.../examples/spark/ScalarSharedRDDExample.scala | 89 +++
.../examples/SharedRDDExampleSelfTest.java | 36 ++
.../IgniteExamplesJ8SelfTestSuite.java | 3 +
.../tests/examples/ScalarExamplesSelfTest.scala | 6 +
.../src/main/resources/META-INF/licenses.txt.vm | 7 +-
.../JettyRestProcessorAbstractSelfTest.java | 23 -
modules/core/src/main/java/META-INF/NOTICE | 2 +-
.../java/org/apache/ignite/IgniteMessaging.java | 11 +-
.../apache/ignite/IgniteSystemProperties.java | 14 +
.../apache/ignite/binary/BinaryRawReader.java | 13 +
.../apache/ignite/binary/BinaryRawWriter.java | 13 +
.../org/apache/ignite/binary/BinaryReader.java | 15 +
.../org/apache/ignite/binary/BinaryWriter.java | 15 +
.../org/apache/ignite/cache/QueryEntity.java | 23 +
.../org/apache/ignite/cache/QueryIndex.java | 25 +-
.../org/apache/ignite/cache/query/SqlQuery.java | 25 +
.../configuration/CacheConfiguration.java | 16 +-
.../configuration/FileSystemConfiguration.java | 75 ++-
.../configuration/IgniteConfiguration.java | 31 ++
.../local/LocalIgfsSecondaryFileSystem.java | 6 +-
.../internal/GridEventConsumeHandler.java | 5 +
.../ignite/internal/GridKernalContext.java | 8 +
.../ignite/internal/GridKernalContextImpl.java | 14 +
.../ignite/internal/GridKernalGatewayImpl.java | 25 +-
.../internal/GridMessageListenHandler.java | 5 +
.../internal/GridPerformanceSuggestions.java | 92 ---
.../org/apache/ignite/internal/GridTopic.java | 2 +-
.../apache/ignite/internal/IgniteKernal.java | 72 ++-
.../ignite/internal/IgniteMessagingImpl.java | 6 +-
.../ignite/internal/IgniteVersionUtils.java | 2 +-
.../org/apache/ignite/internal/IgnitionEx.java | 88 ++-
.../ignite/internal/MappingStoreTask.java | 3 +-
.../ignite/internal/MarshallerContextImpl.java | 50 +-
.../internal/StripedExecutorMXBeanAdapter.java | 90 +++
.../internal/binary/BinaryClassDescriptor.java | 94 ++--
.../ignite/internal/binary/BinaryContext.java | 7 +
.../internal/binary/BinaryFieldAccessor.java | 79 ++-
.../binary/BinaryMetadataCollector.java | 11 +
.../internal/binary/BinaryObjectImpl.java | 9 +
.../binary/BinaryObjectOffheapImpl.java | 9 +
.../internal/binary/BinaryReaderExImpl.java | 342 ++++++++++--
.../binary/BinarySerializedFieldComparator.java | 3 +
.../ignite/internal/binary/BinaryUtils.java | 147 ++++-
.../ignite/internal/binary/BinaryWriteMode.java | 6 +
.../internal/binary/BinaryWriterExImpl.java | 80 ++-
.../internal/binary/GridBinaryMarshaller.java | 8 +-
.../binary/builder/BinaryBuilderReader.java | 37 ++
.../client/util/GridClientConsistentHash.java | 14 +-
.../internal/managers/GridManagerAdapter.java | 2 +-
.../managers/communication/GridIoManager.java | 88 +--
.../communication/GridIoMessageFactory.java | 20 +-
.../managers/communication/GridIoPolicy.java | 3 +
.../discovery/GridDiscoveryManager.java | 268 +++------
.../eventstorage/GridEventStorageManager.java | 34 +-
.../affinity/GridAffinityAssignmentCache.java | 8 +-
.../cache/CacheAffinitySharedManager.java | 2 +-
.../processors/cache/EntryGetResult.java | 65 +++
.../processors/cache/GridCacheAdapter.java | 128 +++--
.../processors/cache/GridCacheContext.java | 4 +-
.../processors/cache/GridCacheEntryEx.java | 42 +-
.../cache/GridCacheEvictionManager.java | 60 +-
.../processors/cache/GridCacheGateway.java | 48 +-
.../processors/cache/GridCacheIoManager.java | 19 +-
.../processors/cache/GridCacheMapEntry.java | 140 ++++-
.../processors/cache/GridCacheProcessor.java | 97 +++-
.../processors/cache/GridCacheUtils.java | 9 +-
.../processors/cache/IgniteCacheProxy.java | 3 +
.../processors/cache/ReaderArguments.java | 74 +++
.../cache/affinity/GridCacheAffinityImpl.java | 2 +-
.../dht/GridClientPartitionTopology.java | 13 +-
.../dht/GridDhtAssignmentFetchFuture.java | 5 +-
.../distributed/dht/GridDhtCacheAdapter.java | 42 +-
.../cache/distributed/dht/GridDhtGetFuture.java | 83 ++-
.../distributed/dht/GridDhtGetSingleFuture.java | 75 +--
.../distributed/dht/GridDhtLocalPartition.java | 120 +++-
.../dht/GridDhtPartitionTopologyImpl.java | 14 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 35 +-
.../dht/GridPartitionedGetFuture.java | 10 +-
.../dht/GridPartitionedSingleGetFuture.java | 10 +-
.../GridDhtAtomicAbstractUpdateFuture.java | 7 +-
.../GridDhtAtomicAbstractUpdateRequest.java | 2 +-
.../dht/atomic/GridDhtAtomicCache.java | 28 +-
.../atomic/GridDhtAtomicSingleUpdateFuture.java | 6 +-
.../GridDhtAtomicSingleUpdateRequest.java | 5 +-
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 6 +-
.../dht/atomic/GridDhtAtomicUpdateRequest.java | 10 +-
.../dht/atomic/GridDhtAtomicUpdateResponse.java | 31 +-
.../GridNearAtomicSingleUpdateFuture.java | 7 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 7 +-
.../atomic/GridNearAtomicUpdateResponse.java | 35 +-
.../dht/colocated/GridDhtColocatedCache.java | 10 +-
.../dht/preloader/GridDhtPreloader.java | 39 +-
.../distributed/near/GridNearGetFuture.java | 19 +-
.../near/GridNearSingleGetRequest.java | 5 +
.../local/atomic/GridLocalAtomicCache.java | 11 +-
.../cache/query/GridCacheQueryManager.java | 191 +++++--
.../continuous/CacheContinuousQueryHandler.java | 97 +++-
.../cache/transactions/IgniteTxHandler.java | 6 +-
.../transactions/IgniteTxLocalAdapter.java | 65 ++-
.../cache/version/GridCacheVersion.java | 2 +-
.../cache/version/GridCacheVersionManager.java | 2 +-
.../clock/GridClockSyncProcessor.java | 2 +-
.../continuous/GridContinuousHandler.java | 5 +
.../continuous/GridContinuousProcessor.java | 3 +
.../processors/igfs/IgfsDataManager.java | 11 +-
.../internal/processors/igfs/IgfsImpl.java | 32 +-
.../processors/igfs/IgfsMetaManager.java | 27 +-
.../internal/processors/igfs/IgfsProcessor.java | 130 +----
.../internal/processors/igfs/IgfsUtils.java | 215 +++++--
.../igfs/client/IgfsClientAbstractCallable.java | 23 +-
.../igfs/client/IgfsClientAffinityCallable.java | 6 +-
.../igfs/client/IgfsClientDeleteCallable.java | 6 +-
.../igfs/client/IgfsClientExistsCallable.java | 5 +-
.../igfs/client/IgfsClientInfoCallable.java | 5 +-
.../client/IgfsClientListFilesCallable.java | 5 +-
.../client/IgfsClientListPathsCallable.java | 5 +-
.../igfs/client/IgfsClientMkdirsCallable.java | 6 +-
.../igfs/client/IgfsClientRenameCallable.java | 6 +-
.../igfs/client/IgfsClientSetTimesCallable.java | 6 +-
.../igfs/client/IgfsClientSizeCallable.java | 5 +-
.../igfs/client/IgfsClientSummaryCallable.java | 5 +-
.../igfs/client/IgfsClientUpdateCallable.java | 6 +-
.../meta/IgfsClientMetaIdsForPathCallable.java | 5 +-
.../meta/IgfsClientMetaInfoForPathCallable.java | 5 +-
.../meta/IgfsClientMetaUnlockCallable.java | 8 +-
.../secondary/local/LocalFileSystemUtils.java | 25 +
.../internal/processors/job/GridJobWorker.java | 4 +
.../marshaller/ClientRequestFuture.java | 2 +-
.../GridMarshallerMappingProcessor.java | 39 +-
.../marshaller/MappingUpdatedListener.java | 29 +
.../MissingMappingRequestMessage.java | 2 +-
.../MissingMappingResponseMessage.java | 2 +-
.../processors/odbc/OdbcRequestHandler.java | 2 +
.../platform/PlatformProcessorImpl.java | 9 -
.../cache/PlatformCacheEntryProcessorImpl.java | 6 +-
.../callback/PlatformCallbackGateway.java | 23 +
.../platform/callback/PlatformCallbackOp.java | 3 +
.../utils/PlatformConfigurationUtils.java | 132 ++++-
.../internal/processors/pool/PoolProcessor.java | 5 +
.../processors/query/GridQueryIndexing.java | 21 +-
.../processors/query/GridQueryProcessor.java | 216 +++++---
.../processors/query/GridQueryProperty.java | 21 +-
.../query/GridQueryTypeDescriptor.java | 7 +
.../processors/query/GridRunningQueryInfo.java | 132 +++++
.../suggestions/GridPerformanceSuggestions.java | 105 ++++
.../JvmConfigurationSuggestions.java | 104 ++++
.../suggestions/OsConfigurationSuggestions.java | 127 +++++
.../internal/suggestions/package-info.java | 21 +
.../ignite/internal/util/GridBusyLock.java | 2 +-
.../ignite/internal/util/IgniteUtils.java | 14 +
.../util/StripedCompositeReadWriteLock.java | 50 +-
.../ignite/internal/util/StripedExecutor.java | 65 ++-
.../nio/GridAbstractCommunicationClient.java | 37 +-
.../util/nio/GridCommunicationClient.java | 5 -
.../util/tostring/GridToStringBuilder.java | 2 +-
.../internal/visor/VisorMultiNodeTask.java | 2 +-
.../visor/cache/VisorCacheClearTask.java | 88 +--
.../visor/cache/VisorCacheTypeMetadata.java | 6 +
.../visor/compute/VisorGatewayTask.java | 30 +-
.../visor/node/VisorIgfsConfiguration.java | 4 +-
.../visor/node/VisorNodeDataCollectorJob.java | 6 +-
.../visor/query/VisorCancelQueriesTask.java | 72 +++
.../query/VisorCollectRunningQueriesTask.java | 96 ++++
.../internal/visor/query/VisorRunningQuery.java | 132 +++++
.../ignite/lang/IgniteProductVersion.java | 2 +-
.../java/org/apache/ignite/lang/IgniteUuid.java | 25 +-
.../ignite/mxbean/StripedExecutorMXBean.java | 90 +++
...PlatformCachePluginConfigurationClosure.java | 31 ++
...mCachePluginConfigurationClosureFactory.java | 37 ++
.../PlatformPluginConfigurationClosure.java | 30 +
...atformPluginConfigurationClosureFactory.java | 37 ++
.../communication/tcp/TcpCommunicationSpi.java | 25 +
.../ignite/spi/discovery/tcp/ClientImpl.java | 90 ++-
.../ignite/spi/discovery/tcp/ServerImpl.java | 63 ++-
.../messages/TcpDiscoveryAbstractMessage.java | 21 +
.../org/apache/ignite/thread/IgniteThread.java | 26 +-
modules/core/src/test/config/igfs-loopback.xml | 27 -
modules/core/src/test/config/igfs-shmem.xml | 27 -
modules/core/src/test/config/log4j-test.xml | 6 +
...atformCachePluginConfigurationClosureFactory | 1 +
...rm.PlatformPluginConfigurationClosureFactory | 1 +
.../ignite/igfs/IgfsEventsAbstractSelfTest.java | 51 +-
.../igfs/IgfsFragmentizerAbstractSelfTest.java | 17 +-
.../ignite/igfs/IgfsFragmentizerSelfTest.java | 3 +-
.../internal/GridContinuousTaskSelfTest.java | 79 +++
.../MarshallerContextLockingSelfTest.java | 6 +
.../binary/BinaryMarshallerSelfTest.java | 99 ++++
.../binary/BinaryObjectExceptionSelfTest.java | 209 +++++++
.../communication/GridIoManagerSelfTest.java | 6 +-
.../GridDiscoveryManagerAliveCacheSelfTest.java | 55 --
.../discovery/GridDiscoveryManagerSelfTest.java | 214 -------
.../cache/CacheConcurrentReadThroughTest.java | 184 ++++++
.../cache/CacheDeferredDeleteQueueTest.java | 134 +++++
.../cache/GridCacheLifecycleAwareSelfTest.java | 33 ++
.../processors/cache/GridCacheOffHeapTest.java | 274 ---------
.../processors/cache/GridCacheTestEntryEx.java | 30 +-
...lerCacheClientRequestsMappingOnMissTest.java | 24 +-
...niteTopologyValidatorGridSplitCacheTest.java | 334 +++++++++++
...CacheAtomicReferenceApiSelfAbstractTest.java | 60 +-
...idCacheAtomicStampedApiSelfAbstractTest.java | 59 ++
.../GridCacheQueueApiSelfAbstractTest.java | 58 ++
.../GridCacheSetAbstractSelfTest.java | 53 ++
.../IgniteAtomicLongApiAbstractSelfTest.java | 27 +
.../IgniteCountDownLatchAbstractSelfTest.java | 43 ++
.../IgniteLockAbstractSelfTest.java | 54 +-
.../IgniteSemaphoreAbstractSelfTest.java | 52 +-
.../near/GridNearCacheStoreUpdateTest.java | 466 ++++++++++++++++
.../GridNearOffheapCacheStoreUpdateTest.java | 35 ++
.../cache/query/IndexingSpiQuerySelfTest.java | 69 ++-
.../IndexingSpiQueryWithH2IndexingSelfTest.java | 36 ++
.../ClientReconnectContinuousQueryTest.java | 201 +++++++
.../igfs/IgfsAbstractBaseSelfTest.java | 17 +-
.../igfs/IgfsBackupFailoverSelfTest.java | 7 +-
...lockMessageSystemPoolStarvationSelfTest.java | 17 +-
...sCachePerBlockLruEvictionPolicySelfTest.java | 18 +-
.../processors/igfs/IgfsCacheSelfTest.java | 19 +-
.../igfs/IgfsDataManagerSelfTest.java | 33 +-
.../processors/igfs/IgfsMaxSizeSelfTest.java | 6 +-
.../igfs/IgfsMetaManagerSelfTest.java | 6 +-
.../processors/igfs/IgfsMetricsSelfTest.java | 16 +-
.../processors/igfs/IgfsModesSelfTest.java | 51 +-
.../processors/igfs/IgfsOneClientNodeTest.java | 13 +-
.../processors/igfs/IgfsProcessorSelfTest.java | 25 +-
.../igfs/IgfsProcessorValidationSelfTest.java | 320 +++--------
...gfsSecondaryFileSystemInjectionSelfTest.java | 8 +-
...IpcEndpointRegistrationAbstractSelfTest.java | 17 +-
.../processors/igfs/IgfsSizeSelfTest.java | 27 +-
.../processors/igfs/IgfsStartCacheTest.java | 28 +-
.../processors/igfs/IgfsStreamsSelfTest.java | 46 +-
.../processors/igfs/IgfsTaskSelfTest.java | 8 +-
.../IgfsAbstractRecordResolverSelfTest.java | 8 +-
...niteMessagingConfigVariationFullApiTest.java | 195 +++++--
.../internal/util/StripedExecutorTest.java | 168 ++++++
.../ipc/shmem/IpcSharedMemoryNodeStartup.java | 30 +-
.../marshaller/MarshallerContextSelfTest.java | 8 +
.../marshaller/MarshallerContextTestImpl.java | 1 +
.../ignite/messaging/GridMessagingSelfTest.java | 114 +++-
.../messaging/IgniteMessagingSendAsyncTest.java | 544 ++++++++++++++++++
.../plugin/PlatformTestPluginConfiguration.java | 63 +++
...rmTestPluginConfigurationClosureFactory.java | 61 ++
.../plugin/PlatformTestPluginException.java | 34 ++
.../plugin/PlatformTestPluginExtension.java | 2 +-
.../plugin/PlatformTestPluginProvider.java | 8 +-
.../plugin/PlatformTestPluginTarget.java | 62 ++-
.../cache/PlatformGetCachePluginsTask.java | 85 +++
.../PlatformTestCachePluginConfiguration.java | 60 ++
...formTestCachePluginConfigurationClosure.java | 48 ++
...tCachePluginConfigurationClosureFactory.java | 37 ++
.../cache/PlatformTestCachePluginProvider.java | 73 +++
.../tcp/TcpCommunicationSpiDropNodesTest.java | 322 +++++++++++
.../TcpCommunicationSpiFaultyClientTest.java | 265 +++++++++
.../startup/GridRandomCommandLineLoader.java | 2 +-
.../ignite/testframework/GridTestNode.java | 1 +
.../testframework/junits/GridAbstractTest.java | 23 +-
.../junits/GridTestKernalContext.java | 1 +
.../junits/multijvm/IgniteNodeRunner.java | 55 +-
.../junits/multijvm/IgniteProcessProxy.java | 63 ++-
.../ignite/testsuites/IgniteBasicTestSuite.java | 2 +
.../IgniteBinaryObjectsTestSuite.java | 2 +
.../ignite/testsuites/IgniteCacheTestSuite.java | 2 +
.../testsuites/IgniteCacheTestSuite2.java | 7 +
.../testsuites/IgniteComputeGridTestSuite.java | 2 +
.../testsuites/IgniteKernalSelfTestSuite.java | 5 +-
.../IgniteSpiCommunicationSelfTestSuite.java | 5 +
.../IgniteSpiDiscoverySelfTestSuite.java | 2 +-
.../IgniteTopologyValidatorTestSuit.java | 1 +
modules/hadoop/pom.xml | 7 +
.../hadoop/impl/igfs/HadoopIgfsInProc.java | 190 ++++++-
.../hadoop/impl/igfs/HadoopIgfsUtils.java | 6 +
.../hadoop/impl/igfs/HadoopIgfsWrapper.java | 99 ++--
.../processors/hadoop/impl/v2/HadoopV2Job.java | 10 +-
.../hadoop/shuffle/HadoopShuffle.java | 2 +-
.../test/config/hadoop-fs-open-test/grid-0.xml | 126 +++++
.../test/config/hadoop-fs-open-test/grid-1.xml | 126 +++++
.../test/config/hadoop-fs-open-test/grid-2.xml | 126 +++++
.../test/config/igfs-cli-config-dual-async.xml | 135 +++++
.../test/config/igfs-cli-config-dual-sync.xml | 133 +++++
.../src/test/config/igfs-cli-config-primary.xml | 124 +++++
.../src/test/config/igfs-cli-config-proxy.xml | 133 +++++
.../impl/HadoopAbstractMapReduceTest.java | 6 +-
.../hadoop/impl/HadoopAbstractSelfTest.java | 18 +-
.../igfs/HadoopFIleSystemFactorySelfTest.java | 8 +-
.../HadoopIgfs20FileSystemAbstractSelfTest.java | 52 +-
.../igfs/HadoopIgfsDualAbstractSelfTest.java | 8 +-
...oopSecondaryFileSystemConfigurationTest.java | 69 +--
.../igfs/IgfsNearOnlyMultiNodeSelfTest.java | 6 +-
.../IgniteHadoopFileSystemAbstractSelfTest.java | 184 +++---
...opFileSystemClientBasedAbstractSelfTest.java | 193 +++++++
...pFileSystemClientBasedDualAsyncSelfTest.java | 38 ++
...opFileSystemClientBasedDualSyncSelfTest.java | 38 ++
...niteHadoopFileSystemClientBasedOpenTest.java | 305 ++++++++++
...oopFileSystemClientBasedPrimarySelfTest.java | 38 ++
...adoopFileSystemClientBasedProxySelfTest.java | 37 ++
.../IgniteHadoopFileSystemClientSelfTest.java | 56 +-
...IgniteHadoopFileSystemHandshakeSelfTest.java | 8 +-
.../IgniteHadoopFileSystemIpcCacheSelfTest.java | 47 +-
...niteHadoopFileSystemLoggerStateSelfTest.java | 22 +-
...oopbackExternalToClientAbstractSelfTest.java | 61 ++
...opbackExternalToClientDualAsyncSelfTest.java | 33 ++
...oopbackExternalToClientDualSyncSelfTest.java | 33 ++
...LoopbackExternalToClientPrimarySelfTest.java | 33 ++
...emLoopbackExternalToClientProxySelfTest.java | 33 ++
...condaryFileSystemInitializationSelfTest.java | 30 +-
...ileSystemShmemEmbeddedDualAsyncSelfTest.java | 33 --
...FileSystemShmemEmbeddedDualSyncSelfTest.java | 33 --
...pFileSystemShmemEmbeddedPrimarySelfTest.java | 33 --
...ileSystemShmemEmbeddedSecondarySelfTest.java | 33 --
...emShmemExternalToClientAbstractSelfTest.java | 106 ++++
...mShmemExternalToClientDualAsyncSelfTest.java | 33 ++
...emShmemExternalToClientDualSyncSelfTest.java | 33 ++
...temShmemExternalToClientPrimarySelfTest.java | 33 ++
...ystemShmemExternalToClientProxySelfTest.java | 33 ++
.../testsuites/IgniteHadoopTestSuite.java | 21 +-
.../IgniteIgfsLinuxAndMacOSTestSuite.java | 17 +-
.../cache/query/GridCacheTwoStepQuery.java | 18 +-
.../query/h2/DmlStatementsProcessor.java | 69 +--
.../processors/query/h2/IgniteH2Indexing.java | 119 +++-
.../query/h2/dml/UpdatePlanBuilder.java | 105 ++--
.../query/h2/sql/GridSqlQuerySplitter.java | 4 +-
.../query/h2/twostep/GridMapQueryExecutor.java | 8 +-
.../h2/twostep/GridReduceQueryExecutor.java | 69 ++-
...CacheScanPartitionQueryFallbackSelfTest.java | 2 +-
.../cache/CacheSqlQueryValueCopySelfTest.java | 208 ++++++-
.../cache/GridCacheCrossCacheQuerySelfTest.java | 2 +-
.../IgniteCacheAbstractFieldsQuerySelfTest.java | 21 +
...niteCacheAbstractInsertSqlQuerySelfTest.java | 4 +
.../cache/IgniteCacheAbstractQuerySelfTest.java | 391 +++++++++++++
.../IgniteCacheAbstractSqlDmlQuerySelfTest.java | 2 +-
.../IgniteCacheInsertSqlQuerySelfTest.java | 22 +
.../cache/IgniteCacheMergeSqlQuerySelfTest.java | 24 +
.../IgniteCacheUpdateSqlQuerySelfTest.java | 63 ++-
.../cache/QueryEntityCaseMismatchTest.java | 107 ++++
.../IgniteCachePartitionedQuerySelfTest.java | 85 +++
.../IgniteSqlEntryCacheModeAgnosticTest.java | 140 +++++
.../query/IgniteSqlQueryDedicatedPoolTest.java | 110 ++++
.../h2/GridIndexingSpiAbstractSelfTest.java | 41 +-
.../IgniteCacheQuerySelfTestSuite.java | 6 +
.../IgniteCacheQuerySelfTestSuite3.java | 2 +
modules/kubernetes/DEVNOTES.txt | 63 +++
modules/kubernetes/README.txt | 33 ++
modules/kubernetes/config/Dockerfile | 45 ++
modules/kubernetes/config/example-kube.xml | 44 ++
.../kubernetes/config/ignite-deployment.yaml | 26 +
modules/kubernetes/config/ignite-service.yaml | 14 +
modules/kubernetes/config/run.sh | 50 ++
modules/kubernetes/licenses/apache-2.0.txt | 202 +++++++
modules/kubernetes/pom.xml | 93 ++++
.../TcpDiscoveryKubernetesIpFinder.java | 317 +++++++++++
.../tcp/ipfinder/kubernetes/package-info.java | 22 +
.../TcpDiscoveryKubernetesIpFinderSelfTest.java | 93 ++++
.../tcp/ipfinder/kubernetes/package-info.java | 22 +
.../testsuites/IgniteKubernetesTestSuite.java | 41 ++
.../include/ignite/binary/binary_object.h | 22 +-
.../binary/include/ignite/binary/binary_type.h | 8 +-
.../include/ignite/impl/binary/binary_common.h | 6 +
.../ignite/impl/binary/binary_object_header.h | 9 +-
.../ignite/impl/binary/binary_object_impl.h | 61 +-
.../ignite/impl/binary/binary_reader_impl.h | 29 +-
.../ignite/impl/binary/binary_type_updater.h | 2 +-
.../binary/binary_array_identity_resolver.cpp | 2 +-
.../src/impl/binary/binary_object_header.cpp | 26 +-
.../src/impl/binary/binary_object_impl.cpp | 61 +-
.../src/impl/binary/binary_type_manager.cpp | 2 +-
modules/platforms/cpp/common/Makefile.am | 1 +
.../common/include/ignite/common/concurrent.h | 29 +-
.../include/ignite/common/platform_utils.h | 6 +-
.../cpp/common/include/ignite/ignite_error.h | 2 +-
.../include/ignite/common/dynamic_load_os.h | 131 +++++
.../os/linux/src/common/dynamic_load_os.cpp | 90 +++
.../os/linux/src/common/platform_utils.cpp | 18 +-
.../win/include/ignite/common/dynamic_load_os.h | 133 +++++
.../os/win/src/common/dynamic_load_os.cpp | 115 ++++
.../common/os/win/src/common/platform_utils.cpp | 26 +-
.../cpp/common/project/vs/common.vcxproj | 2 +
.../common/project/vs/common.vcxproj.filters | 6 +
.../platforms/cpp/common/src/common/utils.cpp | 3 +-
.../platforms/cpp/common/src/ignite_error.cpp | 68 +--
modules/platforms/cpp/core-test/Makefile.am | 5 +-
.../core-test/include/ignite/binary_test_defs.h | 106 ++--
.../cpp/core-test/project/vs/core-test.vcxproj | 2 +
.../project/vs/core-test.vcxproj.filters | 6 +
.../cpp/core-test/src/binary_object_test.cpp | 6 +-
.../src/binary_reader_writer_raw_test.cpp | 23 +-
.../cpp/core-test/src/cache_invoke_test.cpp | 553 +++++++++++++++++++
.../platforms/cpp/core-test/src/cache_test.cpp | 5 +-
.../cpp/core-test/src/cluster_test.cpp | 98 ++++
.../cpp/core-test/src/interop_memory_test.cpp | 3 +-
modules/platforms/cpp/core/Makefile.am | 1 +
modules/platforms/cpp/core/include/Makefile.am | 8 +
.../cpp/core/include/ignite/cache/cache.h | 217 ++++++--
.../ignite/cache/cache_entry_processor.h | 111 ++++
.../include/ignite/cache/mutable_cache_entry.h | 176 ++++++
.../include/ignite/cache/query/query_cursor.h | 2 +-
.../platforms/cpp/core/include/ignite/ignite.h | 18 +
.../cpp/core/include/ignite/ignite_binding.h | 119 ++++
.../include/ignite/ignite_binding_context.h | 88 +++
.../core/include/ignite/ignite_configuration.h | 2 -
.../impl/binary/binary_type_updater_impl.h | 2 +-
.../impl/cache/cache_entry_processor_holder.h | 282 ++++++++++
.../core/include/ignite/impl/cache/cache_impl.h | 71 +--
.../ignite/impl/cluster/cluster_group_impl.h | 77 +++
.../include/ignite/impl/ignite_binding_impl.h | 121 ++++
.../include/ignite/impl/ignite_environment.h | 61 +-
.../cpp/core/include/ignite/impl/ignite_impl.h | 50 +-
.../ignite/impl/interop/interop_target.h | 37 +-
.../core/include/ignite/impl/module_manager.h | 131 +++++
.../cpp/core/include/ignite/impl/operations.h | 62 +--
.../platforms/cpp/core/project/vs/core.vcxproj | 9 +
.../cpp/core/project/vs/core.vcxproj.filters | 30 +
modules/platforms/cpp/core/src/ignite.cpp | 12 +-
modules/platforms/cpp/core/src/ignition.cpp | 343 +++++++-----
.../impl/binary/binary_type_updater_impl.cpp | 2 +-
.../cpp/core/src/impl/cache/cache_impl.cpp | 66 ++-
.../continuous/continuous_query_handle_impl.cpp | 2 +-
.../core/src/impl/cache/query/query_impl.cpp | 8 +-
.../src/impl/cluster/cluster_group_impl.cpp | 64 +++
.../cpp/core/src/impl/ignite_environment.cpp | 92 ++-
.../platforms/cpp/core/src/impl/ignite_impl.cpp | 32 +-
.../core/src/impl/interop/interop_target.cpp | 49 +-
.../src/impl/transactions/transactions_impl.cpp | 14 +-
.../platforms/cpp/jni/include/ignite/jni/java.h | 2 +-
.../cpp/jni/include/ignite/jni/utils.h | 69 ++-
.../platforms/cpp/jni/os/linux/src/utils.cpp | 221 ++++----
modules/platforms/cpp/jni/os/win/src/utils.cpp | 227 ++++----
modules/platforms/cpp/jni/src/java.cpp | 53 +-
modules/platforms/cpp/odbc/src/utility.cpp | 17 +-
.../Properties/AssemblyInfo.cs | 2 +-
.../Apache.Ignite.AspNet.nuspec | 2 +-
.../Properties/AssemblyInfo.cs | 2 +-
.../Properties/AssemblyInfo.cs | 2 +-
.../Properties/AssemblyInfo.cs | 2 +-
.../Properties/AssemblyInfo.cs | 2 +-
.../Apache.Ignite.Core.Tests.csproj | 3 +
.../Cache/CacheAbstractTransactionalTest.cs | 105 ++--
.../Cache/Query/CacheLinqTest.cs | 96 ++++
.../Cache/Store/CacheStoreTest.cs | 30 +-
.../Compute/ComputeApiTest.cs | 18 +-
.../Apache.Ignite.Core.Tests/ExceptionsTest.cs | 28 +
.../Cache/CacheJavaPluginConfiguration.cs | 45 ++
.../Plugin/Cache/CacheJavaPluginTest.cs | 113 ++++
.../Plugin/Cache/CachePluginConfiguration.cs | 24 +
.../Plugin/Cache/CachePluginTest.cs | 7 +-
.../Plugin/PluginTest.cs | 66 ++-
.../Plugin/TestIgnitePluginConfiguration.cs | 20 +
.../Plugin/TestIgnitePluginException.cs | 64 +++
.../Plugin/TestIgnitePluginProvider.cs | 18 +
.../Properties/AssemblyInfo.cs | 2 +-
.../Apache.Ignite.Core.Schema.nuspec | 2 +-
.../Apache.Ignite.Core.csproj | 2 +
.../Apache.Ignite.Core.nuspec | 2 +-
.../Cache/Configuration/CacheConfiguration.cs | 22 +-
.../Cache/Configuration/QueryEntity.cs | 2 +-
.../Common/ExceptionFactory.cs | 31 ++
.../Apache.Ignite.Core/Common/JavaException.cs | 62 ++-
.../Apache.Ignite.Core/IgniteConfiguration.cs | 28 +
.../IgniteConfigurationSection.xsd | 5 +
.../Impl/Binary/BinaryUtils.cs | 44 +-
.../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs | 9 +-
.../Common/IgniteConfigurationXmlSerializer.cs | 7 +
.../Apache.Ignite.Core/Impl/ExceptionUtils.cs | 96 ++--
.../Impl/Plugin/PluginContext.cs | 19 +
.../Impl/Plugin/PluginProcessor.cs | 116 ++++
.../Impl/Unmanaged/UnmanagedCallbackOp.cs | 3 +-
.../Impl/Unmanaged/UnmanagedCallbacks.cs | 11 +-
.../Plugin/Cache/ICachePluginConfiguration.cs | 18 +-
.../Plugin/IPluginConfiguration.cs | 15 +-
.../Apache.Ignite.Core/Plugin/IPluginContext.cs | 16 +
.../Apache.Ignite.Core/Plugin/PluginCallback.cs | 29 +
.../Properties/AssemblyInfo.cs | 2 +-
.../Apache.Ignite.EntityFramework.nuspec | 2 +-
.../Apache.Ignite.Linq.nuspec | 2 +-
.../Impl/CacheQueryExpressionVisitor.cs | 127 ++++-
.../Impl/CacheQueryModelVisitor.cs | 3 +
.../Properties/AssemblyInfo.cs | 2 +-
.../Apache.Ignite.Log4Net.nuspec | 2 +-
.../Properties/AssemblyInfo.cs | 2 +-
.../Apache.Ignite.NLog.nuspec | 2 +-
.../Properties/AssemblyInfo.cs | 2 +-
.../Apache.Ignite/Properties/AssemblyInfo.cs | 2 +-
.../Apache.Ignite.Examples.csproj | 1 +
.../Datagrid/TransactionExample.cs | 75 ++-
.../Properties/AssemblyInfo.cs | 2 +-
modules/scalar-2.10/pom.xml | 2 +-
modules/scalar/pom.xml | 2 +-
.../apache/ignite/spark/JavaIgniteContext.scala | 6 +
.../org/apache/ignite/spring/sprint-exclude.xml | 2 -
.../ignite/tools/classgen/ClassesGenerator.java | 4 +-
modules/web-console/backend/app/agent.js | 44 +-
modules/web-console/backend/app/browser.js | 26 +
modules/web-console/backend/app/mongo.js | 49 +-
modules/web-console/backend/app/routes.js | 5 +-
.../web-console/backend/routes/activities.js | 45 ++
modules/web-console/backend/routes/admin.js | 2 +-
modules/web-console/backend/routes/agent.js | 10 +-
modules/web-console/backend/routes/profile.js | 4 +-
modules/web-console/backend/routes/public.js | 1 -
.../web-console/backend/services/activities.js | 116 ++++
.../web-console/backend/services/sessions.js | 6 +-
modules/web-console/backend/services/users.js | 20 +-
.../backend/test/unit/ActivitiesService.test.js | 131 +++++
modules/web-console/frontend/app/app.config.js | 13 +
modules/web-console/frontend/app/app.js | 29 +-
.../activities-user-dialog.controller.js | 27 +
.../activities-user-dialog.jade | 36 ++
.../components/activities-user-dialog/index.js | 35 ++
.../form-field-datepicker.jade | 55 ++
.../form-field-datepicker.scss | 20 +
.../list-of-registered-users/index.js | 28 +
.../list-of-registered-users.categories.js | 30 +
.../list-of-registered-users.column-defs.js | 80 +++
.../list-of-registered-users.controller.js | 235 ++++++++
.../list-of-registered-users.jade | 58 ++
.../ui-grid-header/ui-grid-header.jade | 27 +
.../ui-grid-header/ui-grid-header.scss | 84 +++
.../ui-grid-settings/ui-grid-settings.jade | 33 ++
.../ui-grid-settings/ui-grid-settings.scss | 99 ++++
.../app/core/activities/Activities.data.js | 34 ++
.../frontend/app/core/admin/Admin.data.js | 77 +++
modules/web-console/frontend/app/core/index.js | 25 +
modules/web-console/frontend/app/data/i18n.js | 39 ++
.../ui-ace-pom/ui-ace-pom.controller.js | 4 +-
.../ui-grid-settings/ui-grid-settings.jade | 33 --
.../ui-grid-settings/ui-grid-settings.scss | 38 --
.../app/filters/uiGridSubcategories.filter.js | 24 +
.../frontend/app/modules/Demo/Demo.module.js | 166 ------
.../frontend/app/modules/agent/agent.module.js | 15 -
.../app/modules/branding/branding.provider.js | 2 +-
.../modules/configuration/Version.service.js | 35 +-
.../configuration/configuration.module.js | 6 +-
.../configuration/generator/Maven.service.js | 10 +-
.../frontend/app/modules/demo/Demo.module.js | 172 ++++++
.../frontend/app/modules/sql/sql.controller.js | 14 +-
.../frontend/app/modules/sql/sql.module.js | 2 +-
.../frontend/app/modules/states/admin.state.js | 2 +-
.../configuration/summary/summary.controller.js | 6 +-
.../configuration/summary/summary.worker.js | 34 +-
.../app/modules/user/AclRoute.provider.js | 31 +-
.../frontend/app/modules/user/Auth.service.js | 2 +-
.../frontend/app/modules/user/permissions.js | 2 +-
.../frontend/app/modules/user/user.module.js | 6 +-
modules/web-console/frontend/app/vendor.js | 1 +
.../frontend/controllers/admin-controller.js | 234 --------
.../frontend/controllers/domains-controller.js | 12 +-
modules/web-console/frontend/package.json | 181 +++---
.../stylesheets/_font-awesome-custom.scss | 28 +
.../frontend/public/stylesheets/style.scss | 31 +-
.../frontend/test/unit/Version.test.js | 26 +-
.../frontend/views/settings/admin.jade | 32 +-
modules/web-console/frontend/views/sql/sql.jade | 4 +-
.../views/templates/agent-download.jade | 12 +-
modules/web-console/web-agent/README.txt | 2 +-
.../ignite/console/agent/AgentLauncher.java | 203 ++++---
.../apache/ignite/console/agent/AgentUtils.java | 80 +++
.../console/agent/handlers/AbstractHandler.java | 110 ----
.../agent/handlers/AbstractListener.java | 104 ++++
.../console/agent/handlers/DatabaseHandler.java | 298 ----------
.../agent/handlers/DatabaseListener.java | 316 +++++++++++
.../console/agent/handlers/RestHandler.java | 276 ---------
.../console/agent/handlers/RestListener.java | 287 ++++++++++
.../ignite/console/demo/AgentClusterDemo.java | 475 +---------------
.../ignite/console/demo/AgentDemoUtils.java | 79 +++
.../demo/service/DemoCachesLoadService.java | 456 +++++++++++++++
.../service/DemoRandomCacheLoadService.java | 120 ++++
.../service/DemoServiceClusterSingleton.java | 41 ++
.../demo/service/DemoServiceKeyAffinity.java | 41 ++
.../service/DemoServiceMultipleInstances.java | 41 ++
.../demo/service/DemoServiceNodeSingleton.java | 41 ++
modules/yardstick/DEVNOTES-standalone.txt | 16 +
modules/yardstick/DEVNOTES.txt | 20 +-
modules/yardstick/README.txt | 142 +++--
.../config/benchmark-atomic-win.properties | 2 +-
.../config/benchmark-atomic.properties | 35 +-
.../config/benchmark-bin-identity.properties | 16 +-
.../config/benchmark-cache-load-win.properties | 2 +-
.../config/benchmark-cache-load.properties | 4 +-
.../config/benchmark-client-mode.properties | 68 ++-
.../config/benchmark-compute-win.properties | 2 +-
.../config/benchmark-compute.properties | 30 +-
.../config/benchmark-failover.properties | 2 +-
.../yardstick/config/benchmark-full.properties | 62 +--
.../config/benchmark-multicast.properties | 107 ++--
.../config/benchmark-put-indexed-val.properties | 23 +-
.../benchmark-query-put-separated.properties | 3 +-
.../config/benchmark-query-win.properties | 2 +-
.../yardstick/config/benchmark-query.properties | 33 +-
.../config/benchmark-remote-sample.properties | 80 +++
.../config/benchmark-remote.properties | 119 ++++
.../config/benchmark-sample.properties | 80 +++
.../config/benchmark-sql-dml.properties | 36 +-
.../yardstick/config/benchmark-store.properties | 3 +-
.../config/benchmark-tx-win.properties | 2 +-
.../yardstick/config/benchmark-tx.properties | 33 +-
.../yardstick/config/benchmark-win.properties | 2 +-
modules/yardstick/config/benchmark.properties | 76 ++-
.../yardstick/config/ignite-remote-config.xml | 47 ++
.../test-max-int-values-offheap.properties | 3 +-
.../test-max-int-values-onheap.properties | 3 +-
.../config/test-max-int-values-swap.properties | 3 +-
modules/yardstick/pom-standalone.xml | 2 +-
modules/yardstick/pom.xml | 4 +-
.../yardstick/IgniteBenchmarkArguments.java | 28 +-
.../org/apache/ignite/yardstick/IgniteNode.java | 2 +-
.../cache/IgnitePutRemoveBenchmark.java | 42 ++
.../cache/IgnitePutRemoveTxBenchmark.java | 30 +
.../cache/IgnitePutValue8Benchmark.java | 42 ++
.../IgniteCacheRandomOperationBenchmark.java | 49 ++
parent/pom.xml | 2 +-
pom.xml | 7 +-
621 files changed, 24816 insertions(+), 6758 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/796c933a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/DmlStatementsProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/796c933a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
----------------------------------------------------------------------
[41/50] [abbrv] ignite git commit: IGNITE-817 [Test] Disabled tests
of GridCacheOffHeapTest
Posted by vo...@apache.org.
IGNITE-817 [Test] Disabled tests of GridCacheOffHeapTest
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/50620a74
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/50620a74
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/50620a74
Branch: refs/heads/ignite-4565-ddl
Commit: 50620a7460d770b51857dbfd27b7d78f61fcaeac
Parents: 1265793
Author: Alexander Menshikov <sh...@gmail.com>
Authored: Mon Feb 20 12:31:54 2017 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Mon Feb 20 12:31:54 2017 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheOffHeapTest.java | 274 -------------------
1 file changed, 274 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/50620a74/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTest.java
deleted file mode 100644
index c902579..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTest.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache;
-
-import java.util.concurrent.Callable;
-import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.ignite.Ignite;
-import org.apache.ignite.cache.CacheMode;
-import org.apache.ignite.cache.eviction.fifo.FifoEvictionPolicy;
-import org.apache.ignite.configuration.CacheConfiguration;
-import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.IgniteKernal;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
-import org.apache.ignite.spi.swapspace.noop.NoopSwapSpaceSpi;
-import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-
-import static org.apache.ignite.cache.CacheMode.PARTITIONED;
-import static org.apache.ignite.cache.CacheMode.REPLICATED;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_ASYNC;
-
-/**
- * Test for cache swap.
- */
-public class GridCacheOffHeapTest extends GridCommonAbstractTest {
- /** */
- private final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
-
- /** */
- private CacheMode mode;
-
- /** */
- private int onheap;
-
- /** Start size. */
- private int startSize = 4 * 1024 * 1024;
-
- /** {@inheritDoc} */
- @Override protected long getTestTimeout() {
- return Long.MAX_VALUE;
- }
-
- /** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
-
- TcpDiscoverySpi disco = new TcpDiscoverySpi();
-
- disco.setIpFinder(ipFinder);
-
- cfg.setDiscoverySpi(disco);
-
- cfg.setSwapSpaceSpi(new NoopSwapSpaceSpi());
-
- CacheConfiguration cacheCfg = defaultCacheConfiguration();
-
- cacheCfg.setWriteSynchronizationMode(FULL_ASYNC);
- cacheCfg.setSwapEnabled(false);
- cacheCfg.setCacheMode(mode);
- cacheCfg.setNearConfiguration(null);
- cacheCfg.setStartSize(startSize);
-
- if (onheap > 0) {
- FifoEvictionPolicy plc = new FifoEvictionPolicy();
- plc.setMaxSize(onheap);
-
- cacheCfg.setEvictionPolicy(plc);
-
- cacheCfg.setOffHeapMaxMemory(80 * 1024L * 1024L * 1024L); // 10GB
- }
-
- cfg.setCacheConfiguration(cacheCfg);
-
- return cfg;
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testOnHeapReplicatedPerformance() throws Exception {
- fail("https://issues.apache.org/jira/browse/IGNITE-817");
-
- mode = REPLICATED;
- onheap = 0;
- startSize = 18 * 1024 * 1024;
-
- performanceTest();
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testOnHeapPartitionedPerformance() throws Exception {
- fail("https://issues.apache.org/jira/browse/IGNITE-817");
-
- mode = PARTITIONED;
- onheap = 0;
- startSize = 18 * 1024 * 1024;
-
- performanceTest();
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testOffHeapReplicatedPerformance() throws Exception {
- fail("https://issues.apache.org/jira/browse/IGNITE-817");
-
- mode = REPLICATED;
- onheap = 1024 * 1024;
- startSize = onheap;
-
- performanceTest();
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testOffHeapPartitionedPerformance() throws Exception {
- fail("https://issues.apache.org/jira/browse/IGNITE-817");
-
- mode = PARTITIONED;
- onheap = 4 * 1024 * 1024;
-
- performanceTest();
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testOnHeapReplicatedPerformanceMultithreaded() throws Exception {
- fail("https://issues.apache.org/jira/browse/IGNITE-817");
-
- mode = REPLICATED;
- onheap = 0;
- startSize = 18 * 1024 * 1024;
-
- performanceMultithreadedTest();
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testOnHeapPartitionedPerformanceMultithreaded() throws Exception {
- fail("https://issues.apache.org/jira/browse/IGNITE-817");
-
- mode = PARTITIONED;
- onheap = 0;
- startSize = 18 * 1024 * 1024;
-
- performanceMultithreadedTest();
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testOffHeapReplicatedPerformanceMultithreaded() throws Exception {
- mode = REPLICATED;
- onheap = 1024 * 1024;
- startSize = onheap;
-
- performanceMultithreadedTest();
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testOffHeapPartitionedPerformanceMultithreaded() throws Exception {
- fail("https://issues.apache.org/jira/browse/IGNITE-817");
-
- mode = PARTITIONED;
- onheap = 4 * 1024 * 1024;
-
- performanceMultithreadedTest();
- }
-
- /**
- * @throws Exception If failed.
- */
- private void performanceTest() throws Exception {
- Ignite g = startGrid();
-
- try {
- GridCacheAdapter<Integer, Integer> cache = ((IgniteKernal)g).internalCache(null);
-
-// int max = 17 * 1024 * 1024;
- int max = Integer.MAX_VALUE;
-
- long start = System.currentTimeMillis();
-
- for (int i = 0; i < max; i++) {
- cache.getAndPut(i, i);
-
- if (i % 100000 == 0) {
- long cur = System.currentTimeMillis();
-
- info("Stats [i=" + i + ", time=" + (cur - start) + ", throughput=" + (i * 1000d / (cur - start)) +
- "ops/sec, onheapCnt=" + cache.size() + ", offheapCnt=" + cache.offHeapEntriesCount() + "]");
- }
- }
- }
- finally {
- stopAllGrids();
- }
- }
-
- /**
- * @throws Exception If failed.
- */
- private void performanceMultithreadedTest() throws Exception {
- Ignite g = startGrid();
-
- try {
- final GridCacheAdapter<Integer, Integer> c = ((IgniteKernal)g).internalCache(null);
-
- final long start = System.currentTimeMillis();
-
- final AtomicInteger keyGen = new AtomicInteger();
-
- final int reserveSize = 1024 * 1024;
-
- multithreaded(new Callable<Object>() {
- @SuppressWarnings("InfiniteLoopStatement")
- @Override public Object call() throws Exception {
- while (true) {
- int val = keyGen.addAndGet(reserveSize); // Reserve keys.
-
- for (int i = val - reserveSize; i < val; i++) {
- c.getAndPut(i, i);
-
- if (i % 500000 == 0) {
- long dur = System.currentTimeMillis() - start;
- long keySize= c.size() + c.offHeapEntriesCount();
-
- info("Stats [size=" + keySize + ", time=" + dur + ", throughput=" +
- (keySize * 1000f / dur) + " ops/sec, onheapCnt=" + c.size() +
- ", offheapCnt=" + c.offHeapEntriesCount() + "]");
- }
- }
- }
- }
- }, Runtime.getRuntime().availableProcessors());
- }
- finally {
- stopAllGrids();
- }
- }
-
- /**
- * Main method.
- *
- * @param args Parameters.
- * @throws Exception If failed.
- */
-// public static void main(String[] args) throws Exception {
-// new GridCacheOffHeapTest().testOffHeapReplicatedPerformanceMultithreaded();
-// }
-}
\ No newline at end of file
[38/50] [abbrv] ignite git commit: IGNITE-4212 Ignite Benchmarking
Simplification and Automation / IGNITE-4478 Fixing documentation and
resolving lack of usability
Posted by vo...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/12657937/modules/yardstick/config/benchmark-remote-sample.properties
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/benchmark-remote-sample.properties b/modules/yardstick/config/benchmark-remote-sample.properties
new file mode 100644
index 0000000..5f158ac
--- /dev/null
+++ b/modules/yardstick/config/benchmark-remote-sample.properties
@@ -0,0 +1,80 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# Contains benchmarks for ATOMIC cache.
+#
+
+# JVM options.
+JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false"
+
+# Uncomment to enable concurrent garbage collection (GC) if you encounter long GC pauses.
+# JVM_OPTS=${JVM_OPTS}" \
+# -XX:+UseParNewGC \
+# -XX:+UseConcMarkSweepGC \
+# -XX:+UseTLAB \
+# -XX:NewSize=128m \
+# -XX:MaxNewSize=128m \
+# -XX:MaxTenuringThreshold=0 \
+# -XX:SurvivorRatio=1024 \
+# -XX:+UseCMSInitiatingOccupancyOnly \
+# -XX:CMSInitiatingOccupancyFraction=60 \
+#"
+
+# List of default probes.
+# Add DStatProbe or VmStatProbe if your OS supports it (e.g. if running on Linux).
+BENCHMARK_DEFAULT_PROBES=ThroughputLatencyProbe,PercentileProbe
+
+# Packages where the specified benchmark is searched by reflection mechanism.
+BENCHMARK_PACKAGES=org.yardstickframework,org.apache.ignite.yardstick
+
+# Probe point writer class name.
+# BENCHMARK_WRITER=
+
+# Comma-separated list of the hosts to run BenchmarkServers on. 2 nodes on local host are enabled by default.
+SERVER_HOSTS=localhost,localhost
+
+# Comma-separated list of the hosts to run BenchmarkDrivers on. 1 node on local host is enabled by default.
+DRIVER_HOSTS=localhost
+
+# Flag which indicates to upload yardstick from one host to every other and collect logs and results automatically.
+AUTO_COPY=true
+
+# Remote username.
+# REMOTE_USER=
+
+# Number of nodes, used to wait for the specified number of nodes to start.
+nodesNum=$((`echo ${SERVER_HOSTS} | tr ',' '\n' | wc -l` + `echo ${DRIVER_HOSTS} | tr ',' '\n' | wc -l`))
+
+# Backups count.
+b=1
+
+# Warmup.
+w=60
+
+# Duration.
+d=300
+
+# Threads count.
+t=64
+
+# Sync mode.
+sm=PRIMARY_SYNC
+
+# Run configuration.
+# Note that each benchmark is set to run for 300 seconds (5 min) with warm-up set to 60 seconds (1 minute).
+CONFIGS="\
+-cfg ${SCRIPT_DIR}/../config/ignite-remote-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutBenchmark -sn IgniteNode -ds atomic-put-${b}-backup,\
+"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/12657937/modules/yardstick/config/benchmark-remote.properties
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/benchmark-remote.properties b/modules/yardstick/config/benchmark-remote.properties
new file mode 100644
index 0000000..0cda79e
--- /dev/null
+++ b/modules/yardstick/config/benchmark-remote.properties
@@ -0,0 +1,119 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# Contains all benchmarks
+#
+
+now0=`date +'%H%M%S'`
+
+# JVM options.
+JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false"
+
+# Uncomment to enable concurrent garbage collection (GC) if you encounter long GC pauses.
+JVM_OPTS=${JVM_OPTS}" \
+ -XX:+PrintGCDetails \
+ -verbose:gc \
+ -XX:+UseParNewGC \
+ -XX:+UseConcMarkSweepGC \
+ -XX:+UseTLAB \
+ -XX:NewSize=128m \
+ -XX:MaxNewSize=128m \
+ -XX:MaxTenuringThreshold=0 \
+ -XX:SurvivorRatio=1024 \
+ -XX:+UseCMSInitiatingOccupancyOnly \
+ -XX:CMSInitiatingOccupancyFraction=60 \
+"
+
+#Ignite version
+ver="RELEASE-"
+
+# List of default probes.
+# Add DStatProbe or VmStatProbe if your OS supports it (e.g. if running on Linux).
+BENCHMARK_DEFAULT_PROBES=ThroughputLatencyProbe,PercentileProbe,DStatProbe
+
+# Packages where the specified benchmark is searched by reflection mechanism.
+BENCHMARK_PACKAGES=org.yardstickframework,org.apache.ignite.yardstick
+
+# Flag which indicates to restart the servers after execution of every benchmark.
+RESTART_SERVERS=true
+
+# Probe point writer class name.
+# BENCHMARK_WRITER=
+
+# Comma-separated list of the hosts to run BenchmarkServers on. 2 nodes on local host are enabled by default.
+SERVER_HOSTS=localhost,localhost
+
+# Comma-separated list of the hosts to run BenchmarkDrivers on. 1 node on local host is enabled by default.
+DRIVER_HOSTS=localhost
+
+# Remote username.
+# REMOTE_USER=
+
+# Flag which indicates to upload yardstick from one host to every other and collect logs and results automatically.
+AUTO_COPY=true
+
+# Number of nodes, used to wait for the specified number of nodes to start.
+nodesNum=$((`echo ${SERVER_HOSTS} | tr ',' '\n' | wc -l` + `echo ${DRIVER_HOSTS} | tr ',' '\n' | wc -l`))
+
+# Backups count.
+b=1
+
+# Warmup.
+w=60
+
+# Duration.
+d=300
+
+# Threads count.
+t=64
+
+# Sync mode.
+sm=PRIMARY_SYNC
+
+# Jobs.
+j=10
+
+# Run configuration which contains all benchmarks.
+# Note that each benchmark is set to run for 300 seconds (5 min) with warm-up set to 60 seconds (1 minute).
+CONFIGS="\
+-cfg ${SCRIPT_DIR}/../config/ignite-remote-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutBenchmark -sn IgniteNode -ds ${ver}atomic-put-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-remote-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetBenchmark -sn IgniteNode -ds ${ver}atomic-put-get-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-remote-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxBenchmark -sn IgniteNode -ds ${ver}tx-put-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-remote-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteGetAndPutTxBenchmark -sn IgniteNode -ds ${ver}tx-getAndPut-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-remote-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteInvokeTxBenchmark -sn IgniteNode -ds ${ver}tx-invoke-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-remote-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetTxBenchmark -sn IgniteNode -ds ${ver}tx-put-get-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-remote-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryBenchmark -sn IgniteNode -ds ${ver}sql-query-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-remote-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryJoinBenchmark -sn IgniteNode -ds ${ver}sql-query-join-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-remote-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryPutBenchmark -sn IgniteNode -ds ${ver}sql-query-put-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-remote-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -j ${j} -dn IgniteAffinityCallBenchmark -sn IgniteNode -ds ${ver}affcall-compute-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-remote-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -j ${j} -dn IgniteApplyBenchmark -sn IgniteNode -ds ${ver}apply-compute-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-remote-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -j ${j} -dn IgniteBroadcastBenchmark -sn IgniteNode -ds ${ver}broad-compute-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-remote-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -j ${j} -dn IgniteExecuteBenchmark -sn IgniteNode -ds ${ver}exec-compute-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-remote-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -j ${j} -dn IgniteRunBenchmark -sn IgniteNode -ds ${ver}run-compute-${b}-backup\
+-cfg ${SCRIPT_DIR}/../config/ignite-remote-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetOffHeapBenchmark -sn IgniteNode -ds ${ver}atomic-put-get-offheap-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-remote-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}atomic-put-get-offheap-val-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-remote-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutOffHeapBenchmark -sn IgniteNode -ds ${ver}atomic-put-offheap-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-remote-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}atomic-put-offheap-val-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-remote-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxOffHeapBenchmark -sn IgniteNode -ds ${ver}tx-put-offheap-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-remote-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}tx-put-offheap-val-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-remote-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryOffHeapBenchmark -sn IgniteNode -ds ${ver}sql-query-offheap-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-remote-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryJoinOffHeapBenchmark -sn IgniteNode -ds ${ver}sql-query-join-offheap-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-remote-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryPutOffHeapBenchmark -sn IgniteNode -ds ${ver}sql-query-put-offheap-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-remote-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -bs 1000 -sm PRIMARY_SYNC -dn IgnitePutAllBenchmark -sn IgniteNode -ds ${ver}atomic-putAll-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-remote-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -bs 1000 -col -sm PRIMARY_SYNC -dn IgnitePutAllBenchmark -sn IgniteNode -ds ${ver}atomic-collocated-putAll-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-remote-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -bs 1000 -sm PRIMARY_SYNC -dn IgnitePutAllTxBenchmark -sn IgniteNode -ds ${ver}atomic-putAll-tx-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-remote-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -bs 1000 -col -sm PRIMARY_SYNC -dn IgnitePutAllTxBenchmark -sn IgniteNode -ds ${ver}atomic-collocated-putAll-tx-${b}-backup\
+"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/12657937/modules/yardstick/config/benchmark-sample.properties
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/benchmark-sample.properties b/modules/yardstick/config/benchmark-sample.properties
index fee7cbb..1932ae7 100644
--- a/modules/yardstick/config/benchmark-sample.properties
+++ b/modules/yardstick/config/benchmark-sample.properties
@@ -55,8 +55,26 @@ DRIVER_HOSTS=localhost
# Number of nodes, used to wait for the specified number of nodes to start.
nodesNum=$((`echo ${SERVER_HOSTS} | tr ',' '\n' | wc -l` + `echo ${DRIVER_HOSTS} | tr ',' '\n' | wc -l`))
+# Backups count.
+b=1
+
+# Warmup.
+w=60
+
+# Duration.
+d=300
+
+# Threads count.
+t=64
+
+# Sync mode.
+sm=PRIMARY_SYNC
+
+# Jobs.
+j=10
+
# Run configuration.
-# Note that each benchmark is set to run for 300 seconds (5 mins) with warm-up set to 60 seconds (1 minute).
+# Note that each benchmark is set to run for 300 seconds (5 min) with warm-up set to 60 seconds (1 minute).
CONFIGS="\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutBenchmark -sn IgniteNode -ds atomic-put-1-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutBenchmark -sn IgniteNode -ds atomic-put-${b}-backup,\
"
http://git-wip-us.apache.org/repos/asf/ignite/blob/12657937/modules/yardstick/config/benchmark-sql-dml.properties
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/benchmark-sql-dml.properties b/modules/yardstick/config/benchmark-sql-dml.properties
index 2ce2e1f..a8bb453 100644
--- a/modules/yardstick/config/benchmark-sql-dml.properties
+++ b/modules/yardstick/config/benchmark-sql-dml.properties
@@ -55,18 +55,36 @@ DRIVER_HOSTS=localhost
# Number of nodes, used to wait for the specified number of nodes to start.
nodesNum=$((`echo ${SERVER_HOSTS} | tr ',' '\n' | wc -l` + `echo ${DRIVER_HOSTS} | tr ',' '\n' | wc -l`))
+# Backups count.
+b=1
+
+# Warmup.
+w=60
+
+# Duration.
+d=300
+
+# Threads count.
+t=64
+
+# Sync mode.
+sm=PRIMARY_SYNC
+
+# Jobs.
+j=10
+
# Run configuration.
-# Note that each benchmark is set to run for 300 seconds (5 mins) with warm-up set to 60 seconds (1 minute).
+# Note that each benchmark is set to run for 300 seconds (5 min) with warm-up set to 60 seconds (1 minute).
#
CONFIGS="\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -bs 2 -dn IgniteSqlMergeAllBenchmark -sn IgniteNode -ds sql-merge-all-bs-2-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -bs 6 -dn IgniteSqlMergeAllBenchmark -sn IgniteNode -ds sql-merge-all-bs-6-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -bs 10 -dn IgniteSqlMergeAllBenchmark -sn IgniteNode -ds sql-merge-all-bs-10-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteSqlMergeBenchmark -sn IgniteNode -ds sql-merge-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteSqlMergeQueryBenchmark -sn IgniteNode -ds sql-merge-query-1-backup\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteSqlMergeIndexedValue1Benchmark -sn IgniteNode -ds sql-merge-indexed1-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteSqlMergeIndexedValue2Benchmark -sn IgniteNode -ds sql-merge-indexed2-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteSqlMergeIndexedValue8Benchmark -sn IgniteNode -ds sql-merge-indexed8-1-backup\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 2 -dn IgniteSqlMergeAllBenchmark -sn IgniteNode -ds sql-merge-all-bs-2-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 6 -dn IgniteSqlMergeAllBenchmark -sn IgniteNode -ds sql-merge-all-bs-6-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 10 -dn IgniteSqlMergeAllBenchmark -sn IgniteNode -ds sql-merge-all-bs-10-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlMergeBenchmark -sn IgniteNode -ds sql-merge-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlMergeQueryBenchmark -sn IgniteNode -ds sql-merge-query-${b}-backup\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlMergeIndexedValue1Benchmark -sn IgniteNode -ds sql-merge-indexed1-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlMergeIndexedValue2Benchmark -sn IgniteNode -ds sql-merge-indexed2-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlMergeIndexedValue8Benchmark -sn IgniteNode -ds sql-merge-indexed8-${b}-backup\
"
http://git-wip-us.apache.org/repos/asf/ignite/blob/12657937/modules/yardstick/config/benchmark-store.properties
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/benchmark-store.properties b/modules/yardstick/config/benchmark-store.properties
index 746fa11..ea8487f 100644
--- a/modules/yardstick/config/benchmark-store.properties
+++ b/modules/yardstick/config/benchmark-store.properties
@@ -26,7 +26,6 @@ JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false"
# Uncomment to enable concurrent garbage collection (GC) if you encounter long GC pauses.
JVM_OPTS=${JVM_OPTS}" \
--Xloggc:./gc${now0}.log \
-XX:+PrintGCDetails \
-verbose:gc \
-XX:+UseParNewGC \
@@ -50,7 +49,7 @@ BENCHMARK_DEFAULT_PROBES=ThroughputLatencyProbe,PercentileProbe,DStatProbe
# Packages where the specified benchmark is searched by reflection mechanism.
BENCHMARK_PACKAGES=org.yardstickframework,org.apache.ignite.yardstick
-# Restart servers for each benchmark.
+# Flag which indicates to restart the servers before every benchmark execution.
RESTART_SERVERS=true
# Probe point writer class name.
http://git-wip-us.apache.org/repos/asf/ignite/blob/12657937/modules/yardstick/config/benchmark-tx-win.properties
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/benchmark-tx-win.properties b/modules/yardstick/config/benchmark-tx-win.properties
index 54a40b1..490b9d7 100644
--- a/modules/yardstick/config/benchmark-tx-win.properties
+++ b/modules/yardstick/config/benchmark-tx-win.properties
@@ -51,7 +51,7 @@ set DRIVER_HOSTS=localhost
:: set REMOTE_USER=
:: Run configuration which contains all benchmarks.
-:: Note that each benchmark is set to run for 300 seconds (5 mins) with warm-up set to 60 seconds (1 minute).
+:: Note that each benchmark is set to run for 300 seconds (5 min) with warm-up set to 60 seconds (1 minute).
set CONFIGS=^
-cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutTxBenchmark -sn IgniteNode -ds tx-put-1-backup,^
-cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteGetAndPutTxBenchmark -sn IgniteNode -ds tx-getAndPut-1-backup,^
http://git-wip-us.apache.org/repos/asf/ignite/blob/12657937/modules/yardstick/config/benchmark-tx.properties
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/benchmark-tx.properties b/modules/yardstick/config/benchmark-tx.properties
index 0d5bb02..4744dee 100644
--- a/modules/yardstick/config/benchmark-tx.properties
+++ b/modules/yardstick/config/benchmark-tx.properties
@@ -55,15 +55,30 @@ DRIVER_HOSTS=localhost
# Number of nodes, used to wait for the specified number of nodes to start.
nodesNum=$((`echo ${SERVER_HOSTS} | tr ',' '\n' | wc -l` + `echo ${DRIVER_HOSTS} | tr ',' '\n' | wc -l`))
+# Backups count.
+b=1
+
+# Warmup.
+w=60
+
+# Duration.
+d=300
+
+# Threads count.
+t=64
+
+# Sync mode.
+sm=PRIMARY_SYNC
+
# Run configuration.
-# Note that each benchmark is set to run for 300 seconds (5 mins) with warm-up set to 60 seconds (1 minute).
+# Note that each benchmark is set to run for 300 seconds (5 min) with warm-up set to 60 seconds (1 minute).
CONFIGS="\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutTxBenchmark -sn IgniteNode -ds tx-put-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteGetAndPutTxBenchmark -sn IgniteNode -ds tx-getAndPut-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteInvokeTxBenchmark -sn IgniteNode -ds tx-invoke-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutTxOffHeapBenchmark -sn IgniteNode -ds tx-put-offheap-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutTxOffHeapValuesBenchmark -sn IgniteNode -ds tx-put-offheap-val-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutGetTxBenchmark -sn IgniteNode -ds tx-put-get-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutGetTxOffHeapBenchmark -sn IgniteNode -ds tx-put-get-offheap-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutGetTxOffHeapValuesBenchmark -sn IgniteNode -ds tx-put-get-offheap-val-1-backup\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxBenchmark -sn IgniteNode -ds tx-put-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteGetAndPutTxBenchmark -sn IgniteNode -ds tx-getAndPut-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteInvokeTxBenchmark -sn IgniteNode -ds tx-invoke-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxOffHeapBenchmark -sn IgniteNode -ds tx-put-offheap-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxOffHeapValuesBenchmark -sn IgniteNode -ds tx-put-offheap-val-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetTxBenchmark -sn IgniteNode -ds tx-put-get-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetTxOffHeapBenchmark -sn IgniteNode -ds tx-put-get-offheap-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetTxOffHeapValuesBenchmark -sn IgniteNode -ds tx-put-get-offheap-val-${b}-backup\
"
http://git-wip-us.apache.org/repos/asf/ignite/blob/12657937/modules/yardstick/config/benchmark-win.properties
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/benchmark-win.properties b/modules/yardstick/config/benchmark-win.properties
index b75b5d6..e97d036 100644
--- a/modules/yardstick/config/benchmark-win.properties
+++ b/modules/yardstick/config/benchmark-win.properties
@@ -54,7 +54,7 @@ set DRIVER_HOSTS=localhost
:: set REMOTE_USER=
:: Run configuration which contains all benchmarks.
-:: Note that each benchmark is set to run for 300 seconds (5 mins) with warm-up set to 60 seconds (1 minute).
+:: Note that each benchmark is set to run for 300 seconds (5 min) with warm-up set to 60 seconds (1 minute).
set CONFIGS=^
-cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutBenchmark -sn IgniteNode -ds atomic-put-1-backup,^
-cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutGetBenchmark -sn IgniteNode -ds atomic-put-get-1-backup,^
http://git-wip-us.apache.org/repos/asf/ignite/blob/12657937/modules/yardstick/config/benchmark.properties
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/benchmark.properties b/modules/yardstick/config/benchmark.properties
index cfc1499..1b5d5fe 100644
--- a/modules/yardstick/config/benchmark.properties
+++ b/modules/yardstick/config/benchmark.properties
@@ -24,7 +24,6 @@ JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false"
# Uncomment to enable concurrent garbage collection (GC) if you encounter long GC pauses.
JVM_OPTS=${JVM_OPTS}" \
- -Xloggc:./gc${now0}.log \
-XX:+PrintGCDetails \
-verbose:gc \
-XX:+UseParNewGC \
@@ -48,6 +47,7 @@ BENCHMARK_DEFAULT_PROBES=ThroughputLatencyProbe,PercentileProbe,DStatProbe
# Packages where the specified benchmark is searched by reflection mechanism.
BENCHMARK_PACKAGES=org.yardstickframework,org.apache.ignite.yardstick
+# Flag which indicates to restart the servers before every benchmark execution.
RESTART_SERVERS=true
# Probe point writer class name.
@@ -65,34 +65,52 @@ DRIVER_HOSTS=localhost
# Number of nodes, used to wait for the specified number of nodes to start.
nodesNum=$((`echo ${SERVER_HOSTS} | tr ',' '\n' | wc -l` + `echo ${DRIVER_HOSTS} | tr ',' '\n' | wc -l`))
+# Backups count.
+b=1
+
+# Warmup.
+w=60
+
+# Duration.
+d=300
+
+# Threads count.
+t=64
+
+# Sync mode.
+sm=PRIMARY_SYNC
+
+# Jobs.
+j=10
+
# Run configuration which contains all benchmarks.
-# Note that each benchmark is set to run for 300 seconds (5 mins) with warm-up set to 60 seconds (1 minute).
+# Note that each benchmark is set to run for 300 seconds (5 min) with warm-up set to 60 seconds (1 minute).
CONFIGS="\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutBenchmark -sn IgniteNode -ds ${ver}atomic-put-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutGetBenchmark -sn IgniteNode -ds ${ver}atomic-put-get-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutTxBenchmark -sn IgniteNode -ds ${ver}tx-put-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteGetAndPutTxBenchmark -sn IgniteNode -ds ${ver}tx-getAndPut-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteInvokeTxBenchmark -sn IgniteNode -ds ${ver}tx-invoke-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutGetTxBenchmark -sn IgniteNode -ds ${ver}tx-put-get-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteSqlQueryBenchmark -sn IgniteNode -ds ${ver}sql-query-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteSqlQueryJoinBenchmark -sn IgniteNode -ds ${ver}sql-query-join-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteSqlQueryPutBenchmark -sn IgniteNode -ds ${ver}sql-query-put-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -j 10 -dn IgniteAffinityCallBenchmark -sn IgniteNode -ds ${ver}affcall-compute-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -j 10 -dn IgniteApplyBenchmark -sn IgniteNode -ds ${ver}apply-compute-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -j 10 -dn IgniteBroadcastBenchmark -sn IgniteNode -ds ${ver}broad-compute-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -j 10 -dn IgniteExecuteBenchmark -sn IgniteNode -ds ${ver}exec-compute-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -j 10 -dn IgniteRunBenchmark -sn IgniteNode -ds ${ver}run-compute-1-backup\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutGetOffHeapBenchmark -sn IgniteNode -ds ${ver}atomic-put-get-offheap-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutGetOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}atomic-put-get-offheap-val-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutOffHeapBenchmark -sn IgniteNode -ds ${ver}atomic-put-offheap-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}atomic-put-offheap-val-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutTxOffHeapBenchmark -sn IgniteNode -ds ${ver}tx-put-offheap-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutTxOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}tx-put-offheap-val-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteSqlQueryOffHeapBenchmark -sn IgniteNode -ds ${ver}sql-query-offheap-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteSqlQueryJoinOffHeapBenchmark -sn IgniteNode -ds ${ver}sql-query-join-offheap-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteSqlQueryPutOffHeapBenchmark -sn IgniteNode -ds ${ver}sql-query-put-offheap-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -bs 1000 -sm PRIMARY_SYNC -dn IgnitePutAllBenchmark -sn IgniteNode -ds ${ver}atomic-putAll-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -bs 1000 -col -sm PRIMARY_SYNC -dn IgnitePutAllBenchmark -sn IgniteNode -ds ${ver}atomic-collocated-putAll-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -bs 1000 -sm PRIMARY_SYNC -dn IgnitePutAllTxBenchmark -sn IgniteNode -ds ${ver}atomic-putAll-tx-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -bs 1000 -col -sm PRIMARY_SYNC -dn IgnitePutAllTxBenchmark -sn IgniteNode -ds ${ver}atomic-collocated-putAll-tx-1-backup\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutBenchmark -sn IgniteNode -ds ${ver}atomic-put-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetBenchmark -sn IgniteNode -ds ${ver}atomic-put-get-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxBenchmark -sn IgniteNode -ds ${ver}tx-put-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteGetAndPutTxBenchmark -sn IgniteNode -ds ${ver}tx-getAndPut-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteInvokeTxBenchmark -sn IgniteNode -ds ${ver}tx-invoke-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetTxBenchmark -sn IgniteNode -ds ${ver}tx-put-get-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryBenchmark -sn IgniteNode -ds ${ver}sql-query-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryJoinBenchmark -sn IgniteNode -ds ${ver}sql-query-join-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryPutBenchmark -sn IgniteNode -ds ${ver}sql-query-put-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -j ${j} -dn IgniteAffinityCallBenchmark -sn IgniteNode -ds ${ver}affcall-compute-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -j ${j} -dn IgniteApplyBenchmark -sn IgniteNode -ds ${ver}apply-compute-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -j ${j} -dn IgniteBroadcastBenchmark -sn IgniteNode -ds ${ver}broad-compute-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -j ${j} -dn IgniteExecuteBenchmark -sn IgniteNode -ds ${ver}exec-compute-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -j ${j} -dn IgniteRunBenchmark -sn IgniteNode -ds ${ver}run-compute-${b}-backup\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetOffHeapBenchmark -sn IgniteNode -ds ${ver}atomic-put-get-offheap-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}atomic-put-get-offheap-val-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutOffHeapBenchmark -sn IgniteNode -ds ${ver}atomic-put-offheap-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}atomic-put-offheap-val-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxOffHeapBenchmark -sn IgniteNode -ds ${ver}tx-put-offheap-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}tx-put-offheap-val-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryOffHeapBenchmark -sn IgniteNode -ds ${ver}sql-query-offheap-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryJoinOffHeapBenchmark -sn IgniteNode -ds ${ver}sql-query-join-offheap-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryPutOffHeapBenchmark -sn IgniteNode -ds ${ver}sql-query-put-offheap-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -bs 1000 -sm PRIMARY_SYNC -dn IgnitePutAllBenchmark -sn IgniteNode -ds ${ver}atomic-putAll-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -bs 1000 -col -sm PRIMARY_SYNC -dn IgnitePutAllBenchmark -sn IgniteNode -ds ${ver}atomic-collocated-putAll-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -bs 1000 -sm PRIMARY_SYNC -dn IgnitePutAllTxBenchmark -sn IgniteNode -ds ${ver}atomic-putAll-tx-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -bs 1000 -col -sm PRIMARY_SYNC -dn IgnitePutAllTxBenchmark -sn IgniteNode -ds ${ver}atomic-collocated-putAll-tx-${b}-backup\
"
http://git-wip-us.apache.org/repos/asf/ignite/blob/12657937/modules/yardstick/config/ignite-remote-config.xml
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/ignite-remote-config.xml b/modules/yardstick/config/ignite-remote-config.xml
new file mode 100644
index 0000000..0962e53
--- /dev/null
+++ b/modules/yardstick/config/ignite-remote-config.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ 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.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!--
+ Ignite Spring configuration file to startup grid.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+ <import resource="ignite-base-config.xml"/>
+
+ <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration" parent="base-ignite.cfg">
+
+ <property name="discoverySpi">
+ <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">
+ <property name="ipFinder">
+ <bean
+ class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">
+ <property name="addresses">
+ <list>
+ <!-- In distributed environment, replace with actual hosts IP addresses. -->
+ <value>127.0.0.1:47500..47509</value>
+ </list>
+ </property>
+ </bean>
+ </property>
+ </bean>
+ </property>
+ </bean>
+</beans>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/12657937/modules/yardstick/config/test-max-int-values-offheap.properties
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/test-max-int-values-offheap.properties b/modules/yardstick/config/test-max-int-values-offheap.properties
index 5b4da20..42769ec 100644
--- a/modules/yardstick/config/test-max-int-values-offheap.properties
+++ b/modules/yardstick/config/test-max-int-values-offheap.properties
@@ -22,7 +22,6 @@
# Uncomment to enable concurrent garbage collection (GC) if you encounter long GC pauses.
JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false \
- -Xloggc:./gc${now0}.log \
-XX:+PrintGCDetails \
-XX:-PrintGCTimeStamps \
-verbose:gc \
@@ -62,7 +61,7 @@ DRIVER_HOSTS=fosters-218
nodesNum=$((`echo ${SERVER_HOSTS} | tr ',' '\n' | wc -l` + `echo ${DRIVER_HOSTS} | tr ',' '\n' | wc -l`))
# Run configuration.
-# Note that each benchmark is set to run for 300 seconds (5 mins) with warm-up set to 60 seconds (1 minute).
+# Note that each benchmark is set to run for 300 seconds (5 min) with warm-up set to 60 seconds (1 minute).
CONFIGS="\
-cfg ${SCRIPT_DIR}/../config/ignite-int-max-values-offheap-config.xml -nn ${nodesNum} -b 0 -w 0 -d 9999999 -t 1 -sm PRIMARY_SYNC -dn IntMaxValueEntriesTest -sn IgniteNode -ds int-max-values-offheap\
"
http://git-wip-us.apache.org/repos/asf/ignite/blob/12657937/modules/yardstick/config/test-max-int-values-onheap.properties
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/test-max-int-values-onheap.properties b/modules/yardstick/config/test-max-int-values-onheap.properties
index d29800a..0faf5f3 100644
--- a/modules/yardstick/config/test-max-int-values-onheap.properties
+++ b/modules/yardstick/config/test-max-int-values-onheap.properties
@@ -22,7 +22,6 @@
# Uncomment to enable concurrent garbage collection (GC) if you encounter long GC pauses.
JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false \
- -Xloggc:./gc${now0}.log \
-XX:+PrintGCDetails \
-XX:-PrintGCTimeStamps \
-verbose:gc \
@@ -62,7 +61,7 @@ DRIVER_HOSTS=fosters-218
nodesNum=$((`echo ${SERVER_HOSTS} | tr ',' '\n' | wc -l` + `echo ${DRIVER_HOSTS} | tr ',' '\n' | wc -l`))
# Run configuration.
-# Note that each benchmark is set to run for 300 seconds (5 mins) with warm-up set to 60 seconds (1 minute).
+# Note that each benchmark is set to run for 300 seconds (5 min) with warm-up set to 60 seconds (1 minute).
CONFIGS="\
-cfg ${SCRIPT_DIR}/../config/ignite-int-max-values-onheap-config.xml -nn ${nodesNum} -b 0 -w 0 -d 9999999 -t 1 -sm PRIMARY_SYNC -dn IntMaxValueEntriesTest -sn IgniteNode -ds int-max-values-onheap\
"
http://git-wip-us.apache.org/repos/asf/ignite/blob/12657937/modules/yardstick/config/test-max-int-values-swap.properties
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/test-max-int-values-swap.properties b/modules/yardstick/config/test-max-int-values-swap.properties
index 203f004..900e8ac 100644
--- a/modules/yardstick/config/test-max-int-values-swap.properties
+++ b/modules/yardstick/config/test-max-int-values-swap.properties
@@ -22,7 +22,6 @@
# Uncomment to enable concurrent garbage collection (GC) if you encounter long GC pauses.
JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false \
- -Xloggc:./gc${now0}.log \
-XX:+PrintGCDetails \
-XX:-PrintGCTimeStamps \
-verbose:gc \
@@ -62,7 +61,7 @@ DRIVER_HOSTS=fosters-218
nodesNum=$((`echo ${SERVER_HOSTS} | tr ',' '\n' | wc -l` + `echo ${DRIVER_HOSTS} | tr ',' '\n' | wc -l`))
# Run configuration.
-# Note that each benchmark is set to run for 300 seconds (5 mins) with warm-up set to 60 seconds (1 minute).
+# Note that each benchmark is set to run for 300 seconds (5 min) with warm-up set to 60 seconds (1 minute).
CONFIGS="\
-cfg ${SCRIPT_DIR}/../config/ignite-int-max-values-swap-config.xml -nn ${nodesNum} -b 0 -w 0 -d 9999999 -t 1 -sm PRIMARY_SYNC -dn IntMaxValueEntriesTest -sn IgniteNode -ds int-max-values-swap\
"
http://git-wip-us.apache.org/repos/asf/ignite/blob/12657937/modules/yardstick/pom-standalone.xml
----------------------------------------------------------------------
diff --git a/modules/yardstick/pom-standalone.xml b/modules/yardstick/pom-standalone.xml
index 0bd5a0f..d6d5a20 100644
--- a/modules/yardstick/pom-standalone.xml
+++ b/modules/yardstick/pom-standalone.xml
@@ -29,7 +29,7 @@
<url>http://ignite.apache.org</url>
<properties>
- <yardstick.version>0.8.0</yardstick.version>
+ <yardstick.version>0.8.3</yardstick.version>
<spring.version>4.1.0.RELEASE</spring.version>
</properties>
http://git-wip-us.apache.org/repos/asf/ignite/blob/12657937/modules/yardstick/pom.xml
----------------------------------------------------------------------
diff --git a/modules/yardstick/pom.xml b/modules/yardstick/pom.xml
index d96fcc6..f65cdbd 100644
--- a/modules/yardstick/pom.xml
+++ b/modules/yardstick/pom.xml
@@ -35,7 +35,7 @@
<url>http://ignite.apache.org</url>
<properties>
- <yardstick.version>0.8.2</yardstick.version>
+ <yardstick.version>0.8.3</yardstick.version>
<spring.version>4.1.0.RELEASE</spring.version>
</properties>
http://git-wip-us.apache.org/repos/asf/ignite/blob/12657937/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 238361b..9d86a24 100644
--- a/pom.xml
+++ b/pom.xml
@@ -507,10 +507,13 @@
<fileset dir="${basedir}/target/release-package/benchmarks/config/">
<include name="*.*" />
<exclude name="benchmark.properties"/>
+ <exclude name="benchmark-remote.properties"/>
<exclude name="benchmark-sample.properties"/>
+ <exclude name="benchmark-remote-sample.properties"/>
<exclude name="benchmark-multicast.properties"/>
<exclude name="ignite-base-config.xml"/>
<exclude name="ignite-localhost-config.xml"/>
+ <exclude name="ignite-remote-config.xml"/>
<exclude name="ignite-multicast-config.xml"/>
</fileset>
</delete>
@@ -542,7 +545,7 @@
tofile="${basedir}/target/release-package/benchmarks/README.txt" overwrite="true">
</copy>
- <copy file="${basedir}/modules/yardstick/DEVNOTES.txt"
+ <copy file="${basedir}/modules/yardstick/DEVNOTES-standalone.txt"
tofile="${basedir}/target/release-package/benchmarks/sources/DEVNOTES.txt"/>
</target>
</configuration>
[32/50] [abbrv] ignite git commit: Performance optimizations.
Posted by vo...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/b02ad0de/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
index a4a0c35..1d88742 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
@@ -120,6 +120,9 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter {
/** */
private volatile boolean stopping;
+ /** */
+ private boolean stopped;
+
/** Discovery listener. */
private final GridLocalEventListener discoLsnr = new GridLocalEventListener() {
@Override public void onEvent(Event evt) {
@@ -222,18 +225,25 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter {
// Acquire write busy lock.
busyLock.writeLock().lock();
- if (supplier != null)
- supplier.stop();
+ try {
+ if (supplier != null)
+ supplier.stop();
- if (demander != null)
- demander.stop();
+ if (demander != null)
+ demander.stop();
- IgniteCheckedException err = stopError();
+ IgniteCheckedException err = stopError();
- for (GridDhtForceKeysFuture fut : forceKeyFuts.values())
- fut.onDone(err);
+ for (GridDhtForceKeysFuture fut : forceKeyFuts.values())
+ fut.onDone(err);
- top = null;
+ top = null;
+
+ stopped = true;
+ }
+ finally {
+ busyLock.writeLock().unlock();
+ }
}
/**
* @return Node stop exception.
@@ -441,13 +451,16 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter {
* @return {@code true} if entered to busy state.
*/
private boolean enterBusy() {
- if (busyLock.readLock().tryLock())
- return true;
+ if (!busyLock.readLock().tryLock())
+ return false;
- if (log.isDebugEnabled())
- log.debug("Failed to enter busy state on node (exchanger is stopping): " + cctx.nodeId());
+ if (stopped) {
+ busyLock.readLock().unlock();
- return false;
+ return false;
+ }
+
+ return true;
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/b02ad0de/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java
index 8fe33d8..1a925f3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java
@@ -200,6 +200,11 @@ public class GridNearSingleGetRequest extends GridCacheMessage implements GridCa
return accessTtl;
}
+ /** {@inheritDoc} */
+ @Override public int partition() {
+ return partId;
+ }
+
/**
* @return Read through flag.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/b02ad0de/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
index af87dfe..90a68ad 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
@@ -514,8 +514,8 @@ public class IgniteTxHandler {
for (IgniteTxEntry e : F.concat(false, req.reads(), req.writes())) {
GridCacheContext ctx = e.context();
- Collection<ClusterNode> cacheNodes0 = ctx.discovery().cacheAffinityNodes(ctx.name(), expVer);
- Collection<ClusterNode> cacheNodes1 = ctx.discovery().cacheAffinityNodes(ctx.name(), curVer);
+ Collection<ClusterNode> cacheNodes0 = ctx.discovery().cacheAffinityNodes(ctx.cacheId(), expVer);
+ Collection<ClusterNode> cacheNodes1 = ctx.discovery().cacheAffinityNodes(ctx.cacheId(), curVer);
if (!cacheNodes0.equals(cacheNodes1) || ctx.affinity().affinityTopologyVersion().compareTo(curVer) < 0)
return true;
http://git-wip-us.apache.org/repos/asf/ignite/blob/b02ad0de/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java
index 95aab74..ccc17e5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java
@@ -354,4 +354,4 @@ public class GridCacheVersion implements Message, Comparable<GridCacheVersion>,
", order=" + order() +
", nodeOrder=" + nodeOrder() + ']';
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/b02ad0de/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionManager.java
index 9be8b50..5a8904f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionManager.java
@@ -304,4 +304,4 @@ public class GridCacheVersionManager extends GridCacheSharedManagerAdapter {
public GridCacheVersion last() {
return last;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/b02ad0de/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java
index 0764316..257d0d9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java
@@ -478,4 +478,4 @@ public class GridClockSyncProcessor extends GridProcessorAdapter {
curr.onNodeLeft(nodeId);
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/b02ad0de/modules/core/src/main/java/org/apache/ignite/internal/util/GridBusyLock.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridBusyLock.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridBusyLock.java
index c23e1de..76fef50 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridBusyLock.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridBusyLock.java
@@ -79,4 +79,4 @@ public class GridBusyLock {
public void unblock() {
lock.writeLock().unlock();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/b02ad0de/modules/core/src/main/java/org/apache/ignite/internal/util/StripedCompositeReadWriteLock.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/StripedCompositeReadWriteLock.java b/modules/core/src/main/java/org/apache/ignite/internal/util/StripedCompositeReadWriteLock.java
index 12940e6..e215663 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/StripedCompositeReadWriteLock.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/StripedCompositeReadWriteLock.java
@@ -17,15 +17,14 @@
package org.apache.ignite.internal.util;
-import org.apache.ignite.thread.IgniteThread;
-import org.jetbrains.annotations.NotNull;
-
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.Condition;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
+import org.apache.ignite.thread.IgniteThread;
+import org.jetbrains.annotations.NotNull;
/**
* ReadWriteLock with striping mechanics.
@@ -69,10 +68,15 @@ public class StripedCompositeReadWriteLock implements ReadWriteLock {
int idx;
if (Thread.currentThread() instanceof IgniteThread) {
- idx = ((IgniteThread)Thread.currentThread()).groupIndex();
+ IgniteThread igniteThread = (IgniteThread)Thread.currentThread();
+
+ idx = igniteThread.compositeRwLockIndex();
+
+ if (idx == IgniteThread.GRP_IDX_UNASSIGNED) {
+ idx = IDX_GEN.incrementAndGet();
- if (idx == IgniteThread.GRP_IDX_UNASSIGNED)
- idx = IDX.get();
+ igniteThread.compositeRwLockIndex(idx);
+ }
}
else
idx = IDX.get();
@@ -135,7 +139,7 @@ public class StripedCompositeReadWriteLock implements ReadWriteLock {
* Internal lock routine.
*
* @param canInterrupt Whether to acquire the lock interruptibly.
- * @throws InterruptedException
+ * @throws InterruptedException If interrupted.
*/
private void lock0(boolean canInterrupt) throws InterruptedException {
int i = 0;
@@ -167,13 +171,41 @@ public class StripedCompositeReadWriteLock implements ReadWriteLock {
/** {@inheritDoc} */
@Override public boolean tryLock() {
- throw new UnsupportedOperationException();
+ int i = 0;
+
+ try {
+ for (; i < locks.length; i++) {
+ if (!locks[i].writeLock().tryLock())
+ break;
+ }
+ }
+ finally {
+ if (0 < i && i < locks.length)
+ unlock0(i - 1);
+ }
+
+ return i == locks.length;
}
/** {@inheritDoc} */
@SuppressWarnings("NullableProblems")
@Override public boolean tryLock(long time, TimeUnit unit) throws InterruptedException {
- throw new UnsupportedOperationException();
+ int i = 0;
+
+ long end = unit.toNanos(time) + System.nanoTime();
+
+ try {
+ for (; i < locks.length && System.nanoTime() < end; i++) {
+ if (!locks[i].writeLock().tryLock(time, unit))
+ break;
+ }
+ }
+ finally {
+ if (0 < i && i < locks.length)
+ unlock0(i - 1);
+ }
+
+ return i == locks.length;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/b02ad0de/modules/core/src/main/java/org/apache/ignite/internal/util/StripedExecutor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/StripedExecutor.java b/modules/core/src/main/java/org/apache/ignite/internal/util/StripedExecutor.java
index e70f0ce..b5ef431 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/StripedExecutor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/StripedExecutor.java
@@ -125,11 +125,11 @@ public class StripedExecutor implements ExecutorService {
GridStringBuilder sb = new GridStringBuilder();
- sb.a(">>> Possible starvation in striped pool: ")
- .a(stripe.thread.getName()).a(U.nl())
- .a(stripe.queueToString()).a(U.nl())
- .a("deadlock: ").a(deadlockPresent).a(U.nl())
- .a("completed: ").a(completedCnt).a(U.nl());
+ sb.a(">>> Possible starvation in striped pool.").a(U.nl())
+ .a(" Thread name: ").a(stripe.thread.getName()).a(U.nl())
+ .a(" Queue: ").a(stripe.queueToString()).a(U.nl())
+ .a(" Deadlock: ").a(deadlockPresent).a(U.nl())
+ .a(" Completed: ").a(completedCnt).a(U.nl());
U.printStackTrace(
stripe.thread.getId(),
http://git-wip-us.apache.org/repos/asf/ignite/blob/b02ad0de/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridAbstractCommunicationClient.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridAbstractCommunicationClient.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridAbstractCommunicationClient.java
index f2ab932..6302d84 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridAbstractCommunicationClient.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridAbstractCommunicationClient.java
@@ -17,7 +17,7 @@
package org.apache.ignite.internal.util.nio;
-import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.jetbrains.annotations.Nullable;
@@ -30,7 +30,7 @@ public abstract class GridAbstractCommunicationClient implements GridCommunicati
private volatile long lastUsed = U.currentTimeMillis();
/** Reservations. */
- private final AtomicInteger reserves = new AtomicInteger();
+ private final AtomicBoolean closed = new AtomicBoolean();
/** Metrics listener. */
protected final GridNioMetricsListener metricsLsnr;
@@ -54,48 +54,27 @@ public abstract class GridAbstractCommunicationClient implements GridCommunicati
/** {@inheritDoc} */
@Override public boolean close() {
- return reserves.compareAndSet(0, -1);
+ return !closed.get() && closed.compareAndSet(false, true);
}
/** {@inheritDoc} */
@Override public void forceClose() {
- reserves.set(-1);
+ closed.set(false);
}
/** {@inheritDoc} */
@Override public boolean closed() {
- return reserves.get() == -1;
+ return closed.get();
}
/** {@inheritDoc} */
@Override public boolean reserve() {
- while (true) {
- int r = reserves.get();
-
- if (r == -1)
- return false;
-
- if (reserves.compareAndSet(r, r + 1))
- return true;
- }
+ return !closed.get();
}
/** {@inheritDoc} */
@Override public void release() {
- while (true) {
- int r = reserves.get();
-
- if (r == -1)
- return;
-
- if (reserves.compareAndSet(r, r - 1))
- return;
- }
- }
-
- /** {@inheritDoc} */
- @Override public boolean reserved() {
- return reserves.get() > 0;
+ // No-op.
}
/** {@inheritDoc} */
@@ -119,4 +98,4 @@ public abstract class GridAbstractCommunicationClient implements GridCommunicati
@Override public String toString() {
return S.toString(GridAbstractCommunicationClient.class, this);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/b02ad0de/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridCommunicationClient.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridCommunicationClient.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridCommunicationClient.java
index 71b2c24..f872ff6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridCommunicationClient.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridCommunicationClient.java
@@ -69,11 +69,6 @@ public interface GridCommunicationClient {
public void release();
/**
- * @return {@code True} if client was reserved.
- */
- public boolean reserved();
-
- /**
* Gets idle time of this client.
*
* @return Idle time of this client.
http://git-wip-us.apache.org/repos/asf/ignite/blob/b02ad0de/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
index 4c89a7c..2664505 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
@@ -361,6 +361,10 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
@Override public void onConnected(GridNioSession ses) {
if (ses.accepted()) {
+ if (log.isInfoEnabled())
+ log.info("Accepted incoming communication connection [locAddr=" + ses.localAddress() +
+ ", rmtAddr=" + ses.remoteAddress() + ']');
+
if (log.isDebugEnabled())
log.debug("Sending local node ID to newly accepted session: " + ses);
@@ -371,6 +375,11 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
U.error(log, "Failed to send message: " + e, e);
}
}
+ else {
+ if (log.isInfoEnabled())
+ log.info("Established outgoing communication connection [locAddr=" + ses.localAddress() +
+ ", rmtAddr=" + ses.remoteAddress() + ']');
+ }
}
@Override public void onDisconnected(GridNioSession ses, @Nullable Exception e) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/b02ad0de/modules/core/src/main/java/org/apache/ignite/thread/IgniteThread.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/thread/IgniteThread.java b/modules/core/src/main/java/org/apache/ignite/thread/IgniteThread.java
index 03ed589..0f987e1 100644
--- a/modules/core/src/main/java/org/apache/ignite/thread/IgniteThread.java
+++ b/modules/core/src/main/java/org/apache/ignite/thread/IgniteThread.java
@@ -18,6 +18,7 @@
package org.apache.ignite.thread;
import java.util.concurrent.atomic.AtomicLong;
+import org.apache.ignite.internal.util.typedef.internal.A;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.worker.GridWorker;
@@ -48,6 +49,9 @@ public class IgniteThread extends Thread {
/** Group index. */
private final int grpIdx;
+ /** */
+ private int compositeRwLockIdx;
+
/**
* Creates thread with given worker.
*
@@ -93,8 +97,10 @@ public class IgniteThread extends Thread {
public IgniteThread(ThreadGroup grp, String gridName, String threadName, Runnable r, int grpIdx) {
super(grp, r, createName(cntr.incrementAndGet(), threadName, gridName));
+ A.ensure(grpIdx >= -1, "grpIdx >= -1");
+
this.gridName = gridName;
- this.grpIdx = grpIdx;
+ this.grpIdx = compositeRwLockIdx = grpIdx;
}
/**
@@ -106,7 +112,7 @@ public class IgniteThread extends Thread {
super(threadGrp, threadName);
this.gridName = gridName;
- this.grpIdx = GRP_IDX_UNASSIGNED;
+ this.grpIdx = compositeRwLockIdx = GRP_IDX_UNASSIGNED;
}
/**
@@ -126,6 +132,20 @@ public class IgniteThread extends Thread {
}
/**
+ * @return Composite RW lock index.
+ */
+ public int compositeRwLockIndex() {
+ return compositeRwLockIdx;
+ }
+
+ /**
+ * @param compositeRwLockIdx Composite RW lock index.
+ */
+ public void compositeRwLockIndex(int compositeRwLockIdx) {
+ this.compositeRwLockIdx = compositeRwLockIdx;
+ }
+
+ /**
* Creates new thread name.
*
* @param num Thread number.
@@ -141,4 +161,4 @@ public class IgniteThread extends Thread {
@Override public String toString() {
return S.toString(IgniteThread.class, this, "name", getName());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/b02ad0de/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
index 031fad9..03cbdbd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
@@ -23,15 +23,11 @@ import java.util.Iterator;
import java.util.List;
import java.util.concurrent.CountDownLatch;
import org.apache.ignite.Ignite;
-import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.configuration.NearCacheConfiguration;
import org.apache.ignite.events.Event;
import org.apache.ignite.events.EventType;
-import org.apache.ignite.internal.IgniteKernal;
-import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
-import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.G;
import org.apache.ignite.lang.IgnitePredicate;
@@ -157,8 +153,6 @@ public class GridDiscoveryManagerAliveCacheSelfTest extends GridCommonAbstractTe
stopTempNodes();
latch.await();
-
- validateAlives();
}
}
@@ -199,55 +193,6 @@ public class GridDiscoveryManagerAliveCacheSelfTest extends GridCommonAbstractTe
}
/**
- * Validates that all node collections contain actual information.
- */
- @SuppressWarnings("SuspiciousMethodCalls")
- private void validateAlives() {
- for (Ignite g : alive) {
- log.info("Validate node: " + g.name());
-
- assertEquals("Unexpected nodes number for node: " + g.name(), PERM_NODES_CNT, g.cluster().nodes().size());
- }
-
- for (final Ignite g : alive) {
- IgniteKernal k = (IgniteKernal)g;
-
- GridDiscoveryManager discoMgr = k.context().discovery();
-
- final Collection<ClusterNode> currTop = g.cluster().nodes();
-
- long currVer = discoMgr.topologyVersion();
-
- long startVer = discoMgr.localNode().order();
-
- for (long v = currVer; v > currVer - GridDiscoveryManager.DISCOVERY_HISTORY_SIZE && v >= startVer; v--) {
- F.forAll(discoMgr.aliveCacheNodes(null, new AffinityTopologyVersion(v)),
- new IgnitePredicate<ClusterNode>() {
- @Override public boolean apply(ClusterNode e) {
- return currTop.contains(e);
- }
- });
-
- F.forAll(discoMgr.aliveRemoteCacheNodes(null, new AffinityTopologyVersion(v)),
- new IgnitePredicate<ClusterNode>() {
- @Override public boolean apply(ClusterNode e) {
- return currTop.contains(e) || g.cluster().localNode().equals(e);
- }
- });
-
- GridCacheSharedContext<?, ?> ctx = k.context().cache().context();
-
- ClusterNode oldest =
- ctx.discovery().oldestAliveCacheServerNode(new AffinityTopologyVersion(currVer));
-
- assertNotNull(oldest);
-
- assertTrue(currTop.contains(oldest));
- }
- }
- }
-
- /**
* Starts temporary nodes.
*
* @throws Exception If failed.
http://git-wip-us.apache.org/repos/asf/ignite/blob/b02ad0de/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerSelfTest.java
deleted file mode 100644
index c9179d4..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerSelfTest.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.managers.discovery;
-
-import org.apache.ignite.Ignite;
-import org.apache.ignite.Ignition;
-import org.apache.ignite.configuration.CacheConfiguration;
-import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.configuration.NearCacheConfiguration;
-import org.apache.ignite.internal.IgniteKernal;
-import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
-import org.apache.ignite.internal.util.typedef.F;
-import org.apache.ignite.lang.IgnitePredicate;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
-import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-
-import static org.apache.ignite.cache.CacheMode.PARTITIONED;
-
-/**
- *
- */
-public abstract class GridDiscoveryManagerSelfTest extends GridCommonAbstractTest {
- /** */
- private static final String CACHE_NAME = "cache";
-
- /** */
- private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
-
- /** {@inheritDoc} */
- @Override protected void afterTest() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
- @SuppressWarnings("IfMayBeConditional")
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
-
- CacheConfiguration ccfg1 = defaultCacheConfiguration();
-
- ccfg1.setName(CACHE_NAME);
-
- CacheConfiguration ccfg2 = defaultCacheConfiguration();
-
- ccfg2.setName(null);
-
- if (gridName.equals(getTestGridName(1)))
- cfg.setClientMode(true);
- else {
- ccfg1.setNearConfiguration(null);
- ccfg2.setNearConfiguration(null);
-
- ccfg1.setCacheMode(PARTITIONED);
- ccfg2.setCacheMode(PARTITIONED);
-
- cfg.setCacheConfiguration(ccfg1, ccfg2);
- }
-
- TcpDiscoverySpi discoverySpi = new TcpDiscoverySpi();
-
- discoverySpi.setIpFinder(IP_FINDER);
-
- cfg.setDiscoverySpi(discoverySpi);
-
- return cfg;
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testHasNearCache() throws Exception {
- IgniteKernal g0 = (IgniteKernal)startGrid(0); // PARTITIONED_ONLY cache.
-
- AffinityTopologyVersion none = new AffinityTopologyVersion(-1);
- AffinityTopologyVersion one = new AffinityTopologyVersion(1);
- AffinityTopologyVersion two = new AffinityTopologyVersion(2, 2);
- AffinityTopologyVersion three = new AffinityTopologyVersion(3);
- AffinityTopologyVersion four = new AffinityTopologyVersion(4);
- AffinityTopologyVersion five = new AffinityTopologyVersion(5);
-
- assertFalse(g0.context().discovery().hasNearCache(CACHE_NAME, none));
- assertFalse(g0.context().discovery().hasNearCache(null, none));
-
- assertFalse(g0.context().discovery().hasNearCache(CACHE_NAME, one));
- assertFalse(g0.context().discovery().hasNearCache(null, one));
-
- IgniteKernal g1 = (IgniteKernal)startGrid(1); // NEAR_ONLY cache.
-
- grid(1).createNearCache(null, new NearCacheConfiguration());
-
- grid(1).createNearCache(CACHE_NAME, new NearCacheConfiguration());
-
- assertFalse(g0.context().discovery().hasNearCache(CACHE_NAME, one));
- assertTrue(g0.context().discovery().hasNearCache(CACHE_NAME, two));
- assertFalse(g0.context().discovery().hasNearCache(null, one));
- assertTrue(g0.context().discovery().hasNearCache(null, two));
-
- assertTrue(g1.context().discovery().hasNearCache(CACHE_NAME, two));
- assertTrue(g1.context().discovery().hasNearCache(null, two));
-
- IgniteKernal g2 = (IgniteKernal)startGrid(2); // PARTITIONED_ONLY cache.
-
- assertFalse(g0.context().discovery().hasNearCache(CACHE_NAME, one));
- assertTrue(g0.context().discovery().hasNearCache(CACHE_NAME, two));
- assertTrue(g0.context().discovery().hasNearCache(CACHE_NAME, three));
- assertFalse(g0.context().discovery().hasNearCache(null, one));
- assertTrue(g0.context().discovery().hasNearCache(null, two));
- assertTrue(g0.context().discovery().hasNearCache(null, three));
-
- assertTrue(g1.context().discovery().hasNearCache(CACHE_NAME, two));
- assertTrue(g1.context().discovery().hasNearCache(CACHE_NAME, three));
- assertTrue(g1.context().discovery().hasNearCache(null, two));
- assertTrue(g1.context().discovery().hasNearCache(null, three));
-
- assertTrue(g2.context().discovery().hasNearCache(CACHE_NAME, three));
- assertTrue(g2.context().discovery().hasNearCache(null, three));
-
- stopGrid(2);
-
- // Wait all nodes are on version 4.
- for (;;) {
- if (F.forAll(
- Ignition.allGrids(),
- new IgnitePredicate<Ignite>() {
- @Override public boolean apply(Ignite ignite) {
- return ignite.cluster().topologyVersion() == 4;
- }
- }))
- break;
-
- Thread.sleep(1000);
- }
-
- assertFalse(g0.context().discovery().hasNearCache(CACHE_NAME, one));
- assertTrue(g0.context().discovery().hasNearCache(CACHE_NAME, two));
- assertTrue(g0.context().discovery().hasNearCache(CACHE_NAME, three));
- assertTrue(g0.context().discovery().hasNearCache(CACHE_NAME, four));
- assertFalse(g0.context().discovery().hasNearCache(null, one));
- assertTrue(g0.context().discovery().hasNearCache(null, two));
- assertTrue(g0.context().discovery().hasNearCache(null, three));
- assertTrue(g0.context().discovery().hasNearCache(null, four));
-
- assertTrue(g1.context().discovery().hasNearCache(CACHE_NAME, three));
- assertTrue(g1.context().discovery().hasNearCache(CACHE_NAME, four));
- assertTrue(g1.context().discovery().hasNearCache(null, three));
- assertTrue(g1.context().discovery().hasNearCache(null, four));
-
- stopGrid(1);
-
- // Wait all nodes are on version 5.
- for (;;) {
- if (F.forAll(
- Ignition.allGrids(),
- new IgnitePredicate<Ignite>() {
- @Override public boolean apply(Ignite ignite) {
- return ignite.cluster().topologyVersion() == 5;
- }
- }))
- break;
-
- Thread.sleep(1000);
- }
-
- assertFalse(g0.context().discovery().hasNearCache(CACHE_NAME, one));
- assertTrue(g0.context().discovery().hasNearCache(CACHE_NAME, two));
- assertTrue(g0.context().discovery().hasNearCache(CACHE_NAME, three));
- assertTrue(g0.context().discovery().hasNearCache(CACHE_NAME, four));
- assertFalse(g0.context().discovery().hasNearCache(CACHE_NAME, five));
-
- assertFalse(g0.context().discovery().hasNearCache(null, one));
- assertTrue(g0.context().discovery().hasNearCache(null, two));
- assertTrue(g0.context().discovery().hasNearCache(null, three));
- assertTrue(g0.context().discovery().hasNearCache(null, four));
- assertFalse(g0.context().discovery().hasNearCache(null, five));
- }
-
- /**
- *
- */
- public static class RegularDiscovery extends GridDiscoveryManagerSelfTest {
- /** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
-
- ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setForceServerMode(true);
-
- return cfg;
- }
- }
-
- /**
- *
- */
- public static class ClientDiscovery extends GridDiscoveryManagerSelfTest {
- // No-op.
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/b02ad0de/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java
index b28619c..41035ec 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java
@@ -26,7 +26,6 @@ import org.apache.ignite.internal.GridDiscoverySelfTest;
import org.apache.ignite.internal.GridFailedInputParametersSelfTest;
import org.apache.ignite.internal.GridHomePathSelfTest;
import org.apache.ignite.internal.GridKernalConcurrentAccessStopSelfTest;
-import org.apache.ignite.internal.IgniteConcurrentEntryProcessorAccessStopTest;
import org.apache.ignite.internal.GridListenActorSelfTest;
import org.apache.ignite.internal.GridLocalEventListenerSelfTest;
import org.apache.ignite.internal.GridNodeFilterSelfTest;
@@ -36,13 +35,13 @@ import org.apache.ignite.internal.GridRuntimeExceptionSelfTest;
import org.apache.ignite.internal.GridSameVmStartupSelfTest;
import org.apache.ignite.internal.GridSpiExceptionSelfTest;
import org.apache.ignite.internal.GridVersionSelfTest;
+import org.apache.ignite.internal.IgniteConcurrentEntryProcessorAccessStopTest;
import org.apache.ignite.internal.IgniteUpdateNotifierPerClusterSettingSelfTest;
import org.apache.ignite.internal.managers.GridManagerStopSelfTest;
import org.apache.ignite.internal.managers.communication.GridCommunicationSendMessageSelfTest;
import org.apache.ignite.internal.managers.deployment.GridDeploymentManagerStopSelfTest;
import org.apache.ignite.internal.managers.discovery.GridDiscoveryManagerAliveCacheSelfTest;
import org.apache.ignite.internal.managers.discovery.GridDiscoveryManagerAttributesSelfTest;
-import org.apache.ignite.internal.managers.discovery.GridDiscoveryManagerSelfTest;
import org.apache.ignite.internal.managers.discovery.IgniteTopologyPrintFormatSelfTest;
import org.apache.ignite.internal.managers.events.GridEventStorageManagerSelfTest;
import org.apache.ignite.internal.managers.swapspace.GridSwapSpaceManagerSelfTest;
@@ -111,8 +110,6 @@ public class IgniteKernalSelfTestSuite extends TestSuite {
suite.addTestSuite(GridDiscoveryManagerAttributesSelfTest.RegularDiscovery.class);
suite.addTestSuite(GridDiscoveryManagerAttributesSelfTest.ClientDiscovery.class);
suite.addTestSuite(GridDiscoveryManagerAliveCacheSelfTest.class);
- suite.addTestSuite(GridDiscoveryManagerSelfTest.RegularDiscovery.class);
- suite.addTestSuite(GridDiscoveryManagerSelfTest.ClientDiscovery.class);
suite.addTestSuite(GridDiscoveryEventSelfTest.class);
suite.addTestSuite(GridPortProcessorSelfTest.class);
suite.addTestSuite(GridHomePathSelfTest.class);
http://git-wip-us.apache.org/repos/asf/ignite/blob/b02ad0de/modules/tools/src/main/java/org/apache/ignite/tools/classgen/ClassesGenerator.java
----------------------------------------------------------------------
diff --git a/modules/tools/src/main/java/org/apache/ignite/tools/classgen/ClassesGenerator.java b/modules/tools/src/main/java/org/apache/ignite/tools/classgen/ClassesGenerator.java
index 360bb2a..ecc0654 100644
--- a/modules/tools/src/main/java/org/apache/ignite/tools/classgen/ClassesGenerator.java
+++ b/modules/tools/src/main/java/org/apache/ignite/tools/classgen/ClassesGenerator.java
@@ -33,7 +33,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator;
import java.util.TreeSet;
-import java.util.concurrent.locks.AbstractQueuedSynchronizer;
import java.util.jar.JarEntry;
import java.util.jar.JarInputStream;
@@ -212,7 +211,8 @@ public class ClassesGenerator {
if (included) {
Class<?> cls = Class.forName(clsName, false, ldr);
- if (Serializable.class.isAssignableFrom(cls) && !AbstractQueuedSynchronizer.class.isAssignableFrom(cls)) {
+ if (Serializable.class.isAssignableFrom(cls) &&
+ !(cls.getName().endsWith("Future") || cls.getName().endsWith("FutureAdapter"))) {
if (!cls.isInterface() && !Modifier.isAbstract(cls.getModifiers()) && !cls.isEnum() &&
!cls.getSimpleName().isEmpty()) {
try {
[23/50] [abbrv] ignite git commit: IGNITE-4472 Fixed became this user.
Posted by vo...@apache.org.
IGNITE-4472 Fixed became this user.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ee832e4c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ee832e4c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ee832e4c
Branch: refs/heads/ignite-4565-ddl
Commit: ee832e4ca502e70e5891cb299ea348adcea96d93
Parents: e8f8e0a
Author: Andrey Novikov <an...@gridgain.com>
Authored: Thu Feb 16 10:41:30 2017 +0700
Committer: Andrey Novikov <an...@gridgain.com>
Committed: Thu Feb 16 10:41:30 2017 +0700
----------------------------------------------------------------------
modules/web-console/backend/routes/profile.js | 4 ++--
modules/web-console/backend/services/sessions.js | 6 +-----
modules/web-console/backend/services/users.js | 7 ++-----
.../web-console/frontend/views/templates/agent-download.jade | 4 ++--
4 files changed, 7 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ee832e4c/modules/web-console/backend/routes/profile.js
----------------------------------------------------------------------
diff --git a/modules/web-console/backend/routes/profile.js b/modules/web-console/backend/routes/profile.js
index 1d6fccb..76edf72 100644
--- a/modules/web-console/backend/routes/profile.js
+++ b/modules/web-console/backend/routes/profile.js
@@ -50,7 +50,7 @@ module.exports.factory = function(_, express, mongo, usersService) {
if (becomeUsed) {
req.session.viewedUser = user;
- return user;
+ return req.user;
}
return new Promise((resolve, reject) => {
@@ -64,7 +64,7 @@ module.exports.factory = function(_, express, mongo, usersService) {
});
});
})
- .then(() => usersService.get(req.user, req.session.viewedUser))
+ .then((user) => usersService.get(user, req.session.viewedUser))
.then(res.api.ok)
.catch(res.api.error);
});
http://git-wip-us.apache.org/repos/asf/ignite/blob/ee832e4c/modules/web-console/backend/services/sessions.js
----------------------------------------------------------------------
diff --git a/modules/web-console/backend/services/sessions.js b/modules/web-console/backend/services/sessions.js
index 7f62a60..7f3fc73 100644
--- a/modules/web-console/backend/services/sessions.js
+++ b/modules/web-console/backend/services/sessions.js
@@ -42,11 +42,7 @@ module.exports.factory = (_, mongo, errors) => {
return Promise.reject(new errors.IllegalAccessError('Became this user is not permitted. Only administrators can perform this actions.'));
return mongo.Account.findById(viewedUserId).lean().exec()
- .then((viewedUser) => {
- viewedUser.token = session.req.user.token;
-
- session.viewedUser = viewedUser;
- });
+ .then((viewedUser) => session.viewedUser = viewedUser);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/ee832e4c/modules/web-console/backend/services/users.js
----------------------------------------------------------------------
diff --git a/modules/web-console/backend/services/users.js b/modules/web-console/backend/services/users.js
index 2dd603f..0aff45f 100644
--- a/modules/web-console/backend/services/users.js
+++ b/modules/web-console/backend/services/users.js
@@ -212,11 +212,8 @@ module.exports.factory = (_, mongo, settings, spacesService, mailsService, activ
const becomeUsed = viewedUser && user.admin;
- if (becomeUsed) {
- user = viewedUser;
-
- user.becomeUsed = true;
- }
+ if (becomeUsed)
+ user = _.extend({}, viewedUser, {becomeUsed: true, becameToken: user.token});
else
user = user.toJSON();
http://git-wip-us.apache.org/repos/asf/ignite/blob/ee832e4c/modules/web-console/frontend/views/templates/agent-download.jade
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/views/templates/agent-download.jade b/modules/web-console/frontend/views/templates/agent-download.jade
index f5a6ba0..b913636 100644
--- a/modules/web-console/frontend/views/templates/agent-download.jade
+++ b/modules/web-console/frontend/views/templates/agent-download.jade
@@ -34,8 +34,8 @@
i.fa.fa-chevron-circle-right(ng-show='!agentLoad.showToken' ng-click='agentLoad.showToken = ! agentLoad.showToken')
a(ng-click='agentLoad.showToken = ! agentLoad.showToken') {{agentLoad.showToken ? 'Hide security token...' : 'Show security token...'}}
.details-row(ng-show='agentLoad.showToken')
- label.labelField Security token: {{user.token}}
- i.tipLabel.fa.fa-clipboard(ignite-copy-to-clipboard='{{user.token}}' bs-tooltip='' data-title='Copy security token to clipboard')
+ label.labelField Security token: {{user.becameToken || user.token}}
+ i.tipLabel.fa.fa-clipboard(ignite-copy-to-clipboard='{{user.becameToken || user.token}}' bs-tooltip='' data-title='Copy security token to clipboard')
i.tipLabel.icon-help(ng-if=lines bs-tooltip='' data-title='The security token is used for authorization of web agent')
.agent-download(ng-if='hasAgents')
p Connection to Ignite Web Agent is established, but agent failed to connect to Ignite Node
[35/50] [abbrv] ignite git commit: Fixed NPE in
IgniteProcessProxy.kill()
Posted by vo...@apache.org.
Fixed NPE in IgniteProcessProxy.kill()
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/11bc0586
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/11bc0586
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/11bc0586
Branch: refs/heads/ignite-4565-ddl
Commit: 11bc0586318c36e59aa227febc5268b33f0e1be0
Parents: b02ad0d
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Fri Feb 17 18:45:17 2017 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Fri Feb 17 18:45:17 2017 +0700
----------------------------------------------------------------------
.../testframework/junits/multijvm/IgniteProcessProxy.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/11bc0586/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java
index 9bb5205..7c62208 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java
@@ -234,9 +234,12 @@ public class IgniteProcessProxy implements IgniteEx {
* @param gridName Grid name.
*/
public static void kill(String gridName) {
+ A.notNull(gridName, "gridName");
+
IgniteProcessProxy proxy = gridProxies.get(gridName);
- A.notNull(gridName, "gridName");
+ if (proxy == null)
+ return;
try {
proxy.getProcess().kill();
[15/50] [abbrv] ignite git commit: IGNITE-4678 Node version in range.
Posted by vo...@apache.org.
IGNITE-4678 Node version in range.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2cfd55dc
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2cfd55dc
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2cfd55dc
Branch: refs/heads/ignite-4565-ddl
Commit: 2cfd55dcff04cd81ac81e8ed68a34e7ad9ebb883
Parents: 571586c
Author: Andrey Novikov <an...@gridgain.com>
Authored: Wed Feb 15 16:08:57 2017 +0700
Committer: Andrey Novikov <an...@gridgain.com>
Committed: Wed Feb 15 16:08:57 2017 +0700
----------------------------------------------------------------------
.../modules/configuration/Version.service.js | 30 +++++++++++++++++---
.../frontend/test/unit/Version.test.js | 26 ++++++++++++++++-
.../demo/service/DemoCachesLoadService.java | 2 +-
.../service/DemoRandomCacheLoadService.java | 2 +-
4 files changed, 53 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2cfd55dc/modules/web-console/frontend/app/modules/configuration/Version.service.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/configuration/Version.service.js b/modules/web-console/frontend/app/modules/configuration/Version.service.js
index 746b1ed..3fc7199 100644
--- a/modules/web-console/frontend/app/modules/configuration/Version.service.js
+++ b/modules/web-console/frontend/app/modules/configuration/Version.service.js
@@ -77,12 +77,34 @@ export default class IgniteVersion {
}
/**
+ * Check if node version in range
+ * @param {String} nodeVer Node version.
+ * @param {Array.<String>} ranges Version ranges to compare with.
+ * @returns {Boolean} `True` if node version is equal or greater than specified range.
+ */
+ includes(nodeVer, ...ranges) {
+ return !!_.find(ranges, ([after, before]) =>
+ this.compare(nodeVer, after) >= 0 && (_.isNil(before) || this.compare(nodeVer, before) < 0)
+ );
+ }
+
+ /**
* Check if node version is newer or same
- * @param {String} nodeVer
- * @param {String} sinceVer
- * @returns {Boolean}
+ * @param {String} nodeVer Node version.
+ * @param {String} sinceVer Version to compare with.
+ * @returns {Boolean} `True` if node version is equal or greater than specified version.
*/
since(nodeVer, sinceVer) {
- return this.compare(nodeVer, sinceVer) >= 0;
+ return this.includes(nodeVer, [sinceVer]);
+ }
+
+ /**
+ * Check whether node version before than specified version.
+ * @param {String} nodeVer Node version.
+ * @param {String} sinceVer Version to compare with.
+ * @return {Boolean} `True` if node version before than specified version.
+ */
+ before(nodeVer, sinceVer) {
+ return !this.since(nodeVer, sinceVer);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/2cfd55dc/modules/web-console/frontend/test/unit/Version.test.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/test/unit/Version.test.js b/modules/web-console/frontend/test/unit/Version.test.js
index 2d75ab5..72685ea 100644
--- a/modules/web-console/frontend/test/unit/Version.test.js
+++ b/modules/web-console/frontend/test/unit/Version.test.js
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import VersionService from '../../app/modules/configuration/Version.service.js';
+import VersionService from '../../app/modules/configuration/Version.service';
const INSTANCE = new VersionService();
@@ -53,6 +53,7 @@ suite('VersionServiceTestsSuite', () => {
});
test('Check since call', () => {
+ assert.equal(INSTANCE.since('1.5.0', '1.5.0'), true);
assert.equal(INSTANCE.since('1.6.0', '1.5.0'), true);
});
@@ -60,6 +61,29 @@ suite('VersionServiceTestsSuite', () => {
assert.equal(INSTANCE.since('1.3.0', '1.5.0'), false);
});
+ test('Check before call', () => {
+ assert.equal(INSTANCE.before('1.5.0', '1.5.0'), false);
+ assert.equal(INSTANCE.before('1.5.0', '1.6.0'), true);
+ });
+
+ test('Check wrong before call', () => {
+ assert.equal(INSTANCE.before('1.5.0', '1.3.0'), false);
+ });
+
+ test('Check includes call', () => {
+ assert.equal(INSTANCE.includes('1.5.4', ['1.5.5', '1.6.0'], ['1.6.2']), false);
+ assert.equal(INSTANCE.includes('1.5.5', ['1.5.5', '1.6.0'], ['1.6.2']), true);
+ assert.equal(INSTANCE.includes('1.5.11', ['1.5.5', '1.6.0'], ['1.6.2']), true);
+ assert.equal(INSTANCE.includes('1.6.0', ['1.5.5', '1.6.0'], ['1.6.2']), false);
+ assert.equal(INSTANCE.includes('1.6.1', ['1.5.5', '1.6.0'], ['1.6.2']), false);
+ assert.equal(INSTANCE.includes('1.6.2', ['1.5.5', '1.6.0'], ['1.6.2']), true);
+ assert.equal(INSTANCE.includes('1.6.3', ['1.5.5', '1.6.0'], ['1.6.2']), true);
+ });
+
+ test('Check wrong before call', () => {
+ assert.equal(INSTANCE.before('1.5.0', '1.3.0'), false);
+ });
+
test('Parse 1.7.0-SNAPSHOT', () => {
const version = INSTANCE.parse('1.7.0-SNAPSHOT');
assert.equal(version.major, 1);
http://git-wip-us.apache.org/repos/asf/ignite/blob/2cfd55dc/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoCachesLoadService.java
----------------------------------------------------------------------
diff --git a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoCachesLoadService.java b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoCachesLoadService.java
index 9117646..fbfa2ae 100644
--- a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoCachesLoadService.java
+++ b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoCachesLoadService.java
@@ -114,7 +114,7 @@ public class DemoCachesLoadService implements Service {
/** {@inheritDoc} */
@Override public void cancel(ServiceContext ctx) {
if (cachePool != null)
- cachePool.shutdown();
+ cachePool.shutdownNow();
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/2cfd55dc/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoRandomCacheLoadService.java
----------------------------------------------------------------------
diff --git a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoRandomCacheLoadService.java b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoRandomCacheLoadService.java
index 57b26a2..c704dbe 100644
--- a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoRandomCacheLoadService.java
+++ b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoRandomCacheLoadService.java
@@ -62,7 +62,7 @@ public class DemoRandomCacheLoadService implements Service {
/** {@inheritDoc} */
@Override public void cancel(ServiceContext ctx) {
if (cachePool != null)
- cachePool.shutdown();
+ cachePool.shutdownNow();
}
/** {@inheritDoc} */
[02/50] [abbrv] ignite git commit: IGNITE-4158: Added java.sql.Time
support for BinaryMarshaller. This closes #1515.
Posted by vo...@apache.org.
IGNITE-4158: Added java.sql.Time support for BinaryMarshaller. This closes #1515.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/00dd3d81
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/00dd3d81
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/00dd3d81
Branch: refs/heads/ignite-4565-ddl
Commit: 00dd3d815e0bf61784151891304ed01babed1e05
Parents: 2f57470
Author: Vyacheslav Daradur <da...@gmail.com>
Authored: Mon Feb 13 14:42:13 2017 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Mon Feb 13 14:42:13 2017 +0300
----------------------------------------------------------------------
.../apache/ignite/binary/BinaryRawReader.java | 13 ++++
.../apache/ignite/binary/BinaryRawWriter.java | 13 ++++
.../org/apache/ignite/binary/BinaryReader.java | 15 ++++
.../org/apache/ignite/binary/BinaryWriter.java | 15 ++++
.../internal/binary/BinaryClassDescriptor.java | 13 ++++
.../ignite/internal/binary/BinaryContext.java | 3 +
.../internal/binary/BinaryFieldAccessor.java | 23 ++++++
.../binary/BinaryMetadataCollector.java | 11 +++
.../internal/binary/BinaryObjectImpl.java | 9 +++
.../binary/BinaryObjectOffheapImpl.java | 9 +++
.../internal/binary/BinaryReaderExImpl.java | 58 ++++++++++++++
.../binary/BinarySerializedFieldComparator.java | 3 +
.../ignite/internal/binary/BinaryUtils.java | 79 ++++++++++++++++++--
.../ignite/internal/binary/BinaryWriteMode.java | 6 ++
.../internal/binary/BinaryWriterExImpl.java | 66 ++++++++++++++++
.../internal/binary/GridBinaryMarshaller.java | 6 ++
.../binary/builder/BinaryBuilderReader.java | 37 +++++++++
.../processors/odbc/OdbcRequestHandler.java | 2 +
.../binary/BinaryMarshallerSelfTest.java | 59 +++++++++++++++
19 files changed, 432 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/00dd3d81/modules/core/src/main/java/org/apache/ignite/binary/BinaryRawReader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/binary/BinaryRawReader.java b/modules/core/src/main/java/org/apache/ignite/binary/BinaryRawReader.java
index ce059d1..c51a9c6 100644
--- a/modules/core/src/main/java/org/apache/ignite/binary/BinaryRawReader.java
+++ b/modules/core/src/main/java/org/apache/ignite/binary/BinaryRawReader.java
@@ -18,6 +18,7 @@
package org.apache.ignite.binary;
import java.math.BigDecimal;
+import java.sql.Time;
import java.sql.Timestamp;
import java.util.Collection;
import java.util.Date;
@@ -110,6 +111,12 @@ public interface BinaryRawReader {
@Nullable public Timestamp readTimestamp() throws BinaryObjectException;
/**
+ * @return Time.
+ * @throws BinaryObjectException In case of error.
+ */
+ @Nullable public Time readTime() throws BinaryObjectException;
+
+ /**
* @return Object.
* @throws BinaryObjectException In case of error.
*/
@@ -194,6 +201,12 @@ public interface BinaryRawReader {
@Nullable public Timestamp[] readTimestampArray() throws BinaryObjectException;
/**
+ * @return Time array.
+ * @throws BinaryObjectException In case of error.
+ */
+ @Nullable public Time[] readTimeArray() throws BinaryObjectException;
+
+ /**
* @return Object array.
* @throws BinaryObjectException In case of error.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/00dd3d81/modules/core/src/main/java/org/apache/ignite/binary/BinaryRawWriter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/binary/BinaryRawWriter.java b/modules/core/src/main/java/org/apache/ignite/binary/BinaryRawWriter.java
index f283c06..84ce3de 100644
--- a/modules/core/src/main/java/org/apache/ignite/binary/BinaryRawWriter.java
+++ b/modules/core/src/main/java/org/apache/ignite/binary/BinaryRawWriter.java
@@ -18,6 +18,7 @@
package org.apache.ignite.binary;
import java.math.BigDecimal;
+import java.sql.Time;
import java.sql.Timestamp;
import java.util.Collection;
import java.util.Date;
@@ -110,6 +111,12 @@ public interface BinaryRawWriter {
public void writeTimestamp(@Nullable Timestamp val) throws BinaryObjectException;
/**
+ * @param val Time to write.
+ * @throws BinaryObjectException In case of error.
+ */
+ public void writeTime(@Nullable Time val) throws BinaryObjectException;
+
+ /**
* @param obj Value to write.
* @throws BinaryObjectException In case of error.
*/
@@ -197,6 +204,12 @@ public interface BinaryRawWriter {
* @param val Value to write.
* @throws BinaryObjectException In case of error.
*/
+ public void writeTimeArray(@Nullable Time[] val) throws BinaryObjectException;
+
+ /**
+ * @param val Value to write.
+ * @throws BinaryObjectException In case of error.
+ */
public void writeObjectArray(@Nullable Object[] val) throws BinaryObjectException;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/00dd3d81/modules/core/src/main/java/org/apache/ignite/binary/BinaryReader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/binary/BinaryReader.java b/modules/core/src/main/java/org/apache/ignite/binary/BinaryReader.java
index 93a9469..b04e746 100644
--- a/modules/core/src/main/java/org/apache/ignite/binary/BinaryReader.java
+++ b/modules/core/src/main/java/org/apache/ignite/binary/BinaryReader.java
@@ -18,6 +18,7 @@
package org.apache.ignite.binary;
import java.math.BigDecimal;
+import java.sql.Time;
import java.sql.Timestamp;
import java.util.Collection;
import java.util.Date;
@@ -130,6 +131,13 @@ public interface BinaryReader {
/**
* @param fieldName Field name.
+ * @return Time.
+ * @throws BinaryObjectException In case of error.
+ */
+ public Time readTime(String fieldName) throws BinaryObjectException;
+
+ /**
+ * @param fieldName Field name.
* @return Object.
* @throws BinaryObjectException In case of error.
*/
@@ -228,6 +236,13 @@ public interface BinaryReader {
/**
* @param fieldName Field name.
+ * @return Time array.
+ * @throws BinaryObjectException In case of error.
+ */
+ public Time[] readTimeArray(String fieldName) throws BinaryObjectException;
+
+ /**
+ * @param fieldName Field name.
* @return Object array.
* @throws BinaryObjectException In case of error.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/00dd3d81/modules/core/src/main/java/org/apache/ignite/binary/BinaryWriter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/binary/BinaryWriter.java b/modules/core/src/main/java/org/apache/ignite/binary/BinaryWriter.java
index b24b206..541d3d6 100644
--- a/modules/core/src/main/java/org/apache/ignite/binary/BinaryWriter.java
+++ b/modules/core/src/main/java/org/apache/ignite/binary/BinaryWriter.java
@@ -18,6 +18,7 @@
package org.apache.ignite.binary;
import java.math.BigDecimal;
+import java.sql.Time;
import java.sql.Timestamp;
import java.util.Collection;
import java.util.Date;
@@ -131,6 +132,13 @@ public interface BinaryWriter {
/**
* @param fieldName Field name.
+ * @param val Time to write.
+ * @throws BinaryObjectException In case of error.
+ */
+ public void writeTime(String fieldName, @Nullable Time val) throws BinaryObjectException;
+
+ /**
+ * @param fieldName Field name.
* @param obj Value to write.
* @throws BinaryObjectException In case of error.
*/
@@ -232,6 +240,13 @@ public interface BinaryWriter {
* @param val Value to write.
* @throws BinaryObjectException In case of error.
*/
+ public void writeTimeArray(String fieldName, @Nullable Time[] val) throws BinaryObjectException;
+
+ /**
+ * @param fieldName Field name.
+ * @param val Value to write.
+ * @throws BinaryObjectException In case of error.
+ */
public void writeObjectArray(String fieldName, @Nullable Object[] val) throws BinaryObjectException;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/00dd3d81/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
index 3a72a31..b63e674 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
@@ -24,6 +24,7 @@ import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.lang.reflect.Proxy;
import java.math.BigDecimal;
+import java.sql.Time;
import java.sql.Timestamp;
import java.util.Collection;
import java.util.Collections;
@@ -222,6 +223,7 @@ public class BinaryClassDescriptor {
case UUID:
case DATE:
case TIMESTAMP:
+ case TIME:
case BYTE_ARR:
case SHORT_ARR:
case INT_ARR:
@@ -235,6 +237,7 @@ public class BinaryClassDescriptor {
case UUID_ARR:
case DATE_ARR:
case TIMESTAMP_ARR:
+ case TIME_ARR:
case OBJECT_ARR:
case COL:
case MAP:
@@ -611,6 +614,11 @@ public class BinaryClassDescriptor {
break;
+ case TIME:
+ writer.doWriteTime((Time)obj);
+
+ break;
+
case BYTE_ARR:
writer.doWriteByteArray((byte[])obj);
@@ -676,6 +684,11 @@ public class BinaryClassDescriptor {
break;
+ case TIME_ARR:
+ writer.doWriteTimeArray((Time[]) obj);
+
+ break;
+
case OBJECT_ARR:
writer.doWriteObjectArray((Object[])obj);
http://git-wip-us.apache.org/repos/asf/ignite/blob/00dd3d81/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
index b291872..6d4cedd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
@@ -98,6 +98,7 @@ import java.math.BigDecimal;
import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLClassLoader;
+import java.sql.Time;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Collection;
@@ -289,6 +290,7 @@ public class BinaryContext {
registerPredefinedType(BigDecimal.class, GridBinaryMarshaller.DECIMAL);
registerPredefinedType(Date.class, GridBinaryMarshaller.DATE);
registerPredefinedType(Timestamp.class, GridBinaryMarshaller.TIMESTAMP);
+ registerPredefinedType(Time.class, GridBinaryMarshaller.TIME);
registerPredefinedType(UUID.class, GridBinaryMarshaller.UUID);
registerPredefinedType(byte[].class, GridBinaryMarshaller.BYTE_ARR);
@@ -304,6 +306,7 @@ public class BinaryContext {
registerPredefinedType(UUID[].class, GridBinaryMarshaller.UUID_ARR);
registerPredefinedType(Date[].class, GridBinaryMarshaller.DATE_ARR);
registerPredefinedType(Timestamp[].class, GridBinaryMarshaller.TIMESTAMP_ARR);
+ registerPredefinedType(Time[].class, GridBinaryMarshaller.TIME_ARR);
registerPredefinedType(Object[].class, GridBinaryMarshaller.OBJ_ARR);
// Special collections.
http://git-wip-us.apache.org/repos/asf/ignite/blob/00dd3d81/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldAccessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldAccessor.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldAccessor.java
index af33b63..aabb772 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldAccessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldAccessor.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.binary;
import java.lang.reflect.Field;
import java.math.BigDecimal;
+import java.sql.Time;
import java.sql.Timestamp;
import java.util.Collection;
import java.util.Date;
@@ -86,6 +87,7 @@ public abstract class BinaryFieldAccessor {
case UUID:
case DATE:
case TIMESTAMP:
+ case TIME:
case BYTE_ARR:
case SHORT_ARR:
case INT_ARR:
@@ -99,6 +101,7 @@ public abstract class BinaryFieldAccessor {
case UUID_ARR:
case DATE_ARR:
case TIMESTAMP_ARR:
+ case TIME_ARR:
case ENUM_ARR:
case OBJECT_ARR:
case BINARY_OBJ:
@@ -522,6 +525,11 @@ public abstract class BinaryFieldAccessor {
break;
+ case TIME:
+ writer.writeTimeField((Time)val);
+
+ break;
+
case BYTE_ARR:
writer.writeByteArrayField((byte[])val);
@@ -587,6 +595,11 @@ public abstract class BinaryFieldAccessor {
break;
+ case TIME_ARR:
+ writer.writeTimeArrayField((Time[])val);
+
+ break;
+
case OBJECT_ARR:
writer.writeObjectArrayField((Object[])val);
@@ -723,6 +736,11 @@ public abstract class BinaryFieldAccessor {
break;
+ case TIME:
+ val = reader.readTime(id);
+
+ break;
+
case BYTE_ARR:
val = reader.readByteArray(id);
@@ -788,6 +806,11 @@ public abstract class BinaryFieldAccessor {
break;
+ case TIME_ARR:
+ val = reader.readTimeArray(id);
+
+ break;
+
case OBJECT_ARR:
val = reader.readObjectArray(id);
http://git-wip-us.apache.org/repos/asf/ignite/blob/00dd3d81/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMetadataCollector.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMetadataCollector.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMetadataCollector.java
index e8574ef..2585b3b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMetadataCollector.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMetadataCollector.java
@@ -21,6 +21,7 @@ import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.math.BigDecimal;
+import java.sql.Time;
import java.sql.Timestamp;
import java.util.Collection;
import java.util.Date;
@@ -144,6 +145,11 @@ class BinaryMetadataCollector implements BinaryWriter {
}
/** {@inheritDoc} */
+ @Override public void writeTime(String fieldName, @Nullable Time val) throws BinaryObjectException {
+ add(fieldName, BinaryWriteMode.TIME);
+ }
+
+ /** {@inheritDoc} */
@Override public <T extends Enum<?>> void writeEnum(String fieldName, T val) throws BinaryObjectException {
add(fieldName, BinaryWriteMode.ENUM);
}
@@ -224,6 +230,11 @@ class BinaryMetadataCollector implements BinaryWriter {
}
/** {@inheritDoc} */
+ @Override public void writeTimeArray(String fieldName, @Nullable Time[] val) throws BinaryObjectException {
+ add(fieldName, BinaryWriteMode.TIME_ARR);
+ }
+
+ /** {@inheritDoc} */
@Override public void writeObjectArray(String fieldName, @Nullable Object[] val) throws BinaryObjectException {
add(fieldName, BinaryWriteMode.OBJECT_ARR);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/00dd3d81/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
index 360c71a..7a81659 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
@@ -40,6 +40,7 @@ import java.io.ObjectOutput;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.nio.ByteBuffer;
+import java.sql.Time;
import java.sql.Timestamp;
import java.util.Date;
import java.util.UUID;
@@ -430,6 +431,14 @@ public final class BinaryObjectImpl extends BinaryObjectExImpl implements Extern
break;
}
+ case GridBinaryMarshaller.TIME: {
+ long time = BinaryPrimitives.readLong(arr, fieldPos + 1);
+
+ val = new Time(time);
+
+ break;
+ }
+
case GridBinaryMarshaller.UUID: {
long most = BinaryPrimitives.readLong(arr, fieldPos + 1);
long least = BinaryPrimitives.readLong(arr, fieldPos + 1 + 8);
http://git-wip-us.apache.org/repos/asf/ignite/blob/00dd3d81/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java
index f9a31db..3f095f7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java
@@ -24,6 +24,7 @@ import java.io.ObjectOutput;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.nio.ByteBuffer;
+import java.sql.Time;
import java.sql.Timestamp;
import java.util.Date;
import java.util.UUID;
@@ -323,6 +324,14 @@ public class BinaryObjectOffheapImpl extends BinaryObjectExImpl implements Exter
break;
}
+ case GridBinaryMarshaller.TIME: {
+ long time = BinaryPrimitives.readLong(ptr, fieldPos + 1);
+
+ val = new Time(time);
+
+ break;
+ }
+
case GridBinaryMarshaller.UUID: {
long most = BinaryPrimitives.readLong(ptr, fieldPos + 1);
long least = BinaryPrimitives.readLong(ptr, fieldPos + 1 + 8);
http://git-wip-us.apache.org/repos/asf/ignite/blob/00dd3d81/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryReaderExImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryReaderExImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryReaderExImpl.java
index 775f237..246cf57 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryReaderExImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryReaderExImpl.java
@@ -21,6 +21,7 @@ import java.io.EOFException;
import java.io.IOException;
import java.io.ObjectInput;
import java.math.BigDecimal;
+import java.sql.Time;
import java.sql.Timestamp;
import java.util.Collection;
import java.util.Date;
@@ -74,8 +75,10 @@ import static org.apache.ignite.internal.binary.GridBinaryMarshaller.SHORT;
import static org.apache.ignite.internal.binary.GridBinaryMarshaller.SHORT_ARR;
import static org.apache.ignite.internal.binary.GridBinaryMarshaller.STRING;
import static org.apache.ignite.internal.binary.GridBinaryMarshaller.STRING_ARR;
+import static org.apache.ignite.internal.binary.GridBinaryMarshaller.TIME;
import static org.apache.ignite.internal.binary.GridBinaryMarshaller.TIMESTAMP;
import static org.apache.ignite.internal.binary.GridBinaryMarshaller.TIMESTAMP_ARR;
+import static org.apache.ignite.internal.binary.GridBinaryMarshaller.TIME_ARR;
import static org.apache.ignite.internal.binary.GridBinaryMarshaller.UNREGISTERED_TYPE_ID;
import static org.apache.ignite.internal.binary.GridBinaryMarshaller.UUID;
import static org.apache.ignite.internal.binary.GridBinaryMarshaller.UUID_ARR;
@@ -1105,6 +1108,51 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina
}
/** {@inheritDoc} */
+ @Override @Nullable public Time readTime(String fieldName) throws BinaryObjectException {
+ return findFieldByName(fieldName) ? this.readTime() : null;
+ }
+
+ /** {@inheritDoc} */
+ @Override @Nullable public Time readTime() throws BinaryObjectException {
+ return checkFlagNoHandles(TIME) == Flag.NORMAL ? BinaryUtils.doReadTime(in) : null;
+ }
+
+ /** {@inheritDoc} */
+ @Override @Nullable public Time[] readTimeArray(String fieldName) throws BinaryObjectException {
+ return findFieldByName(fieldName) ? this.readTimeArray() : null;
+ }
+
+ /**
+ * @param fieldId Field ID.
+ * @return Value.
+ * @throws BinaryObjectException In case of error.
+ */
+ @Nullable Time readTime(int fieldId) throws BinaryObjectException {
+ return findFieldById(fieldId) ? this.readTime() : null;
+ }
+
+ /**
+ * @param fieldId Field ID.
+ * @return Value.
+ * @throws BinaryObjectException In case of error.
+ */
+ @Nullable Time[] readTimeArray(int fieldId) throws BinaryObjectException {
+ return findFieldById(fieldId) ? this.readTimeArray() : null;
+ }
+
+ /** {@inheritDoc} */
+ @Override @Nullable public Time[] readTimeArray() throws BinaryObjectException {
+ switch (checkFlag(TIME_ARR)) {
+ case NORMAL:
+ return BinaryUtils.doReadTimeArray(in);
+ case HANDLE:
+ return readHandleField();
+ default:
+ return null;
+ }
+ }
+
+ /** {@inheritDoc} */
@SuppressWarnings("unchecked")
@Nullable @Override public <T> T readObject(String fieldName) throws BinaryObjectException {
return findFieldByName(fieldName) ? (T)BinaryUtils.doReadObject(in, ctx, ldr, this) : null;
@@ -1566,6 +1614,11 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina
break;
+ case TIME:
+ obj = BinaryUtils.doReadTime(in);
+
+ break;
+
case BYTE_ARR:
obj = BinaryUtils.doReadByteArray(in);
@@ -1631,6 +1684,11 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina
break;
+ case TIME_ARR:
+ obj = BinaryUtils.doReadTimeArray(in);
+
+ break;
+
case OBJ_ARR:
obj = BinaryUtils.doReadObjectArray(in, ctx, ldr, this, true);
http://git-wip-us.apache.org/repos/asf/ignite/blob/00dd3d81/modules/core/src/main/java/org/apache/ignite/internal/binary/BinarySerializedFieldComparator.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinarySerializedFieldComparator.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinarySerializedFieldComparator.java
index 130bb0c..4375073 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinarySerializedFieldComparator.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinarySerializedFieldComparator.java
@@ -229,6 +229,9 @@ public class BinarySerializedFieldComparator {
case GridBinaryMarshaller.TIMESTAMP:
return c1.readLong(1) == c2.readLong(1) && c1.readInt(1 + 8) == c2.readInt(1 + 8);
+ case GridBinaryMarshaller.TIME:
+ return c1.readLong(1) == c2.readLong(1);
+
case GridBinaryMarshaller.UUID:
return c1.readLong(1) == c2.readLong(1) && c1.readLong(1 + 8) == c2.readLong(1 + 8);
http://git-wip-us.apache.org/repos/asf/ignite/blob/00dd3d81/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
index 6831ef9..2b55b6c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
@@ -28,6 +28,7 @@ import java.lang.reflect.Modifier;
import java.lang.reflect.Proxy;
import java.math.BigDecimal;
import java.math.BigInteger;
+import java.sql.Time;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Collection;
@@ -158,6 +159,7 @@ public class BinaryUtils {
PLAIN_CLASS_TO_FLAG.put(UUID.class, GridBinaryMarshaller.UUID);
PLAIN_CLASS_TO_FLAG.put(Date.class, GridBinaryMarshaller.DATE);
PLAIN_CLASS_TO_FLAG.put(Timestamp.class, GridBinaryMarshaller.TIMESTAMP);
+ PLAIN_CLASS_TO_FLAG.put(Time.class, GridBinaryMarshaller.TIME);
PLAIN_CLASS_TO_FLAG.put(byte[].class, GridBinaryMarshaller.BYTE_ARR);
PLAIN_CLASS_TO_FLAG.put(short[].class, GridBinaryMarshaller.SHORT_ARR);
@@ -172,6 +174,7 @@ public class BinaryUtils {
PLAIN_CLASS_TO_FLAG.put(UUID[].class, GridBinaryMarshaller.UUID_ARR);
PLAIN_CLASS_TO_FLAG.put(Date[].class, GridBinaryMarshaller.DATE_ARR);
PLAIN_CLASS_TO_FLAG.put(Timestamp[].class, GridBinaryMarshaller.TIMESTAMP_ARR);
+ PLAIN_CLASS_TO_FLAG.put(Time[].class, GridBinaryMarshaller.TIME_ARR);
for (Map.Entry<Class<?>, Byte> entry : PLAIN_CLASS_TO_FLAG.entrySet())
FLAG_TO_CLASS.put(entry.getValue(), entry.getKey());
@@ -187,8 +190,8 @@ public class BinaryUtils {
for (byte b : new byte[] {
GridBinaryMarshaller.BYTE, GridBinaryMarshaller.SHORT, GridBinaryMarshaller.INT, GridBinaryMarshaller.LONG, GridBinaryMarshaller.FLOAT, GridBinaryMarshaller.DOUBLE,
- GridBinaryMarshaller.CHAR, GridBinaryMarshaller.BOOLEAN, GridBinaryMarshaller.DECIMAL, GridBinaryMarshaller.STRING, GridBinaryMarshaller.UUID, GridBinaryMarshaller.DATE, GridBinaryMarshaller.TIMESTAMP,
- GridBinaryMarshaller.BYTE_ARR, GridBinaryMarshaller.SHORT_ARR, GridBinaryMarshaller.INT_ARR, GridBinaryMarshaller.LONG_ARR, GridBinaryMarshaller.FLOAT_ARR, GridBinaryMarshaller.DOUBLE_ARR,
+ GridBinaryMarshaller.CHAR, GridBinaryMarshaller.BOOLEAN, GridBinaryMarshaller.DECIMAL, GridBinaryMarshaller.STRING, GridBinaryMarshaller.UUID, GridBinaryMarshaller.DATE, GridBinaryMarshaller.TIMESTAMP, GridBinaryMarshaller.TIME,
+ GridBinaryMarshaller.BYTE_ARR, GridBinaryMarshaller.SHORT_ARR, GridBinaryMarshaller.INT_ARR, GridBinaryMarshaller.LONG_ARR, GridBinaryMarshaller.FLOAT_ARR, GridBinaryMarshaller.DOUBLE_ARR, GridBinaryMarshaller.TIME_ARR,
GridBinaryMarshaller.CHAR_ARR, GridBinaryMarshaller.BOOLEAN_ARR, GridBinaryMarshaller.DECIMAL_ARR, GridBinaryMarshaller.STRING_ARR, GridBinaryMarshaller.UUID_ARR, GridBinaryMarshaller.DATE_ARR, GridBinaryMarshaller.TIMESTAMP_ARR,
GridBinaryMarshaller.ENUM, GridBinaryMarshaller.ENUM_ARR, GridBinaryMarshaller.NULL}) {
@@ -207,6 +210,7 @@ public class BinaryUtils {
BINARY_CLS.add(UUID.class);
BINARY_CLS.add(Date.class);
BINARY_CLS.add(Timestamp.class);
+ BINARY_CLS.add(Time.class);
BINARY_CLS.add(BigDecimal.class);
BINARY_CLS.add(byte[].class);
BINARY_CLS.add(short[].class);
@@ -220,6 +224,7 @@ public class BinaryUtils {
BINARY_CLS.add(UUID[].class);
BINARY_CLS.add(Date[].class);
BINARY_CLS.add(Timestamp[].class);
+ BINARY_CLS.add(Time[].class);
BINARY_CLS.add(BigDecimal[].class);
FIELD_TYPE_NAMES = new String[104];
@@ -237,6 +242,7 @@ public class BinaryUtils {
FIELD_TYPE_NAMES[GridBinaryMarshaller.STRING] = "String";
FIELD_TYPE_NAMES[GridBinaryMarshaller.DATE] = "Date";
FIELD_TYPE_NAMES[GridBinaryMarshaller.TIMESTAMP] = "Timestamp";
+ FIELD_TYPE_NAMES[GridBinaryMarshaller.TIME] = "Time";
FIELD_TYPE_NAMES[GridBinaryMarshaller.ENUM] = "Enum";
FIELD_TYPE_NAMES[GridBinaryMarshaller.OBJ] = "Object";
FIELD_TYPE_NAMES[GridBinaryMarshaller.BINARY_OBJ] = "Object";
@@ -256,6 +262,7 @@ public class BinaryUtils {
FIELD_TYPE_NAMES[GridBinaryMarshaller.STRING_ARR] = "String[]";
FIELD_TYPE_NAMES[GridBinaryMarshaller.DATE_ARR] = "Date[]";
FIELD_TYPE_NAMES[GridBinaryMarshaller.TIMESTAMP_ARR] = "Timestamp[]";
+ FIELD_TYPE_NAMES[GridBinaryMarshaller.TIME_ARR] = "Time[]";
FIELD_TYPE_NAMES[GridBinaryMarshaller.OBJ_ARR] = "Object[]";
FIELD_TYPE_NAMES[GridBinaryMarshaller.ENUM_ARR] = "Enum[]";
@@ -445,6 +452,11 @@ public class BinaryUtils {
break;
+ case GridBinaryMarshaller.TIME:
+ writer.doWriteTime((Time)val);
+
+ break;
+
case GridBinaryMarshaller.BYTE_ARR:
writer.doWriteByteArray((byte[])val);
@@ -510,6 +522,11 @@ public class BinaryUtils {
break;
+ case GridBinaryMarshaller.TIME_ARR:
+ writer.doWriteTimeArray((Time[])val);
+
+ break;
+
default:
throw new IllegalArgumentException("Can't write object with type: " + val.getClass());
}
@@ -560,7 +577,8 @@ public class BinaryUtils {
* @return {@code true} if content of serialized array value cannot contain references to other object.
*/
public static boolean isPlainArrayType(int type) {
- return (type >= GridBinaryMarshaller.BYTE_ARR && type <= GridBinaryMarshaller.DATE_ARR) || type == GridBinaryMarshaller.TIMESTAMP_ARR;
+ return (type >= GridBinaryMarshaller.BYTE_ARR && type <= GridBinaryMarshaller.DATE_ARR)
+ || type == GridBinaryMarshaller.TIMESTAMP_ARR || type == GridBinaryMarshaller.TIME_ARR;
}
/**
@@ -577,7 +595,8 @@ public class BinaryUtils {
return GridBinaryMarshaller.ENUM;
if (cls.isArray())
- return cls.getComponentType().isEnum() || cls.getComponentType() == Enum.class ? GridBinaryMarshaller.ENUM_ARR : GridBinaryMarshaller.OBJ_ARR;
+ return cls.getComponentType().isEnum() || cls.getComponentType() == Enum.class ?
+ GridBinaryMarshaller.ENUM_ARR : GridBinaryMarshaller.OBJ_ARR;
if (isSpecialCollection(cls))
return GridBinaryMarshaller.COL;
@@ -695,7 +714,7 @@ public class BinaryUtils {
return cls == byte[].class || cls == short[].class || cls == int[].class || cls == long[].class ||
cls == float[].class || cls == double[].class || cls == char[].class || cls == boolean[].class ||
cls == String[].class || cls == UUID[].class || cls == Date[].class || cls == Timestamp[].class ||
- cls == BigDecimal[].class;
+ cls == BigDecimal[].class || cls == Time[].class;
}
/**
@@ -1000,7 +1019,7 @@ public class BinaryUtils {
public static BinaryWriteMode mode(Class<?> cls) {
assert cls != null;
- /** Primitives. */
+ // Primitives.
if (cls == byte.class)
return BinaryWriteMode.P_BYTE;
else if (cls == boolean.class)
@@ -1018,7 +1037,7 @@ public class BinaryUtils {
else if (cls == double.class)
return BinaryWriteMode.P_DOUBLE;
- /** Boxed primitives. */
+ // Boxed primitives.
else if (cls == Byte.class)
return BinaryWriteMode.BYTE;
else if (cls == Boolean.class)
@@ -1036,7 +1055,7 @@ public class BinaryUtils {
else if (cls == Double.class)
return BinaryWriteMode.DOUBLE;
- /** The rest types. */
+ // The rest types.
else if (cls == BigDecimal.class)
return BinaryWriteMode.DECIMAL;
else if (cls == String.class)
@@ -1047,6 +1066,8 @@ public class BinaryUtils {
return BinaryWriteMode.DATE;
else if (cls == Timestamp.class)
return BinaryWriteMode.TIMESTAMP;
+ else if (cls == Time.class)
+ return BinaryWriteMode.TIME;
else if (cls == byte[].class)
return BinaryWriteMode.BYTE_ARR;
else if (cls == short[].class)
@@ -1073,6 +1094,8 @@ public class BinaryUtils {
return BinaryWriteMode.DATE_ARR;
else if (cls == Timestamp[].class)
return BinaryWriteMode.TIMESTAMP_ARR;
+ else if (cls == Time[].class)
+ return BinaryWriteMode.TIME_ARR;
else if (cls.isArray())
return cls.getComponentType().isEnum() ? BinaryWriteMode.ENUM_ARR : BinaryWriteMode.OBJECT_ARR;
else if (cls == BinaryObjectImpl.class)
@@ -1270,6 +1293,15 @@ public class BinaryUtils {
/**
* @return Value.
+ */
+ public static Time doReadTime(BinaryInputStream in) {
+ long time = in.readLong();
+
+ return new Time(time);
+ }
+
+ /**
+ * @return Value.
* @throws BinaryObjectException In case of error.
*/
public static BigDecimal[] doReadDecimalArray(BinaryInputStream in) throws BinaryObjectException {
@@ -1395,6 +1427,31 @@ public class BinaryUtils {
/**
* @return Value.
+ * @throws BinaryObjectException In case of error.
+ */
+ public static Time[] doReadTimeArray(BinaryInputStream in) throws BinaryObjectException {
+ int len = in.readInt();
+
+ Time[] arr = new Time[len];
+
+ for (int i = 0; i < len; i++) {
+ byte flag = in.readByte();
+
+ if (flag == GridBinaryMarshaller.NULL)
+ arr[i] = null;
+ else {
+ if (flag != GridBinaryMarshaller.TIME)
+ throw new BinaryObjectException("Invalid flag value: " + flag);
+
+ arr[i] = doReadTime(in);
+ }
+ }
+
+ return arr;
+ }
+
+ /**
+ * @return Value.
*/
public static BinaryObject doReadBinaryObject(BinaryInputStream in, BinaryContext ctx) {
if (in.offheapPointer() > 0) {
@@ -1759,6 +1816,9 @@ public class BinaryUtils {
case GridBinaryMarshaller.TIMESTAMP:
return doReadTimestamp(in);
+ case GridBinaryMarshaller.TIME:
+ return doReadTime(in);
+
case GridBinaryMarshaller.BYTE_ARR:
return doReadByteArray(in);
@@ -1798,6 +1858,9 @@ public class BinaryUtils {
case GridBinaryMarshaller.TIMESTAMP_ARR:
return doReadTimestampArray(in);
+ case GridBinaryMarshaller.TIME_ARR:
+ return doReadTimeArray(in);
+
case GridBinaryMarshaller.OBJ_ARR:
return doReadObjectArray(in, ctx, ldr, handles, false);
http://git-wip-us.apache.org/repos/asf/ignite/blob/00dd3d81/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriteMode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriteMode.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriteMode.java
index 7e8c9bd..fb000a0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriteMode.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriteMode.java
@@ -85,6 +85,9 @@ public enum BinaryWriteMode {
TIMESTAMP(GridBinaryMarshaller.TIMESTAMP),
/** */
+ TIME(GridBinaryMarshaller.TIME),
+
+ /** */
BYTE_ARR(GridBinaryMarshaller.BYTE_ARR),
/** */
@@ -124,6 +127,9 @@ public enum BinaryWriteMode {
TIMESTAMP_ARR(GridBinaryMarshaller.TIMESTAMP_ARR),
/** */
+ TIME_ARR(GridBinaryMarshaller.TIME_ARR),
+
+ /** */
OBJECT_ARR(GridBinaryMarshaller.OBJ_ARR),
/** */
http://git-wip-us.apache.org/repos/asf/ignite/blob/00dd3d81/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java
index 3289780..ba4822f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java
@@ -23,6 +23,7 @@ import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Proxy;
import java.math.BigDecimal;
import java.math.BigInteger;
+import java.sql.Time;
import java.sql.Timestamp;
import java.util.Collection;
import java.util.Date;
@@ -486,6 +487,19 @@ public class BinaryWriterExImpl implements BinaryWriter, BinaryRawWriterEx, Obje
}
/**
+ * @param time Time.
+ */
+ public void doWriteTime(@Nullable Time time) {
+ if (time== null)
+ out.writeByte(GridBinaryMarshaller.NULL);
+ else {
+ out.unsafeEnsure(1 + 8);
+ out.unsafeWriteByte(GridBinaryMarshaller.TIME);
+ out.unsafeWriteLong(time.getTime());
+ }
+ }
+
+ /**
* Write object.
*
* @param obj Object.
@@ -702,6 +716,22 @@ public class BinaryWriterExImpl implements BinaryWriter, BinaryRawWriterEx, Obje
}
/**
+ * @param val Array of time.
+ */
+ void doWriteTimeArray(@Nullable Time[] val) {
+ if (val == null)
+ out.writeByte(GridBinaryMarshaller.NULL);
+ else {
+ out.unsafeEnsure(1 + 4);
+ out.unsafeWriteByte(GridBinaryMarshaller.TIME_ARR);
+ out.unsafeWriteInt(val.length);
+
+ for (Time time : val)
+ doWriteTime(time);
+ }
+ }
+
+ /**
* @param val Array of objects.
* @throws org.apache.ignite.binary.BinaryObjectException In case of error.
*/
@@ -1126,6 +1156,13 @@ public class BinaryWriterExImpl implements BinaryWriter, BinaryRawWriterEx, Obje
}
/**
+ * @param val Value.
+ */
+ void writeTimeField(@Nullable Time val) {
+ doWriteTime(val);
+ }
+
+ /**
* @param obj Object.
* @throws org.apache.ignite.binary.BinaryObjectException In case of error.
*/
@@ -1226,6 +1263,13 @@ public class BinaryWriterExImpl implements BinaryWriter, BinaryRawWriterEx, Obje
/**
* @param val Value.
+ */
+ void writeTimeArrayField(@Nullable Time[] val) {
+ doWriteTimeArray(val);
+ }
+
+ /**
+ * @param val Value.
* @throws org.apache.ignite.binary.BinaryObjectException In case of error.
*/
void writeObjectArrayField(@Nullable Object[] val) throws BinaryObjectException {
@@ -1414,6 +1458,17 @@ public class BinaryWriterExImpl implements BinaryWriter, BinaryRawWriterEx, Obje
}
/** {@inheritDoc} */
+ @Override public void writeTime(String fieldName, @Nullable Time val) throws BinaryObjectException {
+ writeFieldId(fieldName);
+ writeTimeField(val);
+ }
+
+ /** {@inheritDoc} */
+ @Override public void writeTime(@Nullable Time val) throws BinaryObjectException {
+ doWriteTime(val);
+ }
+
+ /** {@inheritDoc} */
@Override public void writeObject(String fieldName, @Nullable Object obj) throws BinaryObjectException {
writeFieldId(fieldName);
writeObjectField(obj);
@@ -1582,6 +1637,17 @@ public class BinaryWriterExImpl implements BinaryWriter, BinaryRawWriterEx, Obje
doWriteTimestampArray(val);
}
+ /** {@inheritDoc} */
+ @Override public void writeTimeArray(String fieldName, @Nullable Time[] val) throws BinaryObjectException {
+ writeFieldId(fieldName);
+ writeTimeArrayField(val);
+ }
+
+ /** {@inheritDoc} */
+ @Override public void writeTimeArray(@Nullable Time[] val) throws BinaryObjectException {
+ doWriteTimeArray(val);
+ }
+
/** {@inheritDoc} */
@Override public void writeObjectArray(String fieldName, @Nullable Object[] val) throws BinaryObjectException {
writeFieldId(fieldName);
http://git-wip-us.apache.org/repos/asf/ignite/blob/00dd3d81/modules/core/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
index 624fa33..8616155 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
@@ -147,6 +147,12 @@ public class GridBinaryMarshaller {
/** Proxy. */
public static final byte PROXY = 35;
+ /** Time. */
+ public static final byte TIME = 36;
+
+ /** Time array. */
+ public static final byte TIME_ARR = 37;
+
/** */
public static final byte NULL = (byte)101;
http://git-wip-us.apache.org/repos/asf/ignite/blob/00dd3d81/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderReader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderReader.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderReader.java
index baaabd6..9cd032d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderReader.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderReader.java
@@ -29,6 +29,7 @@ import org.apache.ignite.internal.binary.BinarySchema;
import org.apache.ignite.internal.binary.streams.BinaryHeapInputStream;
import org.apache.ignite.internal.binary.BinaryUtils;
+import java.sql.Time;
import java.sql.Timestamp;
import java.util.Date;
import java.util.HashMap;
@@ -292,6 +293,11 @@ public class BinaryBuilderReader implements BinaryPositionReadable {
break;
+ case GridBinaryMarshaller.TIME:
+ len = 8;
+
+ break;
+
case GridBinaryMarshaller.CHAR_ARR:
case GridBinaryMarshaller.SHORT_ARR:
len = 4 + readLength() * 2;
@@ -313,6 +319,7 @@ public class BinaryBuilderReader implements BinaryPositionReadable {
case GridBinaryMarshaller.DECIMAL_ARR:
case GridBinaryMarshaller.DATE_ARR:
case GridBinaryMarshaller.TIMESTAMP_ARR:
+ case GridBinaryMarshaller.TIME_ARR:
case GridBinaryMarshaller.OBJ_ARR:
case GridBinaryMarshaller.ENUM_ARR:
case GridBinaryMarshaller.UUID_ARR:
@@ -428,6 +435,7 @@ public class BinaryBuilderReader implements BinaryPositionReadable {
case GridBinaryMarshaller.UUID:
case GridBinaryMarshaller.DATE:
case GridBinaryMarshaller.TIMESTAMP:
+ case GridBinaryMarshaller.TIME:
return new BinaryPlainLazyValue(this, pos, len);
case GridBinaryMarshaller.BYTE_ARR:
@@ -441,6 +449,7 @@ public class BinaryBuilderReader implements BinaryPositionReadable {
case GridBinaryMarshaller.DECIMAL_ARR:
case GridBinaryMarshaller.DATE_ARR:
case GridBinaryMarshaller.TIMESTAMP_ARR:
+ case GridBinaryMarshaller.TIME_ARR:
case GridBinaryMarshaller.UUID_ARR:
case GridBinaryMarshaller.STRING_ARR:
case GridBinaryMarshaller.ENUM_ARR:
@@ -587,6 +596,11 @@ public class BinaryBuilderReader implements BinaryPositionReadable {
break;
+ case GridBinaryMarshaller.TIME:
+ plainLazyValLen = 8;
+
+ break;
+
case GridBinaryMarshaller.BYTE_ARR:
plainLazyValLen = 4 + readLength();
modifiableLazyVal = true;
@@ -693,6 +707,29 @@ public class BinaryBuilderReader implements BinaryPositionReadable {
return res;
}
+ case GridBinaryMarshaller.TIME_ARR: {
+ int size = readInt();
+
+ Time[] res = new Time[size];
+
+ for (int i = 0; i < res.length; i++) {
+ byte flag = arr[pos++];
+
+ if (flag == GridBinaryMarshaller.NULL) continue;
+
+ if (flag != GridBinaryMarshaller.TIME)
+ throw new BinaryObjectException("Invalid flag value: " + flag);
+
+ long time = BinaryPrimitives.readLong(arr, pos);
+
+ pos += 8;
+
+ res[i] = new Time(time);
+ }
+
+ return res;
+ }
+
case GridBinaryMarshaller.UUID_ARR:
case GridBinaryMarshaller.STRING_ARR:
case GridBinaryMarshaller.DECIMAL_ARR: {
http://git-wip-us.apache.org/repos/asf/ignite/blob/00dd3d81/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcRequestHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcRequestHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcRequestHandler.java
index f922d9a..311d2eb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcRequestHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcRequestHandler.java
@@ -473,6 +473,8 @@ public class OdbcRequestHandler {
return GridBinaryMarshaller.SHORT;
case Types.TIME:
+ return GridBinaryMarshaller.TIME;
+
case Types.TIMESTAMP:
return GridBinaryMarshaller.TIMESTAMP;
http://git-wip-us.apache.org/repos/asf/ignite/blob/00dd3d81/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
index 2d43559..5bfc95c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
@@ -31,6 +31,7 @@ import java.math.BigDecimal;
import java.math.BigInteger;
import java.math.RoundingMode;
import java.net.InetSocketAddress;
+import java.sql.Time;
import java.sql.Timestamp;
import java.util.AbstractQueue;
import java.util.ArrayList;
@@ -316,6 +317,22 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ public void testTime() throws Exception {
+ Time time = new Time(System.currentTimeMillis());
+ assertEquals(time, marshalUnmarshal(time));
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testTimeArray() throws Exception {
+ Time[] times = new Time[]{new Time(System.currentTimeMillis()), new Time(123456789)};
+ assertArrayEquals(times, marshalUnmarshal(times));
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
public void testByteArray() throws Exception {
byte[] arr = new byte[] {10, 20, 30};
@@ -629,10 +646,14 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
Date date = new Date();
Timestamp ts = new Timestamp(System.currentTimeMillis());
+ Time time = new Time(System.currentTimeMillis());
+ Time[] timeArr = new Time[]{time, new Time(date.getTime()), new Time(System.currentTimeMillis())};
DateClass1 obj1 = new DateClass1();
obj1.date = date;
obj1.ts = ts;
+ obj1.time = time;
+ obj1.timeArr = timeArr;
BinaryObject po1 = marshal(obj1, marsh);
@@ -640,10 +661,16 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
assertEquals(Date.class, po1.field("date").getClass());
assertEquals(ts, po1.field("ts"));
assertEquals(Timestamp.class, po1.field("ts").getClass());
+ assertEquals(time, po1.field("time"));
+ assertEquals(Time.class, po1.field("time").getClass());
+ assertArrayEquals(timeArr, (Object[])po1.field("timeArr"));
+ assertEquals(Time[].class, po1.field("timeArr").getClass());
obj1 = po1.deserialize();
assertEquals(date, obj1.date);
assertEquals(ts, obj1.ts);
+ assertEquals(time, obj1.time);
+ assertArrayEquals(timeArr, obj1.timeArr);
}
/**
@@ -3976,6 +4003,9 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
private Timestamp ts;
/** */
+ private Time time;
+
+ /** */
private byte[] bArr;
/** */
@@ -4009,6 +4039,9 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
private Date[] dateArr;
/** */
+ private Time[] timeArr;
+
+ /** */
private Object[] objArr;
/** */
@@ -4124,6 +4157,12 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
private Timestamp tsRaw;
/** */
+ private Time time;
+
+ /** */
+ private Time timeRaw;
+
+ /** */
private byte[] bArr;
/** */
@@ -4190,6 +4229,12 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
private Date[] dateArrRaw;
/** */
+ private Time[] timeArr;
+
+ /** */
+ private Time[] timeArrRaw;
+
+ /** */
private Object[] objArr;
/** */
@@ -4245,6 +4290,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
writer.writeUuid("_uuid", uuid);
writer.writeDate("_date", date);
writer.writeTimestamp("_ts", ts);
+ writer.writeTime("_time", time);
writer.writeByteArray("_bArr", bArr);
writer.writeShortArray("_sArr", sArr);
writer.writeIntArray("_iArr", iArr);
@@ -4256,6 +4302,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
writer.writeStringArray("_strArr", strArr);
writer.writeUuidArray("_uuidArr", uuidArr);
writer.writeDateArray("_dateArr", dateArr);
+ writer.writeTimeArray("_timeArr", timeArr);
writer.writeObjectArray("_objArr", objArr);
writer.writeCollection("_col", col);
writer.writeMap("_map", map);
@@ -4278,6 +4325,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
raw.writeUuid(uuidRaw);
raw.writeDate(dateRaw);
raw.writeTimestamp(tsRaw);
+ raw.writeTime(timeRaw);
raw.writeByteArray(bArrRaw);
raw.writeShortArray(sArrRaw);
raw.writeIntArray(iArrRaw);
@@ -4289,6 +4337,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
raw.writeStringArray(strArrRaw);
raw.writeUuidArray(uuidArrRaw);
raw.writeDateArray(dateArrRaw);
+ raw.writeTimeArray(timeArrRaw);
raw.writeObjectArray(objArrRaw);
raw.writeCollection(colRaw);
raw.writeMap(mapRaw);
@@ -4312,6 +4361,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
uuid = reader.readUuid("_uuid");
date = reader.readDate("_date");
ts = reader.readTimestamp("_ts");
+ time = reader.readTime("_time");
bArr = reader.readByteArray("_bArr");
sArr = reader.readShortArray("_sArr");
iArr = reader.readIntArray("_iArr");
@@ -4323,6 +4373,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
strArr = reader.readStringArray("_strArr");
uuidArr = reader.readUuidArray("_uuidArr");
dateArr = reader.readDateArray("_dateArr");
+ timeArr = reader.readTimeArray("_timeArr");
objArr = reader.readObjectArray("_objArr");
col = reader.readCollection("_col");
map = reader.readMap("_map");
@@ -4345,6 +4396,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
uuidRaw = raw.readUuid();
dateRaw = raw.readDate();
tsRaw = raw.readTimestamp();
+ timeRaw = raw.readTime();
bArrRaw = raw.readByteArray();
sArrRaw = raw.readShortArray();
iArrRaw = raw.readIntArray();
@@ -4356,6 +4408,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
strArrRaw = raw.readStringArray();
uuidArrRaw = raw.readUuidArray();
dateArrRaw = raw.readDateArray();
+ timeArrRaw = raw.readTimeArray();
objArrRaw = raw.readObjectArray();
colRaw = raw.readCollection();
mapRaw = raw.readMap();
@@ -4873,6 +4926,12 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/** */
private Timestamp ts;
+
+ /** */
+ private Time time;
+
+ /** */
+ private Time[] timeArr;
}
/**
[24/50] [abbrv] ignite git commit: IGNITE-4159: fixing logging
Posted by vo...@apache.org.
IGNITE-4159: fixing logging
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/06908d29
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/06908d29
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/06908d29
Branch: refs/heads/ignite-4565-ddl
Commit: 06908d29e0f2687fc31885f7fae5e436801a2c11
Parents: ee832e4
Author: Denis Magda <dm...@gridgain.com>
Authored: Wed Feb 15 20:37:26 2017 -0800
Committer: Denis Magda <dm...@gridgain.com>
Committed: Wed Feb 15 20:37:26 2017 -0800
----------------------------------------------------------------------
.../ipfinder/kubernetes/TcpDiscoveryKubernetesIpFinder.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/06908d29/modules/kubernetes/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/kubernetes/TcpDiscoveryKubernetesIpFinder.java
----------------------------------------------------------------------
diff --git a/modules/kubernetes/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/kubernetes/TcpDiscoveryKubernetesIpFinder.java b/modules/kubernetes/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/kubernetes/TcpDiscoveryKubernetesIpFinder.java
index f312195..53b6df6 100644
--- a/modules/kubernetes/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/kubernetes/TcpDiscoveryKubernetesIpFinder.java
+++ b/modules/kubernetes/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/kubernetes/TcpDiscoveryKubernetesIpFinder.java
@@ -137,7 +137,8 @@ public class TcpDiscoveryKubernetesIpFinder extends TcpDiscoveryIpFinderAdapter
Collection<InetSocketAddress> addrs = new ArrayList<>();
try {
- log.debug("Getting Apache Ignite endpoints from: " + url);
+ if (log.isDebugEnabled())
+ log.debug("Getting Apache Ignite endpoints from: " + url);
HttpsURLConnection conn = (HttpsURLConnection)url.openConnection();
@@ -159,7 +160,8 @@ public class TcpDiscoveryKubernetesIpFinder extends TcpDiscoveryIpFinderAdapter
for (Address address : subset.addresses) {
addrs.add(new InetSocketAddress(address.ip, 0));
- log.debug("Added an address to the list: " + address.ip);
+ if (log.isDebugEnabled())
+ log.debug("Added an address to the list: " + address.ip);
}
}
}
[44/50] [abbrv] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-2.0
Posted by vo...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into ignite-2.0
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
# modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e1d8224c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e1d8224c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e1d8224c
Branch: refs/heads/ignite-4565-ddl
Commit: e1d8224c156a11dbdd79da20437edd75cc818dc4
Parents: 0d2d5b3
Author: sboikov <sb...@gridgain.com>
Authored: Mon Feb 20 14:44:26 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Feb 20 14:46:02 2017 +0300
----------------------------------------------------------------------
.../managers/discovery/GridDiscoveryManager.java | 13 +++++++------
.../processors/marshaller/ClientRequestFuture.java | 2 +-
2 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e1d8224c/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index e0d4593..def811b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -17,8 +17,6 @@
package org.apache.ignite.internal.managers.discovery;
-import java.io.Serializable;
-import java.io.Externalizable;
import java.lang.management.GarbageCollectorMXBean;
import java.lang.management.ManagementFactory;
import java.lang.management.MemoryMXBean;
@@ -1555,8 +1553,8 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
}
/** @return all alive server nodes is topology */
- public Collection<ClusterNode> aliveSrvNodes() {
- return discoCache().aliveSrvNodes();
+ public Collection<ClusterNode> aliveServerNodes() {
+ return discoCache().aliveServerNodes();
}
/** @return Full topology size. */
@@ -2525,6 +2523,9 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
/** Highest node order. */
private final long maxOrder;
+ /** Alive server nodes */
+ private final Collection<ClusterNode> aliveSrvNodes;
+
/**
* Cached alive server remote nodes with caches.
*/
@@ -2728,9 +2729,9 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
}
/**
- * Gets all alive server nodes.
+ * @return All alive server nodes.
*/
- Collection<ClusterNode> aliveSrvNodes() {
+ Collection<ClusterNode> aliveServerNodes() {
return aliveSrvNodes;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/e1d8224c/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/ClientRequestFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/ClientRequestFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/ClientRequestFuture.java
index a361760..773dabe 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/ClientRequestFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/ClientRequestFuture.java
@@ -77,7 +77,7 @@ final class ClientRequestFuture extends GridFutureAdapter<MappingExchangeResult>
) {
ioMgr = ctx.io();
discoMgr = ctx.discovery();
- aliveSrvNodes = new LinkedList<>(discoMgr.aliveSrvNodes());
+ aliveSrvNodes = new LinkedList<>(discoMgr.aliveServerNodes());
this.item = item;
this.syncMap = syncMap;
[46/50] [abbrv] ignite git commit: IGNITE-3625: IGFS: "meta" and
"data" caches are now configured inside IGFS bean. This closes #923. This
closes #972.
Posted by vo...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/hadoop/src/test/config/igfs-cli-config-dual-async.xml
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/config/igfs-cli-config-dual-async.xml b/modules/hadoop/src/test/config/igfs-cli-config-dual-async.xml
index 6fc38cd..bd2ae87 100644
--- a/modules/hadoop/src/test/config/igfs-cli-config-dual-async.xml
+++ b/modules/hadoop/src/test/config/igfs-cli-config-dual-async.xml
@@ -60,39 +60,6 @@
</property>
<!--
- Configure caches where IGFS will store data.
- -->
- <property name="cacheConfiguration">
- <list>
- <!--
- Configure metadata cache where file system structure will be stored. It must be TRANSACTIONAL,
- and must have backups to maintain file system consistency in case of node crash.
- -->
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="replicated"/>
- <property name="cacheMode" value="REPLICATED"/>
- <property name="atomicityMode" value="TRANSACTIONAL"/>
- </bean>
-
- <!--
- Configure data cache where file's data will be stored.
- -->
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="partitioned"/>
- <property name="atomicityMode" value="TRANSACTIONAL"/>
- <property name="cacheMode" value="PARTITIONED"/>
- <property name="writeSynchronizationMode" value="FULL_SYNC"/>
-
- <property name="affinityMapper">
- <bean class="org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper">
- <property name="groupSize" value="128"/>
- </bean>
- </property>
- </bean>
- </list>
- </property>
-
- <!--
This port will be used by Apache Hadoop client to connect to Ignite node as if it was a job tracker.
-->
<property name="connectorConfiguration">
@@ -110,9 +77,27 @@
<!-- IGFS name you will use to access IGFS through Hadoop API. -->
<property name="name" value="igfs"/>
- <!-- Caches with these names must be configured. -->
- <property name="metaCacheName" value="replicated"/>
- <property name="dataCacheName" value="partitioned"/>
+ <!-- IGFS Caches. -->
+ <property name="metaCacheConfiguration">
+ <bean class="org.apache.ignite.configuration.CacheConfiguration">
+ <property name="cacheMode" value="REPLICATED"/>
+ <property name="atomicityMode" value="TRANSACTIONAL"/>
+ </bean>
+ </property>
+ <property name="dataCacheConfiguration">
+ <bean class="org.apache.ignite.configuration.CacheConfiguration">
+ <property name="atomicityMode" value="TRANSACTIONAL"/>
+ <property name="cacheMode" value="PARTITIONED"/>
+ <property name="writeSynchronizationMode" value="FULL_SYNC"/>
+
+ <property name="affinityMapper">
+ <bean class="org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper">
+ <property name="groupSize" value="128"/>
+ </bean>
+ </property>
+ </bean>
+ </property>
+
<property name="blockSize" value="524288"/>
<property name="defaultMode" value="DUAL_ASYNC"/>
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/hadoop/src/test/config/igfs-cli-config-dual-sync.xml
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/config/igfs-cli-config-dual-sync.xml b/modules/hadoop/src/test/config/igfs-cli-config-dual-sync.xml
index fcd8d82..9b76344 100644
--- a/modules/hadoop/src/test/config/igfs-cli-config-dual-sync.xml
+++ b/modules/hadoop/src/test/config/igfs-cli-config-dual-sync.xml
@@ -58,39 +58,6 @@
</property>
<!--
- Configure caches where IGFS will store data.
- -->
- <property name="cacheConfiguration">
- <list>
- <!--
- Configure metadata cache where file system structure will be stored. It must be TRANSACTIONAL,
- and must have backups to maintain file system consistency in case of node crash.
- -->
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="replicated"/>
- <property name="cacheMode" value="REPLICATED"/>
- <property name="atomicityMode" value="TRANSACTIONAL"/>
- </bean>
-
- <!--
- Configure data cache where file's data will be stored.
- -->
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="partitioned"/>
- <property name="atomicityMode" value="TRANSACTIONAL"/>
- <property name="cacheMode" value="PARTITIONED"/>
- <property name="writeSynchronizationMode" value="FULL_SYNC"/>
-
- <property name="affinityMapper">
- <bean class="org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper">
- <property name="groupSize" value="128"/>
- </bean>
- </property>
- </bean>
- </list>
- </property>
-
- <!--
This port will be used by Apache Hadoop client to connect to Ignite node as if it was a job tracker.
-->
<property name="connectorConfiguration">
@@ -108,9 +75,27 @@
<!-- IGFS name you will use to access IGFS through Hadoop API. -->
<property name="name" value="igfs"/>
- <!-- Caches with these names must be configured. -->
- <property name="metaCacheName" value="replicated"/>
- <property name="dataCacheName" value="partitioned"/>
+ <!-- IGFS Caches. -->
+ <property name="metaCacheConfiguration">
+ <bean class="org.apache.ignite.configuration.CacheConfiguration">
+ <property name="cacheMode" value="REPLICATED"/>
+ <property name="atomicityMode" value="TRANSACTIONAL"/>
+ </bean>
+ </property>
+ <property name="dataCacheConfiguration">
+ <bean class="org.apache.ignite.configuration.CacheConfiguration">
+ <property name="atomicityMode" value="TRANSACTIONAL"/>
+ <property name="cacheMode" value="PARTITIONED"/>
+ <property name="writeSynchronizationMode" value="FULL_SYNC"/>
+
+ <property name="affinityMapper">
+ <bean class="org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper">
+ <property name="groupSize" value="128"/>
+ </bean>
+ </property>
+ </bean>
+ </property>
+
<property name="blockSize" value="524288"/>
<property name="defaultMode" value="DUAL_SYNC"/>
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/hadoop/src/test/config/igfs-cli-config-primary.xml
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/config/igfs-cli-config-primary.xml b/modules/hadoop/src/test/config/igfs-cli-config-primary.xml
index cc066b2..0268cff 100644
--- a/modules/hadoop/src/test/config/igfs-cli-config-primary.xml
+++ b/modules/hadoop/src/test/config/igfs-cli-config-primary.xml
@@ -60,39 +60,6 @@
</property>
<!--
- Configure caches where IGFS will store data.
- -->
- <property name="cacheConfiguration">
- <list>
- <!--
- Configure metadata cache where file system structure will be stored. It must be TRANSACTIONAL,
- and must have backups to maintain file system consistency in case of node crash.
- -->
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="replicated"/>
- <property name="cacheMode" value="REPLICATED"/>
- <property name="atomicityMode" value="TRANSACTIONAL"/>
- </bean>
-
- <!--
- Configure data cache where file's data will be stored.
- -->
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="partitioned"/>
- <property name="atomicityMode" value="TRANSACTIONAL"/>
- <property name="cacheMode" value="PARTITIONED"/>
- <property name="writeSynchronizationMode" value="FULL_SYNC"/>
-
- <property name="affinityMapper">
- <bean class="org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper">
- <property name="groupSize" value="128"/>
- </bean>
- </property>
- </bean>
- </list>
- </property>
-
- <!--
This port will be used by Apache Hadoop client to connect to Ignite node as if it was a job tracker.
-->
<property name="connectorConfiguration">
@@ -110,9 +77,27 @@
<!-- IGFS name you will use to access IGFS through Hadoop API. -->
<property name="name" value="igfs"/>
- <!-- Caches with these names must be configured. -->
- <property name="metaCacheName" value="replicated"/>
- <property name="dataCacheName" value="partitioned"/>
+ <!-- IGFS Caches. -->
+ <property name="metaCacheConfiguration">
+ <bean class="org.apache.ignite.configuration.CacheConfiguration">
+ <property name="cacheMode" value="REPLICATED"/>
+ <property name="atomicityMode" value="TRANSACTIONAL"/>
+ </bean>
+ </property>
+ <property name="dataCacheConfiguration">
+ <bean class="org.apache.ignite.configuration.CacheConfiguration">
+ <property name="atomicityMode" value="TRANSACTIONAL"/>
+ <property name="cacheMode" value="PARTITIONED"/>
+ <property name="writeSynchronizationMode" value="FULL_SYNC"/>
+
+ <property name="affinityMapper">
+ <bean class="org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper">
+ <property name="groupSize" value="128"/>
+ </bean>
+ </property>
+ </bean>
+ </property>
+
<property name="blockSize" value="524288"/>
<property name="defaultMode" value="PRIMARY"/>
<property name="ipcEndpointEnabled" value="false"/>
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/hadoop/src/test/config/igfs-cli-config-proxy.xml
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/config/igfs-cli-config-proxy.xml b/modules/hadoop/src/test/config/igfs-cli-config-proxy.xml
index f25fd50..f4f794f 100644
--- a/modules/hadoop/src/test/config/igfs-cli-config-proxy.xml
+++ b/modules/hadoop/src/test/config/igfs-cli-config-proxy.xml
@@ -58,39 +58,6 @@
</property>
<!--
- Configure caches where IGFS will store data.
- -->
- <property name="cacheConfiguration">
- <list>
- <!--
- Configure metadata cache where file system structure will be stored. It must be TRANSACTIONAL,
- and must have backups to maintain file system consistency in case of node crash.
- -->
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="replicated"/>
- <property name="cacheMode" value="REPLICATED"/>
- <property name="atomicityMode" value="TRANSACTIONAL"/>
- </bean>
-
- <!--
- Configure data cache where file's data will be stored.
- -->
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="partitioned"/>
- <property name="atomicityMode" value="TRANSACTIONAL"/>
- <property name="cacheMode" value="PARTITIONED"/>
- <property name="writeSynchronizationMode" value="FULL_SYNC"/>
-
- <property name="affinityMapper">
- <bean class="org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper">
- <property name="groupSize" value="128"/>
- </bean>
- </property>
- </bean>
- </list>
- </property>
-
- <!--
This port will be used by Apache Hadoop client to connect to Ignite node as if it was a job tracker.
-->
<property name="connectorConfiguration">
@@ -108,9 +75,27 @@
<!-- IGFS name you will use to access IGFS through Hadoop API. -->
<property name="name" value="igfs"/>
- <!-- Caches with these names must be configured. -->
- <property name="metaCacheName" value="replicated"/>
- <property name="dataCacheName" value="partitioned"/>
+ <!-- IGFS Caches. -->
+ <property name="metaCacheConfiguration">
+ <bean class="org.apache.ignite.configuration.CacheConfiguration">
+ <property name="cacheMode" value="REPLICATED"/>
+ <property name="atomicityMode" value="TRANSACTIONAL"/>
+ </bean>
+ </property>
+ <property name="dataCacheConfiguration">
+ <bean class="org.apache.ignite.configuration.CacheConfiguration">
+ <property name="atomicityMode" value="TRANSACTIONAL"/>
+ <property name="cacheMode" value="PARTITIONED"/>
+ <property name="writeSynchronizationMode" value="FULL_SYNC"/>
+
+ <property name="affinityMapper">
+ <bean class="org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper">
+ <property name="groupSize" value="128"/>
+ </bean>
+ </property>
+ </bean>
+ </property>
+
<property name="blockSize" value="524288"/>
<property name="defaultMode" value="PROXY"/>
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractMapReduceTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractMapReduceTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractMapReduceTest.java
index d3ce124..619149c 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractMapReduceTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractMapReduceTest.java
@@ -359,8 +359,6 @@ public class HadoopAbstractMapReduceTest extends HadoopAbstractWordCountTest {
@Nullable IgfsSecondaryFileSystem secondaryFs, @Nullable IgfsIpcEndpointConfiguration restCfg) throws Exception {
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
- igfsCfg.setDataCacheName("dataCache");
- igfsCfg.setMetaCacheName("metaCache");
igfsCfg.setName(igfsName);
igfsCfg.setBlockSize(IGFS_BLOCK_SIZE);
igfsCfg.setDefaultMode(mode);
@@ -387,6 +385,9 @@ public class HadoopAbstractMapReduceTest extends HadoopAbstractWordCountTest {
metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
+ igfsCfg.setDataCacheConfiguration(dataCacheCfg);
+ igfsCfg.setMetaCacheConfiguration(metaCacheCfg);
+
IgniteConfiguration cfg = new IgniteConfiguration();
cfg.setGridName(gridName);
@@ -396,7 +397,6 @@ public class HadoopAbstractMapReduceTest extends HadoopAbstractWordCountTest {
discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true));
cfg.setDiscoverySpi(discoSpi);
- cfg.setCacheConfiguration(dataCacheCfg, metaCacheCfg);
cfg.setFileSystemConfiguration(igfsCfg);
cfg.setLocalHost("127.0.0.1");
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractSelfTest.java
index e2e8295..4a810e2 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractSelfTest.java
@@ -53,12 +53,6 @@ public abstract class HadoopAbstractSelfTest extends GridCommonAbstractTest {
/** IGFS name. */
protected static final String igfsName = null;
- /** IGFS name. */
- protected static final String igfsMetaCacheName = "meta";
-
- /** IGFS name. */
- protected static final String igfsDataCacheName = "data";
-
/** IGFS block size. */
protected static final int igfsBlockSize = 1024;
@@ -133,11 +127,8 @@ public abstract class HadoopAbstractSelfTest extends GridCommonAbstractTest {
discoSpi.setIpFinder(IP_FINDER);
- if (igfsEnabled()) {
- cfg.setCacheConfiguration(metaCacheConfiguration(), dataCacheConfiguration());
-
+ if (igfsEnabled())
cfg.setFileSystemConfiguration(igfsConfiguration());
- }
if (restEnabled()) {
ConnectorConfiguration clnCfg = new ConnectorConfiguration();
@@ -167,14 +158,15 @@ public abstract class HadoopAbstractSelfTest extends GridCommonAbstractTest {
/**
* @return IGFS configuration.
+ * @throws Exception If failed.
*/
public FileSystemConfiguration igfsConfiguration() throws Exception {
FileSystemConfiguration cfg = new FileSystemConfiguration();
cfg.setName(igfsName);
cfg.setBlockSize(igfsBlockSize);
- cfg.setDataCacheName(igfsDataCacheName);
- cfg.setMetaCacheName(igfsMetaCacheName);
+ cfg.setDataCacheConfiguration(dataCacheConfiguration());
+ cfg.setMetaCacheConfiguration(metaCacheConfiguration());
cfg.setFragmentizerEnabled(false);
return cfg;
@@ -186,7 +178,6 @@ public abstract class HadoopAbstractSelfTest extends GridCommonAbstractTest {
public CacheConfiguration metaCacheConfiguration() {
CacheConfiguration cfg = new CacheConfiguration();
- cfg.setName(igfsMetaCacheName);
cfg.setCacheMode(REPLICATED);
cfg.setAtomicityMode(TRANSACTIONAL);
cfg.setWriteSynchronizationMode(FULL_SYNC);
@@ -200,7 +191,6 @@ public abstract class HadoopAbstractSelfTest extends GridCommonAbstractTest {
protected CacheConfiguration dataCacheConfiguration() {
CacheConfiguration cfg = new CacheConfiguration();
- cfg.setName(igfsDataCacheName);
cfg.setCacheMode(PARTITIONED);
cfg.setAtomicityMode(TRANSACTIONAL);
cfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(igfsBlockGroupSize));
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopFIleSystemFactorySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopFIleSystemFactorySelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopFIleSystemFactorySelfTest.java
index 5f64845..ac8f815 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopFIleSystemFactorySelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopFIleSystemFactorySelfTest.java
@@ -222,8 +222,6 @@ public class HadoopFIleSystemFactorySelfTest extends IgfsCommonAbstractTest {
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
- igfsCfg.setDataCacheName("dataCache");
- igfsCfg.setMetaCacheName("metaCache");
igfsCfg.setName(name);
igfsCfg.setDefaultMode(dfltMode);
igfsCfg.setIpcEndpointConfiguration(endpointCfg);
@@ -232,7 +230,6 @@ public class HadoopFIleSystemFactorySelfTest extends IgfsCommonAbstractTest {
CacheConfiguration dataCacheCfg = defaultCacheConfiguration();
- dataCacheCfg.setName("dataCache");
dataCacheCfg.setCacheMode(PARTITIONED);
dataCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(2));
@@ -242,11 +239,13 @@ public class HadoopFIleSystemFactorySelfTest extends IgfsCommonAbstractTest {
CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
- metaCacheCfg.setName("metaCache");
metaCacheCfg.setCacheMode(REPLICATED);
metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
+ igfsCfg.setDataCacheConfiguration(dataCacheCfg);
+ igfsCfg.setMetaCacheConfiguration(metaCacheCfg);
+
IgniteConfiguration cfg = new IgniteConfiguration();
cfg.setGridName(name);
@@ -256,7 +255,6 @@ public class HadoopFIleSystemFactorySelfTest extends IgfsCommonAbstractTest {
discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true));
cfg.setDiscoverySpi(discoSpi);
- cfg.setCacheConfiguration(dataCacheCfg, metaCacheCfg);
cfg.setFileSystemConfiguration(igfsCfg);
cfg.setLocalHost("127.0.0.1");
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfs20FileSystemAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfs20FileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfs20FileSystemAbstractSelfTest.java
index a297aef..201309e 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfs20FileSystemAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfs20FileSystemAbstractSelfTest.java
@@ -188,23 +188,21 @@ public abstract class HadoopIgfs20FileSystemAbstractSelfTest extends IgfsCommonA
// Start secondary IGFS.
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
- igfsCfg.setDataCacheName("partitioned");
- igfsCfg.setMetaCacheName("replicated");
igfsCfg.setName("igfs_secondary");
igfsCfg.setIpcEndpointConfiguration(secondaryIpcEndpointConfiguration());
igfsCfg.setManagementPort(-1);
igfsCfg.setBlockSize(512 * 1024);
igfsCfg.setPrefetchBlocks(1);
- CacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration dataCacheCfg = defaultCacheConfiguration();
- cacheCfg.setName("partitioned");
- cacheCfg.setCacheMode(PARTITIONED);
- cacheCfg.setNearConfiguration(null);
- cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- cacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(GRP_SIZE));
- cacheCfg.setBackups(0);
- cacheCfg.setAtomicityMode(TRANSACTIONAL);
+ dataCacheCfg.setName("partitioned");
+ dataCacheCfg.setCacheMode(PARTITIONED);
+ dataCacheCfg.setNearConfiguration(null);
+ dataCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
+ dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(GRP_SIZE));
+ dataCacheCfg.setBackups(0);
+ dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
@@ -213,6 +211,9 @@ public abstract class HadoopIgfs20FileSystemAbstractSelfTest extends IgfsCommonA
metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
+ igfsCfg.setDataCacheConfiguration(dataCacheCfg);
+ igfsCfg.setMetaCacheConfiguration(metaCacheCfg);
+
IgniteConfiguration cfg = new IgniteConfiguration();
cfg.setGridName("grid_secondary");
@@ -222,7 +223,7 @@ public abstract class HadoopIgfs20FileSystemAbstractSelfTest extends IgfsCommonA
discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true));
cfg.setDiscoverySpi(discoSpi);
- cfg.setCacheConfiguration(metaCacheCfg, cacheCfg);
+ cfg.setCacheConfiguration(metaCacheCfg, dataCacheCfg);
cfg.setFileSystemConfiguration(igfsCfg);
cfg.setIncludeEventTypes(EVT_TASK_FAILED, EVT_TASK_FINISHED, EVT_JOB_MAPPED);
cfg.setLocalHost(U.getLocalHost().getHostAddress());
@@ -250,7 +251,6 @@ public abstract class HadoopIgfs20FileSystemAbstractSelfTest extends IgfsCommonA
discoSpi.setIpFinder(IP_FINDER);
cfg.setDiscoverySpi(discoSpi);
- cfg.setCacheConfiguration(cacheConfiguration(gridName));
cfg.setFileSystemConfiguration(igfsConfiguration(gridName));
cfg.setIncludeEventTypes(EVT_TASK_FAILED, EVT_TASK_FINISHED, EVT_JOB_MAPPED);
cfg.setLocalHost("127.0.0.1");
@@ -265,10 +265,9 @@ public abstract class HadoopIgfs20FileSystemAbstractSelfTest extends IgfsCommonA
* @param gridName Grid name.
* @return Cache configuration.
*/
- protected CacheConfiguration[] cacheConfiguration(String gridName) {
+ protected CacheConfiguration dataCacheConfiguration(String gridName) {
CacheConfiguration cacheCfg = defaultCacheConfiguration();
- cacheCfg.setName("partitioned");
cacheCfg.setCacheMode(PARTITIONED);
cacheCfg.setNearConfiguration(null);
cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
@@ -276,14 +275,23 @@ public abstract class HadoopIgfs20FileSystemAbstractSelfTest extends IgfsCommonA
cacheCfg.setBackups(0);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
- CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
+ return cacheCfg;
+ }
+
+ /**
+ * Gets cache configuration.
+ *
+ * @param gridName Grid name.
+ * @return Cache configuration.
+ */
+ protected CacheConfiguration metaCacheConfiguration(String gridName) {
+ CacheConfiguration ccfg = defaultCacheConfiguration();
- metaCacheCfg.setName("replicated");
- metaCacheCfg.setCacheMode(REPLICATED);
- metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
+ ccfg.setCacheMode(REPLICATED);
+ ccfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
+ ccfg.setAtomicityMode(TRANSACTIONAL);
- return new CacheConfiguration[] {metaCacheCfg, cacheCfg};
+ return ccfg;
}
/**
@@ -295,12 +303,12 @@ public abstract class HadoopIgfs20FileSystemAbstractSelfTest extends IgfsCommonA
protected FileSystemConfiguration igfsConfiguration(String gridName) throws IgniteCheckedException {
FileSystemConfiguration cfg = new FileSystemConfiguration();
- cfg.setDataCacheName("partitioned");
- cfg.setMetaCacheName("replicated");
cfg.setName("igfs");
cfg.setPrefetchBlocks(1);
cfg.setMaxSpaceSize(64 * 1024 * 1024);
cfg.setDefaultMode(mode);
+ cfg.setMetaCacheConfiguration(metaCacheConfiguration(gridName));
+ cfg.setDataCacheConfiguration(dataCacheConfiguration(gridName));
if (mode != PRIMARY)
cfg.setSecondaryFileSystem(new IgniteHadoopIgfsSecondaryFileSystem(secondaryFileSystemUriPath(),
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsDualAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsDualAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsDualAbstractSelfTest.java
index cf1ccda..74df5dc 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsDualAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsDualAbstractSelfTest.java
@@ -152,8 +152,6 @@ public abstract class HadoopIgfsDualAbstractSelfTest extends IgfsCommonAbstractT
@Nullable IgfsSecondaryFileSystem secondaryFs, @Nullable IgfsIpcEndpointConfiguration restCfg) throws Exception {
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
- igfsCfg.setDataCacheName("dataCache");
- igfsCfg.setMetaCacheName("metaCache");
igfsCfg.setName(igfsName);
igfsCfg.setBlockSize(IGFS_BLOCK_SIZE);
igfsCfg.setDefaultMode(mode);
@@ -180,6 +178,9 @@ public abstract class HadoopIgfsDualAbstractSelfTest extends IgfsCommonAbstractT
metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
+ igfsCfg.setDataCacheConfiguration(dataCacheCfg);
+ igfsCfg.setMetaCacheConfiguration(metaCacheCfg);
+
IgniteConfiguration cfg = new IgniteConfiguration();
cfg.setGridName(gridName);
@@ -189,7 +190,6 @@ public abstract class HadoopIgfsDualAbstractSelfTest extends IgfsCommonAbstractT
discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true));
cfg.setDiscoverySpi(discoSpi);
- cfg.setCacheConfiguration(dataCacheCfg, metaCacheCfg);
cfg.setFileSystemConfiguration(igfsCfg);
cfg.setLocalHost("127.0.0.1");
@@ -292,7 +292,7 @@ public abstract class HadoopIgfsDualAbstractSelfTest extends IgfsCommonAbstractT
IgfsBlockKey key = new IgfsBlockKey(info.id(), info.affinityKey(), info.evictExclude(), 2);
IgniteCache<IgfsBlockKey, byte[]> dataCache = igfs.context().kernalContext().cache().jcache(
- igfs.configuration().getDataCacheName());
+ igfs.configuration().getDataCacheConfiguration().getName());
for (int i = 0; i < 10; i++) {
if (dataCache.containsKey(key))
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopSecondaryFileSystemConfigurationTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopSecondaryFileSystemConfigurationTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopSecondaryFileSystemConfigurationTest.java
index 9d49537..8c438d7 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopSecondaryFileSystemConfigurationTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopSecondaryFileSystemConfigurationTest.java
@@ -267,30 +267,29 @@ public class HadoopSecondaryFileSystemConfigurationTest extends IgfsCommonAbstra
private void startSecondary() {
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
- igfsCfg.setDataCacheName("partitioned");
- igfsCfg.setMetaCacheName("replicated");
igfsCfg.setName("igfs_secondary");
igfsCfg.setIpcEndpointConfiguration(SECONDARY_ENDPOINT_CFG);
igfsCfg.setBlockSize(512 * 1024);
igfsCfg.setPrefetchBlocks(1);
- CacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration dataCacheCfg = defaultCacheConfiguration();
- cacheCfg.setName("partitioned");
- cacheCfg.setCacheMode(PARTITIONED);
- cacheCfg.setNearConfiguration(null);
- cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- cacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(GRP_SIZE));
- cacheCfg.setBackups(0);
- cacheCfg.setAtomicityMode(TRANSACTIONAL);
+ dataCacheCfg.setCacheMode(PARTITIONED);
+ dataCacheCfg.setNearConfiguration(null);
+ dataCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
+ dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(GRP_SIZE));
+ dataCacheCfg.setBackups(0);
+ dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
- metaCacheCfg.setName("replicated");
metaCacheCfg.setCacheMode(REPLICATED);
metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
+ igfsCfg.setDataCacheConfiguration(dataCacheCfg);
+ igfsCfg.setMetaCacheConfiguration(metaCacheCfg);
+
IgniteConfiguration cfg = new IgniteConfiguration();
cfg.setGridName("grid_secondary");
@@ -300,7 +299,6 @@ public class HadoopSecondaryFileSystemConfigurationTest extends IgfsCommonAbstra
discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true));
cfg.setDiscoverySpi(discoSpi);
- cfg.setCacheConfiguration(metaCacheCfg, cacheCfg);
cfg.setFileSystemConfiguration(igfsCfg);
cfg.setIncludeEventTypes(EVT_TASK_FAILED, EVT_TASK_FINISHED, EVT_JOB_MAPPED);
@@ -338,7 +336,6 @@ public class HadoopSecondaryFileSystemConfigurationTest extends IgfsCommonAbstra
discoSpi.setIpFinder(IP_FINDER);
cfg.setDiscoverySpi(discoSpi);
- cfg.setCacheConfiguration(cacheConfiguration());
cfg.setFileSystemConfiguration(fsConfiguration(gridName));
cfg.setIncludeEventTypes(EVT_TASK_FAILED, EVT_TASK_FINISHED, EVT_JOB_MAPPED);
cfg.setCommunicationSpi(communicationSpi());
@@ -349,27 +346,36 @@ public class HadoopSecondaryFileSystemConfigurationTest extends IgfsCommonAbstra
/**
* Gets cache configuration.
*
- * @return Cache configuration.
+ * @return Meta cache configuration.
*/
- protected CacheConfiguration[] cacheConfiguration() {
- CacheConfiguration cacheCfg = defaultCacheConfiguration();
+ protected CacheConfiguration metaCacheConfiguration() {
- cacheCfg.setName("partitioned");
- cacheCfg.setCacheMode(PARTITIONED);
- cacheCfg.setNearConfiguration(null);
- cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- cacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(GRP_SIZE));
- cacheCfg.setBackups(0);
- cacheCfg.setAtomicityMode(TRANSACTIONAL);
+ CacheConfiguration ccfg = defaultCacheConfiguration();
- CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
+ ccfg.setName("replicated");
+ ccfg.setCacheMode(REPLICATED);
+ ccfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
+ ccfg.setAtomicityMode(TRANSACTIONAL);
- metaCacheCfg.setName("replicated");
- metaCacheCfg.setCacheMode(REPLICATED);
- metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
+ return ccfg;
+ }
- return new CacheConfiguration[] {metaCacheCfg, cacheCfg};
+ /**
+ * @return Data cache configuration.
+ */
+ protected CacheConfiguration dataCacheConfiguration() {
+ CacheConfiguration ccfg = defaultCacheConfiguration();
+
+ ccfg.setName("partitioned");
+ ccfg.setCacheMode(PARTITIONED);
+ ccfg.setNearConfiguration(null);
+ ccfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
+ ccfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(GRP_SIZE));
+ ccfg.setBackups(0);
+ ccfg.setAtomicityMode(TRANSACTIONAL);
+
+
+ return ccfg;
}
/**
@@ -381,8 +387,6 @@ public class HadoopSecondaryFileSystemConfigurationTest extends IgfsCommonAbstra
protected FileSystemConfiguration fsConfiguration(String gridName) throws IgniteCheckedException {
FileSystemConfiguration cfg = new FileSystemConfiguration();
- cfg.setDataCacheName("partitioned");
- cfg.setMetaCacheName("replicated");
cfg.setName("igfs");
cfg.setPrefetchBlocks(1);
cfg.setDefaultMode(mode);
@@ -396,6 +400,9 @@ public class HadoopSecondaryFileSystemConfigurationTest extends IgfsCommonAbstra
cfg.setManagementPort(-1);
cfg.setBlockSize(512 * 1024); // Together with group blocks mapper will yield 64M per node groups.
+ cfg.setDataCacheConfiguration(dataCacheConfiguration());
+ cfg.setMetaCacheConfiguration(metaCacheConfiguration());
+
return cfg;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgfsNearOnlyMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgfsNearOnlyMultiNodeSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgfsNearOnlyMultiNodeSelfTest.java
index 51048c6..2e03718 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgfsNearOnlyMultiNodeSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgfsNearOnlyMultiNodeSelfTest.java
@@ -88,9 +88,9 @@ public class IgfsNearOnlyMultiNodeSelfTest extends GridCommonAbstractTest {
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
- igfsCfg.setDataCacheName("data");
- igfsCfg.setMetaCacheName("meta");
igfsCfg.setName("igfs");
+ igfsCfg.setDataCacheConfiguration(cacheConfiguration(gridName, "data"));
+ igfsCfg.setMetaCacheConfiguration(cacheConfiguration(gridName, "meta"));
IgfsIpcEndpointConfiguration endpointCfg = new IgfsIpcEndpointConfiguration();
@@ -103,8 +103,6 @@ public class IgfsNearOnlyMultiNodeSelfTest extends GridCommonAbstractTest {
cfg.setFileSystemConfiguration(igfsCfg);
- cfg.setCacheConfiguration(cacheConfiguration(gridName, "data"), cacheConfiguration(gridName, "meta"));
-
cfg.setIncludeEventTypes(EVT_TASK_FAILED, EVT_TASK_FINISHED, EVT_JOB_MAPPED);
if (cnt == 0)
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemAbstractSelfTest.java
index 4d4f68b..2d58d2d 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemAbstractSelfTest.java
@@ -246,22 +246,20 @@ public abstract class IgniteHadoopFileSystemAbstractSelfTest extends IgfsCommonA
// Start secondary IGFS.
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
- igfsCfg.setDataCacheName("partitioned");
- igfsCfg.setMetaCacheName("replicated");
igfsCfg.setName("igfs_secondary");
igfsCfg.setIpcEndpointConfiguration(SECONDARY_ENDPOINT_CFG);
igfsCfg.setBlockSize(512 * 1024);
igfsCfg.setPrefetchBlocks(1);
- CacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration dataCacheCfg = defaultCacheConfiguration();
- cacheCfg.setName("partitioned");
- cacheCfg.setCacheMode(PARTITIONED);
- cacheCfg.setNearConfiguration(null);
- cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- cacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(GRP_SIZE));
- cacheCfg.setBackups(0);
- cacheCfg.setAtomicityMode(TRANSACTIONAL);
+ dataCacheCfg.setName("partitioned");
+ dataCacheCfg.setCacheMode(PARTITIONED);
+ dataCacheCfg.setNearConfiguration(null);
+ dataCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
+ dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(GRP_SIZE));
+ dataCacheCfg.setBackups(0);
+ dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
@@ -270,6 +268,9 @@ public abstract class IgniteHadoopFileSystemAbstractSelfTest extends IgfsCommonA
metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
+ igfsCfg.setDataCacheConfiguration(dataCacheCfg);
+ igfsCfg.setMetaCacheConfiguration(metaCacheCfg);
+
IgniteConfiguration cfg = new IgniteConfiguration();
cfg.setGridName("grid_secondary");
@@ -281,7 +282,6 @@ public abstract class IgniteHadoopFileSystemAbstractSelfTest extends IgfsCommonA
discoSpi.setIpFinder(finder);
cfg.setDiscoverySpi(discoSpi);
- cfg.setCacheConfiguration(metaCacheCfg, cacheCfg);
cfg.setFileSystemConfiguration(igfsCfg);
cfg.setIncludeEventTypes(EVT_TASK_FAILED, EVT_TASK_FINISHED, EVT_JOB_MAPPED);
@@ -360,7 +360,6 @@ public abstract class IgniteHadoopFileSystemAbstractSelfTest extends IgfsCommonA
cfg.setGridName(gridName);
cfg.setMarshaller(new OptimizedMarshaller());
cfg.setDiscoverySpi(discoSpi);
- cfg.setCacheConfiguration(cacheConfiguration(gridName));
cfg.setFileSystemConfiguration(igfsConfiguration(gridName));
cfg.setIncludeEventTypes(EVT_TASK_FAILED, EVT_TASK_FINISHED, EVT_JOB_MAPPED);
@@ -373,25 +372,35 @@ public abstract class IgniteHadoopFileSystemAbstractSelfTest extends IgfsCommonA
* @param gridName Grid name.
* @return Cache configuration.
*/
- protected CacheConfiguration[] cacheConfiguration(String gridName) {
- CacheConfiguration cacheCfg = defaultCacheConfiguration();
+ protected CacheConfiguration dataCacheConfiguration(String gridName) {
+ CacheConfiguration ccfg = defaultCacheConfiguration();
+
+ ccfg.setName("partitioned");
+ ccfg.setCacheMode(PARTITIONED);
+ ccfg.setNearConfiguration(null);
+ ccfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
+ ccfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(GRP_SIZE));
+ ccfg.setBackups(0);
+ ccfg.setAtomicityMode(TRANSACTIONAL);
- cacheCfg.setName("partitioned");
- cacheCfg.setCacheMode(PARTITIONED);
- cacheCfg.setNearConfiguration(null);
- cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- cacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(GRP_SIZE));
- cacheCfg.setBackups(0);
- cacheCfg.setAtomicityMode(TRANSACTIONAL);
+ return ccfg;
+ }
- CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
+ /**
+ * Gets cache configuration.
+ *
+ * @param gridName Grid name.
+ * @return Cache configuration.
+ */
+ protected CacheConfiguration metaCacheConfiguration(String gridName) {
+ CacheConfiguration ccfg = defaultCacheConfiguration();
- metaCacheCfg.setName("replicated");
- metaCacheCfg.setCacheMode(REPLICATED);
- metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
+ ccfg.setName("replicated");
+ ccfg.setCacheMode(REPLICATED);
+ ccfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
+ ccfg.setAtomicityMode(TRANSACTIONAL);
- return new CacheConfiguration[] {metaCacheCfg, cacheCfg};
+ return ccfg;
}
/**
@@ -403,8 +412,8 @@ public abstract class IgniteHadoopFileSystemAbstractSelfTest extends IgfsCommonA
protected FileSystemConfiguration igfsConfiguration(String gridName) throws IgniteCheckedException {
FileSystemConfiguration cfg = new FileSystemConfiguration();
- cfg.setDataCacheName("partitioned");
- cfg.setMetaCacheName("replicated");
+ cfg.setDataCacheConfiguration(dataCacheConfiguration(gridName));
+ cfg.setMetaCacheConfiguration(metaCacheConfiguration(gridName));
cfg.setName("igfs");
cfg.setPrefetchBlocks(1);
cfg.setDefaultMode(mode);
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientBasedOpenTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientBasedOpenTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientBasedOpenTest.java
index 6091dca..657ee6e 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientBasedOpenTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientBasedOpenTest.java
@@ -223,7 +223,8 @@ public class IgniteHadoopFileSystemClientBasedOpenTest extends GridCommonAbstrac
assert false : "Exception must be thrown";
}
catch (Exception e) {
- assertTrue(e.getMessage().contains("Cannot find IGFS 'igfs-wrong-name' at the node"));
+ assertTrue(e.getMessage().contains(
+ "Ignite client node doesn't have IGFS with the given name: igfs-wrong-name"));
}
} finally {
stopAllGrids();
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientSelfTest.java
index 209e634..16c8fe1 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientSelfTest.java
@@ -80,8 +80,8 @@ public class IgniteHadoopFileSystemClientSelfTest extends IgfsCommonAbstractTest
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
- igfsCfg.setDataCacheName("partitioned");
- igfsCfg.setMetaCacheName("replicated");
+ igfsCfg.setDataCacheConfiguration(dataCacheConfiguration());
+ igfsCfg.setMetaCacheConfiguration(metaCacheConfiguration());
igfsCfg.setName("igfs");
igfsCfg.setBlockSize(512 * 1024);
@@ -92,7 +92,6 @@ public class IgniteHadoopFileSystemClientSelfTest extends IgfsCommonAbstractTest
igfsCfg.setIpcEndpointConfiguration(endpointCfg);
- cfg.setCacheConfiguration(cacheConfiguration());
cfg.setFileSystemConfiguration(igfsCfg);
return cfg;
@@ -103,27 +102,36 @@ public class IgniteHadoopFileSystemClientSelfTest extends IgfsCommonAbstractTest
*
* @return Cache configuration.
*/
- protected CacheConfiguration[] cacheConfiguration() {
- CacheConfiguration cacheCfg = defaultCacheConfiguration();
-
- cacheCfg.setName("partitioned");
- cacheCfg.setCacheMode(PARTITIONED);
- cacheCfg.setNearConfiguration(null);
- cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
- cacheCfg.setEvictionPolicy(null);
- cacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(128));
- cacheCfg.setBackups(0);
- cacheCfg.setAtomicityMode(TRANSACTIONAL);
-
- CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
-
- metaCacheCfg.setName("replicated");
- metaCacheCfg.setCacheMode(REPLICATED);
- metaCacheCfg.setWriteSynchronizationMode(FULL_SYNC);
- metaCacheCfg.setEvictionPolicy(null);
- metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
-
- return new CacheConfiguration[] {metaCacheCfg, cacheCfg};
+ protected CacheConfiguration dataCacheConfiguration() {
+ CacheConfiguration ccfg = defaultCacheConfiguration();
+
+ ccfg.setName("partitioned");
+ ccfg.setCacheMode(PARTITIONED);
+ ccfg.setNearConfiguration(null);
+ ccfg.setWriteSynchronizationMode(FULL_SYNC);
+ ccfg.setEvictionPolicy(null);
+ ccfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(128));
+ ccfg.setBackups(0);
+ ccfg.setAtomicityMode(TRANSACTIONAL);
+
+ return ccfg;
+ }
+
+ /**
+ * Gets cache configuration.
+ *
+ * @return Cache configuration.
+ */
+ protected CacheConfiguration metaCacheConfiguration() {
+ CacheConfiguration ccfg = defaultCacheConfiguration();
+
+ ccfg.setName("replicated");
+ ccfg.setCacheMode(REPLICATED);
+ ccfg.setWriteSynchronizationMode(FULL_SYNC);
+ ccfg.setEvictionPolicy(null);
+ ccfg.setAtomicityMode(TRANSACTIONAL);
+
+ return ccfg;
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemHandshakeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemHandshakeSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemHandshakeSelfTest.java
index a01c015..3457c45 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemHandshakeSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemHandshakeSelfTest.java
@@ -285,14 +285,12 @@ public class IgniteHadoopFileSystemHandshakeSelfTest extends IgfsCommonAbstractT
CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
- metaCacheCfg.setName("replicated");
metaCacheCfg.setCacheMode(REPLICATED);
metaCacheCfg.setWriteSynchronizationMode(FULL_SYNC);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
CacheConfiguration dataCacheCfg = defaultCacheConfiguration();
- dataCacheCfg.setName("partitioned");
dataCacheCfg.setCacheMode(PARTITIONED);
dataCacheCfg.setNearConfiguration(null);
dataCacheCfg.setWriteSynchronizationMode(FULL_SYNC);
@@ -300,15 +298,13 @@ public class IgniteHadoopFileSystemHandshakeSelfTest extends IgfsCommonAbstractT
dataCacheCfg.setBackups(0);
dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
- cfg.setCacheConfiguration(metaCacheCfg, dataCacheCfg);
-
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
- igfsCfg.setDataCacheName("partitioned");
- igfsCfg.setMetaCacheName("replicated");
igfsCfg.setName(dfltIgfsName ? null : IGFS_NAME);
igfsCfg.setPrefetchBlocks(1);
igfsCfg.setDefaultMode(PRIMARY);
+ igfsCfg.setDataCacheConfiguration(dataCacheCfg);
+ igfsCfg.setMetaCacheConfiguration(metaCacheCfg);
IgfsIpcEndpointConfiguration endpointCfg = new IgfsIpcEndpointConfiguration();
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemIpcCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemIpcCacheSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemIpcCacheSelfTest.java
index 35f1ceb..ac2ae68 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemIpcCacheSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemIpcCacheSelfTest.java
@@ -73,10 +73,10 @@ public class IgniteHadoopFileSystemIpcCacheSelfTest extends IgfsCommonAbstractTe
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
- igfsCfg.setDataCacheName("partitioned");
- igfsCfg.setMetaCacheName("replicated");
igfsCfg.setName("igfs");
igfsCfg.setManagementPort(FileSystemConfiguration.DFLT_MGMT_PORT + cnt);
+ igfsCfg.setDataCacheConfiguration(dataCacheConfiguration());
+ igfsCfg.setMetaCacheConfiguration(metaCacheConfiguration());
IgfsIpcEndpointConfiguration endpointCfg = new IgfsIpcEndpointConfiguration();
@@ -89,7 +89,7 @@ public class IgniteHadoopFileSystemIpcCacheSelfTest extends IgfsCommonAbstractTe
cfg.setFileSystemConfiguration(igfsCfg);
- cfg.setCacheConfiguration(cacheConfiguration());
+ cfg.setCacheConfiguration(dataCacheConfiguration());
cfg.setIncludeEventTypes(EVT_TASK_FAILED, EVT_TASK_FINISHED, EVT_JOB_MAPPED);
@@ -109,25 +109,34 @@ public class IgniteHadoopFileSystemIpcCacheSelfTest extends IgfsCommonAbstractTe
*
* @return Cache configuration.
*/
- private CacheConfiguration[] cacheConfiguration() {
- CacheConfiguration cacheCfg = defaultCacheConfiguration();
-
- cacheCfg.setName("partitioned");
- cacheCfg.setCacheMode(PARTITIONED);
- cacheCfg.setNearConfiguration(null);
- cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- cacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(GRP_SIZE));
- cacheCfg.setBackups(0);
- cacheCfg.setAtomicityMode(TRANSACTIONAL);
+ private CacheConfiguration dataCacheConfiguration() {
+ CacheConfiguration ccfg = defaultCacheConfiguration();
+
+ ccfg.setName("partitioned");
+ ccfg.setCacheMode(PARTITIONED);
+ ccfg.setNearConfiguration(null);
+ ccfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
+ ccfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(GRP_SIZE));
+ ccfg.setBackups(0);
+ ccfg.setAtomicityMode(TRANSACTIONAL);
+
+ return ccfg;
+ }
- CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
+ /**
+ * Gets cache configuration.
+ *
+ * @return Cache configuration.
+ */
+ private CacheConfiguration metaCacheConfiguration() {
+ CacheConfiguration ccfg = defaultCacheConfiguration();
- metaCacheCfg.setName("replicated");
- metaCacheCfg.setCacheMode(REPLICATED);
- metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
+ ccfg.setName("replicated");
+ ccfg.setCacheMode(REPLICATED);
+ ccfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
+ ccfg.setAtomicityMode(TRANSACTIONAL);
- return new CacheConfiguration[] {metaCacheCfg, cacheCfg};
+ return ccfg;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemLoggerStateSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemLoggerStateSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemLoggerStateSelfTest.java
index 8b6635e..fbf9eda 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemLoggerStateSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemLoggerStateSelfTest.java
@@ -83,8 +83,6 @@ public class IgniteHadoopFileSystemLoggerStateSelfTest extends IgfsCommonAbstrac
private void startUp() throws Exception {
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
- igfsCfg.setDataCacheName("partitioned");
- igfsCfg.setMetaCacheName("replicated");
igfsCfg.setName("igfs");
igfsCfg.setBlockSize(512 * 1024);
igfsCfg.setDefaultMode(PRIMARY);
@@ -96,15 +94,15 @@ public class IgniteHadoopFileSystemLoggerStateSelfTest extends IgfsCommonAbstrac
igfsCfg.setIpcEndpointConfiguration(endpointCfg);
- CacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration dataCacheCfg = defaultCacheConfiguration();
- cacheCfg.setName("partitioned");
- cacheCfg.setCacheMode(PARTITIONED);
- cacheCfg.setNearConfiguration(null);
- cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- cacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(128));
- cacheCfg.setBackups(0);
- cacheCfg.setAtomicityMode(TRANSACTIONAL);
+ dataCacheCfg.setName("partitioned");
+ dataCacheCfg.setCacheMode(PARTITIONED);
+ dataCacheCfg.setNearConfiguration(null);
+ dataCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
+ dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(128));
+ dataCacheCfg.setBackups(0);
+ dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
@@ -113,6 +111,9 @@ public class IgniteHadoopFileSystemLoggerStateSelfTest extends IgfsCommonAbstrac
metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
+ igfsCfg.setDataCacheConfiguration(dataCacheCfg);
+ igfsCfg.setMetaCacheConfiguration(metaCacheCfg);
+
IgniteConfiguration cfg = new IgniteConfiguration();
cfg.setGridName("igfs-grid");
@@ -122,7 +123,6 @@ public class IgniteHadoopFileSystemLoggerStateSelfTest extends IgfsCommonAbstrac
discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true));
cfg.setDiscoverySpi(discoSpi);
- cfg.setCacheConfiguration(metaCacheCfg, cacheCfg);
cfg.setFileSystemConfiguration(igfsCfg);
cfg.setLocalHost("127.0.0.1");
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemSecondaryFileSystemInitializationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemSecondaryFileSystemInitializationSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemSecondaryFileSystemInitializationSelfTest.java
index fd56137..52bb6cf 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemSecondaryFileSystemInitializationSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemSecondaryFileSystemInitializationSelfTest.java
@@ -69,8 +69,6 @@ public class IgniteHadoopFileSystemSecondaryFileSystemInitializationSelfTest ext
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
- igfsCfg.setDataCacheName("partitioned");
- igfsCfg.setMetaCacheName("replicated");
igfsCfg.setName("igfs");
igfsCfg.setBlockSize(512 * 1024);
igfsCfg.setInitializeDefaultPathModes(initDfltPathModes);
@@ -87,23 +85,24 @@ public class IgniteHadoopFileSystemSecondaryFileSystemInitializationSelfTest ext
"igfs://igfs-secondary@127.0.0.1:11500/",
"modules/core/src/test/config/hadoop/core-site-loopback-secondary.xml"));
- CacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration dataCacheCfg = defaultCacheConfiguration();
- cacheCfg.setName("partitioned");
- cacheCfg.setCacheMode(PARTITIONED);
- cacheCfg.setNearConfiguration(null);
- cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- cacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(128));
- cacheCfg.setBackups(0);
- cacheCfg.setAtomicityMode(TRANSACTIONAL);
+ dataCacheCfg.setCacheMode(PARTITIONED);
+ dataCacheCfg.setNearConfiguration(null);
+ dataCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
+ dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(128));
+ dataCacheCfg.setBackups(0);
+ dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
- metaCacheCfg.setName("replicated");
metaCacheCfg.setCacheMode(REPLICATED);
metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
+ igfsCfg.setDataCacheConfiguration(dataCacheCfg);
+ igfsCfg.setMetaCacheConfiguration(metaCacheCfg);
+
IgniteConfiguration cfg = new IgniteConfiguration();
cfg.setGridName("igfs-grid");
@@ -113,7 +112,6 @@ public class IgniteHadoopFileSystemSecondaryFileSystemInitializationSelfTest ext
discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true));
cfg.setDiscoverySpi(discoSpi);
- cfg.setCacheConfiguration(metaCacheCfg, cacheCfg);
cfg.setFileSystemConfiguration(igfsCfg);
cfg.setLocalHost("127.0.0.1");
@@ -138,8 +136,6 @@ public class IgniteHadoopFileSystemSecondaryFileSystemInitializationSelfTest ext
private void startUpSecondary() throws Exception {
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
- igfsCfg.setDataCacheName("partitioned");
- igfsCfg.setMetaCacheName("replicated");
igfsCfg.setName("igfs-secondary");
igfsCfg.setBlockSize(512 * 1024);
igfsCfg.setDefaultMode(PRIMARY);
@@ -153,7 +149,6 @@ public class IgniteHadoopFileSystemSecondaryFileSystemInitializationSelfTest ext
CacheConfiguration cacheCfg = defaultCacheConfiguration();
- cacheCfg.setName("partitioned");
cacheCfg.setCacheMode(PARTITIONED);
cacheCfg.setNearConfiguration(null);
cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
@@ -163,11 +158,13 @@ public class IgniteHadoopFileSystemSecondaryFileSystemInitializationSelfTest ext
CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
- metaCacheCfg.setName("replicated");
metaCacheCfg.setCacheMode(REPLICATED);
metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
+ igfsCfg.setDataCacheConfiguration(cacheCfg);
+ igfsCfg.setMetaCacheConfiguration(metaCacheCfg);
+
IgniteConfiguration cfg = new IgniteConfiguration();
cfg.setGridName("igfs-grid-secondary");
@@ -177,7 +174,6 @@ public class IgniteHadoopFileSystemSecondaryFileSystemInitializationSelfTest ext
discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true));
cfg.setDiscoverySpi(discoSpi);
- cfg.setCacheConfiguration(metaCacheCfg, cacheCfg);
cfg.setFileSystemConfiguration(igfsCfg);
cfg.setLocalHost("127.0.0.1");
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/spring/src/test/java/org/apache/ignite/spring/sprint-exclude.xml
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/apache/ignite/spring/sprint-exclude.xml b/modules/spring/src/test/java/org/apache/ignite/spring/sprint-exclude.xml
index e6bf426..091b6ff 100644
--- a/modules/spring/src/test/java/org/apache/ignite/spring/sprint-exclude.xml
+++ b/modules/spring/src/test/java/org/apache/ignite/spring/sprint-exclude.xml
@@ -33,8 +33,6 @@
<list>
<bean class="org.apache.ignite.configuration.FileSystemConfiguration">
<property name="name" value="test"/>
- <property name="metaCacheName" value="meta"/>
- <property name="dataCacheName" value="data"/>
<property name="maxSpaceSize" value="#{100L * 1024 * 1024}"/>
[45/50] [abbrv] ignite git commit: IGNITE-4628 Add Java callback
support for platform plugins - fix callback signature
Posted by vo...@apache.org.
IGNITE-4628 Add Java callback support for platform plugins - fix callback signature
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f55370b4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f55370b4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f55370b4
Branch: refs/heads/ignite-4565-ddl
Commit: f55370b4fc8b41665a068263b84d53cf2540c30c
Parents: e1d8224
Author: Pavel Tupitsyn <pt...@apache.org>
Authored: Mon Feb 20 18:31:44 2017 +0300
Committer: Pavel Tupitsyn <pt...@apache.org>
Committed: Mon Feb 20 18:31:44 2017 +0300
----------------------------------------------------------------------
.../processors/platform/callback/PlatformCallbackGateway.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/f55370b4/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackGateway.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackGateway.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackGateway.java
index aee14d7..f195c02 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackGateway.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackGateway.java
@@ -1230,14 +1230,14 @@ public class PlatformCallbackGateway {
* @param outMem Out memory (Java writes, platform reads).
* @param inMem In memory (platform writes, Java reads).
*/
- public void pluginCallback(long callbackId, PlatformMemory outMem, PlatformMemory inMem) {
+ public long pluginCallback(long callbackId, PlatformMemory outMem, PlatformMemory inMem) {
enter();
try {
long outPtr = outMem == null ? 0 : outMem.pointer();
long inPtr = inMem == null ? 0 : inMem.pointer();
- PlatformCallbackUtils.inLongLongLongObjectOutLong(envPtr,
+ return PlatformCallbackUtils.inLongLongLongObjectOutLong(envPtr,
PlatformCallbackOp.PluginCallbackInLongLongOutLong, callbackId, outPtr, inPtr, null);
}
finally {