incubator-ignite git commit: # ignite-840 try evict partition on data load
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-840 [created] 9f9a63155
# ignite-840 try evict partition on data load
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9f9a6315
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9f9a6315
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9f9a6315
Branch: refs/heads/ignite-840
Commit: 9f9a6315524f7500476704ec0321a58f43428fd0
Parents: 31fcc3e
Author: sboikov
Authored: Mon Jun 1 10:28:51 2015 +0300
Committer: sboikov
Committed: Mon Jun 1 10:28:51 2015 +0300
--
.../ignite/internal/processors/cache/GridCacheEntryEx.java| 6 ++
.../ignite/internal/processors/cache/GridCacheMapEntry.java | 5 +
.../cache/distributed/GridDistributedCacheEntry.java | 7 ---
.../processors/cache/distributed/dht/GridDhtCacheEntry.java | 6 +-
.../internal/processors/datastreamer/DataStreamerImpl.java| 2 ++
.../internal/processors/cache/GridCacheTestEntryEx.java | 4
.../datastreamer/DataStreamerMultiThreadedSelfTest.java | 2 --
7 files changed, 18 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f9a6315/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
index 8d3d089..3857b35 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
@@ -21,6 +21,7 @@ import org.apache.ignite.*;
import org.apache.ignite.cache.eviction.*;
import org.apache.ignite.internal.processors.affinity.*;
import org.apache.ignite.internal.processors.cache.distributed.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.*;
import org.apache.ignite.internal.processors.cache.transactions.*;
import org.apache.ignite.internal.processors.cache.version.*;
import org.apache.ignite.internal.processors.dr.*;
@@ -943,4 +944,9 @@ public interface GridCacheEntryEx {
* @return {@code True} if value was removed, {@code false} otherwise.
*/
public boolean removeMeta(UUID name, V val);
+
+/**
+ * Calls {@link GridDhtLocalPartition#onUnlock()} for this entry's
partition.
+ */
+public void onUnlock();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f9a6315/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
index 92035af..03638a5 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -4100,6 +4100,11 @@ public abstract class GridCacheMapEntry implements
GridCacheEntryEx {
}
/** {@inheritDoc} */
+@Override public void onUnlock() {
+// No-op.
+}
+
+/** {@inheritDoc} */
@Override public boolean equals(Object o) {
// Identity comparison left on purpose.
return o == this;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f9a6315/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java
index b79f9d5..bd72764 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java
@@ -327,13 +327,6 @@ public class GridDistributedCacheEntry extends
GridCacheMapEntry {
}
/**
- *
- */
-public void onUnlock() {
-// No-op.
-}
-
-/**
* Unlocks local lock.
*
* @return Removed candidate, or null if thread still holds the
lock.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f9a6315/m
svn commit: r9192 - /dev/incubator/ignite/1.1.0-rc7/
Author: sboikov Date: Mon Jun 1 08:58:09 2015 New Revision: 9192 Log: (empty) Removed: dev/incubator/ignite/1.1.0-rc7/
[1/2] incubator-ignite git commit: # ignite-sprint-5: more help info at git-format-patch.sh
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-sprint-5 31fcc3e8b -> 00848cced
# ignite-sprint-5: more help info at git-format-patch.sh
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/52d64bb3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/52d64bb3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/52d64bb3
Branch: refs/heads/ignite-sprint-5
Commit: 52d64bb3bf13b531458889d4ea5d8650ca1789b7
Parents: 2859671
Author: ashutak
Authored: Mon Jun 1 12:16:07 2015 +0300
Committer: ashutak
Committed: Mon Jun 1 12:16:07 2015 +0300
--
scripts/git-format-patch.sh | 14 +-
1 file changed, 9 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52d64bb3/scripts/git-format-patch.sh
--
diff --git a/scripts/git-format-patch.sh b/scripts/git-format-patch.sh
index 970347f..5aa2075 100755
--- a/scripts/git-format-patch.sh
+++ b/scripts/git-format-patch.sh
@@ -20,9 +20,13 @@
# Git patch-file maker.
#
echo 'Usage: scripts/git-format-patch.sh [-ih|--ignitehome ]
[-idb|--ignitedefbranch ] [-ph|--patchhome ]'
+echo 'It is a script to create patch between current and default branches. The
script is safe and do not broke or lose your changes.'
echo "It should be called from IGNITE_HOME directory."
-echo "Patch will be created at PATCHES_HOME between Master branch
(IGNITE_DEFAULT_BRANCH) and Current branch."
+echo "Patch will be created at PATCHES_HOME (= IGNITE_HOME, by default)
between Master branch (IGNITE_DEFAULT_BRANCH) and Current branch."
echo "Note: you can use ${IGNITE_HOME}/scripts/git-patch-prop-local.sh to set
your own local properties (to rewrite settings at git-patch-prop-local.sh). "
+echo 'Examples:'
+echo '- Basic (with all defaults and properties from git-patch-prop.sh):
./scripts/git-format-patch.sh'
+echo '- Rewrite some defaults (see Usage):
./scripts/git-format-patch.sh -ph /home/user_name/patches'
echo
#
@@ -51,17 +55,17 @@ do
IGNITE_HOME="$2"
shift
;;
-
+
-idb|--ignitedefbranch)
IGNITE_DEFAULT_BRANCH="$2"
shift
;;
-
+
-ph|--patchhome)
PATCHES_HOME="$2"
shift
;;
-
+
*)
echo "Unknown parameter: ${key}"
;;
@@ -84,4 +88,4 @@ echo
requireCleanWorkTree ${IGNITE_HOME}
-formatPatch ${IGNITE_HOME} ${IGNITE_DEFAULT_BRANCH} ${IGNITE_CURRENT_BRANCH}
.patch
\ No newline at end of file
+formatPatch ${IGNITE_HOME} ${IGNITE_DEFAULT_BRANCH} ${IGNITE_CURRENT_BRANCH}
.patch
[2/2] incubator-ignite git commit: Merge branch 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-5
Merge branch 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-5 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/00848cce Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/00848cce Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/00848cce Branch: refs/heads/ignite-sprint-5 Commit: 00848ccedd6ad1490461069d5039cf7306626377 Parents: 52d64bb 31fcc3e Author: ashutak Authored: Mon Jun 1 12:16:44 2015 +0300 Committer: ashutak Committed: Mon Jun 1 12:16:44 2015 +0300 -- .../org/apache/ignite/cache/CacheMetrics.java | 187 +++-- .../configuration/IgniteConfiguration.java | 6 + .../org/apache/ignite/igfs/IgfsUserContext.java | 119 ++ .../igfs/secondary/IgfsSecondaryFileSystem.java | 7 + .../internal/igfs/common/IgfsMarshaller.java| 35 +- .../igfs/common/IgfsPathControlRequest.java | 22 + .../internal/managers/GridManagerAdapter.java | 59 +-- .../processors/cache/CacheMetricsImpl.java | 367 - .../cache/CacheMetricsMXBeanImpl.java | 100 + .../processors/cache/CacheMetricsSnapshot.java | 380 + .../processors/cache/GridCacheAdapter.java | 12 +- .../processors/cache/GridCacheSwapManager.java | 118 -- .../internal/processors/hadoop/HadoopJob.java | 2 +- .../ignite/internal/processors/igfs/IgfsEx.java | 8 +- .../internal/processors/igfs/IgfsImpl.java | 8 +- .../processors/igfs/IgfsIpcHandler.java | 184 + .../igfs/IgfsSecondaryFileSystemImpl.java | 9 +- .../internal/processors/igfs/IgfsServer.java| 4 +- .../internal/processors/igfs/IgfsUtils.java | 16 + .../ignite/internal/util/GridJavaProcess.java | 30 +- .../ignite/mxbean/CacheMetricsMXBean.java | 80 .../apache/ignite/plugin/PluginProvider.java| 26 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 35 +- .../org/apache/ignite/spi/IgniteSpiContext.java | 47 --- .../spi/swapspace/file/FileSwapSpaceSpi.java| 8 +- ...CacheLocalOffHeapAndSwapMetricsSelfTest.java | 412 +++ .../testframework/GridSpiTestContext.java | 25 +- .../IgniteCacheMetricsSelfTestSuite.java| 1 + .../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 165 +--- .../hadoop/fs/v1/IgniteHadoopFileSystem.java| 107 +++-- .../hadoop/fs/v2/IgniteHadoopFileSystem.java| 32 +- .../internal/processors/hadoop/HadoopUtils.java | 10 +- .../hadoop/SecondaryFileSystemProvider.java | 53 ++- .../hadoop/fs/HadoopDistributedFileSystem.java | 91 .../hadoop/fs/HadoopFileSystemsUtils.java | 17 - .../hadoop/fs/HadoopLazyConcurrentMap.java | 204 + .../processors/hadoop/igfs/HadoopIgfsEx.java| 6 + .../hadoop/igfs/HadoopIgfsInProc.java | 170 ++-- .../processors/hadoop/igfs/HadoopIgfsIpcIo.java | 2 +- .../hadoop/igfs/HadoopIgfsOutProc.java | 33 +- .../hadoop/igfs/HadoopIgfsWrapper.java | 19 +- .../hadoop/v2/HadoopV2TaskContext.java | 4 +- .../HadoopIgfs20FileSystemAbstractSelfTest.java | 56 ++- ...oopSecondaryFileSystemConfigurationTest.java | 4 +- .../IgniteHadoopFileSystemAbstractSelfTest.java | 63 ++- .../IgniteHadoopFileSystemClientSelfTest.java | 2 +- .../IgniteHadoopFileSystemIpcCacheSelfTest.java | 2 + .../hadoop/HadoopFileSystemsTest.java | 23 +- .../collections/HadoopSkipListSelfTest.java | 4 +- modules/mesos/pom.xml | 8 +- 50 files changed, 2569 insertions(+), 813 deletions(-) --
[3/5] incubator-ignite git commit: Merge branch 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-5
Merge branch 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-5 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/00848cce Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/00848cce Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/00848cce Branch: refs/heads/ignite-218 Commit: 00848ccedd6ad1490461069d5039cf7306626377 Parents: 52d64bb 31fcc3e Author: ashutak Authored: Mon Jun 1 12:16:44 2015 +0300 Committer: ashutak Committed: Mon Jun 1 12:16:44 2015 +0300 -- .../org/apache/ignite/cache/CacheMetrics.java | 187 +++-- .../configuration/IgniteConfiguration.java | 6 + .../org/apache/ignite/igfs/IgfsUserContext.java | 119 ++ .../igfs/secondary/IgfsSecondaryFileSystem.java | 7 + .../internal/igfs/common/IgfsMarshaller.java| 35 +- .../igfs/common/IgfsPathControlRequest.java | 22 + .../internal/managers/GridManagerAdapter.java | 59 +-- .../processors/cache/CacheMetricsImpl.java | 367 - .../cache/CacheMetricsMXBeanImpl.java | 100 + .../processors/cache/CacheMetricsSnapshot.java | 380 + .../processors/cache/GridCacheAdapter.java | 12 +- .../processors/cache/GridCacheSwapManager.java | 118 -- .../internal/processors/hadoop/HadoopJob.java | 2 +- .../ignite/internal/processors/igfs/IgfsEx.java | 8 +- .../internal/processors/igfs/IgfsImpl.java | 8 +- .../processors/igfs/IgfsIpcHandler.java | 184 + .../igfs/IgfsSecondaryFileSystemImpl.java | 9 +- .../internal/processors/igfs/IgfsServer.java| 4 +- .../internal/processors/igfs/IgfsUtils.java | 16 + .../ignite/internal/util/GridJavaProcess.java | 30 +- .../ignite/mxbean/CacheMetricsMXBean.java | 80 .../apache/ignite/plugin/PluginProvider.java| 26 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 35 +- .../org/apache/ignite/spi/IgniteSpiContext.java | 47 --- .../spi/swapspace/file/FileSwapSpaceSpi.java| 8 +- ...CacheLocalOffHeapAndSwapMetricsSelfTest.java | 412 +++ .../testframework/GridSpiTestContext.java | 25 +- .../IgniteCacheMetricsSelfTestSuite.java| 1 + .../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 165 +--- .../hadoop/fs/v1/IgniteHadoopFileSystem.java| 107 +++-- .../hadoop/fs/v2/IgniteHadoopFileSystem.java| 32 +- .../internal/processors/hadoop/HadoopUtils.java | 10 +- .../hadoop/SecondaryFileSystemProvider.java | 53 ++- .../hadoop/fs/HadoopDistributedFileSystem.java | 91 .../hadoop/fs/HadoopFileSystemsUtils.java | 17 - .../hadoop/fs/HadoopLazyConcurrentMap.java | 204 + .../processors/hadoop/igfs/HadoopIgfsEx.java| 6 + .../hadoop/igfs/HadoopIgfsInProc.java | 170 ++-- .../processors/hadoop/igfs/HadoopIgfsIpcIo.java | 2 +- .../hadoop/igfs/HadoopIgfsOutProc.java | 33 +- .../hadoop/igfs/HadoopIgfsWrapper.java | 19 +- .../hadoop/v2/HadoopV2TaskContext.java | 4 +- .../HadoopIgfs20FileSystemAbstractSelfTest.java | 56 ++- ...oopSecondaryFileSystemConfigurationTest.java | 4 +- .../IgniteHadoopFileSystemAbstractSelfTest.java | 63 ++- .../IgniteHadoopFileSystemClientSelfTest.java | 2 +- .../IgniteHadoopFileSystemIpcCacheSelfTest.java | 2 + .../hadoop/HadoopFileSystemsTest.java | 23 +- .../collections/HadoopSkipListSelfTest.java | 4 +- modules/mesos/pom.xml | 8 +- 50 files changed, 2569 insertions(+), 813 deletions(-) --
[5/5] incubator-ignite git commit: Merge branch 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-218
Merge branch 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-218 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6be185b6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6be185b6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6be185b6 Branch: refs/heads/ignite-218 Commit: 6be185b6ea7ded3df298f62732238199c0ccd0c4 Parents: 56cb251 00848cc Author: iveselovskiy Authored: Mon Jun 1 12:23:19 2015 +0300 Committer: iveselovskiy Committed: Mon Jun 1 12:23:19 2015 +0300 -- .../configuration/IgniteConfiguration.java | 6 + .../apache/ignite/plugin/PluginProvider.java| 26 ++-- scripts/git-format-patch.sh | 14 +++ 3 files changed, 34 insertions(+), 12 deletions(-) --
[1/5] incubator-ignite git commit: # ignite-sprint-5 Added javadoc.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-218 c79d26a22 -> 6be185b6e
# ignite-sprint-5 Added javadoc.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/31fcc3e8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/31fcc3e8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/31fcc3e8
Branch: refs/heads/ignite-218
Commit: 31fcc3e8b760c2773e475770d819d433e8d19f4a
Parents: 5c30f9c
Author: sboikov
Authored: Mon Jun 1 09:39:57 2015 +0300
Committer: sboikov
Committed: Mon Jun 1 09:39:57 2015 +0300
--
.../configuration/IgniteConfiguration.java | 6 +
.../apache/ignite/plugin/PluginProvider.java| 26 ++--
2 files changed, 25 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/31fcc3e8/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index ebe2b8e..3d4b64b 100644
---
a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@ -2188,15 +2188,21 @@ public class IgniteConfiguration {
}
/**
+ * Gets plugin configurations.
+ *
* @return Plugin configurations.
+ * @see PluginProvider
*/
public PluginConfiguration[] getPluginConfigurations() {
return pluginCfgs;
}
/**
+ * Sets plugin configurations.
+ *
* @param pluginCfgs Plugin configurations.
* @return {@code this} for chaining.
+ * @see PluginProvider
*/
public IgniteConfiguration setPluginConfigurations(PluginConfiguration...
pluginCfgs) {
this.pluginCfgs = pluginCfgs;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/31fcc3e8/modules/core/src/main/java/org/apache/ignite/plugin/PluginProvider.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/plugin/PluginProvider.java
b/modules/core/src/main/java/org/apache/ignite/plugin/PluginProvider.java
index 17bbc36..f064fde 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/PluginProvider.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/PluginProvider.java
@@ -19,13 +19,22 @@ package org.apache.ignite.plugin;
import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
+import org.apache.ignite.configuration.*;
import org.jetbrains.annotations.*;
import java.io.*;
import java.util.*;
/**
- * Pluggable ignite component.
+ * Pluggable Ignite component.
+ *
+ * Ignite plugins are loaded using JDK {@link ServiceLoader}.
+ * First method called to initialize plugin is {@link
PluginProvider#initExtensions(PluginContext, ExtensionRegistry)}.
+ * If plugin requires configuration it can be set in {@link
IgniteConfiguration} using
+ * {@link IgniteConfiguration#setPluginConfigurations(PluginConfiguration...)}.
+ *
+ * @see IgniteConfiguration#setPluginConfigurations(PluginConfiguration...)
+ * @see PluginContext
*/
public interface PluginProvider {
/**
@@ -49,18 +58,21 @@ public interface PluginProvider {
public T plugin();
/**
+ * Registers extensions.
+ *
* @param ctx Plugin context.
- * @param cls Ignite component class.
- * @return Ignite component or {@code null} if component is not supported.
+ * @param registry Extension registry.
*/
-@Nullable public T createComponent(PluginContext ctx, Class cls);
+public void initExtensions(PluginContext ctx, ExtensionRegistry registry);
/**
- * Register extensions.
+ * Creates Ignite component.
+ *
* @param ctx Plugin context.
- * @param registry Extension registry.
+ * @param cls Ignite component class.
+ * @return Ignite component or {@code null} if component is not supported.
*/
-public void initExtensions(PluginContext ctx, ExtensionRegistry registry);
+@Nullable public T createComponent(PluginContext ctx, Class cls);
/**
* Starts grid component.
[4/5] incubator-ignite git commit: #[IGNITE-218]: save temporary state for review.
#[IGNITE-218]: save temporary state for review.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/56cb251f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/56cb251f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/56cb251f
Branch: refs/heads/ignite-218
Commit: 56cb251fa11c23f4390e049c455d0f64388be8a0
Parents: c79d26a
Author: iveselovskiy
Authored: Mon Jun 1 12:22:42 2015 +0300
Committer: iveselovskiy
Committed: Mon Jun 1 12:22:42 2015 +0300
--
.../processors/hadoop/HadoopTaskContext.java| 18 ++--
.../fs/IgniteHadoopFileSystemCounterWriter.java | 7 +-
.../hadoop/fs/v1/IgniteHadoopFileSystem.java| 24 ++---
.../hadoop/fs/v2/IgniteHadoopFileSystem.java| 2 +-
.../internal/processors/hadoop/HadoopUtils.java | 1 +
.../hadoop/v2/HadoopV2JobResourceManager.java | 6 +-
.../hadoop/v2/HadoopV2TaskContext.java | 24 +
.../hadoop/HadoopAbstractSelfTest.java | 1 -
.../processors/hadoop/HadoopMapReduceTest.java | 94 +++-
.../testsuites/IgniteHadoopTestSuite.java | 2 +-
10 files changed, 122 insertions(+), 57 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/56cb251f/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopTaskContext.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopTaskContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopTaskContext.java
index 47c55bd..d0fafc5 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopTaskContext.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopTaskContext.java
@@ -190,12 +190,14 @@ public abstract class HadoopTaskContext {
public abstract void cleanupTaskEnvironment() throws
IgniteCheckedException;
/**
- *
- * @param user
- * @param callable
- * @param
- * @return
- * @throws IgniteCheckedException
- */
-public abstract T runAs(String user, Callable callable) throws
IgniteCheckedException;
+ * Executes a callable on behalf of the specified user.
+ * In case of embedded task execution the implementation of this method
+ * will use classes loaded by the ClassLoader this HadoopTaskContext
loaded with.
+ * @param user The user name.
+ * @param c The callable.
+ * @param The return type of the Callable.
+ * @return The result of the callable.
+ * @throws IgniteCheckedException On any error in callable.
+ */
+public abstract T runAs(String user, Callable c) throws
IgniteCheckedException;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/56cb251f/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopFileSystemCounterWriter.java
--
diff --git
a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopFileSystemCounterWriter.java
b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopFileSystemCounterWriter.java
index cb4f19b..bbafcd7 100644
---
a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopFileSystemCounterWriter.java
+++
b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopFileSystemCounterWriter.java
@@ -26,6 +26,7 @@ import org.apache.ignite.internal.processors.hadoop.*;
import org.apache.ignite.internal.processors.hadoop.counter.*;
import org.apache.ignite.internal.processors.hadoop.counter.HadoopCounters;
import org.apache.ignite.internal.processors.hadoop.v2.*;
+import org.apache.ignite.internal.processors.igfs.*;
import org.apache.ignite.internal.util.typedef.*;
import java.io.*;
@@ -39,9 +40,6 @@ public class IgniteHadoopFileSystemCounterWriter implements
HadoopCounterWriter
public static final String PERFORMANCE_COUNTER_FILE_NAME = "performance";
/** */
-private static final String DEFAULT_USER_NAME = "anonymous";
-
-/** */
public static final String COUNTER_WRITER_DIR_PROPERTY =
"ignite.counters.fswriter.directory";
/** */
@@ -61,8 +59,7 @@ public class IgniteHadoopFileSystemCounterWriter implements
HadoopCounterWriter
String user = jobInfo.user();
-if (F.isEmpty(user))
-user = DEFAULT_USER_NAME;
+user = IgfsUtils.fixUserName(user);
String dir = jobInfo.property(COUNTER_WRITER_DIR_PROPERTY);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/56cb251f/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/v1/IgniteHadoopFileSystem.java
--
[2/5] incubator-ignite git commit: # ignite-sprint-5: more help info at git-format-patch.sh
# ignite-sprint-5: more help info at git-format-patch.sh
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/52d64bb3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/52d64bb3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/52d64bb3
Branch: refs/heads/ignite-218
Commit: 52d64bb3bf13b531458889d4ea5d8650ca1789b7
Parents: 2859671
Author: ashutak
Authored: Mon Jun 1 12:16:07 2015 +0300
Committer: ashutak
Committed: Mon Jun 1 12:16:07 2015 +0300
--
scripts/git-format-patch.sh | 14 +-
1 file changed, 9 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52d64bb3/scripts/git-format-patch.sh
--
diff --git a/scripts/git-format-patch.sh b/scripts/git-format-patch.sh
index 970347f..5aa2075 100755
--- a/scripts/git-format-patch.sh
+++ b/scripts/git-format-patch.sh
@@ -20,9 +20,13 @@
# Git patch-file maker.
#
echo 'Usage: scripts/git-format-patch.sh [-ih|--ignitehome ]
[-idb|--ignitedefbranch ] [-ph|--patchhome ]'
+echo 'It is a script to create patch between current and default branches. The
script is safe and do not broke or lose your changes.'
echo "It should be called from IGNITE_HOME directory."
-echo "Patch will be created at PATCHES_HOME between Master branch
(IGNITE_DEFAULT_BRANCH) and Current branch."
+echo "Patch will be created at PATCHES_HOME (= IGNITE_HOME, by default)
between Master branch (IGNITE_DEFAULT_BRANCH) and Current branch."
echo "Note: you can use ${IGNITE_HOME}/scripts/git-patch-prop-local.sh to set
your own local properties (to rewrite settings at git-patch-prop-local.sh). "
+echo 'Examples:'
+echo '- Basic (with all defaults and properties from git-patch-prop.sh):
./scripts/git-format-patch.sh'
+echo '- Rewrite some defaults (see Usage):
./scripts/git-format-patch.sh -ph /home/user_name/patches'
echo
#
@@ -51,17 +55,17 @@ do
IGNITE_HOME="$2"
shift
;;
-
+
-idb|--ignitedefbranch)
IGNITE_DEFAULT_BRANCH="$2"
shift
;;
-
+
-ph|--patchhome)
PATCHES_HOME="$2"
shift
;;
-
+
*)
echo "Unknown parameter: ${key}"
;;
@@ -84,4 +88,4 @@ echo
requireCleanWorkTree ${IGNITE_HOME}
-formatPatch ${IGNITE_HOME} ${IGNITE_DEFAULT_BRANCH} ${IGNITE_CURRENT_BRANCH}
.patch
\ No newline at end of file
+formatPatch ${IGNITE_HOME} ${IGNITE_DEFAULT_BRANCH} ${IGNITE_CURRENT_BRANCH}
.patch
incubator-ignite git commit: #[IGNITE-218]: some more cleanup.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-218 6be185b6e -> 4fae10730
#[IGNITE-218]: some more cleanup.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4fae1073
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4fae1073
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4fae1073
Branch: refs/heads/ignite-218
Commit: 4fae1073023efe68f74248cfd15a0d88fd81074e
Parents: 6be185b
Author: iveselovskiy
Authored: Mon Jun 1 12:34:13 2015 +0300
Committer: iveselovskiy
Committed: Mon Jun 1 12:34:13 2015 +0300
--
.../hadoop/taskexecutor/HadoopRunnableTask.java | 22
1 file changed, 22 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fae1073/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/HadoopRunnableTask.java
--
diff --git
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/HadoopRunnableTask.java
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/HadoopRunnableTask.java
index 92d1cb8..512d7ef 100644
---
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/HadoopRunnableTask.java
+++
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/HadoopRunnableTask.java
@@ -104,28 +104,6 @@ public abstract class HadoopRunnableTask implements
Callable {
user = IgfsUtils.fixUserName(user);
-return callImpl(user);
-}
-
-///**
-// * Gets the job property.
-// */
-//private String getJobProperty(String key) {
-//if (job instanceof HadoopV2Job) {
-//Configuration conf = ((HadoopV2Job)job).jobConf();
-//
-//return conf.get(key);
-//}
-//else
-//return job.info().property(key);
-//}
-
-/**
- * Runnable task call implementation
- * @return null.
- * @throws IgniteCheckedException
- */
-Void callImpl(final String user) throws IgniteCheckedException {
assert user != null;
ctx = job.getTaskContext(info);
[1/2] incubator-ignite git commit: # ignite-840 try evict partition on data load
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-sprint-5 00848cced -> 9a16d1906
# ignite-840 try evict partition on data load
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9f9a6315
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9f9a6315
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9f9a6315
Branch: refs/heads/ignite-sprint-5
Commit: 9f9a6315524f7500476704ec0321a58f43428fd0
Parents: 31fcc3e
Author: sboikov
Authored: Mon Jun 1 10:28:51 2015 +0300
Committer: sboikov
Committed: Mon Jun 1 10:28:51 2015 +0300
--
.../ignite/internal/processors/cache/GridCacheEntryEx.java| 6 ++
.../ignite/internal/processors/cache/GridCacheMapEntry.java | 5 +
.../cache/distributed/GridDistributedCacheEntry.java | 7 ---
.../processors/cache/distributed/dht/GridDhtCacheEntry.java | 6 +-
.../internal/processors/datastreamer/DataStreamerImpl.java| 2 ++
.../internal/processors/cache/GridCacheTestEntryEx.java | 4
.../datastreamer/DataStreamerMultiThreadedSelfTest.java | 2 --
7 files changed, 18 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f9a6315/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
index 8d3d089..3857b35 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
@@ -21,6 +21,7 @@ import org.apache.ignite.*;
import org.apache.ignite.cache.eviction.*;
import org.apache.ignite.internal.processors.affinity.*;
import org.apache.ignite.internal.processors.cache.distributed.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.*;
import org.apache.ignite.internal.processors.cache.transactions.*;
import org.apache.ignite.internal.processors.cache.version.*;
import org.apache.ignite.internal.processors.dr.*;
@@ -943,4 +944,9 @@ public interface GridCacheEntryEx {
* @return {@code True} if value was removed, {@code false} otherwise.
*/
public boolean removeMeta(UUID name, V val);
+
+/**
+ * Calls {@link GridDhtLocalPartition#onUnlock()} for this entry's
partition.
+ */
+public void onUnlock();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f9a6315/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
index 92035af..03638a5 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -4100,6 +4100,11 @@ public abstract class GridCacheMapEntry implements
GridCacheEntryEx {
}
/** {@inheritDoc} */
+@Override public void onUnlock() {
+// No-op.
+}
+
+/** {@inheritDoc} */
@Override public boolean equals(Object o) {
// Identity comparison left on purpose.
return o == this;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f9a6315/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java
index b79f9d5..bd72764 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java
@@ -327,13 +327,6 @@ public class GridDistributedCacheEntry extends
GridCacheMapEntry {
}
/**
- *
- */
-public void onUnlock() {
-// No-op.
-}
-
-/**
* Unlocks local lock.
*
* @return Removed candidate, or null if thread still holds the
lock.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/bl
incubator-ignite git commit: # GG-10054 fix dup type id
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-gg-10054 9a83c8974 -> f15b1b0e9
# GG-10054 fix dup type id
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f15b1b0e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f15b1b0e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f15b1b0e
Branch: refs/heads/ignite-gg-10054
Commit: f15b1b0e9d3e8e21880d6d334ce1716761630998
Parents: 9a83c89
Author: ptupitsyn
Authored: Mon Jun 1 12:45:56 2015 +0300
Committer: ptupitsyn
Committed: Mon Jun 1 12:45:56 2015 +0300
--
.../org/apache/ignite/internal/MarshallerContextAdapter.java | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f15b1b0e/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java
index 8386675..ea006fb 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java
@@ -82,9 +82,11 @@ public abstract class MarshallerContextAdapter implements
MarshallerContext {
String oldClsName;
-if ((oldClsName = map.put(typeId, clsName)) != null)
-throw new IgniteException("Duplicate type ID [id=" +
typeId + ", clsName=" + clsName +
+if ((oldClsName = map.put(typeId, clsName)) != null) {
+if (!oldClsName.equals(clsName))
+throw new IgniteException("Duplicate type ID [id=" +
typeId + ", clsName=" + clsName +
", oldClsName=" + oldClsName + ']');
+}
registeredTypes.add(clsName);
}
[2/2] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-840' into ignite-sprint-5
Merge remote-tracking branch 'remotes/origin/ignite-840' into ignite-sprint-5 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9a16d190 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9a16d190 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9a16d190 Branch: refs/heads/ignite-sprint-5 Commit: 9a16d1906b74e918a377cd9d5da6d96c8aeeaaad Parents: 00848cc 9f9a631 Author: sboikov Authored: Mon Jun 1 12:45:01 2015 +0300 Committer: sboikov Committed: Mon Jun 1 12:45:01 2015 +0300 -- .../ignite/internal/processors/cache/GridCacheEntryEx.java| 6 ++ .../ignite/internal/processors/cache/GridCacheMapEntry.java | 5 + .../cache/distributed/GridDistributedCacheEntry.java | 7 --- .../processors/cache/distributed/dht/GridDhtCacheEntry.java | 6 +- .../internal/processors/datastreamer/DataStreamerImpl.java| 2 ++ .../internal/processors/cache/GridCacheTestEntryEx.java | 4 .../datastreamer/DataStreamerMultiThreadedSelfTest.java | 2 -- 7 files changed, 18 insertions(+), 14 deletions(-) --
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-840 [deleted] 9f9a63155
incubator-ignite git commit: # IGNITE-218: Review.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-218 4fae10730 -> 04653a0de
# IGNITE-218: Review.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/04653a0d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/04653a0d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/04653a0d
Branch: refs/heads/ignite-218
Commit: 04653a0de38fd3c7358d05f982e5c8a1a8cc7c86
Parents: 4fae107
Author: vozerov-gridgain
Authored: Mon Jun 1 13:34:33 2015 +0300
Committer: vozerov-gridgain
Committed: Mon Jun 1 13:34:33 2015 +0300
--
.../internal/processors/igfs/IgfsSecondaryFileSystemImpl.java | 2 +-
.../processors/hadoop/taskexecutor/HadoopRunnableTask.java | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/04653a0d/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemImpl.java
index b8095b8..44ee90f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemImpl.java
@@ -121,6 +121,6 @@ class IgfsSecondaryFileSystemImpl implements
IgfsSecondaryFileSystem {
/** {@inheritDoc} */
@Override public void close() throws IgniteException {
-igfs.stop(true);
+// No-op.
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/04653a0d/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/HadoopRunnableTask.java
--
diff --git
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/HadoopRunnableTask.java
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/HadoopRunnableTask.java
index 512d7ef..f091e8f 100644
---
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/HadoopRunnableTask.java
+++
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/HadoopRunnableTask.java
@@ -106,11 +106,12 @@ public abstract class HadoopRunnableTask implements
Callable {
assert user != null;
+// TODO: Inclapsulate user name into HadoopTaskContext.
ctx = job.getTaskContext(info);
return ctx.runAs(user, new Callable() {
@Override public Void call() throws Exception {
-runTaskImpl();
+call0();
return null;
}
@@ -121,7 +122,7 @@ public abstract class HadoopRunnableTask implements
Callable {
* Implements actual task running.
* @throws IgniteCheckedException
*/
-void runTaskImpl() throws IgniteCheckedException {
+void call0() throws IgniteCheckedException {
execStartTs = U.currentTimeMillis();
Throwable err = null;
incubator-ignite git commit: ignite-471-2: yardstick configuration with portable marshaller
Repository: incubator-ignite Updated Branches: refs/heads/ignite-471-2 9a83c8974 -> ba0b50371 ignite-471-2: yardstick configuration with portable marshaller Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ba0b5037 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ba0b5037 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ba0b5037 Branch: refs/heads/ignite-471-2 Commit: ba0b5037169bef4be2e285f934d0a2a8f4ae446f Parents: 9a83c89 Author: Denis Magda Authored: Mon Jun 1 14:16:12 2015 +0300 Committer: Denis Magda Committed: Mon Jun 1 14:16:12 2015 +0300 -- modules/yardstick/config/ignite-base-config.xml | 5 + 1 file changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba0b5037/modules/yardstick/config/ignite-base-config.xml -- diff --git a/modules/yardstick/config/ignite-base-config.xml b/modules/yardstick/config/ignite-base-config.xml index 9d28774..9af03c0 100644 --- a/modules/yardstick/config/ignite-base-config.xml +++ b/modules/yardstick/config/ignite-base-config.xml @@ -163,6 +163,11 @@ + + + + +
incubator-ignite git commit: # IGNITE-943 Move static class instances.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-943 6c837c078 -> ab4c18cac
# IGNITE-943 Move static class instances.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ab4c18ca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ab4c18ca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ab4c18ca
Branch: refs/heads/ignite-943
Commit: ab4c18caca9f3bd5dbc3174eb49ed79c1744a79d
Parents: 6c837c0
Author: sevdokimov
Authored: Mon Jun 1 14:41:08 2015 +0300
Committer: sevdokimov
Committed: Mon Jun 1 14:41:08 2015 +0300
--
.../service/GridServiceProcessor.java | 22 +++-
1 file changed, 12 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ab4c18ca/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
index 8eff6bd..2e31b69 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
@@ -60,12 +60,6 @@ public class GridServiceProcessor extends
GridProcessorAdapter {
/** Time to wait before reassignment retries. */
private static final long RETRY_TIMEOUT = 1000;
-/** */
-private static final ServiceDeploymentPredicate DEPLOYMENT_PREDICATE = new
ServiceDeploymentPredicate();
-
-/** */
-private static final ServiceAssignmentsPredicate ASSIGNMENTS_PREDICATE =
new ServiceAssignmentsPredicate();
-
/** Local service instances. */
private final Map> locSvcs = new
HashMap<>();
@@ -352,7 +346,8 @@ public class GridServiceProcessor extends
GridProcessorAdapter {
"different configuration) [deployed=" +
dep.configuration() + ", new=" + cfg + ']'));
}
else {
-Iterator> it =
serviceEntries(ASSIGNMENTS_PREDICATE);
+Iterator> it =
serviceEntries(
+ServiceAssignmentsPredicate.INSTANCE);
while (it.hasNext()) {
Cache.Entry e = it.next();
@@ -448,7 +443,7 @@ public class GridServiceProcessor extends
GridProcessorAdapter {
public IgniteInternalFuture cancelAll() {
Collection> futs = new ArrayList<>();
-Iterator> it =
serviceEntries(DEPLOYMENT_PREDICATE);
+Iterator> it =
serviceEntries(ServiceDeploymentPredicate.INSTANCE);
while (it.hasNext()) {
Cache.Entry e = it.next();
@@ -471,7 +466,7 @@ public class GridServiceProcessor extends
GridProcessorAdapter {
public Collection serviceDescriptors() {
Collection descs = new ArrayList<>();
-Iterator> it =
serviceEntries(DEPLOYMENT_PREDICATE);
+Iterator> it =
serviceEntries(ServiceDeploymentPredicate.INSTANCE);
while (it.hasNext()) {
Cache.Entry e = it.next();
@@ -1113,7 +1108,8 @@ public class GridServiceProcessor extends
GridProcessorAdapter {
ctx.cache().context().deploy().ignoreOwnership(true);
try {
-Iterator> it =
serviceEntries(DEPLOYMENT_PREDICATE);
+Iterator> it =
serviceEntries(
+ServiceDeploymentPredicate.INSTANCE);
while (it.hasNext()) {
Cache.Entry e = it.next();
@@ -1332,6 +1328,9 @@ public class GridServiceProcessor extends
GridProcessorAdapter {
*/
static class ServiceDeploymentPredicate implements
IgniteBiPredicate {
/** */
+static final ServiceDeploymentPredicate INSTANCE = new
ServiceDeploymentPredicate();
+
+/** */
private static final long serialVersionUID = 0L;
/** {@inheritDoc} */
@@ -1350,6 +1349,9 @@ public class GridServiceProcessor extends
GridProcessorAdapter {
*/
static class ServiceAssignmentsPredicate implements
IgniteBiPredicate {
/** */
+static final ServiceAssignmentsPredicate INSTANCE = new
ServiceAssignmentsPredicate();
+
+/** */
private static final long serialVersionUID = 0L;
/** {@inheritDoc} */
[39/53] [abbrv] incubator-ignite git commit: # ignite-709
# ignite-709
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/07b6cb59
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/07b6cb59
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/07b6cb59
Branch: refs/heads/ignite-sprint-5
Commit: 07b6cb598ddb8f6c8ca76245ffbe6c434e08f870
Parents: 2c3ce15
Author: sboikov
Authored: Fri May 29 11:26:45 2015 +0300
Committer: sboikov
Committed: Fri May 29 11:34:51 2015 +0300
--
.../dht/preloader/GridDhtPartitionMap.java | 2 +-
...niteCacheClientNodeChangingTopologyTest.java | 6 ++
.../junits/common/GridCommonAbstractTest.java | 61 +---
3 files changed, 60 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07b6cb59/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionMap.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionMap.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionMap.java
index facf7e3..faa6cf6 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionMap.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionMap.java
@@ -237,7 +237,7 @@ public class GridDhtPartitionMap implements
Comparable, Ext
* @return Full string representation.
*/
public String toFullString() {
-return S.toString(GridDhtPartitionMap.class, this, "size", size(),
"map", super.toString());
+return S.toString(GridDhtPartitionMap.class, this, "size", size(),
"map", map.toString());
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07b6cb59/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java
index 47c1d7e..922e618 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java
@@ -1556,6 +1556,9 @@ public class IgniteCacheClientNodeChangingTopologyTest
extends GridCommonAbstrac
catch (TimeoutException e) {
log.error("Failed to wait for update.");
+for (Ignite ignite : G.allGrids())
+dumpCacheDebugInfo(ignite);
+
U.dumpThreads(log);
CyclicBarrier barrier0 = updateBarrier;
@@ -1593,6 +1596,9 @@ public class IgniteCacheClientNodeChangingTopologyTest
extends GridCommonAbstrac
catch (TimeoutException e) {
log.error("Failed to wait for update.");
+for (Ignite ignite : G.allGrids())
+dumpCacheDebugInfo(ignite);
+
U.dumpThreads(log);
CyclicBarrier barrier0 = updateBarrier;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07b6cb59/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
index 1f4c7b6..cded7fa 100644
---
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
@@ -31,6 +31,7 @@ import
org.apache.ignite.internal.processors.cache.distributed.dht.*;
import org.apache.ignite.internal.processors.cache.distributed.dht.colocated.*;
import org.apache.ignite.internal.processors.cache.distributed.near.*;
import org.apache.ignite.internal.processors.cache.local.*;
+import org.apache.ignite.internal.processors.cache.transactions.*;
import org.apache.ignite.internal.util.typedef.*;
import or
[02/53] [abbrv] incubator-ignite git commit: # IGNITE-943 Merge TcpDiscoverySpi and TcpClientDiscoverySpi
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/838c0fd8/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index 8ceac1c..2b2c691 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -18,22 +18,17 @@
package org.apache.ignite.spi.discovery.tcp;
import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.events.*;
-import org.apache.ignite.internal.processors.security.*;
import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
import org.apache.ignite.internal.util.io.*;
-import org.apache.ignite.internal.util.lang.*;
import org.apache.ignite.internal.util.tostring.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.security.*;
+import org.apache.ignite.marshaller.*;
+import org.apache.ignite.marshaller.jdk.*;
import org.apache.ignite.resources.*;
import org.apache.ignite.spi.*;
import org.apache.ignite.spi.discovery.*;
@@ -45,22 +40,13 @@ import
org.apache.ignite.spi.discovery.tcp.ipfinder.sharedfs.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
import org.apache.ignite.spi.discovery.tcp.messages.*;
import org.jetbrains.annotations.*;
-import org.jsr166.*;
import java.io.*;
import java.net.*;
-import java.text.*;
import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.internal.IgniteNodeAttributes.*;
-import static org.apache.ignite.spi.IgnitePortProtocol.*;
-import static
org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoverySpiState.*;
-import static
org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryHeartbeatMessage.*;
-import static
org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryStatusCheckMessage.*;
-
/**
* Discovery SPI implementation that uses TCP/IP for node discovery.
*
@@ -150,10 +136,43 @@ import static
org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryStatusChe
@IgniteSpiMultipleInstancesSupport(true)
@DiscoverySpiOrderSupport(true)
@DiscoverySpiHistorySupport(true)
-public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements
TcpDiscoverySpiMBean {
+public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi,
TcpDiscoverySpiMBean {
+/** Node attribute that is mapped to node's external addresses (value is
disc.tcp.ext-addrs). */
+public static final String ATTR_EXT_ADDRS = "disc.tcp.ext-addrs";
+
/** Default local port range (value is 100). */
public static final int DFLT_PORT_RANGE = 100;
+/** Default port to listen (value is 47500). */
+public static final int DFLT_PORT = 47500;
+
+/** Default timeout for joining topology (value is 0). */
+public static final long DFLT_JOIN_TIMEOUT = 0;
+
+/** Default network timeout in milliseconds (value is 5000ms). */
+public static final long DFLT_NETWORK_TIMEOUT = 5000;
+
+/** Default value for thread priority (value is 10). */
+public static final int DFLT_THREAD_PRI = 10;
+
+/** Default heartbeat messages issuing frequency (value is
100ms). */
+public static final long DFLT_HEARTBEAT_FREQ = 100;
+
+/** Default size of topology snapshots history. */
+public static final int DFLT_TOP_HISTORY_SIZE = 1000;
+
+/** Default socket operations timeout in milliseconds (value is
200ms). */
+public static final long DFLT_SOCK_TIMEOUT = 200;
+
+/** Default timeout for receiving message acknowledgement in milliseconds
(value is 50ms). */
+public static final long DFLT_ACK_TIMEOUT = 50;
+
+/** Default socket operations timeout in milliseconds (value is
700ms). */
+public static final long DFLT_SOCK_TIMEOUT_CLIENT = 700;
+
+/** Default timeout for receiving message acknowledgement in milliseconds
(value is 700ms). */
+public static final long DFLT_ACK_TIMEOUT_CLIENT = 700;
+
/** Default reconnect attempts count (value is 10). */
public static final int DFLT_RECONNECT_CNT = 10;
@@ -172,154 +191,236 @@ public class TcpDiscoverySpi extends
TcpDiscoverySpiAdapter implements TcpDiscov
/** Maximum ack timeout value for receiving message acknowledgement in
milliseconds (value is 600,000ms). */
public static final long DFLT_MAX_ACK_TIMEOUT = 10
[42/53] [abbrv] incubator-ignite git commit: # IGNITE-943 Fix TcpClientDiscoverySpiSelfTest.testMetrics
# IGNITE-943 Fix TcpClientDiscoverySpiSelfTest.testMetrics
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ac258a5e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ac258a5e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ac258a5e
Branch: refs/heads/ignite-sprint-5
Commit: ac258a5e06d3c8c9cca82b6883fc3af505a5e5dd
Parents: 2477c0e
Author: sevdokimov
Authored: Fri May 29 13:47:00 2015 +0300
Committer: sevdokimov
Committed: Fri May 29 13:47:00 2015 +0300
--
.../discovery/GridDiscoveryManagerAliveCacheSelfTest.java | 2 +-
.../processors/service/ClosureServiceClientsNodesTest.java | 6 +-
2 files changed, 2 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ac258a5e/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 af4dd0f..f2afb07 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
@@ -52,7 +52,7 @@ public class GridDiscoveryManagerAliveCacheSelfTest extends
GridCommonAbstractTe
private static final int TMP_NODES_CNT = 3;
/** */
-private static final int ITERATIONS = 20;
+private static final int ITERATIONS = 10;
/** */
private int gridCntr;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ac258a5e/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ClosureServiceClientsNodesTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ClosureServiceClientsNodesTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ClosureServiceClientsNodesTest.java
index 761f00f..59594be 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ClosureServiceClientsNodesTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ClosureServiceClientsNodesTest.java
@@ -53,11 +53,7 @@ public class ClosureServiceClientsNodesTest extends
GridCommonAbstractTest {
cfg.setMarshaller(new OptimizedMarshaller(false));
-TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
-
-discoSpi.setIpFinder(ipFinder);
-
-cfg.setDiscoverySpi(discoSpi);
+cfg.setDiscoverySpi(new
TcpDiscoverySpi().setIpFinder(ipFinder).setForceServerMode(true));
cfg.setCacheConfiguration();
[28/53] [abbrv] incubator-ignite git commit: # IGNITE-943 Fix tests
# IGNITE-943 Fix tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a02cb41e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a02cb41e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a02cb41e
Branch: refs/heads/ignite-sprint-5
Commit: a02cb41ef75945f1f57cf960494705bde5439dc9
Parents: 9759b19
Author: sevdokimov
Authored: Thu May 28 17:10:09 2015 +0300
Committer: sevdokimov
Committed: Thu May 28 17:10:09 2015 +0300
--
.../cache/distributed/GridCacheMixedModeSelfTest.java | 3 +++
.../distributed/near/GridCacheNearOnlyTopologySelfTest.java| 1 +
.../lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java| 6 +-
3 files changed, 5 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a02cb41e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMixedModeSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMixedModeSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMixedModeSelfTest.java
index e19442f..a3c977f 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMixedModeSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMixedModeSelfTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.*;
import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.testframework.junits.common.*;
/**
@@ -31,6 +32,8 @@ public class GridCacheMixedModeSelfTest extends
GridCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
+((TcpDiscoverySpi)cfg.getDiscoverySpi()).setForceServerMode(true);
+
cfg.setCacheConfiguration(cacheConfiguration(gridName));
if (F.eq(gridName, getTestGridName(0)))
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a02cb41e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java
index 2893678..b6bc56e 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java
@@ -70,6 +70,7 @@ public class GridCacheNearOnlyTopologySelfTest extends
GridCommonAbstractTest {
TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
+discoSpi.setForceServerMode(true);
discoSpi.setIpFinder(IP_FINDER);
cfg.setDiscoverySpi(discoSpi);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a02cb41e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java
index c401180..8bcb68a 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java
@@ -79,11 +79,7 @@ public class GridCacheNearOnlyLruNearEvictionPolicySelfTest
extends GridCommonAb
c.setCacheConfiguration(cc);
}
-TcpDiscoverySpi disco = new TcpDiscoverySpi();
-
-disco.setIpFinder(ipFinder);
-
-c.setDiscoverySpi(disco);
+c.setDiscoverySpi(new
TcpDiscoverySpi().setIpFinder(ipFinder).setForceServerMode(true));
cnt++;
[17/53] [abbrv] incubator-ignite git commit: # IGNITE-943 Added documentation.
# IGNITE-943 Added documentation.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/77d1dcbd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/77d1dcbd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/77d1dcbd
Branch: refs/heads/ignite-sprint-5
Commit: 77d1dcbdf014b65898b358f18e56ce6ec4e1b27a
Parents: b3ac88f
Author: sevdokimov
Authored: Thu May 28 13:04:07 2015 +0300
Committer: sevdokimov
Committed: Thu May 28 14:46:08 2015 +0300
--
.../ignite/spi/discovery/tcp/TcpDiscoverySpi.java| 15 +++
1 file changed, 15 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/77d1dcbd/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index 71ba0f1..aa8fb76 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -53,6 +53,10 @@ import java.util.concurrent.atomic.*;
* Nodes are organized in ring. So almost all network exchange (except few
cases) is
* done across it.
*
+ * Node may be started in client mode, in this case node does not insert to
the ring,
+ * it connects to any node in the ring router and communicated with that node
only.
+ * Thereby slowing or shutdown of client node will not affect whole cluster.
+ *
* At startup SPI tries to send messages to random IP taken from
* {@link TcpDiscoveryIpFinder} about self start (stops when send succeeds)
* and then this info goes to coordinator. When coordinator processes join
request
@@ -481,6 +485,8 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter
implements DiscoverySpi, T
* is reached, then the process of message sending is considered as failed.
*
* If not specified, default is {@link #DFLT_MAX_ACK_TIMEOUT}.
+ *
+ * Affected server nodes only.
*
* @param maxAckTimeout Maximum acknowledgement timeout.
*/
@@ -502,6 +508,8 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter
implements DiscoverySpi, T
* Sets local port to listen to.
*
* If not specified, default is {@link #DFLT_PORT}.
+ *
+ * Affected server nodes only.
*
* @param locPort Local port to bind.
*/
@@ -523,6 +531,9 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter
implements DiscoverySpi, T
* {@link #getLocalPort()} {@code + locPortRange}.
*
* If not specified, default is {@link #DFLT_PORT_RANGE}.
+ *
+ * Affected server nodes only.
+
*
* @param locPortRange Local port range to bind.
*/
@@ -542,6 +553,8 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter
implements DiscoverySpi, T
* Sets max heartbeats count node can miss without initiating status check.
*
* If not provided, default value is {@link #DFLT_MAX_MISSED_HEARTBEATS}.
+ *
+ * Affected server nodes only.
*
* @param maxMissedHbs Max missed heartbeats.
*/
@@ -603,6 +616,8 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter
implements DiscoverySpi, T
* Sets IP finder clean frequency in milliseconds.
*
* If not provided, default value is {@link #DFLT_IP_FINDER_CLEAN_FREQ}
+ *
+ * Affected server nodes only.
*
* @param ipFinderCleanFreq IP finder clean frequency.
*/
[25/53] [abbrv] incubator-ignite git commit: # IGNITE-943 Fix tests
# IGNITE-943 Fix tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/154bd9e3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/154bd9e3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/154bd9e3
Branch: refs/heads/ignite-sprint-5
Commit: 154bd9e318b1ed68c7894169800695df47649d75
Parents: cc1612d
Author: sevdokimov
Authored: Thu May 28 16:07:25 2015 +0300
Committer: sevdokimov
Committed: Thu May 28 16:07:25 2015 +0300
--
.../processors/cache/GridCacheAtomicMessageCountSelfTest.java| 1 +
.../distributed/IgniteCacheClientNodeChangingTopologyTest.java | 2 +-
.../near/GridCacheRendezvousAffinityClientSelfTest.java | 4
3 files changed, 6 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/154bd9e3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicMessageCountSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicMessageCountSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicMessageCountSelfTest.java
index da2b81c..db4061a 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicMessageCountSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicMessageCountSelfTest.java
@@ -60,6 +60,7 @@ public class GridCacheAtomicMessageCountSelfTest extends
GridCommonAbstractTest
TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
+discoSpi.setForceServerMode(true);
discoSpi.setIpFinder(ipFinder);
cfg.setDiscoverySpi(discoSpi);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/154bd9e3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java
index 47c1d7e..ff99d3b 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java
@@ -79,7 +79,7 @@ public class IgniteCacheClientNodeChangingTopologyTest
extends GridCommonAbstrac
@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
-((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder);
+
((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder).setForceServerMode(true);
cfg.setClientMode(client);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/154bd9e3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheRendezvousAffinityClientSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheRendezvousAffinityClientSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheRendezvousAffinityClientSelfTest.java
index 80651bf..3bab050 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheRendezvousAffinityClientSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheRendezvousAffinityClientSelfTest.java
@@ -24,6 +24,7 @@ import org.apache.ignite.cache.affinity.rendezvous.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.testframework.junits.common.*;
import java.util.*;
@@ -35,9 +36,12 @@ public class GridCacheRendezvousAffinityClientSelfTest
extends GridCommonAbstrac
/** Client node. */
private boolean client;
+/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
+((TcpDiscoverySpi)cfg.getDiscoverySpi()).setForceServerMode(true);
+
[26/53] [abbrv] incubator-ignite git commit: # IGNITE-943 Remove SocketMultiConnector
# IGNITE-943 Remove SocketMultiConnector
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6adc9743
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6adc9743
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6adc9743
Branch: refs/heads/ignite-sprint-5
Commit: 6adc9743d4912ad59a50832f4869e8e41f5f9a04
Parents: 154bd9e
Author: sevdokimov
Authored: Thu May 28 17:03:39 2015 +0300
Committer: sevdokimov
Committed: Thu May 28 17:03:39 2015 +0300
--
.../ignite/spi/discovery/tcp/ServerImpl.java| 21 +--
.../spi/discovery/tcp/SocketMultiConnector.java | 144 ---
2 files changed, 13 insertions(+), 152 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6adc9743/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
index a966363..59e25fc 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
@@ -810,17 +810,22 @@ class ServerImpl extends TcpDiscoveryImpl {
boolean retry = false;
Collection errs = new ArrayList<>();
-try (SocketMultiConnector multiConnector = new
SocketMultiConnector(spi, addrs, 2)) {
-GridTuple3 tuple;
+for (int j = 2; --j >= 0;) {
+for (InetSocketAddress addr : addrs) {
+Socket sock = null;
+Exception ex = null;
-while ((tuple = multiConnector.next()) != null) {
-InetSocketAddress addr = tuple.get1();
-Socket sock = tuple.get2();
-Exception ex = tuple.get3();
+try {
+sock = spi.openSocket(addr);
+}
+catch (Exception e) {
+if (j > 0)
+continue;
-if (ex == null) {
-assert sock != null;
+ex = e;
+}
+if (ex == null) {
try {
Integer res = sendMessageDirectly(joinReq, addr,
sock);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6adc9743/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/SocketMultiConnector.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/SocketMultiConnector.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/SocketMultiConnector.java
deleted file mode 100644
index 698735e..000
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/SocketMultiConnector.java
+++ /dev/null
@@ -1,144 +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.spi.discovery.tcp;
-
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.spi.*;
-import org.jetbrains.annotations.*;
-
-import java.net.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-/**
- * Allow to connect to addresses parallel.
- */
-class SocketMultiConnector implements AutoCloseable {
-/** */
-private int connInProgress;
-
-/** */
-private final ExecutorService executor;
-
-/** */
-private final CompletionService> completionSrvc;
-
-/**
- * @param spi Discovery SPI.
- * @param addrs Addresses.
- * @param retryCnt Retry count.
- */
-SocketMultiConnector(final TcpDiscoverySpi spi,
Collection addrs,
-final int retryCnt) {
-connInProgress = addrs.size();
-
-exe
[31/53] [abbrv] incubator-ignite git commit: # IGNITE-943 Fix tests
# IGNITE-943 Fix tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/110573bc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/110573bc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/110573bc
Branch: refs/heads/ignite-sprint-5
Commit: 110573bcbd6e4bee94c35cc912685e9225b602d4
Parents: 7f98e29
Author: sevdokimov
Authored: Thu May 28 17:19:01 2015 +0300
Committer: sevdokimov
Committed: Thu May 28 17:19:01 2015 +0300
--
.../GridCachePartitionedClientOnlyNoPrimaryFullApiSelfTest.java| 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/110573bc/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedClientOnlyNoPrimaryFullApiSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedClientOnlyNoPrimaryFullApiSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedClientOnlyNoPrimaryFullApiSelfTest.java
index c79c32a..931e347 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedClientOnlyNoPrimaryFullApiSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedClientOnlyNoPrimaryFullApiSelfTest.java
@@ -22,6 +22,7 @@ import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.cluster.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.lang.*;
+import org.apache.ignite.spi.discovery.tcp.*;
import java.util.*;
@@ -38,6 +39,7 @@ public class
GridCachePartitionedClientOnlyNoPrimaryFullApiSelfTest extends Grid
@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
+((TcpDiscoverySpi)cfg.getDiscoverySpi()).setForceServerMode(true);
cfg.setClientMode(true);
return cfg;
[46/53] [abbrv] incubator-ignite git commit: # IGNITE-943 Fix GridSegmentationSelfTest
# IGNITE-943 Fix GridSegmentationSelfTest
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ccc0d403
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ccc0d403
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ccc0d403
Branch: refs/heads/ignite-sprint-5
Commit: ccc0d4038a5d41a8d83e99508279dd17d90d06df
Parents: 99234d0
Author: sevdokimov
Authored: Fri May 29 16:39:59 2015 +0300
Committer: sevdokimov
Committed: Fri May 29 16:40:37 2015 +0300
--
.../org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 7 +++
1 file changed, 7 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ccc0d403/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index 1b8424c..af85050 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -1688,6 +1688,13 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter
implements DiscoverySpi, T
/**
* FOR TEST ONLY!!!
*/
+void forceNextNodeFailure() {
+((ServerImpl)impl).forceNextNodeFailure();
+}
+
+/**
+ * FOR TEST ONLY!!!
+ */
public void
addSendMessageListener(IgniteInClosure lsnr) {
sendMsgLsnrs.add(lsnr);
}
[01/53] [abbrv] incubator-ignite git commit: # IGNITE-943 Merge TcpDiscoverySpi and TcpClientDiscoverySpi
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-sprint-5 9a16d1906 -> 3c0046e8e
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/838c0fd8/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
deleted file mode 100644
index ddbea0c..000
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
+++ /dev/null
@@ -1,1185 +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.spi.discovery.tcp;
-
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.io.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.marshaller.jdk.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.discovery.*;
-import org.apache.ignite.spi.discovery.tcp.internal.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.messages.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.util.concurrent.atomic.*;
-
-/**
- * Base class for TCP discovery SPIs.
- */
-public abstract class TcpDiscoverySpiAdapter extends IgniteSpiAdapter
implements DiscoverySpi {
-/** Default port to listen (value is 47500). */
-public static final int DFLT_PORT = 47500;
-
-/** Default timeout for joining topology (value is 0). */
-public static final long DFLT_JOIN_TIMEOUT = 0;
-
-/** Default network timeout in milliseconds (value is 5000ms). */
-public static final long DFLT_NETWORK_TIMEOUT = 5000;
-
-/** Default value for thread priority (value is 10). */
-public static final int DFLT_THREAD_PRI = 10;
-
-/** Default heartbeat messages issuing frequency (value is
100ms). */
-public static final long DFLT_HEARTBEAT_FREQ = 100;
-
-/** Default size of topology snapshots history. */
-public static final int DFLT_TOP_HISTORY_SIZE = 1000;
-
-/** Response OK. */
-protected static final int RES_OK = 1;
-
-/** Response CONTINUE JOIN. */
-protected static final int RES_CONTINUE_JOIN = 100;
-
-/** Response WAIT. */
-protected static final int RES_WAIT = 200;
-
-/** Local address. */
-protected String locAddr;
-
-/** IP finder. */
-protected TcpDiscoveryIpFinder ipFinder;
-
-/** Socket operations timeout. */
-protected long sockTimeout; // Must be initialized in the constructor of
child class.
-
-/** Message acknowledgement timeout. */
-protected long ackTimeout; // Must be initialized in the constructor of
child class.
-
-/** Network timeout. */
-protected long netTimeout = DFLT_NETWORK_TIMEOUT;
-
-/** Join timeout. */
-@SuppressWarnings("RedundantFieldInitialization")
-protected long joinTimeout = DFLT_JOIN_TIMEOUT;
-
-/** Thread priority for all threads started by SPI. */
-protected int threadPri = DFLT_THREAD_PRI;
-
-/** Heartbeat messages issuing frequency. */
-protected long hbFreq = DFLT_HEARTBEAT_FREQ;
-
-/** Size of topology snapshots history. */
-protected int topHistSize = DFLT_TOP_HISTORY_SIZE;
-
-/** Grid discovery listener. */
-protected volatile DiscoverySpiListener lsnr;
-
-/** Data exchange. */
-protected DiscoverySpiDataExchange exchange;
-
-/** Metrics provider. */
-protected DiscoveryMetricsProvider metricsProvider;
-
-/** Local node attributes. */
-protected Map locNodeAttrs;
-
-/** Local node version. */
-protected IgniteProductVersion locNodeVer;
-
-/** Local node. */
-protected TcpDiscoveryNode locNode;
-
-/** Local host. */
-protected InetAd
[43/53] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-943
Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-943 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/eb810196 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/eb810196 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/eb810196 Branch: refs/heads/ignite-sprint-5 Commit: eb81019604bedd80bf8101f2d65e278b0de88cc0 Parents: ac258a5 7ec4c82 Author: sevdokimov Authored: Fri May 29 14:32:27 2015 +0300 Committer: sevdokimov Committed: Fri May 29 14:32:27 2015 +0300 -- dev-tools/src/main/groovy/jiraslurp.groovy | 3 + .../shmem/IpcSharedMemoryServerEndpoint.java| 2 +- modules/mesos/README.txt| 28 + modules/mesos/licenses/apache-2.0.txt | 202 modules/mesos/licenses/jetty-epl-license.txt| 69 +++ modules/mesos/pom.xml | 101 .../apache/ignite/mesos/ClusterProperties.java | 519 +++ .../apache/ignite/mesos/IgniteFramework.java| 119 + .../apache/ignite/mesos/IgniteScheduler.java| 361 + .../org/apache/ignite/mesos/IgniteTask.java | 86 +++ .../org/apache/ignite/mesos/package-info.java | 22 + .../ignite/mesos/resource/IgniteProvider.java | 234 + .../ignite/mesos/resource/JettyServer.java | 61 +++ .../ignite/mesos/resource/ResourceHandler.java | 142 + .../ignite/mesos/resource/ResourceProvider.java | 120 + .../ignite/mesos/resource/package-info.java | 22 + .../main/resources/ignite-default-config.xml| 35 ++ .../org/apache/ignite/IgniteMesosTestSuite.java | 38 ++ .../ignite/mesos/IgniteSchedulerSelfTest.java | 464 + parent/pom.xml | 4 + pom.xml | 1 + scripts/git-patch-prop.sh | 2 +- 22 files changed, 2633 insertions(+), 2 deletions(-) --
[32/53] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-709_2' into ignite-943
Merge remote-tracking branch 'remotes/origin/ignite-709_2' into ignite-943 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3dea5f14 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3dea5f14 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3dea5f14 Branch: refs/heads/ignite-sprint-5 Commit: 3dea5f148e3fc017bf9643e69f2661a132cfc96c Parents: 110573b 581f4d9 Author: sevdokimov Authored: Thu May 28 17:19:27 2015 +0300 Committer: sevdokimov Committed: Thu May 28 17:19:27 2015 +0300 -- .../configuration/CacheConfiguration.java | 1 - .../processors/cache/GridCacheAdapter.java | 15 - .../cache/GridCacheConcurrentMap.java | 21 ++--- .../processors/cache/GridCacheProcessor.java| 32 +++- .../processors/cache/GridCacheProxyImpl.java| 12 .../processors/cache/IgniteInternalCache.java | 5 +++ .../cache/query/GridCacheQueryAdapter.java | 2 ++ .../cache/query/GridCacheQueryErrorFuture.java | 2 ++ .../cache/query/GridCacheQueryManager.java | 2 +- .../continuous/CacheContinuousQueryManager.java | 24 --- .../cacheobject/IgniteCacheObjectProcessor.java | 5 ++- .../IgniteCacheObjectProcessorImpl.java | 2 +- 12 files changed, 93 insertions(+), 30 deletions(-) --
[08/53] [abbrv] incubator-ignite git commit: # IGNITE-943 Fix tests.
# IGNITE-943 Fix tests. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4117f686 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4117f686 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4117f686 Branch: refs/heads/ignite-sprint-5 Commit: 4117f686300ca138fcda4a5adbe6ee0c2fc48ff4 Parents: bf0e157 Author: sevdokimov Authored: Wed May 27 17:17:53 2015 +0300 Committer: sevdokimov Committed: Wed May 27 17:17:53 2015 +0300 -- .../java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4117f686/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java index 922c496..90ab05a 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java @@ -1582,7 +1582,8 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi, T unregisterMBean(); -impl.spiStop(); +if (impl != null) +impl.spiStop(); } /**
[06/53] [abbrv] incubator-ignite git commit: # IGNITE-943 Fix tests.
# IGNITE-943 Fix tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bf0e1575
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bf0e1575
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bf0e1575
Branch: refs/heads/ignite-sprint-5
Commit: bf0e15750d30a05a4371b86ad2135a9b5fd233cb
Parents: 838c0fd
Author: sevdokimov
Authored: Wed May 27 17:01:02 2015 +0300
Committer: sevdokimov
Committed: Wed May 27 17:01:02 2015 +0300
--
.../org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 2 +-
.../apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 11 +--
.../spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java | 3 +--
3 files changed, 11 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bf0e1575/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
index 7e1f592..46a89aa 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
@@ -78,7 +78,7 @@ class ServerImpl extends TcpDiscoveryImpl {
private RingMessageWorker msgWorker;
/** Client message workers. */
-private ConcurrentMap clientMsgWorkers = new
ConcurrentHashMap8<>();
+protected ConcurrentMap clientMsgWorkers = new
ConcurrentHashMap8<>();
/** Metrics sender. */
@SuppressWarnings("FieldAccessedSynchronizedAndUnsynchronized")
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bf0e1575/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index 2b2c691..922c496 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -1495,6 +1495,8 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter
implements DiscoverySpi, T
sockTimeout = DFLT_SOCK_TIMEOUT_CLIENT;
impl = new ClientImpl(this);
+
+ctxInitLatch.countDown();
}
else {
if (ackTimeout == 0)
@@ -1506,8 +1508,6 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter
implements DiscoverySpi, T
impl = new ServerImpl(this);
}
-startStopwatch();
-
assertParameter(ipFinder != null, "ipFinder != null");
assertParameter(hbFreq > 0, "heartbeatFreq > 0");
assertParameter(netTimeout > 0, "networkTimeout > 0");
@@ -1636,6 +1636,13 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter
implements DiscoverySpi, T
/**
* FOR TEST ONLY!!!
*/
+public int clientWorkerCount() {
+return ((ServerImpl)impl).clientMsgWorkers.size();
+}
+
+/**
+ * FOR TEST ONLY!!!
+ */
public void
addSendMessageListener(IgniteInClosure lsnr) {
sendMsgLsnrs.add(lsnr);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bf0e1575/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
index 1655c33..f27ef33 100644
---
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
@@ -25,7 +25,6 @@ import org.apache.ignite.internal.*;
import org.apache.ignite.internal.util.*;
import org.apache.ignite.internal.util.io.*;
import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.resources.*;
import org.apache.ignite.spi.*;
@@ -341,7 +340,7 @@ public class TcpClientDiscoverySpiSelfTest extends
GridCommonAbstractTest {
attachListeners(3, 3);
-assert
U.field(G.ignite("server-2").configuration().getDiscoverySpi(),
"clientMsgWorkers").isEmpty();
+assert
((TcpDiscoverySpi)G.i
[34/53] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-943
Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-943 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cfe56213 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cfe56213 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cfe56213 Branch: refs/heads/ignite-sprint-5 Commit: cfe56213e1dfc011de47e0425627b3ff73a57763 Parents: 9cddb6f b6fc8a9 Author: sevdokimov Authored: Thu May 28 18:02:47 2015 +0300 Committer: sevdokimov Committed: Thu May 28 18:02:47 2015 +0300 -- dev-tools/gradle/wrapper/gradle-wrapper.jar | Bin 51017 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties| 18 +- dev-tools/gradlew | 163 dev-tools/slurp.sh | 2 +- dev-tools/src/main/groovy/jiraslurp.groovy | 73 -- examples/pom.xml| 2 +- modules/aop/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml| 2 +- .../src/main/java/org/apache/ignite/Ignite.java | 8 +- .../java/org/apache/ignite/IgniteServices.java | 5 +- .../apache/ignite/internal/IgniteKernal.java| 4 +- .../org/apache/ignite/services/Service.java | 5 +- .../core/src/main/resources/ignite.properties | 2 +- .../cache/IgniteDynamicCacheStartSelfTest.java | 20 +- .../service/ClosureServiceClientsNodesTest.java | 245 +++ .../ignite/testsuites/IgniteBasicTestSuite.java | 2 + modules/extdata/p2p/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml| 2 +- .../query/h2/sql/GridSqlQuerySplitter.java | 4 + .../query/h2/sql/BaseH2CompareQueryTest.java| 16 ++ modules/jcl/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/rest-http/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml| 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- .../licenses/jcraft-revised-bsd.txt | 28 --- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- modules/yardstick/pom.xml | 2 +- pom.xml | 2 +- 47 files changed, 498 insertions(+), 159 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cfe56213/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cfe56213/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java --
[48/53] [abbrv] incubator-ignite git commit: # ignite-943 fixed client futures remap
# ignite-943 fixed client futures remap
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d10fe3e9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d10fe3e9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d10fe3e9
Branch: refs/heads/ignite-sprint-5
Commit: d10fe3e9013bc9ecd27823ff00443983b7c066c2
Parents: b3d8e1e
Author: sboikov
Authored: Fri May 29 17:29:28 2015 +0300
Committer: sboikov
Committed: Fri May 29 17:29:28 2015 +0300
--
.../dht/colocated/GridDhtColocatedLockFuture.java | 18 --
.../near/GridNearOptimisticTxPrepareFuture.java | 18 --
2 files changed, 24 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d10fe3e9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
index 5a4c91d..c784948 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
@@ -549,7 +549,7 @@ public final class GridDhtColocatedLockFuture extends
GridCompoundIdentityFuture
}
// Must get topology snapshot and map on that version.
-mapOnTopology(false);
+mapOnTopology(false, null);
}
/**
@@ -557,8 +557,9 @@ public final class GridDhtColocatedLockFuture extends
GridCompoundIdentityFuture
* will asynchronously wait for it's completeness and then try again.
*
* @param remap Remap flag.
+ * @param c Optional closure to run after map.
*/
-private void mapOnTopology(final boolean remap) {
+private void mapOnTopology(final boolean remap, @Nullable final Runnable
c) {
// We must acquire topology snapshot from the topology version future.
cctx.topology().readLock();
@@ -597,12 +598,15 @@ public final class GridDhtColocatedLockFuture extends
GridCompoundIdentityFuture
map(keys, remap);
+if (c != null)
+c.run();
+
markInitialized();
}
else {
fut.listen(new
CI1>() {
@Override public void
apply(IgniteInternalFuture t) {
-mapOnTopology(remap);
+mapOnTopology(remap, c);
}
});
}
@@ -1366,9 +1370,11 @@ public final class GridDhtColocatedLockFuture extends
GridCompoundIdentityFuture
for (KeyCacheObject key : GridDhtColocatedLockFuture.this.keys)
cctx.mvcc().removeExplicitLock(threadId, key, lockVer);
-mapOnTopology(true);
-
-onDone(true);
+mapOnTopology(true, new Runnable() {
+@Override public void run() {
+onDone(true);
+}
+});
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d10fe3e9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
index 0a92112..44b7997 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
@@ -226,13 +226,14 @@ public class GridNearOptimisticTxPrepareFuture extends
GridNearTxPrepareFutureAd
return;
}
-prepareOnTopology(false);
+prepareOnTopology(false, null);
}
/**
* @param remap Remap flag.
+ * @param c Optional closure to run after map.
*/
-private void prepareOnTopology(final boolean remap) {
+private void prepareOnTopology(final boolean remap, @Nullable final
Runnable c) {
GridDhtTopologyFuture topFut = t
[36/53] [abbrv] incubator-ignite git commit: # IGNITE-709 Fix IgfsOneClientNodeTest
# IGNITE-709 Fix IgfsOneClientNodeTest
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2bc07956
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2bc07956
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2bc07956
Branch: refs/heads/ignite-sprint-5
Commit: 2bc07956a828ac836641f4fbe6ae0db7b3cc1793
Parents: 2799c3a
Author: sevdokimov
Authored: Thu May 28 21:47:48 2015 +0300
Committer: sevdokimov
Committed: Thu May 28 21:47:48 2015 +0300
--
.../ignite/spi/discovery/tcp/ServerImpl.java| 112 ---
.../processors/igfs/IgfsOneClientNodeTest.java | 8 +-
2 files changed, 47 insertions(+), 73 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2bc07956/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
index 59e25fc..b5c9519 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
@@ -810,84 +810,61 @@ class ServerImpl extends TcpDiscoveryImpl {
boolean retry = false;
Collection errs = new ArrayList<>();
-for (int j = 2; --j >= 0;) {
-for (InetSocketAddress addr : addrs) {
-Socket sock = null;
-Exception ex = null;
+for (InetSocketAddress addr : addrs) {
+try {
+Integer res = sendMessageDirectly(joinReq, addr);
-try {
-sock = spi.openSocket(addr);
-}
-catch (Exception e) {
-if (j > 0)
-continue;
+assert res != null;
-ex = e;
-}
+noResAddrs.remove(addr);
-if (ex == null) {
-try {
-Integer res = sendMessageDirectly(joinReq, addr,
sock);
+// Address is responsive, reset period start.
+noResStart = 0;
-assert res != null;
+switch (res) {
+case RES_WAIT:
+// Concurrent startup, try sending join request
again or wait if no success.
+retry = true;
-noResAddrs.remove(addr);
+break;
+case RES_OK:
+if (log.isDebugEnabled())
+log.debug("Join request message has been sent
to address [addr=" + addr +
+", req=" + joinReq + ']');
-// Address is responsive, reset period start.
-noResStart = 0;
+// Join request sending succeeded, wait for
response from topology.
+return true;
-switch (res) {
-case RES_WAIT:
-// Concurrent startup, try sending join
request again or wait if no success.
+default:
+// Concurrent startup, try next node.
+if (res == RES_CONTINUE_JOIN) {
+if (!fromAddrs.contains(addr))
retry = true;
+}
+else {
+if (log.isDebugEnabled())
+log.debug("Unexpected response to join
request: " + res);
-break;
-case RES_OK:
-if (log.isDebugEnabled())
-log.debug("Join request message has
been sent to address [addr=" + addr +
-", req=" + joinReq + ']');
-
-// Join request sending succeeded, wait
for response from topology.
-return true;
-
-default:
-// Concurrent startup, try next node.
-if (res == RES_CONTINUE_JOIN) {
-if (!fromAddrs.contains(addr))
-
[04/53] [abbrv] incubator-ignite git commit: # IGNITE-943 Merge TcpDiscoverySpi and TcpClientDiscoverySpi
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/838c0fd8/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
new file mode 100644
index 000..7e1f592
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
@@ -0,0 +1,4792 @@
+/*
+ * 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;
+
+import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
+import org.apache.ignite.cluster.*;
+import org.apache.ignite.internal.*;
+import org.apache.ignite.internal.events.*;
+import org.apache.ignite.internal.processors.security.*;
+import org.apache.ignite.internal.util.*;
+import org.apache.ignite.internal.util.future.*;
+import org.apache.ignite.internal.util.io.*;
+import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.tostring.*;
+import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.lang.*;
+import org.apache.ignite.plugin.security.*;
+import org.apache.ignite.spi.*;
+import org.apache.ignite.spi.discovery.*;
+import org.apache.ignite.spi.discovery.tcp.internal.*;
+import org.apache.ignite.spi.discovery.tcp.messages.*;
+import org.jetbrains.annotations.*;
+import org.jsr166.*;
+
+import java.io.*;
+import java.net.*;
+import java.text.*;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.*;
+
+import static org.apache.ignite.events.EventType.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
+import static org.apache.ignite.spi.IgnitePortProtocol.*;
+import static
org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoverySpiState.*;
+import static
org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryStatusCheckMessage.*;
+
+/**
+ *
+ */
+class ServerImpl extends TcpDiscoveryImpl {
+/** */
+private final Executor utilityPool = new ThreadPoolExecutor(0, 1, 2000,
TimeUnit.MILLISECONDS,
+new LinkedBlockingQueue());
+
+/** Nodes ring. */
+@GridToStringExclude
+private final TcpDiscoveryNodesRing ring = new TcpDiscoveryNodesRing();
+
+/** Topology snapshots history. */
+private final SortedMap> topHist = new
TreeMap<>();
+
+/** Socket readers. */
+private final Collection readers = new LinkedList<>();
+
+/** TCP server for discovery SPI. */
+private TcpServer tcpSrvr;
+
+/** Message worker. */
+@SuppressWarnings("FieldAccessedSynchronizedAndUnsynchronized")
+private RingMessageWorker msgWorker;
+
+/** Client message workers. */
+private ConcurrentMap clientMsgWorkers = new
ConcurrentHashMap8<>();
+
+/** Metrics sender. */
+@SuppressWarnings("FieldAccessedSynchronizedAndUnsynchronized")
+private HeartbeatsSender hbsSnd;
+
+/** Status checker. */
+@SuppressWarnings("FieldAccessedSynchronizedAndUnsynchronized")
+private CheckStatusSender chkStatusSnd;
+
+/** IP finder cleaner. */
+@SuppressWarnings("FieldAccessedSynchronizedAndUnsynchronized")
+private IpFinderCleaner ipFinderCleaner;
+
+/** Statistics printer thread. */
+@SuppressWarnings("FieldAccessedSynchronizedAndUnsynchronized")
+private StatisticsPrinter statsPrinter;
+
+/** Failed nodes (but still in topology). */
+private Collection failedNodes = new HashSet<>();
+
+/** Leaving nodes (but still in topology). */
+private Collection leavingNodes = new HashSet<>();
+
+/** If non-shared IP finder is used this flag shows whether IP finder
contains local address. */
+private boolean ipFinderHasLocAddr;
+
+/** Addresses that do not respond during join requests send (for resolving
concurrent start). */
+private final Collection noResAddrs = new
GridConcurrentHashSet<>();
+
+/** Addresses that incoming join requests send were send from (for
resolving concurrent start). */
+private final Collection fromAddrs = ne
[03/53] [abbrv] incubator-ignite git commit: # IGNITE-943 Merge TcpDiscoverySpi and TcpClientDiscoverySpi
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/838c0fd8/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/SocketMultiConnector.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/SocketMultiConnector.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/SocketMultiConnector.java
index b988ceb..698735e 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/SocketMultiConnector.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/SocketMultiConnector.java
@@ -44,7 +44,7 @@ class SocketMultiConnector implements AutoCloseable {
* @param addrs Addresses.
* @param retryCnt Retry count.
*/
-SocketMultiConnector(final TcpDiscoverySpiAdapter spi,
Collection addrs,
+SocketMultiConnector(final TcpDiscoverySpi spi,
Collection addrs,
final int retryCnt) {
connInProgress = addrs.size();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/838c0fd8/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
deleted file mode 100644
index 52c9016..000
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
+++ /dev/null
@@ -1,1573 +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.spi.discovery.tcp;
-
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.discovery.*;
-import org.apache.ignite.spi.discovery.tcp.internal.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.*;
-import org.apache.ignite.spi.discovery.tcp.messages.*;
-import org.jetbrains.annotations.*;
-import org.jsr166.*;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static java.util.concurrent.TimeUnit.*;
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.internal.events.DiscoveryCustomEvent.*;
-import static
org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryHeartbeatMessage.*;
-
-/**
- * Client discovery SPI implementation that uses TCP/IP for node discovery.
- *
- * This discovery SPI requires at least one server node configured with
- * {@link TcpDiscoverySpi}. It will try to connect to random IP taken from
- * {@link TcpDiscoveryIpFinder} which should point to one of these server
- * nodes and will maintain connection only with this node (will not enter the
ring).
- * If this connection is broken, it will try to reconnect using addresses from
- * the same IP finder.
- *
- * Configuration
- * Mandatory
- * There are no mandatory configuration parameters.
- * Optional
- * The following configuration parameters are optional:
- *
- * IP finder to share info about nodes IP addresses
- * (see {@link #setIpFinder(TcpDiscoveryIpFinder)}).
- * See the following IP finder implementations for details on configuration:
- *
- * {@link
org.apache.ignite.spi.discovery.tcp.ipfinder.sharedfs.TcpDiscoverySharedFsIpFinder}
- * {@ignitelink
org.apache.ignite.spi.discovery.tcp.ipfinder.s3.TcpDiscoveryS3IpFinder}
- * {@link
org.apache.ignite.spi.discovery.tcp.ipfinder.jdbc.TcpDiscoveryJdbcIpFinder}
- * {@link
org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder}
- * {@link TcpDiscoveryMulticastIpFinder} - default
- *
- *
- *
- *
- * Local address (see {@link #setLocalAddress(String)})
- * Heartbeat frequency (see {@link #setHeartbeatFrequency(long)})
- * Network timeout (s
[24/53] [abbrv] incubator-ignite git commit: # IGNITE-943 Fix tests
# IGNITE-943 Fix tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cc1612dd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cc1612dd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cc1612dd
Branch: refs/heads/ignite-sprint-5
Commit: cc1612dda53cb566ba251a6d241914b4d22079ce
Parents: a43522b
Author: sevdokimov
Authored: Thu May 28 16:02:16 2015 +0300
Committer: sevdokimov
Committed: Thu May 28 16:02:16 2015 +0300
--
.../java/org/apache/ignite/internal/GridAffinitySelfTest.java | 1 +
.../processors/cache/IgniteCacheConfigurationTemplateTest.java| 2 +-
.../processors/cache/IgniteCacheNearLockValueSelfTest.java| 3 +++
.../processors/datastreamer/DataStreamProcessorSelfTest.java | 1 +
4 files changed, 6 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc1612dd/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java
index 6735021..7bc8dd6 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java
@@ -47,6 +47,7 @@ public class GridAffinitySelfTest extends
GridCommonAbstractTest {
disco.setMaxMissedHeartbeats(Integer.MAX_VALUE);
disco.setIpFinder(IP_FINDER);
+disco.setForceServerMode(true);
cfg.setDiscoverySpi(disco);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc1612dd/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateTest.java
index a030039..937a3b4 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateTest.java
@@ -59,7 +59,7 @@ public class IgniteCacheConfigurationTemplateTest extends
GridCommonAbstractTest
@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
-((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder);
+
((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder).setForceServerMode(true);
if (addTemplate) {
CacheConfiguration dfltCfg = new CacheConfiguration();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc1612dd/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNearLockValueSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNearLockValueSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNearLockValueSelfTest.java
index 5cc9d04..cd04433 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNearLockValueSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNearLockValueSelfTest.java
@@ -27,6 +27,7 @@ import
org.apache.ignite.internal.processors.cache.distributed.near.*;
import org.apache.ignite.plugin.extensions.communication.*;
import org.apache.ignite.spi.*;
import org.apache.ignite.spi.communication.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.testframework.junits.common.*;
import org.apache.ignite.transactions.*;
@@ -54,6 +55,8 @@ public class IgniteCacheNearLockValueSelfTest extends
GridCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
+cfg.setDiscoverySpi(new TcpDiscoverySpi().setForceServerMode(true));
+
if (getTestGridName(0).equals(gridName))
cfg.setClientMode(true);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc1612dd/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
[11/53] [abbrv] incubator-ignite git commit: IGNITE-943 Fix tests.
IGNITE-943 Fix tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e66578ea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e66578ea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e66578ea
Branch: refs/heads/ignite-sprint-5
Commit: e66578ea8fdc14ce25dace68600c2e5317818bad
Parents: bb35c88
Author: sevdokimov
Authored: Wed May 27 18:16:59 2015 +0300
Committer: sevdokimov
Committed: Wed May 27 18:16:59 2015 +0300
--
.../java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 4 ++--
.../org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 7 +++
2 files changed, 9 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e66578ea/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
index 46a89aa..2cd8212 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
@@ -4080,7 +4080,7 @@ class ServerImpl extends TcpDiscoveryImpl {
// Ping.
if (msg instanceof TcpDiscoveryPingRequest) {
-if (!adapter.getSpiContext().isStopping()) {
+if (!adapter.isNodeStopping0()) {
TcpDiscoveryPingRequest req =
(TcpDiscoveryPingRequest)msg;
TcpDiscoveryPingResponse res = new
TcpDiscoveryPingResponse(locNodeId);
@@ -4649,7 +4649,7 @@ class ServerImpl extends TcpDiscoveryImpl {
*
*/
public boolean ping() throws InterruptedException {
-if (adapter.getSpiContext().isStopping())
+if (adapter.isNodeStopping0())
return false;
GridFutureAdapter fut;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e66578ea/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index 90ab05a..93a1ec3 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -1610,6 +1610,13 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter
implements DiscoverySpi, T
}
/**
+ * @return {@code True} if node is stopping.
+ */
+boolean isNodeStopping0() {
+return super.isNodeStopping();
+}
+
+/**
* @throws IgniteSpiException If any error occurs.
* @return {@code true} if IP finder contains local address.
*/
[12/53] [abbrv] incubator-ignite git commit: # IGNITE-943 Fix IDEA's warnings.
# IGNITE-943 Fix IDEA's warnings.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/982cb0ca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/982cb0ca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/982cb0ca
Branch: refs/heads/ignite-sprint-5
Commit: 982cb0ca1acd1e34f79a387f41d4b25e34e4faab
Parents: e66578e
Author: sevdokimov
Authored: Wed May 27 18:25:36 2015 +0300
Committer: sevdokimov
Committed: Wed May 27 18:25:36 2015 +0300
--
.../org/apache/ignite/spi/discovery/tcp/ClientImpl.java | 2 ++
.../org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 9 +
.../apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java| 2 +-
3 files changed, 8 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/982cb0ca/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
index 455b2af..aa254ec 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
@@ -541,6 +541,7 @@ class ClientImpl extends TcpDiscoveryImpl {
U.closeQuiet(msgWorker.currSock);
}
+/** {@inheritDoc} */
@Override protected IgniteSpiThread workerThread() {
return msgWorker;
}
@@ -548,6 +549,7 @@ class ClientImpl extends TcpDiscoveryImpl {
/**
* FOR TEST PURPOSE ONLY!
*/
+@SuppressWarnings("BusyWait")
public void waitForClientMessagePrecessed() {
Object last = msgWorker.queue.peekLast();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/982cb0ca/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
index 2cd8212..184895b 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
@@ -55,6 +55,7 @@ import static
org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryStatusChe
/**
*
*/
+@SuppressWarnings("NonPrivateFieldAccessedInSynchronizedContext")
class ServerImpl extends TcpDiscoveryImpl {
/** */
private final Executor utilityPool = new ThreadPoolExecutor(0, 1, 2000,
TimeUnit.MILLISECONDS,
@@ -416,7 +417,7 @@ class ServerImpl extends TcpDiscoveryImpl {
DiscoverySpiListener lsnr = adapter.lsnr;
if (lsnr != null) {
-Set processed = new HashSet<>();
+Collection processed = new HashSet<>();
for (TcpDiscoveryNode n : rmts) {
assert n.visible();
@@ -1412,7 +1413,7 @@ class ServerImpl extends TcpDiscoveryImpl {
}
/** {@inheritDoc} */
-public void dumpDebugInfo(IgniteLogger log) {
+@Override public void dumpDebugInfo(IgniteLogger log) {
if (!debugMode) {
U.quietAndWarn(log, "Failed to dump debug info (discovery SPI was
not configured " +
"in debug mode, consider setting 'debugMode' configuration
property to 'true').");
@@ -2040,12 +2041,12 @@ class ServerImpl extends TcpDiscoveryImpl {
final boolean sameHost = U.sameMacs(locNode, next);
-List localNodeAddresses =
U.arrayList(locNode.socketAddresses());
+List locNodeAddrs =
U.arrayList(locNode.socketAddresses());
addr: for (InetSocketAddress addr :
adapter.getNodeAddresses(next, sameHost)) {
long ackTimeout0 = adapter.ackTimeout;
-if (localNodeAddresses.contains(addr)){
+if (locNodeAddrs.contains(addr)){
if (log.isDebugEnabled())
log.debug("Skip to send message to the local node
(probably remote node has the same " +
"loopback address that local node): " + addr);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/982cb0ca/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
b/modules/core/src/main/java/org/apache/ignite/spi/di
[41/53] [abbrv] incubator-ignite git commit: # IGNITE-943 Fix TcpClientDiscoverySpiSelfTest.testMetrics
# IGNITE-943 Fix TcpClientDiscoverySpiSelfTest.testMetrics
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2477c0eb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2477c0eb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2477c0eb
Branch: refs/heads/ignite-sprint-5
Commit: 2477c0ebd2e8003b58e3a83b4389d1118b30b5fc
Parents: 1b0a051
Author: sevdokimov
Authored: Fri May 29 13:44:29 2015 +0300
Committer: sevdokimov
Committed: Fri May 29 13:44:29 2015 +0300
--
.../ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2477c0eb/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
index be3474d..f7be340 100644
---
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
@@ -681,7 +681,7 @@ public class TcpClientDiscoverySpiSelfTest extends
GridCommonAbstractTest {
Ignite g = G.ignite("server-" + i);
for (ClusterNode n : g.cluster().nodes()) {
-if (n.metrics().getTotalExecutedJobs() != execJobsCnt)
+if (n.metrics().getTotalExecutedJobs() != (n.isClient() ? 0 :
execJobsCnt))
return false;
}
}
@@ -690,7 +690,7 @@ public class TcpClientDiscoverySpiSelfTest extends
GridCommonAbstractTest {
Ignite g = G.ignite("client-" + i);
for (ClusterNode n : g.cluster().nodes()) {
-if (n.metrics().getTotalExecutedJobs() != execJobsCnt)
+if (n.metrics().getTotalExecutedJobs() != (n.isClient() ? 0 :
execJobsCnt))
return false;
}
}
[50/53] [abbrv] incubator-ignite git commit: # IGNITE-943 Fix example tests.
# IGNITE-943 Fix example tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f499cfea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f499cfea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f499cfea
Branch: refs/heads/ignite-sprint-5
Commit: f499cfeaf140cf50355be775a79c186102833dfa
Parents: d10120d
Author: sevdokimov
Authored: Fri May 29 20:07:10 2015 +0300
Committer: sevdokimov
Committed: Fri May 29 20:07:10 2015 +0300
--
.../apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 10 --
.../ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java | 10 ++
2 files changed, 14 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f499cfea/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index af85050..56fb63f 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -1614,8 +1614,14 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter
implements DiscoverySpi, T
U.interrupt(sockTimeoutWorker);
U.join(sockTimeoutWorker, log);
-if (ipFinder != null)
-ipFinder.close();
+if (ipFinder != null) {
+try {
+ipFinder.close();
+}
+catch (Exception e) {
+log.error("Failed to close ipFinder", e);
+}
+}
unregisterMBean();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f499cfea/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java
index 6cf06ab..45d0816 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java
@@ -495,11 +495,13 @@ public class TcpDiscoveryMulticastIpFinder extends
TcpDiscoveryVmIpFinder {
/** {@inheritDoc} */
@Override public void close() {
-for (AddressSender addrSnd : addrSnds)
-U.interrupt(addrSnd);
+if (addrSnds != null) {
+for (AddressSender addrSnd : addrSnds)
+U.interrupt(addrSnd);
-for (AddressSender addrSnd : addrSnds)
-U.join(addrSnd, log);
+for (AddressSender addrSnd : addrSnds)
+U.join(addrSnd, log);
+}
}
/** {@inheritDoc} */
[37/53] [abbrv] incubator-ignite git commit: # IGNITE-943 Bug fix: NPE in setAuthenticator
# IGNITE-943 Bug fix: NPE in setAuthenticator
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6b1265c2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6b1265c2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6b1265c2
Branch: refs/heads/ignite-sprint-5
Commit: 6b1265c2b103b4131b3ffc6deecd55d440fbe9b0
Parents: 2bc0795
Author: sevdokimov
Authored: Thu May 28 22:06:29 2015 +0300
Committer: sevdokimov
Committed: Thu May 28 22:06:29 2015 +0300
--
.../ignite/spi/discovery/tcp/ClientImpl.java| 5 -
.../ignite/spi/discovery/tcp/ServerImpl.java| 20 ++--
.../spi/discovery/tcp/TcpDiscoveryImpl.java | 5 -
.../spi/discovery/tcp/TcpDiscoverySpi.java | 5 -
4 files changed, 10 insertions(+), 25 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6b1265c2/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
index 2171085..e672d64 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
@@ -319,11 +319,6 @@ class ClientImpl extends TcpDiscoveryImpl {
}
/** {@inheritDoc} */
-@Override public void setAuthenticator(DiscoverySpiNodeAuthenticator auth)
{
-// No-op.
-}
-
-/** {@inheritDoc} */
@Override public void sendCustomEvent(DiscoverySpiCustomMessage evt) {
if (segmented)
throw new IgniteException("Failed to send custom message: client
is disconnected");
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6b1265c2/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
index b5c9519..57c13d6 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
@@ -115,9 +115,6 @@ class ServerImpl extends TcpDiscoveryImpl {
/** Response on join request from coordinator (in case of duplicate ID or
auth failure). */
private final GridTuple joinRes = F.t1();
-/** Node authenticator. */
-private DiscoverySpiNodeAuthenticator nodeAuth;
-
/** Mutex. */
private final Object mux = new Object();
@@ -631,11 +628,6 @@ class ServerImpl extends TcpDiscoveryImpl {
}
/** {@inheritDoc} */
-@Override public void setAuthenticator(DiscoverySpiNodeAuthenticator
nodeAuth) {
-this.nodeAuth = nodeAuth;
-}
-
-/** {@inheritDoc} */
@Override public void sendCustomEvent(DiscoverySpiCustomMessage evt) {
try {
msgWorker.addMessage(new
TcpDiscoveryCustomEventMessage(getLocalNodeId(), evt, spi.marsh.marshal(evt)));
@@ -680,10 +672,10 @@ class ServerImpl extends TcpDiscoveryImpl {
if (log.isDebugEnabled())
log.debug("Join request message has not been sent (local
node is the first in the topology).");
-if (nodeAuth != null) {
+if (spi.nodeAuth != null) {
// Authenticate local node.
try {
-SecurityContext subj =
nodeAuth.authenticateNode(locNode, locCred);
+SecurityContext subj =
spi.nodeAuth.authenticateNode(locNode, locCred);
if (subj == null)
throw new IgniteSpiException("Authentication
failed for local node: " + locNode.id());
@@ -2469,12 +2461,12 @@ class ServerImpl extends TcpDiscoveryImpl {
return;
}
-if (nodeAuth != null) {
+if (spi.nodeAuth != null) {
// Authenticate node first.
try {
SecurityCredentials cred = unmarshalCredentials(node);
-SecurityContext subj = nodeAuth.authenticateNode(node,
cred);
+SecurityContext subj =
spi.nodeAuth.authenticateNode(node, cred);
if (subj == null) {
// Node has not pass authentication.
@@ -2843,7 +2835,7 @@ class ServerImpl extends TcpDiscoveryImpl {
return;
[10/53] [abbrv] incubator-ignite git commit: # IGNITE-943 Fix tests.
# IGNITE-943 Fix tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bb35c881
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bb35c881
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bb35c881
Branch: refs/heads/ignite-sprint-5
Commit: bb35c8814e092b420157a0119dd31104df6093db
Parents: 4117f68
Author: sevdokimov
Authored: Wed May 27 18:07:00 2015 +0300
Committer: sevdokimov
Committed: Wed May 27 18:07:00 2015 +0300
--
.../core/src/main/java/org/apache/ignite/internal/IgnitionEx.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bb35c881/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 13b015b..42d9cf9 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
@@ -1744,7 +1744,7 @@ public class IgnitionEx {
}
if (myCfg.isClientMode() == null || !myCfg.isClientMode()) {
-if (myCfg.getDiscoverySpi().isClientMode()) {
+if (myCfg.getDiscoverySpi() != null &&
myCfg.getDiscoverySpi().isClientMode()) {
throw new IgniteCheckedException("DiscoverySpi is in
client mode, but node is not in client mode" +
"(consider changing 'IgniteConfiguration.clientMode'
to 'true').");
}
[33/53] [abbrv] incubator-ignite git commit: # ignite-857 review
# ignite-857 review
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9cddb6fe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9cddb6fe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9cddb6fe
Branch: refs/heads/ignite-sprint-5
Commit: 9cddb6fe669ef9f4ac6792a306a665fa2037f773
Parents: 3dea5f1
Author: Yakov Zhdanov
Authored: Thu May 28 17:58:49 2015 +0300
Committer: Yakov Zhdanov
Committed: Thu May 28 17:58:49 2015 +0300
--
.../managers/discovery/GridDiscoveryManager.java | 3 ++-
.../apache/ignite/spi/discovery/DiscoverySpi.java | 3 ++-
.../ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 18 --
.../spi/discovery/tcp/TcpDiscoverySpiMBean.java | 2 +-
...itionedClientOnlyNoPrimaryFullApiSelfTest.java | 3 ++-
5 files changed, 19 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9cddb6fe/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 a910950..4ef602e 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
@@ -285,7 +285,8 @@ public class GridDiscoveryManager extends
GridManagerAdapter {
/** {@inheritDoc} */
@Override protected void onKernalStart0() throws IgniteCheckedException {
if (Boolean.TRUE.equals(ctx.config().isClientMode()) &&
!getSpi().isClientMode())
-ctx.performance().add("Enable client mode for TcpDiscoverySpi (set
TcpDiscoverySpi.forceServerMode to true)");
+ctx.performance().add("Enable client mode for TcpDiscoverySpi " +
+"(set TcpDiscoverySpi.forceServerMode to false)");
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9cddb6fe/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpi.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpi.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpi.java
index e7fbadc..b952087 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpi.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpi.java
@@ -78,7 +78,8 @@ public interface DiscoverySpi extends IgniteSpi {
/**
* Sets node attributes and node version which will be distributed in grid
during
* join process. Note that these attributes cannot be changed and set only
once.
- * @param attrs Map of node attributes.
+ *
+ * @param attrs Map of node attributes.
* @param ver Product version.
*/
public void setNodeAttributes(Map attrs,
IgniteProductVersion ver);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9cddb6fe/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index 52ea78c..64e6001 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -54,10 +54,12 @@ import java.util.concurrent.atomic.*;
* done across it.
*
* If node is configured as client node (see {@link
IgniteConfiguration#clientMode})
- * TcpDiscoverySpi starts in client mode too. In this case node does not
insert to the ring,
- * it connects to any node in the ring router and communicated with that node
only.
- * Thereby slowing or shutdown of client node will not affect whole cluster.
If you want to start TcpDiscoverySpi in
- * server mode regardless {@link IgniteConfiguration#clientMode} you can set
{@link #forceSrvMode} to true.
+ * TcpDiscoverySpi starts in client mode as well. In this case node does not
take its place in the ring,
+ * but it connects to random node in the ring (IP taken from IP finder
configured) and
+ * use it as a router for discovery traffic.
+ * Therefore slow client node or its shutdown will not affect whole cluster.
If TcpDiscoverySpi
+ * needs to be started in server mode
[38/53] [abbrv] incubator-ignite git commit: # ignite-709 can not skip preload on server nodes
# ignite-709 can not skip preload on server nodes
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2c3ce158
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2c3ce158
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2c3ce158
Branch: refs/heads/ignite-sprint-5
Commit: 2c3ce158de266dfd02c91e3e6e377ce667fd598f
Parents: 581f4d9
Author: sboikov
Authored: Fri May 29 10:35:24 2015 +0300
Committer: sboikov
Committed: Fri May 29 10:35:24 2015 +0300
--
.../GridDhtPartitionsExchangeFuture.java| 2 +-
.../IgniteCacheClientNodeConcurrentStart.java | 105 +++
...teCacheClientNodePartitionsExchangeTest.java | 6 +-
.../testsuites/IgniteCacheTestSuite2.java | 1 +
4 files changed, 110 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2c3ce158/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index 162c7b3..145def8 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@ -517,7 +517,7 @@ public class GridDhtPartitionsExchangeFuture extends
GridFutureAdapterhttp://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2c3ce158/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeConcurrentStart.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeConcurrentStart.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeConcurrentStart.java
new file mode 100644
index 000..bd74ece
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeConcurrentStart.java
@@ -0,0 +1,105 @@
+/*
+ * 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.distributed;
+
+import org.apache.ignite.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.spi.discovery.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+import java.util.*;
+import java.util.concurrent.*;
+
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
+
+/**
+ *
+ */
+public class IgniteCacheClientNodeConcurrentStart extends
GridCommonAbstractTest {
+/** */
+protected static TcpDiscoveryIpFinder ipFinder = new
TcpDiscoveryVmIpFinder(true);
+
+/** */
+private static final int NODES_CNT = 5;
+
+/** */
+private Set clientNodes;
+
+/** {@inheritDoc} */
+@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
+IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+assertNotNull(clientNodes);
+
+((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder);
+
+boolean client = false;
+
+for (Integer clientIdx : clientNodes) {
+if (getTestGridName(clientIdx).equals(gridName)) {
+client = true;
+
+break;
+}
+}
+
+cfg.setClientMode(client);
+
+CacheConfiguration ccfg = new CacheConfiguration();
+
+ccfg.setBacku
[22/53] [abbrv] incubator-ignite git commit: # IGNITE-943 Fix GridProjectionSelfTest
# IGNITE-943 Fix GridProjectionSelfTest
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5cec2ba6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5cec2ba6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5cec2ba6
Branch: refs/heads/ignite-sprint-5
Commit: 5cec2ba61b98cabd421aeb0091c5531b246f54e3
Parents: e2e90c4
Author: sevdokimov
Authored: Thu May 28 15:43:34 2015 +0300
Committer: sevdokimov
Committed: Thu May 28 15:43:34 2015 +0300
--
.../ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 4 +++-
.../ignite/internal/GridProjectionAbstractTest.java | 16
2 files changed, 19 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5cec2ba6/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index 5a2ddd6..52ea78c 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -393,8 +393,10 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter
implements DiscoverySpi, T
*
* @param forceSrvMode forceServerMode flag.
*/
-public void setForceServerMode(boolean forceSrvMode) {
+public TcpDiscoverySpi setForceServerMode(boolean forceSrvMode) {
this.forceSrvMode = forceSrvMode;
+
+return this;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5cec2ba6/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionAbstractTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionAbstractTest.java
index 0171290..cb1341c 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionAbstractTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionAbstractTest.java
@@ -20,9 +20,13 @@ package org.apache.ignite.internal;
import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.compute.*;
+import org.apache.ignite.configuration.*;
import org.apache.ignite.events.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.lang.*;
+import org.apache.ignite.spi.discovery.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
import org.apache.ignite.testframework.junits.common.*;
import org.jetbrains.annotations.*;
@@ -38,6 +42,9 @@ import static org.apache.ignite.events.EventType.*;
*/
@SuppressWarnings("deprecation")
public abstract class GridProjectionAbstractTest extends
GridCommonAbstractTest implements Externalizable {
+/** VM ip finder for TCP discovery. */
+private static TcpDiscoveryIpFinder ipFinder = new
TcpDiscoveryVmIpFinder(true);
+
/** Waiting timeout. */
private static final int WAIT_TIMEOUT = 3;
@@ -87,6 +94,15 @@ public abstract class GridProjectionAbstractTest extends
GridCommonAbstractTest
// No-op.
}
+/** {@inheritDoc} */
+@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
+IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+cfg.setDiscoverySpi(new
TcpDiscoverySpi().setForceServerMode(true).setIpFinder(ipFinder));
+
+return cfg;
+}
+
/**
* @param startGrid Start grid flag.
*/
[18/53] [abbrv] incubator-ignite git commit: # IGNITE-943 Added test for broken configuration.
# IGNITE-943 Added test for broken configuration.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b3ac88f8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b3ac88f8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b3ac88f8
Branch: refs/heads/ignite-sprint-5
Commit: b3ac88f8f6613c1cef89657cd2118134f4ad4a06
Parents: b0d9ef8
Author: sevdokimov
Authored: Thu May 28 12:45:19 2015 +0300
Committer: sevdokimov
Committed: Thu May 28 14:46:08 2015 +0300
--
.../tcp/TcpClientDiscoverySpiSelfTest.java | 24 +++-
1 file changed, 23 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b3ac88f8/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
index f27ef33..0d08a0d 100644
---
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
@@ -103,6 +103,9 @@ public class TcpClientDiscoverySpiSelfTest extends
GridCommonAbstractTest {
/** */
private boolean longSockTimeouts;
+/** */
+private Boolean cfgClientMode;
+
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
@@ -119,7 +122,7 @@ public class TcpClientDiscoverySpiSelfTest extends
GridCommonAbstractTest {
disco.setClientMode(true);
-cfg.setClientMode(true);
+cfg.setClientMode(cfgClientMode == null ? true : cfgClientMode);
TcpDiscoveryVmIpFinder ipFinder;
@@ -872,6 +875,25 @@ public class TcpClientDiscoverySpiSelfTest extends
GridCommonAbstractTest {
}
/**
+ *
+ */
+public void testBrokenConfiguration() throws Exception {
+startServerNodes(1);
+
+cfgClientMode = false;
+
+try {
+startClientNodes(1);
+
+fail("Configuration is boken, node cannot be started with
DiscoverySpi.clientMode = true and " +
+"IgniteConfiguration.clientMode = false");
+}
+catch (Exception e) {
+assertTrue(e.getMessage(), e.getMessage().contains("DiscoverySpi
is in client mode"));
+}
+}
+
+/**
* @param clientIdx Index.
* @throws Exception In case of error.
*/
[09/53] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-709_2
Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-709_2 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9d3ab162 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9d3ab162 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9d3ab162 Branch: refs/heads/ignite-sprint-5 Commit: 9d3ab162f3a691fdb9e758a60dbd04dafe06b6d0 Parents: 9188f4e 4be517c Author: sboikov Authored: Wed May 27 18:06:52 2015 +0300 Committer: sboikov Committed: Wed May 27 18:06:52 2015 +0300 -- dev-tools/slurp.sh | 14 +- dev-tools/src/main/groovy/jiraslurp.groovy | 265 +-- examples/pom.xml| 2 +- modules/aop/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml| 2 +- .../processors/cache/IgniteCacheProxy.java | 3 +- .../GridDistributedTxRemoteAdapter.java | 10 +- .../processors/query/GridQueryIndexing.java | 16 ++ .../processors/query/GridQueryProcessor.java| 52 ++-- .../core/src/main/resources/ignite.properties | 2 +- modules/extdata/p2p/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- .../query/h2/GridH2IndexingGeoSelfTest.java | 20 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml| 2 +- .../processors/query/h2/IgniteH2Indexing.java | 17 ++ .../query/h2/opt/GridH2AbstractKeyValueRow.java | 18 +- .../query/h2/opt/GridH2KeyValueRowOffheap.java | 4 +- .../query/h2/sql/GridSqlOperationType.java | 2 +- .../h2/twostep/GridReduceQueryExecutor.java | 2 +- .../IgniteCacheQueryMultiThreadedSelfTest.java | 2 +- .../local/IgniteCacheLocalQuerySelfTest.java| 6 + modules/jcl/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/rest-http/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml| 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- .../visor/commands/node/VisorNodeCommand.scala | 2 +- .../commands/tasks/VisorTasksCommand.scala | 2 +- .../scala/org/apache/ignite/visor/visor.scala | 63 - modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- modules/yardstick/pom.xml | 2 +- pom.xml | 13 +- 49 files changed, 390 insertions(+), 183 deletions(-) --
[35/53] [abbrv] incubator-ignite git commit: # ignite-709 Fix tests
# ignite-709 Fix tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2799c3a6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2799c3a6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2799c3a6
Branch: refs/heads/ignite-sprint-5
Commit: 2799c3a69c2ddfb0b7c5f8f1c88808948fa40664
Parents: cfe5621
Author: sevdokimov
Authored: Thu May 28 19:26:44 2015 +0300
Committer: sevdokimov
Committed: Thu May 28 19:26:44 2015 +0300
--
.../processors/cache/GridCacheAbstractFullApiSelfTest.java| 3 +++
1 file changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2799c3a6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index 70d8f9c..5c31396 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -33,6 +33,7 @@ import org.apache.ignite.internal.util.lang.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.lang.*;
+import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.swapspace.inmemory.*;
import org.apache.ignite.testframework.*;
import org.apache.ignite.transactions.*;
@@ -130,6 +131,8 @@ public abstract class GridCacheAbstractFullApiSelfTest
extends GridCacheAbstract
@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
+((TcpDiscoverySpi)cfg.getDiscoverySpi()).setForceServerMode(true);
+
if (memoryMode() == OFFHEAP_TIERED || memoryMode() == OFFHEAP_VALUES)
cfg.setSwapSpaceSpi(new GridTestSwapSpaceSpi());
[15/53] [abbrv] incubator-ignite git commit: # IGNITE-943 DiscoverySpi.setNodeAttributes should return void
# IGNITE-943 DiscoverySpi.setNodeAttributes should return void
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/966276e1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/966276e1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/966276e1
Branch: refs/heads/ignite-sprint-5
Commit: 966276e11b593f09d8f211aa1d2e6e51671d6bf7
Parents: 0e192ef
Author: sevdokimov
Authored: Thu May 28 12:28:49 2015 +0300
Committer: sevdokimov
Committed: Thu May 28 14:46:07 2015 +0300
--
.../java/org/apache/ignite/spi/discovery/DiscoverySpi.java | 2 +-
.../org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 4 +---
.../org/apache/ignite/internal/GridReleaseTypeSelfTest.java | 8 ++--
...acheAffinityFunctionExcludeNeighborsAbstractSelfTest.java | 4 +---
4 files changed, 5 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/966276e1/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpi.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpi.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpi.java
index 4996d16..f9cec34 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpi.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpi.java
@@ -81,7 +81,7 @@ public interface DiscoverySpi extends IgniteSpi {
* @param attrs Map of node attributes.
* @param ver Product version.
*/
-public TcpDiscoverySpi setNodeAttributes(Map attrs,
IgniteProductVersion ver);
+public void setNodeAttributes(Map attrs,
IgniteProductVersion ver);
/**
* Sets a listener for discovery events. Refer to
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/966276e1/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index 5676fd5..71ba0f1 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -769,7 +769,7 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter
implements DiscoverySpi, T
}
/** {@inheritDoc} */
-@Override public TcpDiscoverySpi setNodeAttributes(Map
attrs, IgniteProductVersion ver) {
+@Override public void setNodeAttributes(Map attrs,
IgniteProductVersion ver) {
assert locNodeAttrs == null;
assert locNodeVer == null;
@@ -780,8 +780,6 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter
implements DiscoverySpi, T
locNodeAttrs = attrs;
locNodeVer = ver;
-
-return this;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/966276e1/modules/core/src/test/java/org/apache/ignite/internal/GridReleaseTypeSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/GridReleaseTypeSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/GridReleaseTypeSelfTest.java
index 603f66c..e6a69cc 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/GridReleaseTypeSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/GridReleaseTypeSelfTest.java
@@ -49,13 +49,11 @@ public class GridReleaseTypeSelfTest extends
GridCommonAbstractTest {
if (clientMode) {
discoSpi = new TcpDiscoverySpi() {
-@Override public TcpDiscoverySpi setNodeAttributes(Map attrs,
+@Override public void setNodeAttributes(Map
attrs,
IgniteProductVersion ver) {
super.setNodeAttributes(attrs, ver);
attrs.put(IgniteNodeAttributes.ATTR_BUILD_VER, nodeVer);
-
-return this;
}
};
@@ -65,13 +63,11 @@ public class GridReleaseTypeSelfTest extends
GridCommonAbstractTest {
}
else {
discoSpi = new TcpDiscoverySpi() {
-@Override public TcpDiscoverySpi setNodeAttributes(Map attrs,
+@Override public void setNodeAttributes(Map
attrs,
IgniteProductVersion ver) {
super.setNodeAttributes(attrs, ver);
attrs.put(IgniteNodeAttributes.ATTR_BUILD_VER, nodeVer);
-
-return thi
[05/53] [abbrv] incubator-ignite git commit: # IGNITE-943 Merge TcpDiscoverySpi and TcpClientDiscoverySpi
# IGNITE-943 Merge TcpDiscoverySpi and TcpClientDiscoverySpi
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/838c0fd8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/838c0fd8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/838c0fd8
Branch: refs/heads/ignite-sprint-5
Commit: 838c0fd83b67b5e906144777d7340d5e61bdfa8a
Parents: 2f169f5
Author: sevdokimov
Authored: Wed May 27 16:18:37 2015 +0300
Committer: sevdokimov
Committed: Wed May 27 16:18:37 2015 +0300
--
.../main/java/org/apache/ignite/Ignition.java |9 +-
.../org/apache/ignite/cluster/ClusterNode.java |6 +-
.../configuration/IgniteConfiguration.java |4 +-
.../apache/ignite/internal/IgniteKernal.java|5 +-
.../org/apache/ignite/internal/IgnitionEx.java | 14 +-
.../ignite/spi/discovery/DiscoverySpi.java | 17 +-
.../ignite/spi/discovery/tcp/ClientImpl.java| 1481 +
.../ignite/spi/discovery/tcp/ServerImpl.java| 4792 +++
.../spi/discovery/tcp/SocketMultiConnector.java |2 +-
.../discovery/tcp/TcpClientDiscoverySpi.java| 1573 -
.../tcp/TcpClientDiscoverySpiMBean.java | 156 -
.../spi/discovery/tcp/TcpDiscoveryImpl.java | 175 +
.../spi/discovery/tcp/TcpDiscoverySpi.java | 5777 --
.../discovery/tcp/TcpDiscoverySpiAdapter.java | 1185
.../spi/discovery/tcp/TcpDiscoverySpiMBean.java |8 +
.../internal/GridReleaseTypeSelfTest.java | 16 +-
.../GridDiscoveryManagerAliveCacheSelfTest.java | 17 +-
.../GridDiscoveryManagerAttributesSelfTest.java | 21 +-
.../discovery/GridDiscoveryManagerSelfTest.java | 21 +-
...acheTcpClientDiscoveryMultiThreadedTest.java |8 +-
.../IgniteClientDataStructuresAbstractTest.java |9 +-
...ientModesTcpClientDiscoveryAbstractTest.java | 10 +-
...unctionExcludeNeighborsAbstractSelfTest.java |5 +-
.../GridCacheSyncReplicatedPreloadSelfTest.java |1 -
...pClientDiscoveryMarshallerCheckSelfTest.java |9 +-
.../TcpClientDiscoverySpiConfigSelfTest.java| 39 -
.../tcp/TcpClientDiscoverySpiSelfTest.java | 44 +-
.../tcp/TcpDiscoveryConcurrentStartTest.java|4 +-
.../tcp/TcpDiscoveryMultiThreadedTest.java |8 +-
.../spi/discovery/tcp/TcpDiscoverySelfTest.java |2 +-
.../tcp/TcpDiscoverySpiConfigSelfTest.java |8 +
.../testframework/junits/GridAbstractTest.java |8 +-
.../IgniteSpiDiscoverySelfTestSuite.java|1 -
33 files changed, 7693 insertions(+), 7742 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/838c0fd8/modules/core/src/main/java/org/apache/ignite/Ignition.java
--
diff --git a/modules/core/src/main/java/org/apache/ignite/Ignition.java
b/modules/core/src/main/java/org/apache/ignite/Ignition.java
index 3270f5c..35e0b51 100644
--- a/modules/core/src/main/java/org/apache/ignite/Ignition.java
+++ b/modules/core/src/main/java/org/apache/ignite/Ignition.java
@@ -20,6 +20,7 @@ package org.apache.ignite;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.spi.discovery.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.jetbrains.annotations.*;
@@ -138,11 +139,11 @@ public class Ignition {
*
* This flag used when node is started if {@link
IgniteConfiguration#isClientMode()}
* is {@code null}. When {@link IgniteConfiguration#isClientMode()} is set
this flag is ignored.
- * It is recommended to use {@link TcpClientDiscoverySpi} on client nodes.
+ * It is recommended to use {@link DiscoverySpi} in client mode too.
*
* @param clientMode Client mode flag.
* @see IgniteConfiguration#isClientMode()
- * @see TcpClientDiscoverySpi
+ * @see TcpDiscoverySpi#setClientMode(boolean)
*/
public static void setClientMode(boolean clientMode) {
IgnitionEx.setClientMode(clientMode);
@@ -153,11 +154,11 @@ public class Ignition {
*
* This flag used when node is started if {@link
IgniteConfiguration#isClientMode()}
* is {@code null}. When {@link IgniteConfiguration#isClientMode()} is set
this flag is ignored.
- * It is recommended to use {@link TcpClientDiscoverySpi} on client nodes.
+ * It is recommended to use {@link DiscoverySpi} in client mode too.
*
* @return Client mode flag.
* @see IgniteConfiguration#isClientMode()
- * @see TcpClientDiscoverySpi
+ * @see TcpDiscoverySpi#setClientMode(boolean)
*/
public static boolean isClientMode() {
return IgnitionEx.isClientMode();
http://git-wip-us.apache.org/repos/
[30/53] [abbrv] incubator-ignite git commit: # IGNITE-943 Fix tests
# IGNITE-943 Fix tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7f98e291
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7f98e291
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7f98e291
Branch: refs/heads/ignite-sprint-5
Commit: 7f98e291fe4b55957d7d26fe6e778dad23f5510d
Parents: 0e7fc0a
Author: sevdokimov
Authored: Thu May 28 17:14:53 2015 +0300
Committer: sevdokimov
Committed: Thu May 28 17:14:53 2015 +0300
--
.../internal/processors/cache/GridCachePutAllFailoverSelfTest.java | 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7f98e291/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java
index ae36c4de..fc9e17b 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java
@@ -617,6 +617,7 @@ public class GridCachePutAllFailoverSelfTest extends
GridCommonAbstractTest {
discoverySpi.setAckTimeout(6);
discoverySpi.setIpFinder(ipFinder);
+discoverySpi.setForceServerMode(true);
cfg.setDiscoverySpi(discoverySpi);
[52/53] [abbrv] incubator-ignite git commit: # IGNITE-943 Move static class instances.
# IGNITE-943 Move static class instances.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ab4c18ca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ab4c18ca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ab4c18ca
Branch: refs/heads/ignite-sprint-5
Commit: ab4c18caca9f3bd5dbc3174eb49ed79c1744a79d
Parents: 6c837c0
Author: sevdokimov
Authored: Mon Jun 1 14:41:08 2015 +0300
Committer: sevdokimov
Committed: Mon Jun 1 14:41:08 2015 +0300
--
.../service/GridServiceProcessor.java | 22 +++-
1 file changed, 12 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ab4c18ca/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
index 8eff6bd..2e31b69 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
@@ -60,12 +60,6 @@ public class GridServiceProcessor extends
GridProcessorAdapter {
/** Time to wait before reassignment retries. */
private static final long RETRY_TIMEOUT = 1000;
-/** */
-private static final ServiceDeploymentPredicate DEPLOYMENT_PREDICATE = new
ServiceDeploymentPredicate();
-
-/** */
-private static final ServiceAssignmentsPredicate ASSIGNMENTS_PREDICATE =
new ServiceAssignmentsPredicate();
-
/** Local service instances. */
private final Map> locSvcs = new
HashMap<>();
@@ -352,7 +346,8 @@ public class GridServiceProcessor extends
GridProcessorAdapter {
"different configuration) [deployed=" +
dep.configuration() + ", new=" + cfg + ']'));
}
else {
-Iterator> it =
serviceEntries(ASSIGNMENTS_PREDICATE);
+Iterator> it =
serviceEntries(
+ServiceAssignmentsPredicate.INSTANCE);
while (it.hasNext()) {
Cache.Entry e = it.next();
@@ -448,7 +443,7 @@ public class GridServiceProcessor extends
GridProcessorAdapter {
public IgniteInternalFuture cancelAll() {
Collection> futs = new ArrayList<>();
-Iterator> it =
serviceEntries(DEPLOYMENT_PREDICATE);
+Iterator> it =
serviceEntries(ServiceDeploymentPredicate.INSTANCE);
while (it.hasNext()) {
Cache.Entry e = it.next();
@@ -471,7 +466,7 @@ public class GridServiceProcessor extends
GridProcessorAdapter {
public Collection serviceDescriptors() {
Collection descs = new ArrayList<>();
-Iterator> it =
serviceEntries(DEPLOYMENT_PREDICATE);
+Iterator> it =
serviceEntries(ServiceDeploymentPredicate.INSTANCE);
while (it.hasNext()) {
Cache.Entry e = it.next();
@@ -1113,7 +1108,8 @@ public class GridServiceProcessor extends
GridProcessorAdapter {
ctx.cache().context().deploy().ignoreOwnership(true);
try {
-Iterator> it =
serviceEntries(DEPLOYMENT_PREDICATE);
+Iterator> it =
serviceEntries(
+ServiceDeploymentPredicate.INSTANCE);
while (it.hasNext()) {
Cache.Entry e = it.next();
@@ -1332,6 +1328,9 @@ public class GridServiceProcessor extends
GridProcessorAdapter {
*/
static class ServiceDeploymentPredicate implements
IgniteBiPredicate {
/** */
+static final ServiceDeploymentPredicate INSTANCE = new
ServiceDeploymentPredicate();
+
+/** */
private static final long serialVersionUID = 0L;
/** {@inheritDoc} */
@@ -1350,6 +1349,9 @@ public class GridServiceProcessor extends
GridProcessorAdapter {
*/
static class ServiceAssignmentsPredicate implements
IgniteBiPredicate {
/** */
+static final ServiceAssignmentsPredicate INSTANCE = new
ServiceAssignmentsPredicate();
+
+/** */
private static final long serialVersionUID = 0L;
/** {@inheritDoc} */
[16/53] [abbrv] incubator-ignite git commit: # IGNITE-943 Rename TcpDiscoveryImpl.adapter to spi
# IGNITE-943 Rename TcpDiscoveryImpl.adapter to spi
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0e192ef8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0e192ef8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0e192ef8
Branch: refs/heads/ignite-sprint-5
Commit: 0e192ef84def1cdfe121e1e132c0b9740341fb9c
Parents: 92b2a57
Author: sevdokimov
Authored: Thu May 28 12:11:22 2015 +0300
Committer: sevdokimov
Committed: Thu May 28 14:46:07 2015 +0300
--
.../ignite/spi/discovery/tcp/ClientImpl.java| 138
.../ignite/spi/discovery/tcp/ServerImpl.java| 348 +--
.../spi/discovery/tcp/TcpDiscoveryImpl.java | 14 +-
3 files changed, 250 insertions(+), 250 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0e192ef8/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
index aa254ec..2171085 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
@@ -116,7 +116,7 @@ class ClientImpl extends TcpDiscoveryImpl {
b.append("Message worker:
").append(threadStatus(msgWorker)).append(U.nl());
b.append("Socket reader:
").append(threadStatus(sockReader)).append(U.nl());
b.append("Socket writer:
").append(threadStatus(sockWriter)).append(U.nl());
-b.append("Socket timeout worker:
").append(threadStatus(adapter.sockTimeoutWorker)).append(U.nl());
+b.append("Socket timeout worker:
").append(threadStatus(spi.sockTimeoutWorker)).append(U.nl());
b.append(U.nl());
@@ -127,7 +127,7 @@ class ClientImpl extends TcpDiscoveryImpl {
b.append(U.nl());
-b.append("Stats: ").append(adapter.stats).append(U.nl());
+b.append("Stats: ").append(spi.stats).append(U.nl());
U.quietAndInfo(log, b.toString());
}
@@ -153,9 +153,9 @@ class ClientImpl extends TcpDiscoveryImpl {
/** {@inheritDoc} */
@Override public void spiStart(@Nullable String gridName) throws
IgniteSpiException {
-adapter.initLocalNode(0, true);
+spi.initLocalNode(0, true);
-locNode = adapter.locNode;
+locNode = spi.locNode;
sockWriter = new SocketWriter();
sockWriter.start();
@@ -176,9 +176,9 @@ class ClientImpl extends TcpDiscoveryImpl {
throw new IgniteSpiException("Thread has been interrupted.", e);
}
-timer.schedule(new HeartbeatSender(), adapter.hbFreq, adapter.hbFreq);
+timer.schedule(new HeartbeatSender(), spi.hbFreq, spi.hbFreq);
-adapter.printStartInfo();
+spi.printStartInfo();
}
/** {@inheritDoc} */
@@ -189,7 +189,7 @@ class ClientImpl extends TcpDiscoveryImpl {
msgWorker.addMessage(SPI_STOP);
try {
-if (!leaveLatch.await(adapter.netTimeout, MILLISECONDS))
+if (!leaveLatch.await(spi.netTimeout, MILLISECONDS))
U.warn(log, "Failed to left node: timeout [nodeId=" +
locNode + ']');
}
catch (InterruptedException ignored) {
@@ -210,7 +210,7 @@ class ClientImpl extends TcpDiscoveryImpl {
U.join(sockWriter, log);
U.join(sockReader, log);
-adapter.printStopInfo();
+spi.printStopInfo();
}
/** {@inheritDoc} */
@@ -253,7 +253,7 @@ class ClientImpl extends TcpDiscoveryImpl {
if (oldFut != null)
fut = oldFut;
else {
-if (adapter.getSpiContext().isStopping()) {
+if (spi.getSpiContext().isStopping()) {
if (pingFuts.remove(nodeId, fut))
fut.onDone(false);
@@ -267,7 +267,7 @@ class ClientImpl extends TcpDiscoveryImpl {
if (pingFuts.remove(nodeId, finalFut))
finalFut.onDone(false);
}
-}, adapter.netTimeout);
+}, spi.netTimeout);
sockWriter.sendMessage(new
TcpDiscoveryClientPingRequest(getLocalNodeId(), nodeId));
}
@@ -297,13 +297,13 @@ class ClientImpl extends TcpDiscoveryImpl {
leaveLatch.countDown();
joinLatch.countDown();
-adapter.getSpiContext().deregisterPorts();
+spi.getSpiContext().deregisterPorts();
Collection rmts = getRemoteNodes();
// This is
[45/53] [abbrv] incubator-ignite git commit: # ignite-943 fix services on client
# ignite-943 fix services on client
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/99234d0a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/99234d0a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/99234d0a
Branch: refs/heads/ignite-sprint-5
Commit: 99234d0ac5fd2e1d1033b1930cb4d7d6d49e0f28
Parents: 477a215
Author: sboikov
Authored: Fri May 29 16:39:00 2015 +0300
Committer: sboikov
Committed: Fri May 29 16:39:00 2015 +0300
--
.../service/GridServiceProcessor.java | 104 ++-
.../service/ClosureServiceClientsNodesTest.java | 10 ++
2 files changed, 110 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/99234d0a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
index a9a15e9..aedac75 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
@@ -27,6 +27,7 @@ import org.apache.ignite.internal.managers.eventstorage.*;
import org.apache.ignite.internal.processors.*;
import org.apache.ignite.internal.processors.affinity.*;
import org.apache.ignite.internal.processors.cache.*;
+import org.apache.ignite.internal.processors.cache.query.*;
import org.apache.ignite.internal.processors.cache.transactions.*;
import org.apache.ignite.internal.processors.timeout.*;
import org.apache.ignite.internal.util.*;
@@ -59,6 +60,12 @@ public class GridServiceProcessor extends
GridProcessorAdapter {
/** Time to wait before reassignment retries. */
private static final long RETRY_TIMEOUT = 1000;
+/** */
+private static final ServiceDeploymentPredicate DEPLOYMENT_PREDICATE = new
ServiceDeploymentPredicate();
+
+/** */
+private static final ServiceAssignmentsPredicate ASSIGNMENTS_PREDICATE =
new ServiceAssignmentsPredicate();
+
/** Local service instances. */
private final Map> locSvcs = new
HashMap<>();
@@ -345,7 +352,11 @@ public class GridServiceProcessor extends
GridProcessorAdapter {
"different configuration) [deployed=" +
dep.configuration() + ", new=" + cfg + ']'));
}
else {
-for (Cache.Entry e :
cache.entrySetx()) {
+Iterator> it =
serviceEntries(ASSIGNMENTS_PREDICATE);
+
+while (it.hasNext()) {
+Cache.Entry e = it.next();
+
if (e.getKey() instanceof
GridServiceAssignmentsKey) {
GridServiceAssignments assigns =
(GridServiceAssignments)e.getValue();
@@ -437,7 +448,11 @@ public class GridServiceProcessor extends
GridProcessorAdapter {
public IgniteInternalFuture cancelAll() {
Collection> futs = new ArrayList<>();
-for (Cache.Entry e : cache.entrySetx()) {
+Iterator> it =
serviceEntries(DEPLOYMENT_PREDICATE);
+
+while (it.hasNext()) {
+Cache.Entry e = it.next();
+
if (!(e.getKey() instanceof GridServiceDeploymentKey))
continue;
@@ -456,7 +471,11 @@ public class GridServiceProcessor extends
GridProcessorAdapter {
public Collection serviceDescriptors() {
Collection descs = new ArrayList<>();
-for (Cache.Entry e : cache.entrySetx()) {
+Iterator> it =
serviceEntries(DEPLOYMENT_PREDICATE);
+
+while (it.hasNext()) {
+Cache.Entry e = it.next();
+
if (!(e.getKey() instanceof GridServiceDeploymentKey))
continue;
@@ -904,6 +923,43 @@ public class GridServiceProcessor extends
GridProcessorAdapter {
}
/**
+ * @param p Entry predicate used to execute query from client node.
+ * @return Service deployment entries.
+ */
+@SuppressWarnings("unchecked")
+private Iterator>
serviceEntries(IgniteBiPredicate p) {
+if (!cache.context().affinityNode()) {
+ClusterNode oldestSrvNode =
+CU.oldestAliveCacheServerNode(cache.context().shared(),
AffinityTopologyVersion.NONE);
+
+if (oldestSrvNode == null)
+return F.emptyIterator();
+
+GridCacheQueryManager qryMgr = cache.context().queries();
+
+CacheQuery> qry =
qryMgr.crea
[23/53] [abbrv] incubator-ignite git commit: # IGNITE-943 Fix Dr* tests
# IGNITE-943 Fix Dr* tests Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a43522ba Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a43522ba Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a43522ba Branch: refs/heads/ignite-sprint-5 Commit: a43522baa9eb93c500c65f92c047850e8a6cd37d Parents: 5cec2ba Author: sevdokimov Authored: Thu May 28 15:50:04 2015 +0300 Committer: sevdokimov Committed: Thu May 28 15:50:04 2015 +0300 -- .../processors/affinity/GridAffinityProcessorAbstractSelfTest.java | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a43522ba/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java index e7fab8e..7da3728 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java @@ -54,6 +54,7 @@ public abstract class GridAffinityProcessorAbstractSelfTest extends GridCommonAb TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); +discoSpi.setForceServerMode(true); discoSpi.setIpFinder(ipFinder); cfg.setDiscoverySpi(discoSpi);
[51/53] [abbrv] incubator-ignite git commit: # ignite-943
# ignite-943
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6c837c07
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6c837c07
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6c837c07
Branch: refs/heads/ignite-sprint-5
Commit: 6c837c0783f04874157ac414f7161273c8c4d9f8
Parents: f499cfe
Author: sboikov
Authored: Fri May 29 23:43:25 2015 +0300
Committer: sboikov
Committed: Fri May 29 23:43:25 2015 +0300
--
.../processors/service/GridServiceProcessor.java | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c837c07/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
index aedac75..8eff6bd 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
@@ -1101,11 +1101,12 @@ public class GridServiceProcessor extends
GridProcessorAdapter {
try {
depExe.submit(new BusyRunnable() {
@Override public void run0() {
-long topVer = ((DiscoveryEvent)evt).topologyVersion();
+AffinityTopologyVersion topVer =
+new
AffinityTopologyVersion(((DiscoveryEvent)evt).topologyVersion());
-ClusterNode oldest =
U.oldest(ctx.discovery().nodes(topVer), null);
+ClusterNode oldest =
CU.oldestAliveCacheServerNode(cache.context().shared(), topVer);
-if (oldest.isLocal()) {
+if (oldest != null && oldest.isLocal()) {
final Collection retries =
new ConcurrentLinkedQueue<>();
if (ctx.deploy().enabled())
@@ -1128,7 +1129,7 @@ public class GridServiceProcessor extends
GridProcessorAdapter {
ctx.cache().internalCache(UTILITY_CACHE_NAME).context().affinity().
affinityReadyFuture(topVer).get();
-reassign(dep, topVer);
+reassign(dep,
topVer.topologyVersion());
}
catch (IgniteCheckedException ex) {
if (!(e instanceof
ClusterTopologyCheckedException))
@@ -1145,7 +1146,7 @@ public class GridServiceProcessor extends
GridProcessorAdapter {
}
if (!retries.isEmpty())
-onReassignmentFailed(topVer, retries);
+onReassignmentFailed(topVer.topologyVersion(),
retries);
}
// Clean up zombie assignments.
[19/53] [abbrv] incubator-ignite git commit: # IGNITE-943 Fix performance suggestion, move it to GridDiscoveryManager
# IGNITE-943 Fix performance suggestion, move it to GridDiscoveryManager
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b0d9ef8a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b0d9ef8a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b0d9ef8a
Branch: refs/heads/ignite-sprint-5
Commit: b0d9ef8ab3f7880c04b0dd8e301e808a66e3d800
Parents: 966276e
Author: sevdokimov
Authored: Thu May 28 12:38:38 2015 +0300
Committer: sevdokimov
Committed: Thu May 28 14:46:08 2015 +0300
--
.../src/main/java/org/apache/ignite/internal/IgniteKernal.java | 3 ---
.../internal/managers/discovery/GridDiscoveryManager.java | 6 ++
2 files changed, 6 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d9ef8a/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 d6e3ca4..9d752ce 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
@@ -1072,9 +1072,6 @@ public class IgniteKernal implements IgniteEx,
IgniteMXBean, Externalizable {
if (cfg.getIncludeEventTypes() != null &&
cfg.getIncludeEventTypes().length != 0)
perf.add("Disable grid events (remove 'includeEventTypes' from
configuration)");
-if (Boolean.TRUE.equals(cfg.isClientMode()) &&
!cfg.getDiscoverySpi().isClientMode())
-perf.add("Use TcpDiscoverySpi in client mode for client node");
-
if (OptimizedMarshaller.available() && !(cfg.getMarshaller()
instanceof OptimizedMarshaller))
perf.add("Enable optimized marshaller (set 'marshaller' to " +
OptimizedMarshaller.class.getSimpleName() + ')');
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d9ef8a/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 9619c1c..0f79084 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
@@ -283,6 +283,12 @@ public class GridDiscoveryManager extends
GridManagerAdapter {
}
/** {@inheritDoc} */
+@Override protected void onKernalStart0() throws IgniteCheckedException {
+if (Boolean.TRUE.equals(ctx.config().isClientMode()) &&
!getSpi().isClientMode())
+ctx.performance().add("Enable client mode for TcpDiscoverySpi (set
TcpDiscoverySpi.clientMode to true)");
+}
+
+/** {@inheritDoc} */
@Override public void start() throws IgniteCheckedException {
long totSysMemory = -1;
[40/53] [abbrv] incubator-ignite git commit: ignite-943 Fix tests: add setForceServerMode(true)
ignite-943 Fix tests: add setForceServerMode(true)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1b0a051d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1b0a051d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1b0a051d
Branch: refs/heads/ignite-sprint-5
Commit: 1b0a051d4f91adc827e84ac816e3082ada6081ef
Parents: 6b1265c
Author: sevdokimov
Authored: Fri May 29 13:15:25 2015 +0300
Committer: sevdokimov
Committed: Fri May 29 13:15:59 2015 +0300
--
.../internal/GridReleaseTypeSelfTest.java | 33 ++--
...GridCacheMixedPartitionExchangeSelfTest.java | 2 +-
.../GridCacheReturnValueTransferSelfTest.java | 3 ++
.../IgniteCacheAbstractStopBusySelfTest.java| 6 +---
.../cache/IgniteCacheAbstractTest.java | 2 +-
.../igfs/IgfsNearOnlyMultiNodeSelfTest.java | 5 +--
.../cache/IgniteCacheAbstractQuerySelfTest.java | 6 +---
7 files changed, 18 insertions(+), 39 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b0a051d/modules/core/src/test/java/org/apache/ignite/internal/GridReleaseTypeSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/GridReleaseTypeSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/GridReleaseTypeSelfTest.java
index 79e8905..96d5f1a 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/GridReleaseTypeSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/GridReleaseTypeSelfTest.java
@@ -45,32 +45,19 @@ public class GridReleaseTypeSelfTest extends
GridCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
-TcpDiscoverySpi discoSpi;
-
-if (clientMode) {
-discoSpi = new TcpDiscoverySpi() {
-@Override public void setNodeAttributes(Map
attrs,
-IgniteProductVersion ver) {
-super.setNodeAttributes(attrs, ver);
+if (clientMode)
+cfg.setClientMode(true);
-attrs.put(IgniteNodeAttributes.ATTR_BUILD_VER, nodeVer);
-}
-};
+TcpDiscoverySpi discoSpi = new TcpDiscoverySpi() {
+@Override public void setNodeAttributes(Map attrs,
+IgniteProductVersion ver) {
+super.setNodeAttributes(attrs, ver);
-cfg.setClientMode(true);
-}
-else {
-discoSpi = new TcpDiscoverySpi() {
-@Override public void setNodeAttributes(Map
attrs,
-IgniteProductVersion ver) {
-super.setNodeAttributes(attrs, ver);
-
-attrs.put(IgniteNodeAttributes.ATTR_BUILD_VER, nodeVer);
-}
-};
-}
+attrs.put(IgniteNodeAttributes.ATTR_BUILD_VER, nodeVer);
+}
+};
-discoSpi.setIpFinder(IP_FINDER);
+discoSpi.setIpFinder(IP_FINDER).setForceServerMode(true);
cfg.setDiscoverySpi(discoSpi);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b0a051d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java
index 266937f..2fad523 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java
@@ -56,7 +56,7 @@ public class GridCacheMixedPartitionExchangeSelfTest extends
GridCommonAbstractT
@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
-((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder);
+
((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder).setForceServerMode(true);
if (cache)
cfg.setCacheConfiguration(cacheConfiguration());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b0a051d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
--
[20/53] [abbrv] incubator-ignite git commit: # IGNITE-943 Remove TcpDiscoverySpi.clientMode, create TcpDiscoverySpi.forceServerMode
# IGNITE-943 Remove TcpDiscoverySpi.clientMode, create
TcpDiscoverySpi.forceServerMode
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e2e90c4b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e2e90c4b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e2e90c4b
Branch: refs/heads/ignite-sprint-5
Commit: e2e90c4bd57ec74c6816f1c595ff8ff867b5a757
Parents: 77d1dcb
Author: sevdokimov
Authored: Thu May 28 14:45:15 2015 +0300
Committer: sevdokimov
Committed: Thu May 28 14:46:52 2015 +0300
--
.../org/apache/ignite/internal/IgnitionEx.java | 13 +--
.../discovery/GridDiscoveryManager.java | 2 +-
.../ignite/spi/discovery/DiscoverySpi.java | 5 ++-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 39 +---
.../spi/discovery/tcp/TcpDiscoverySpiMBean.java | 5 ++-
.../internal/GridReleaseTypeSelfTest.java | 2 -
.../GridDiscoveryManagerAliveCacheSelfTest.java | 4 +-
.../GridDiscoveryManagerAttributesSelfTest.java | 17 -
.../discovery/GridDiscoveryManagerSelfTest.java | 17 -
...acheTcpClientDiscoveryMultiThreadedTest.java | 4 +-
.../IgniteClientDataStructuresAbstractTest.java | 4 +-
.../GridCacheClientModesAbstractSelfTest.java | 3 ++
...ientModesTcpClientDiscoveryAbstractTest.java | 6 +--
...pClientDiscoveryMarshallerCheckSelfTest.java | 8 +---
.../tcp/TcpClientDiscoverySpiSelfTest.java | 35 ++
.../tcp/TcpDiscoveryConcurrentStartTest.java| 8 +---
.../tcp/TcpDiscoveryMultiThreadedTest.java | 16 +---
.../tcp/TcpDiscoverySpiConfigSelfTest.java | 8
18 files changed, 65 insertions(+), 131 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e2e90c4b/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 7eb6262..6e4efb5 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
@@ -1743,13 +1743,6 @@ public class IgnitionEx {
myCfg.setFileSystemConfiguration(clone);
}
-if (myCfg.isClientMode() == null || !myCfg.isClientMode()) {
-if (myCfg.getDiscoverySpi() != null &&
myCfg.getDiscoverySpi().isClientMode()) {
-throw new IgniteCheckedException("DiscoverySpi is in
client mode, but node is not in client mode" +
-"(consider changing 'IgniteConfiguration.clientMode'
to 'true').");
-}
-}
-
initializeDefaultSpi(myCfg);
initializeDefaultCacheConfiguration(myCfg);
@@ -1814,13 +1807,9 @@ public class IgnitionEx {
* @param cfg Ignite configuration.
*/
private void initializeDefaultSpi(IgniteConfiguration cfg) {
-if (cfg.getDiscoverySpi() == null) {
+if (cfg.getDiscoverySpi() == null)
cfg.setDiscoverySpi(new TcpDiscoverySpi());
-if (Boolean.TRUE.equals(cfg.isClientMode()))
-
((TcpDiscoverySpi)cfg.getDiscoverySpi()).setClientMode(true);
-}
-
if (cfg.getDiscoverySpi() instanceof TcpDiscoverySpi) {
TcpDiscoverySpi tcpDisco =
(TcpDiscoverySpi)cfg.getDiscoverySpi();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e2e90c4b/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 0f79084..a910950 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
@@ -285,7 +285,7 @@ public class GridDiscoveryManager extends
GridManagerAdapter {
/** {@inheritDoc} */
@Override protected void onKernalStart0() throws IgniteCheckedException {
if (Boolean.TRUE.equals(ctx.config().isClientMode()) &&
!getSpi().isClientMode())
-ctx.performance().add("Enable client mode for TcpDiscoverySpi (set
TcpDiscoverySpi.clientMode to true)");
+ctx.performance().add("Enable client mode for TcpDiscoverySpi (set
TcpDiscoverySpi.forceServerMode to true)");
[21/53] [abbrv] incubator-ignite git commit: # ignite-709 include internal keys for scan query
# ignite-709 include internal keys for scan query
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/581f4d99
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/581f4d99
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/581f4d99
Branch: refs/heads/ignite-sprint-5
Commit: 581f4d99fc1dd31ca83631f2ceabd7187f1572fe
Parents: 9d3ab16
Author: sboikov
Authored: Thu May 28 12:01:31 2015 +0300
Committer: sboikov
Committed: Thu May 28 14:51:16 2015 +0300
--
.../configuration/CacheConfiguration.java | 1 -
.../processors/cache/GridCacheAdapter.java | 15 -
.../cache/GridCacheConcurrentMap.java | 21 ++---
.../processors/cache/GridCacheProcessor.java| 32 +++-
.../processors/cache/GridCacheProxyImpl.java| 12
.../processors/cache/IgniteInternalCache.java | 5 +++
.../cache/query/GridCacheQueryAdapter.java | 2 ++
.../cache/query/GridCacheQueryErrorFuture.java | 2 ++
.../cache/query/GridCacheQueryManager.java | 2 +-
.../continuous/CacheContinuousQueryManager.java | 24 ---
.../cacheobject/IgniteCacheObjectProcessor.java | 5 ++-
.../IgniteCacheObjectProcessorImpl.java | 2 +-
12 files changed, 93 insertions(+), 30 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/581f4d99/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
index 5a03ed8..3f5d7b7 100644
---
a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
@@ -25,7 +25,6 @@ import org.apache.ignite.cache.eviction.*;
import org.apache.ignite.cache.query.annotations.*;
import org.apache.ignite.cache.store.*;
import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.plugin.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/581f4d99/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 bbd13f1..a8bf1f7 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
@@ -902,7 +902,12 @@ public abstract class GridCacheAdapter implements
IgniteInternalCache keySet() {
-return keySet((CacheEntryPredicate[]) null);
+return keySet((CacheEntryPredicate[])null);
+}
+
+/** {@inheritDoc} */
+@Override public Set keySetx() {
+return keySetx((CacheEntryPredicate[])null);
}
/** {@inheritDoc} */
@@ -4299,6 +4304,14 @@ public abstract class GridCacheAdapter implements
IgniteInternalCache keySetx(@Nullable CacheEntryPredicate... filter) {
+return map.keySetx(filter);
+}
+
+/**
* @param filter Primary key set.
* @return Primary key set.
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/581f4d99/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
index bd3e0f2..db5eed1 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
@@ -626,7 +626,19 @@ public class GridCacheConcurrentMap {
public Set keySet(CacheEntryPredicate... filter) {
checkWeakQueue();
-return new KeySet<>(this, filter);
+return new KeySet<>(this, filter, false);
+}
+
+/**
+ * Key set including internal keys.
+ *
+ * @param filter Filter.
+ * @return Set of the keys contained in this map.
+ */
+public Set keySetx(CacheEntryPredicate... filter) {
+checkWeakQueue();
[49/53] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-943
Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-943 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d10120d6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d10120d6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d10120d6 Branch: refs/heads/ignite-sprint-5 Commit: d10120d67d3d6e20b25e494b03b829b20f263b5b Parents: d10fe3e 5c30f9c Author: sevdokimov Authored: Fri May 29 18:57:20 2015 +0300 Committer: sevdokimov Committed: Fri May 29 18:57:20 2015 +0300 -- .../org/apache/ignite/cache/CacheMetrics.java | 187 +++-- .../org/apache/ignite/igfs/IgfsUserContext.java | 119 ++ .../igfs/secondary/IgfsSecondaryFileSystem.java | 7 + .../internal/igfs/common/IgfsMarshaller.java| 35 +- .../igfs/common/IgfsPathControlRequest.java | 22 + .../internal/managers/GridManagerAdapter.java | 59 +-- .../processors/cache/CacheMetricsImpl.java | 367 - .../cache/CacheMetricsMXBeanImpl.java | 100 + .../processors/cache/CacheMetricsSnapshot.java | 380 + .../processors/cache/GridCacheAdapter.java | 12 +- .../processors/cache/GridCacheSwapManager.java | 118 -- .../internal/processors/hadoop/HadoopJob.java | 2 +- .../ignite/internal/processors/igfs/IgfsEx.java | 8 +- .../internal/processors/igfs/IgfsImpl.java | 8 +- .../processors/igfs/IgfsIpcHandler.java | 184 + .../igfs/IgfsSecondaryFileSystemImpl.java | 9 +- .../internal/processors/igfs/IgfsServer.java| 4 +- .../internal/processors/igfs/IgfsUtils.java | 16 + .../ignite/internal/util/GridJavaProcess.java | 30 +- .../ignite/mxbean/CacheMetricsMXBean.java | 80 .../org/apache/ignite/spi/IgniteSpiAdapter.java | 35 +- .../org/apache/ignite/spi/IgniteSpiContext.java | 47 --- .../spi/swapspace/file/FileSwapSpaceSpi.java| 8 +- ...CacheLocalOffHeapAndSwapMetricsSelfTest.java | 412 +++ .../testframework/GridSpiTestContext.java | 25 +- .../IgniteCacheMetricsSelfTestSuite.java| 1 + .../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 165 +--- .../hadoop/fs/v1/IgniteHadoopFileSystem.java| 107 +++-- .../hadoop/fs/v2/IgniteHadoopFileSystem.java| 32 +- .../internal/processors/hadoop/HadoopUtils.java | 10 +- .../hadoop/SecondaryFileSystemProvider.java | 53 ++- .../hadoop/fs/HadoopDistributedFileSystem.java | 91 .../hadoop/fs/HadoopFileSystemsUtils.java | 17 - .../hadoop/fs/HadoopLazyConcurrentMap.java | 204 + .../processors/hadoop/igfs/HadoopIgfsEx.java| 6 + .../hadoop/igfs/HadoopIgfsInProc.java | 170 ++-- .../processors/hadoop/igfs/HadoopIgfsIpcIo.java | 2 +- .../hadoop/igfs/HadoopIgfsOutProc.java | 33 +- .../hadoop/igfs/HadoopIgfsWrapper.java | 19 +- .../hadoop/v2/HadoopV2TaskContext.java | 4 +- .../HadoopIgfs20FileSystemAbstractSelfTest.java | 56 ++- ...oopSecondaryFileSystemConfigurationTest.java | 4 +- .../IgniteHadoopFileSystemAbstractSelfTest.java | 63 ++- .../IgniteHadoopFileSystemClientSelfTest.java | 2 +- .../IgniteHadoopFileSystemIpcCacheSelfTest.java | 2 + .../hadoop/HadoopFileSystemsTest.java | 23 +- .../collections/HadoopSkipListSelfTest.java | 4 +- 47 files changed, 2537 insertions(+), 805 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d10120d6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d10120d6/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java --
[47/53] [abbrv] incubator-ignite git commit: # IGNITE-943 Increase test timeout.
# IGNITE-943 Increase test timeout.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b3d8e1e1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b3d8e1e1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b3d8e1e1
Branch: refs/heads/ignite-sprint-5
Commit: b3d8e1e13bfc0049de5832ca1291ed5511e3f191
Parents: ccc0d40
Author: sevdokimov
Authored: Fri May 29 17:11:44 2015 +0300
Committer: sevdokimov
Committed: Fri May 29 17:11:44 2015 +0300
--
.../ignite/internal/processors/cache/CacheRemoveAllSelfTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b3d8e1e1/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheRemoveAllSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheRemoveAllSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheRemoveAllSelfTest.java
index f5de96f..1d4d2f4 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheRemoveAllSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheRemoveAllSelfTest.java
@@ -32,7 +32,7 @@ import java.util.concurrent.atomic.*;
public class CacheRemoveAllSelfTest extends GridCacheAbstractSelfTest {
/** {@inheritDoc} */
@Override protected long getTestTimeout() {
-return 6;
+return 2 * 60 * 1000;
}
/** {@inheritDoc} */
[13/53] [abbrv] incubator-ignite git commit: Merge branches 'ignite-709_2' and 'ignite-943' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-943
Merge branches 'ignite-709_2' and 'ignite-943' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-943 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5ecc08ef Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5ecc08ef Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5ecc08ef Branch: refs/heads/ignite-sprint-5 Commit: 5ecc08ef15a170593f755c2e2bdd18045c71a7aa Parents: 982cb0c 9d3ab16 Author: Yakov Zhdanov Authored: Wed May 27 18:35:34 2015 +0300 Committer: Yakov Zhdanov Committed: Wed May 27 18:35:34 2015 +0300 -- dev-tools/slurp.sh | 14 +- dev-tools/src/main/groovy/jiraslurp.groovy | 265 ++- examples/pom.xml|2 +- modules/aop/pom.xml |2 +- modules/aws/pom.xml |2 +- modules/clients/pom.xml |2 +- modules/cloud/pom.xml |2 +- modules/codegen/pom.xml |2 +- modules/core/pom.xml|2 +- .../ignite/internal/GridKernalContext.java |5 + .../ignite/internal/GridKernalContextImpl.java |5 + .../discovery/GridDiscoveryManager.java | 73 +- .../affinity/GridAffinityAssignmentCache.java | 32 + .../processors/cache/GridCacheAdapter.java |2 +- .../cache/GridCacheAffinityManager.java | 14 + .../processors/cache/GridCacheContext.java |6 +- .../processors/cache/GridCacheGateway.java |2 +- .../processors/cache/GridCacheIoManager.java|8 +- .../processors/cache/GridCacheMvccManager.java | 32 +- .../GridCachePartitionExchangeManager.java | 67 +- .../processors/cache/GridCachePreloader.java|6 +- .../cache/GridCachePreloaderAdapter.java| 11 +- .../processors/cache/GridCacheProcessor.java|6 +- .../cache/GridCacheSharedContext.java |1 + .../processors/cache/GridCacheUtils.java| 228 +-- .../processors/cache/IgniteCacheProxy.java |3 +- .../distributed/GridDistributedTxMapping.java | 17 + .../GridDistributedTxRemoteAdapter.java | 10 +- .../dht/GridClientPartitionTopology.java|8 +- .../dht/GridDhtAssignmentFetchFuture.java |4 +- .../distributed/dht/GridDhtCacheAdapter.java| 27 +- .../distributed/dht/GridDhtLockFuture.java | 10 +- .../dht/GridDhtPartitionTopologyImpl.java | 22 +- .../dht/GridDhtTransactionalCacheAdapter.java | 224 ++- .../distributed/dht/GridDhtTxLocalAdapter.java |8 +- .../distributed/dht/GridDhtTxPrepareFuture.java |3 +- .../dht/atomic/GridDhtAtomicCache.java | 18 +- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 10 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 78 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 112 +- .../dht/colocated/GridDhtColocatedCache.java| 12 +- .../colocated/GridDhtColocatedLockFuture.java | 207 +- .../dht/preloader/GridDhtForceKeysFuture.java |4 +- .../preloader/GridDhtPartitionDemandPool.java | 26 +- .../preloader/GridDhtPartitionSupplyPool.java | 29 +- .../GridDhtPartitionsExchangeFuture.java| 305 ++- .../preloader/GridDhtPartitionsFullMessage.java |4 +- .../GridDhtPartitionsSingleMessage.java | 33 +- .../dht/preloader/GridDhtPreloader.java | 28 +- .../preloader/GridDhtPreloaderAssignments.java |3 +- .../distributed/near/GridNearCacheAdapter.java |2 +- .../distributed/near/GridNearLockFuture.java| 271 ++- .../distributed/near/GridNearLockRequest.java | 68 +- .../distributed/near/GridNearLockResponse.java | 48 +- .../near/GridNearOptimisticTxPrepareFuture.java | 77 +- .../GridNearPessimisticTxPrepareFuture.java |5 +- .../near/GridNearTransactionalCache.java|4 +- .../cache/distributed/near/GridNearTxLocal.java | 43 +- .../near/GridNearTxPrepareRequest.java | 72 +- .../near/GridNearTxPrepareResponse.java | 70 +- .../processors/cache/local/GridLocalCache.java |6 +- .../local/atomic/GridLocalAtomicCache.java |6 +- .../cache/query/GridCacheQueryAdapter.java | 10 +- .../cache/transactions/IgniteInternalTx.java|5 + .../cache/transactions/IgniteTxAdapter.java | 15 +- .../cache/transactions/IgniteTxHandler.java | 148 +- .../processors/query/GridQueryIndexing.java | 16 + .../processors/query/GridQueryProcessor.java| 52 +- .../internal/util/future/GridFutureAdapter.java |4 +- .../core/src/main/resources/ignite.properties |2 +- .../GridDiscoveryManagerAliveCacheSelfTest.java |4 +- .../GridCacheAbstractFailoverSelfTest.java |2 +- .../GridCac
[27/53] [abbrv] incubator-ignite git commit: # IGNITE-943 Fix IgniteCacheClientNodePartitionsExchangeTest
# IGNITE-943 Fix IgniteCacheClientNodePartitionsExchangeTest
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9759b19c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9759b19c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9759b19c
Branch: refs/heads/ignite-sprint-5
Commit: 9759b19ce5db74533e171a9eb3ba0bd2eee449b7
Parents: 6adc974
Author: sevdokimov
Authored: Thu May 28 17:06:57 2015 +0300
Committer: sevdokimov
Committed: Thu May 28 17:06:57 2015 +0300
--
.../distributed/IgniteCacheClientNodePartitionsExchangeTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9759b19c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodePartitionsExchangeTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodePartitionsExchangeTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodePartitionsExchangeTest.java
index 162aa81..d1fbf5a 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodePartitionsExchangeTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodePartitionsExchangeTest.java
@@ -64,7 +64,7 @@ public class IgniteCacheClientNodePartitionsExchangeTest
extends GridCommonAbstr
@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
-((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder);
+
((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder).setForceServerMode(true);
cfg.setClientMode(client);
[44/53] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-709_2' into ignite-943
Merge remote-tracking branch 'remotes/origin/ignite-709_2' into ignite-943 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/477a2150 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/477a2150 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/477a2150 Branch: refs/heads/ignite-sprint-5 Commit: 477a2150ddc597b79846f862759dd6aed2cf4294 Parents: eb810196 07b6cb5 Author: sboikov Authored: Fri May 29 16:07:40 2015 +0300 Committer: sboikov Committed: Fri May 29 16:07:40 2015 +0300 -- .../dht/preloader/GridDhtPartitionMap.java | 2 +- .../GridDhtPartitionsExchangeFuture.java| 2 +- ...niteCacheClientNodeChangingTopologyTest.java | 6 ++ .../IgniteCacheClientNodeConcurrentStart.java | 105 +++ ...teCacheClientNodePartitionsExchangeTest.java | 6 +- .../junits/common/GridCommonAbstractTest.java | 61 +-- .../testsuites/IgniteCacheTestSuite2.java | 1 + 7 files changed, 170 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/477a2150/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/477a2150/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodePartitionsExchangeTest.java --
[07/53] [abbrv] incubator-ignite git commit: # ignite-23
# ignite-23
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9188f4ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9188f4ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9188f4ed
Branch: refs/heads/ignite-sprint-5
Commit: 9188f4ed312d4a0289a3c2b63ebe478341be6424
Parents: cf6c420
Author: sboikov
Authored: Wed May 27 16:51:07 2015 +0300
Committer: sboikov
Committed: Wed May 27 17:01:14 2015 +0300
--
...niteCacheClientNodeChangingTopologyTest.java | 29 ++--
.../junits/common/GridCommonAbstractTest.java | 2 +-
2 files changed, 27 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9188f4ed/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java
index e13b283..47c1d7e 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java
@@ -29,6 +29,7 @@ import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.*;
import org.apache.ignite.internal.processors.cache.distributed.near.*;
import org.apache.ignite.internal.processors.cache.version.*;
+import org.apache.ignite.internal.util.lang.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.plugin.extensions.communication.*;
@@ -851,8 +852,8 @@ public class IgniteCacheClientNodeChangingTopologyTest
extends GridCommonAbstrac
ccfg.setRebalanceMode(SYNC);
ccfg.setNearConfiguration(nearCfg);
-IgniteEx ignite0 = startGrid(0);
-IgniteEx ignite1 = startGrid(1);
+final IgniteEx ignite0 = startGrid(0);
+final IgniteEx ignite1 = startGrid(1);
client = true;
@@ -920,10 +921,32 @@ public class IgniteCacheClientNodeChangingTopologyTest
extends GridCommonAbstrac
lockFut.get();
+boolean wait = GridTestUtils.waitForCondition(new GridAbsPredicate() {
+@Override public boolean apply() {
+return unlocked(ignite0) && unlocked(ignite1);
+}
+
+private boolean unlocked(Ignite ignite) {
+IgniteCache cache = ignite.cache(null);
+
+for (Integer key : keys) {
+if (cache.isLocalLocked(key, false)) {
+log.info("Key is locked [key=" + key + ", node=" +
ignite.name() + ']');
+
+return false;
+}
+}
+
+return true;
+}
+}, 10_000);
+
+assertTrue(wait);
+
for (Integer key : keys) {
Lock lock = cache0.lock(key);
-assertTrue(lock.tryLock());
+assertTrue("Failed to lock: " + key, lock.tryLock());
lock.unlock();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9188f4ed/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
index a4d3355..1f4c7b6 100644
---
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
@@ -391,7 +391,7 @@ public abstract class GridCommonAbstractTest extends
GridAbstractTest {
if (i == 0)
start = System.currentTimeMillis();
-if (i >= 50)
+if (System.currentTimeMillis() - start >
30_000)
throw new IgniteException("Timeout of
waiting for topology map update [grid="
+ g.name() + ", p=" + p + ", nodes=" +
exp + ", owners=" + actual +
[14/53] [abbrv] incubator-ignite git commit: # ignite-943 minor
# ignite-943 minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/92b2a57b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/92b2a57b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/92b2a57b
Branch: refs/heads/ignite-sprint-5
Commit: 92b2a57b040d49536be03e36d0fa69edc9e32771
Parents: 5ecc08e
Author: Yakov Zhdanov
Authored: Wed May 27 19:13:07 2015 +0300
Committer: Yakov Zhdanov
Committed: Wed May 27 19:13:07 2015 +0300
--
.../core/src/main/java/org/apache/ignite/cluster/ClusterNode.java | 2 +-
.../core/src/main/java/org/apache/ignite/internal/IgnitionEx.java | 2 +-
.../java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 1 -
3 files changed, 2 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92b2a57b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java
b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java
index 8f56372..85fd08a 100644
--- a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java
+++ b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java
@@ -248,9 +248,9 @@ public interface ClusterNode {
* while topology clients connect to topology in a different way.
*
* @return {@code True} if this node is a client node, {@code false}
otherwise.
- * @see DiscoverySpi#isClientMode()
* @see IgniteConfiguration#isClientMode()
* @see Ignition#isClientMode()
+ * @see DiscoverySpi#isClientMode()
*/
public boolean isClient();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92b2a57b/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 42d9cf9..7eb6262 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
@@ -1817,7 +1817,7 @@ public class IgnitionEx {
if (cfg.getDiscoverySpi() == null) {
cfg.setDiscoverySpi(new TcpDiscoverySpi());
-if (cfg.isClientMode() != null && cfg.isClientMode())
+if (Boolean.TRUE.equals(cfg.isClientMode()))
((TcpDiscoverySpi)cfg.getDiscoverySpi()).setClientMode(true);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92b2a57b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index d995717..5676fd5 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -1877,5 +1877,4 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter
implements DiscoverySpi, T
return S.toString(SocketTimeoutObject.class, this);
}
}
-
}
[29/53] [abbrv] incubator-ignite git commit: # IGNITE-943 Fix tests
# IGNITE-943 Fix tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0e7fc0a2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0e7fc0a2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0e7fc0a2
Branch: refs/heads/ignite-sprint-5
Commit: 0e7fc0a2a1b5f81a4fdc7012d9ee47cdd1c2c912
Parents: a02cb41
Author: sevdokimov
Authored: Thu May 28 17:13:10 2015 +0300
Committer: sevdokimov
Committed: Thu May 28 17:13:10 2015 +0300
--
.../processors/cache/GridCacheAbstractRemoveFailureTest.java | 3 +++
.../GridCacheAtomicInvalidPartitionHandlingSelfTest.java | 6 +-
2 files changed, 4 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0e7fc0a2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java
index d5d80ab..2b6a6b0 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java
@@ -23,6 +23,7 @@ import org.apache.ignite.internal.*;
import org.apache.ignite.internal.util.lang.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.testframework.*;
import org.jsr166.*;
@@ -75,6 +76,8 @@ public abstract class GridCacheAbstractRemoveFailureTest
extends GridCacheAbstra
@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
+((TcpDiscoverySpi)cfg.getDiscoverySpi()).setForceServerMode(true);
+
if (testClientNode() && getTestGridName(0).equals(gridName))
cfg.setClientMode(true);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0e7fc0a2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
index 55125a2..054a110 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
@@ -68,11 +68,7 @@ public class GridCacheAtomicInvalidPartitionHandlingSelfTest
extends GridCommonA
@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
-TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
-
-discoSpi.setIpFinder(IP_FINDER);
-
-cfg.setDiscoverySpi(discoSpi);
+cfg.setDiscoverySpi(new
TcpDiscoverySpi().setIpFinder(IP_FINDER).setForceServerMode(true));
cfg.setCacheConfiguration(cacheConfiguration());
[53/53] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-943' into ignite-sprint-5
Merge remote-tracking branch 'remotes/origin/ignite-943' into ignite-sprint-5 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3c0046e8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3c0046e8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3c0046e8 Branch: refs/heads/ignite-sprint-5 Commit: 3c0046e8e040ab53a5f39819b1c86487f645d25f Parents: 9a16d19 ab4c18c Author: sevdokimov Authored: Mon Jun 1 14:42:34 2015 +0300 Committer: sevdokimov Committed: Mon Jun 1 14:42:34 2015 +0300 -- .../main/java/org/apache/ignite/Ignition.java | 18 +- .../org/apache/ignite/cluster/ClusterNode.java | 24 +- .../configuration/CacheConfiguration.java | 27 +- .../configuration/IgniteConfiguration.java |4 +- .../ignite/internal/ClusterMetricsSnapshot.java | 14 + .../internal/GridEventConsumeHandler.java | 100 +- .../ignite/internal/GridKernalContext.java |5 + .../ignite/internal/GridKernalContextImpl.java |5 + .../apache/ignite/internal/IgniteKernal.java| 23 +- .../org/apache/ignite/internal/IgnitionEx.java | 20 +- .../ignite/internal/MarshallerContextImpl.java |2 +- .../internal/events/DiscoveryCustomEvent.java | 18 +- .../managers/discovery/CustomEventListener.java | 31 + .../discovery/CustomMessageWrapper.java | 63 + .../discovery/DiscoveryCustomMessage.java | 48 + .../discovery/GridDiscoveryManager.java | 214 +- .../affinity/GridAffinityAssignmentCache.java | 32 + .../cache/DynamicCacheChangeBatch.java | 20 +- .../cache/DynamicCacheDescriptor.java |2 + .../processors/cache/GridCacheAdapter.java | 17 +- .../cache/GridCacheAffinityManager.java | 14 + .../cache/GridCacheConcurrentMap.java | 21 +- .../processors/cache/GridCacheContext.java |6 +- .../processors/cache/GridCacheGateway.java |2 +- .../processors/cache/GridCacheIoManager.java|8 +- .../processors/cache/GridCacheMvccManager.java | 32 +- .../GridCachePartitionExchangeManager.java | 71 +- .../processors/cache/GridCachePreloader.java|6 +- .../cache/GridCachePreloaderAdapter.java| 11 +- .../processors/cache/GridCacheProcessor.java| 74 +- .../processors/cache/GridCacheProxyImpl.java| 12 + .../cache/GridCacheSharedContext.java |1 + .../processors/cache/GridCacheUtils.java| 234 +- .../processors/cache/IgniteInternalCache.java |5 + .../cache/affinity/GridCacheAffinityImpl.java | 10 +- .../CacheDataStructuresManager.java |2 +- .../distributed/GridDistributedTxMapping.java | 17 + .../dht/GridClientPartitionTopology.java|8 +- .../dht/GridDhtAssignmentFetchFuture.java |4 +- .../distributed/dht/GridDhtCacheAdapter.java| 27 +- .../distributed/dht/GridDhtLockFuture.java | 10 +- .../dht/GridDhtPartitionTopologyImpl.java | 22 +- .../dht/GridDhtTransactionalCacheAdapter.java | 224 +- .../distributed/dht/GridDhtTxLocalAdapter.java |8 +- .../distributed/dht/GridDhtTxPrepareFuture.java |3 +- .../dht/atomic/GridDhtAtomicCache.java | 18 +- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 10 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 78 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 112 +- .../dht/colocated/GridDhtColocatedCache.java| 12 +- .../colocated/GridDhtColocatedLockFuture.java | 213 +- .../dht/preloader/GridDhtForceKeysFuture.java |4 +- .../preloader/GridDhtPartitionDemandPool.java | 26 +- .../dht/preloader/GridDhtPartitionMap.java |2 +- .../preloader/GridDhtPartitionSupplyPool.java | 29 +- .../GridDhtPartitionsExchangeFuture.java| 313 +- .../preloader/GridDhtPartitionsFullMessage.java |4 +- .../GridDhtPartitionsSingleMessage.java | 33 +- .../dht/preloader/GridDhtPreloader.java | 28 +- .../preloader/GridDhtPreloaderAssignments.java |3 +- .../distributed/near/GridNearAtomicCache.java |5 + .../distributed/near/GridNearCacheAdapter.java |2 +- .../distributed/near/GridNearGetFuture.java |2 +- .../distributed/near/GridNearLockFuture.java| 271 +- .../distributed/near/GridNearLockRequest.java | 68 +- .../distributed/near/GridNearLockResponse.java | 48 +- .../near/GridNearOptimisticTxPrepareFuture.java | 83 +- .../GridNearPessimisticTxPrepareFuture.java |5 +- .../near/GridNearTransactionalCache.java|4 +- .../cache/distributed/near/GridNearTxLocal.java | 43 +- .../near/GridNearTxPrepareRequest.java | 72 +- .../near/GridNearTxPrepareResponse.java | 70 +- .../processors/cache/local/GridLocalCache.java |6 +- .../local/atomic/
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-709_2 [deleted] 07b6cb598
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-943 [deleted] ab4c18cac
incubator-ignite git commit: # IGNITW-956: WIP.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-956 [created] bb796512e
# IGNITW-956: WIP.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bb796512
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bb796512
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bb796512
Branch: refs/heads/ignite-956
Commit: bb796512e1902dadd2e7ef240326e2ebbd5668bb
Parents: c232631
Author: AKuznetsov
Authored: Mon Jun 1 18:55:30 2015 +0700
Committer: AKuznetsov
Committed: Mon Jun 1 18:55:30 2015 +0700
--
DEVNOTES.txt | 6 ++
examples/pom.xml | 4 ++--
modules/scalar/pom.xml| 8
modules/visor-console/pom.xml | 8
parent/pom.xml| 1 +
pom.xml | 7 +++
6 files changed, 24 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bb796512/DEVNOTES.txt
--
diff --git a/DEVNOTES.txt b/DEVNOTES.txt
index 1562dc4..45a59ab 100644
--- a/DEVNOTES.txt
+++ b/DEVNOTES.txt
@@ -3,9 +3,15 @@ Ignite Fabric Maven Build Instructions
Without LGPL dependencies (default):
mvn clean package -DskipTests
+With Scala 2.11:
+ mvn clean package -DskipTests -Prelease,scala-2.11
+
With LGPL dependencies:
mvn clean package -DskipTests -Prelease,lgpl
+With LGPL and Scala 2.11:
+ mvn clean package -DskipTests -Prelease,lgpl,scala-2.11
+
Look for incubator-ignite--bin.zip in ./target/bin directory.
NOTE: JDK version should be 1.7.0-* or >= 1.8.0-u40.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bb796512/examples/pom.xml
--
diff --git a/examples/pom.xml b/examples/pom.xml
index 78c5852..a8b6b29 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -150,8 +150,8 @@
org.scalatest
-scalatest_2.11
-2.2.2
+scalatest_${scala.binary.version}
+2.2.4
test
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bb796512/modules/scalar/pom.xml
--
diff --git a/modules/scalar/pom.xml b/modules/scalar/pom.xml
index d3fcf2e..a9a6638 100644
--- a/modules/scalar/pom.xml
+++ b/modules/scalar/pom.xml
@@ -30,7 +30,7 @@
../../parent
-ignite-scalar
+ignite-scalar_2.10
1.2.0-SNAPSHOT
@@ -43,7 +43,7 @@
org.scala-lang
scala-library
-2.11.2
+2.10.5
@@ -70,8 +70,8 @@
org.scalatest
-scalatest_2.11
-2.2.2
+scalatest_2.10
+2.2.4
test
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bb796512/modules/visor-console/pom.xml
--
diff --git a/modules/visor-console/pom.xml b/modules/visor-console/pom.xml
index 8e71970..579ee47 100644
--- a/modules/visor-console/pom.xml
+++ b/modules/visor-console/pom.xml
@@ -79,13 +79,13 @@
org.scala-lang
scala-library
-2.11.2
+${scala.version}
jline
-jline
-2.12.1
+${scala.jline.groupid}
+${scala.jline.version}
@@ -99,7 +99,7 @@
org.scalatest
-scalatest_2.11
+scalatest_2.10
2.2.4
test
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bb796512/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index a514e35..25e6b0c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -41,6 +41,7 @@
d
doxygen
git
+scala-2.10
org.apache.ignite
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bb796512/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 6f8524f..ca89910 100644
--- a/pom.xml
+++ b/pom.xml
@@ -420,6 +420,13 @@
+
+
+
+
+
+
+
lgpl
incubator-ignite git commit: IGNITE-943 Fix javadoc problems.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-sprint-5 3c0046e8e -> 97d0b04e2
IGNITE-943 Fix javadoc problems.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/97d0b04e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/97d0b04e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/97d0b04e
Branch: refs/heads/ignite-sprint-5
Commit: 97d0b04e268985bd5afc32a35cd432b04e5d30a8
Parents: 3c0046e
Author: sevdokimov
Authored: Mon Jun 1 15:29:54 2015 +0300
Committer: sevdokimov
Committed: Mon Jun 1 15:29:54 2015 +0300
--
modules/core/src/main/java/org/apache/ignite/Ignition.java | 4 ++--
.../org/apache/ignite/configuration/IgniteConfiguration.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/97d0b04e/modules/core/src/main/java/org/apache/ignite/Ignition.java
--
diff --git a/modules/core/src/main/java/org/apache/ignite/Ignition.java
b/modules/core/src/main/java/org/apache/ignite/Ignition.java
index 35e0b51..d5d59a5 100644
--- a/modules/core/src/main/java/org/apache/ignite/Ignition.java
+++ b/modules/core/src/main/java/org/apache/ignite/Ignition.java
@@ -143,7 +143,7 @@ public class Ignition {
*
* @param clientMode Client mode flag.
* @see IgniteConfiguration#isClientMode()
- * @see TcpDiscoverySpi#setClientMode(boolean)
+ * @see TcpDiscoverySpi#setForceServerMode(boolean)
*/
public static void setClientMode(boolean clientMode) {
IgnitionEx.setClientMode(clientMode);
@@ -158,7 +158,7 @@ public class Ignition {
*
* @return Client mode flag.
* @see IgniteConfiguration#isClientMode()
- * @see TcpDiscoverySpi#setClientMode(boolean)
+ * @see TcpDiscoverySpi#setForceServerMode(boolean)
*/
public static boolean isClientMode() {
return IgnitionEx.isClientMode();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/97d0b04e/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index 38e1f2c..71298f5 100644
---
a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@ -1827,7 +1827,7 @@ public class IgniteConfiguration {
* {@link DiscoverySpi} in client mode if this property is {@code true}.
*
* @return Client mode flag.
- * @see TcpDiscoverySpi#setClientMode(boolean)
+ * @see TcpDiscoverySpi#setForceServerMode(boolean)
*/
public Boolean isClientMode() {
return clientMode;
[40/50] [abbrv] incubator-ignite git commit: [IGNITE-958]: IGNITE-218 (Wrong staging permissions while running MR job under hadoop accelerator): IGFS part.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/35388195/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/igfs/HadoopIgfsOutProc.java
--
diff --git
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/igfs/HadoopIgfsOutProc.java
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/igfs/HadoopIgfsOutProc.java
index 7dca049..f23c62c 100644
---
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/igfs/HadoopIgfsOutProc.java
+++
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/igfs/HadoopIgfsOutProc.java
@@ -81,6 +81,9 @@ public class HadoopIgfsOutProc implements HadoopIgfsEx,
HadoopIgfsIpcIoListener
/** IGFS name. */
private final String igfs;
+/** The user this out proc is performing on behalf of. */
+private final String userName;
+
/** Client log. */
private final Log log;
@@ -100,8 +103,8 @@ public class HadoopIgfsOutProc implements HadoopIgfsEx,
HadoopIgfsIpcIoListener
* @param log Client logger.
* @throws IOException If failed.
*/
-public HadoopIgfsOutProc(String host, int port, String grid, String igfs,
Log log) throws IOException {
-this(host, port, grid, igfs, false, log);
+public HadoopIgfsOutProc(String host, int port, String grid, String igfs,
Log log, String user) throws IOException {
+this(host, port, grid, igfs, false, log, user);
}
/**
@@ -113,8 +116,8 @@ public class HadoopIgfsOutProc implements HadoopIgfsEx,
HadoopIgfsIpcIoListener
* @param log Client logger.
* @throws IOException If failed.
*/
-public HadoopIgfsOutProc(int port, String grid, String igfs, Log log)
throws IOException {
-this(null, port, grid, igfs, true, log);
+public HadoopIgfsOutProc(int port, String grid, String igfs, Log log,
String user) throws IOException {
+this(null, port, grid, igfs, true, log, user);
}
/**
@@ -128,7 +131,7 @@ public class HadoopIgfsOutProc implements HadoopIgfsEx,
HadoopIgfsIpcIoListener
* @param log Client logger.
* @throws IOException If failed.
*/
-private HadoopIgfsOutProc(String host, int port, String grid, String igfs,
boolean shmem, Log log)
+private HadoopIgfsOutProc(String host, int port, String grid, String igfs,
boolean shmem, Log log, String user)
throws IOException {
assert host != null && !shmem || host == null && shmem :
"Invalid arguments [host=" + host + ", port=" + port + ", shmem="
+ shmem + ']';
@@ -138,6 +141,7 @@ public class HadoopIgfsOutProc implements HadoopIgfsEx,
HadoopIgfsIpcIoListener
this.grid = grid;
this.igfs = igfs;
this.log = log;
+this.userName = IgfsUtils.fixUserName(user);
io = HadoopIgfsIpcIo.get(log, endpoint);
@@ -173,6 +177,7 @@ public class HadoopIgfsOutProc implements HadoopIgfsEx,
HadoopIgfsIpcIoListener
msg.command(INFO);
msg.path(path);
+msg.userName(userName);
return io.send(msg).chain(FILE_RES).get();
}
@@ -184,6 +189,7 @@ public class HadoopIgfsOutProc implements HadoopIgfsEx,
HadoopIgfsIpcIoListener
msg.command(UPDATE);
msg.path(path);
msg.properties(props);
+msg.userName(userName);
return io.send(msg).chain(FILE_RES).get();
}
@@ -196,6 +202,7 @@ public class HadoopIgfsOutProc implements HadoopIgfsEx,
HadoopIgfsIpcIoListener
msg.path(path);
msg.accessTime(accessTime);
msg.modificationTime(modificationTime);
+msg.userName(userName);
return io.send(msg).chain(BOOL_RES).get();
}
@@ -207,6 +214,7 @@ public class HadoopIgfsOutProc implements HadoopIgfsEx,
HadoopIgfsIpcIoListener
msg.command(RENAME);
msg.path(src);
msg.destinationPath(dest);
+msg.userName(userName);
return io.send(msg).chain(BOOL_RES).get();
}
@@ -218,6 +226,7 @@ public class HadoopIgfsOutProc implements HadoopIgfsEx,
HadoopIgfsIpcIoListener
msg.command(DELETE);
msg.path(path);
msg.flag(recursive);
+msg.userName(userName);
return io.send(msg).chain(BOOL_RES).get();
}
@@ -231,6 +240,7 @@ public class HadoopIgfsOutProc implements HadoopIgfsEx,
HadoopIgfsIpcIoListener
msg.path(path);
msg.start(start);
msg.length(len);
+msg.userName(userName);
return io.send(msg).chain(BLOCK_LOCATION_COL_RES).get();
}
@@ -241,6 +251,7 @@ public class HadoopIgfsOutProc implements HadoopIgfsEx,
HadoopIgfsIpcIoListener
msg.command(PATH_SUMMARY);
msg.path(path);
+msg.userName(userName);
return io.send(msg).chain(SUMMARY_RES).get();
}
@@ -252,6 +263,7 @@ public class HadoopIgfsOutProc implements HadoopIgfsEx,
Hadoop
[48/50] [abbrv] incubator-ignite git commit: # ignite-sprint-5: more help info at git-format-patch.sh
# ignite-sprint-5: more help info at git-format-patch.sh
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/52d64bb3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/52d64bb3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/52d64bb3
Branch: refs/heads/ignite-648
Commit: 52d64bb3bf13b531458889d4ea5d8650ca1789b7
Parents: 2859671
Author: ashutak
Authored: Mon Jun 1 12:16:07 2015 +0300
Committer: ashutak
Committed: Mon Jun 1 12:16:07 2015 +0300
--
scripts/git-format-patch.sh | 14 +-
1 file changed, 9 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52d64bb3/scripts/git-format-patch.sh
--
diff --git a/scripts/git-format-patch.sh b/scripts/git-format-patch.sh
index 970347f..5aa2075 100755
--- a/scripts/git-format-patch.sh
+++ b/scripts/git-format-patch.sh
@@ -20,9 +20,13 @@
# Git patch-file maker.
#
echo 'Usage: scripts/git-format-patch.sh [-ih|--ignitehome ]
[-idb|--ignitedefbranch ] [-ph|--patchhome ]'
+echo 'It is a script to create patch between current and default branches. The
script is safe and do not broke or lose your changes.'
echo "It should be called from IGNITE_HOME directory."
-echo "Patch will be created at PATCHES_HOME between Master branch
(IGNITE_DEFAULT_BRANCH) and Current branch."
+echo "Patch will be created at PATCHES_HOME (= IGNITE_HOME, by default)
between Master branch (IGNITE_DEFAULT_BRANCH) and Current branch."
echo "Note: you can use ${IGNITE_HOME}/scripts/git-patch-prop-local.sh to set
your own local properties (to rewrite settings at git-patch-prop-local.sh). "
+echo 'Examples:'
+echo '- Basic (with all defaults and properties from git-patch-prop.sh):
./scripts/git-format-patch.sh'
+echo '- Rewrite some defaults (see Usage):
./scripts/git-format-patch.sh -ph /home/user_name/patches'
echo
#
@@ -51,17 +55,17 @@ do
IGNITE_HOME="$2"
shift
;;
-
+
-idb|--ignitedefbranch)
IGNITE_DEFAULT_BRANCH="$2"
shift
;;
-
+
-ph|--patchhome)
PATCHES_HOME="$2"
shift
;;
-
+
*)
echo "Unknown parameter: ${key}"
;;
@@ -84,4 +88,4 @@ echo
requireCleanWorkTree ${IGNITE_HOME}
-formatPatch ${IGNITE_HOME} ${IGNITE_DEFAULT_BRANCH} ${IGNITE_CURRENT_BRANCH}
.patch
\ No newline at end of file
+formatPatch ${IGNITE_HOME} ${IGNITE_DEFAULT_BRANCH} ${IGNITE_CURRENT_BRANCH}
.patch
[41/50] [abbrv] incubator-ignite git commit: [IGNITE-958]: IGNITE-218 (Wrong staging permissions while running MR job under hadoop accelerator): IGFS part.
[IGNITE-958]: IGNITE-218 (Wrong staging permissions while running MR job under
hadoop accelerator): IGFS part.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/35388195
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/35388195
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/35388195
Branch: refs/heads/ignite-648
Commit: 353881951fcdcc16c3dc31d808d3af6c263f74ce
Parents: 7ec4c82
Author: iveselovskiy
Authored: Fri May 29 15:31:35 2015 +0300
Committer: iveselovskiy
Committed: Fri May 29 15:31:35 2015 +0300
--
.../igfs/secondary/IgfsSecondaryFileSystem.java | 7 +
.../internal/igfs/common/IgfsMarshaller.java| 35 +---
.../igfs/common/IgfsPathControlRequest.java | 22 +++
.../internal/processors/hadoop/HadoopJob.java | 2 +-
.../ignite/internal/processors/igfs/IgfsEx.java | 8 +-
.../internal/processors/igfs/IgfsImpl.java | 8 +-
.../processors/igfs/IgfsIpcHandler.java | 184 ++-
.../igfs/IgfsSecondaryFileSystemImpl.java | 9 +-
.../internal/processors/igfs/IgfsServer.java| 4 +-
.../internal/processors/igfs/IgfsUtils.java | 16 ++
.../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 165 -
.../hadoop/fs/v1/IgniteHadoopFileSystem.java| 107 +++
.../hadoop/fs/v2/IgniteHadoopFileSystem.java| 32 +++-
.../internal/processors/hadoop/HadoopUtils.java | 10 +-
.../hadoop/SecondaryFileSystemProvider.java | 53 +++---
.../hadoop/fs/HadoopDistributedFileSystem.java | 91 -
.../hadoop/fs/HadoopFileSystemsUtils.java | 17 --
.../processors/hadoop/igfs/HadoopIgfsEx.java| 6 +
.../hadoop/igfs/HadoopIgfsInProc.java | 170 -
.../processors/hadoop/igfs/HadoopIgfsIpcIo.java | 2 +-
.../hadoop/igfs/HadoopIgfsOutProc.java | 33 +++-
.../hadoop/igfs/HadoopIgfsWrapper.java | 19 +-
.../hadoop/v2/HadoopV2TaskContext.java | 4 +-
.../HadoopIgfs20FileSystemAbstractSelfTest.java | 56 --
...oopSecondaryFileSystemConfigurationTest.java | 4 +-
.../IgniteHadoopFileSystemAbstractSelfTest.java | 63 +--
.../IgniteHadoopFileSystemClientSelfTest.java | 2 +-
.../IgniteHadoopFileSystemIpcCacheSelfTest.java | 2 +
.../hadoop/HadoopFileSystemsTest.java | 23 +--
.../collections/HadoopSkipListSelfTest.java | 4 +-
30 files changed, 684 insertions(+), 474 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/35388195/modules/core/src/main/java/org/apache/ignite/igfs/secondary/IgfsSecondaryFileSystem.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/igfs/secondary/IgfsSecondaryFileSystem.java
b/modules/core/src/main/java/org/apache/ignite/igfs/secondary/IgfsSecondaryFileSystem.java
index 9026eac..cb69352 100644
---
a/modules/core/src/main/java/org/apache/ignite/igfs/secondary/IgfsSecondaryFileSystem.java
+++
b/modules/core/src/main/java/org/apache/ignite/igfs/secondary/IgfsSecondaryFileSystem.java
@@ -198,4 +198,11 @@ public interface IgfsSecondaryFileSystem {
* @return Map of properties.
*/
public Map properties();
+
+
+/**
+ * Closes the secondary file system.
+ * @throws IgniteException in case of an error.
+ */
+public void close() throws IgniteException;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/35388195/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMarshaller.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMarshaller.java
b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMarshaller.java
index 11af716..6a6f22a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMarshaller.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMarshaller.java
@@ -73,6 +73,7 @@ public class IgfsMarshaller {
}
/**
+ * Serializes the message and sends it into the given output stream.
* @param msg Message.
* @param hdr Message header.
* @param out Output.
@@ -119,6 +120,7 @@ public class IgfsMarshaller {
IgfsPathControlRequest req = (IgfsPathControlRequest)msg;
+U.writeString(out, req.userName());
writePath(out, req.path());
writePath(out, req.destinationPath());
out.writeBoolean(req.flag());
@@ -236,6 +238,7 @@ public class IgfsMarshaller {
case OPEN_CREATE: {
IgfsPathControlRequest req = new IgfsPathControlRequest();
[04/50] [abbrv] incubator-ignite git commit: # ignite-456: slurp.sh
# ignite-456: slurp.sh
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/982235b7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/982235b7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/982235b7
Branch: refs/heads/ignite-648
Commit: 982235b75f980eff4c20f5fc7560db55af32bd7d
Parents: 26b1d0d
Author: artem.shutak
Authored: Tue May 26 21:14:52 2015 +0300
Committer: artem.shutak
Committed: Tue May 26 21:14:52 2015 +0300
--
dev-tools/slurp.sh | 10 ++
1 file changed, 10 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/982235b7/dev-tools/slurp.sh
--
diff --git a/dev-tools/slurp.sh b/dev-tools/slurp.sh
index 1636f21..7eb6fdb 100755
--- a/dev-tools/slurp.sh
+++ b/dev-tools/slurp.sh
@@ -51,6 +51,16 @@ TASK_RUNNER_USER='task_runner'
#
TASK_RUNNER_PWD=''
+echo ">>"
+echo "<"$(date +"%H:%M:%S")"> Starting task triggering"
+echo ">>"
+
+# Useful settings
+#cd /home/teamcity/jobs/incubator-ignite/
+#
+#export JAVA_HOME=
+#export PATH=$PATH:
+
git fetch
git checkout ${DEFAULT_BRANCH}
[44/50] [abbrv] incubator-ignite git commit: #gg-10369: Fix exception when we start ignite and gridgain nodes.
#gg-10369: Fix exception when we start ignite and gridgain nodes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5df06682
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5df06682
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5df06682
Branch: refs/heads/ignite-648
Commit: 5df06682c517731b3811ca4d0daabaa504b732f3
Parents: 8455c7a
Author: ivasilinets
Authored: Fri May 29 16:57:30 2015 +0300
Committer: ivasilinets
Committed: Fri May 29 16:57:30 2015 +0300
--
.../ignite/internal/util/GridJavaProcess.java | 30
1 file changed, 18 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5df06682/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java
index bff26ec..42fe089 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java
@@ -128,25 +128,31 @@ public final class GridJavaProcess {
gjProc.log = log;
gjProc.procKilledC = procKilledC;
-String javaBin = System.getProperty("java.home") + File.separator +
"bin" + File.separator + "java";
-String classpath = System.getProperty("java.class.path");
-String sfcp = System.getProperty("surefire.test.class.path");
-
-if (sfcp != null)
-classpath += System.getProperty("path.separator") + sfcp;
-
-if (cp != null)
-classpath += System.getProperty("path.separator") + cp;
-
List procParams = params == null || params.isEmpty() ?
Collections.emptyList() : Arrays.asList(params.split(" "));
List procCommands = new ArrayList<>();
+String javaBin = System.getProperty("java.home") + File.separator +
"bin" + File.separator + "java";
+
procCommands.add(javaBin);
procCommands.addAll(jvmArgs == null ? U.jvmArgs() : jvmArgs);
-procCommands.add("-cp");
-procCommands.add(classpath);
+
+if (!jvmArgs.contains("-cp") && !jvmArgs.contains("-classpath")) {
+String classpath = System.getProperty("java.class.path");
+
+String sfcp = System.getProperty("surefire.test.class.path");
+
+if (sfcp != null)
+classpath += System.getProperty("path.separator") + sfcp;
+
+if (cp != null)
+classpath += System.getProperty("path.separator") + cp;
+
+procCommands.add("-cp");
+procCommands.add(classpath);
+}
+
procCommands.add(clsName);
procCommands.addAll(procParams);
[35/50] [abbrv] incubator-ignite git commit: # ignite-456: add comment
# ignite-456: add comment
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3d77af8c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3d77af8c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3d77af8c
Branch: refs/heads/ignite-648
Commit: 3d77af8cb13552dfb8a183029959bb7b148a4018
Parents: e16cb03
Author: ashutak
Authored: Thu May 28 19:18:10 2015 +0300
Committer: ashutak
Committed: Thu May 28 19:18:10 2015 +0300
--
dev-tools/src/main/groovy/jiraslurp.groovy | 3 +++
scripts/git-patch-prop.sh | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3d77af8c/dev-tools/src/main/groovy/jiraslurp.groovy
--
diff --git a/dev-tools/src/main/groovy/jiraslurp.groovy
b/dev-tools/src/main/groovy/jiraslurp.groovy
index 3547337..8498cf0 100644
--- a/dev-tools/src/main/groovy/jiraslurp.groovy
+++ b/dev-tools/src/main/groovy/jiraslurp.groovy
@@ -420,6 +420,9 @@ def runAllTestBuilds = {builds, jiraNum ->
else {
postData = "" +
" " +
+" " +
+"Auto triggered build to validate last
attached patch file at $jiraNum." +
+" " +
" " +
""
+
" " +
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3d77af8c/scripts/git-patch-prop.sh
--
diff --git a/scripts/git-patch-prop.sh b/scripts/git-patch-prop.sh
index 9c52583..c856fb4 100644
--- a/scripts/git-patch-prop.sh
+++ b/scripts/git-patch-prop.sh
@@ -19,6 +19,6 @@
#
# Git patch-file maker/applier properties.
#
-IGNITE_DEFAULT_BRANCH='ignite-sprint-3'
+IGNITE_DEFAULT_BRANCH='ignite-sprint-5'
PATCHES_HOME=${IGNITE_HOME}
[22/50] [abbrv] incubator-ignite git commit: #IGNITE-857 Added comma separate limit.
#IGNITE-857 Added comma separate limit.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/07a10952
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/07a10952
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/07a10952
Branch: refs/heads/ignite-648
Commit: 07a10952093f8f4c7ce432413bb582c6ab96dc26
Parents: 8deb577
Author: nikolay_tikhonov
Authored: Thu May 28 11:15:55 2015 +0300
Committer: nikolay_tikhonov
Committed: Thu May 28 11:15:55 2015 +0300
--
.../apache/ignite/mesos/ClusterProperties.java | 18 +++
.../apache/ignite/mesos/IgniteScheduler.java| 34 +++-
.../ignite/mesos/IgniteSchedulerSelfTest.java | 56 ++--
3 files changed, 91 insertions(+), 17 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07a10952/modules/mesos/src/main/java/org/apache/ignite/mesos/ClusterProperties.java
--
diff --git
a/modules/mesos/src/main/java/org/apache/ignite/mesos/ClusterProperties.java
b/modules/mesos/src/main/java/org/apache/ignite/mesos/ClusterProperties.java
index 9f0b304..944735e 100644
--- a/modules/mesos/src/main/java/org/apache/ignite/mesos/ClusterProperties.java
+++ b/modules/mesos/src/main/java/org/apache/ignite/mesos/ClusterProperties.java
@@ -215,6 +215,13 @@ public class ClusterProperties {
}
/**
+ * Set CPU count limit.
+ */
+public void cpusPerNode(double cpu) {
+this.cpuPerNode = cpu;
+}
+
+/**
* @return mem limit.
*/
public double memory() {
@@ -223,6 +230,8 @@ public class ClusterProperties {
/**
* Set mem limit.
+ *
+ * @param mem Memory.
*/
public void memory(double mem) {
this.mem = mem;
@@ -236,6 +245,15 @@ public class ClusterProperties {
}
/**
+ * Set mem limit.
+ *
+ * @param mem Memory.
+ */
+public void memoryPerNode(double mem) {
+ this.memPerNode = mem;
+}
+
+/**
* @return disk limit.
*/
public double disk() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07a10952/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteScheduler.java
--
diff --git
a/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteScheduler.java
b/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteScheduler.java
index 17daf45..e833025 100644
--- a/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteScheduler.java
+++ b/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteScheduler.java
@@ -29,7 +29,7 @@ import java.util.concurrent.atomic.*;
*/
public class IgniteScheduler implements Scheduler {
/** Cpus. */
-public static final String CPUS = "cpus";
+public static final String CPU = "cpus";
/** Mem. */
public static final String MEM = "mem";
@@ -126,14 +126,17 @@ public class IgniteScheduler implements Scheduler {
.addUris(Protos.CommandInfo.URI.newBuilder()
.setValue(cfgUrl));
-if (clusterProps.usersLibsUrl() != null)
-builder.addUris(Protos.CommandInfo.URI.newBuilder()
-.setValue(clusterProps.usersLibsUrl())
-.setExtract(true));
-else if (resourceProvider.resourceUrl() != null) {
-for (String url : resourceProvider.resourceUrl())
-
builder.addUris(Protos.CommandInfo.URI.newBuilder().setValue(url));
-}
+// Collection user's libs.
+Collection usersLibs = new ArrayList<>();
+
+if (clusterProps.usersLibsUrl() != null &&
!clusterProps.usersLibsUrl().isEmpty())
+Collections.addAll(usersLibs,
clusterProps.usersLibsUrl().split(DELIM));
+
+if (resourceProvider.resourceUrl() != null &&
!resourceProvider.resourceUrl().isEmpty())
+usersLibs.addAll(resourceProvider.resourceUrl());
+
+for (String url : usersLibs)
+builder.addUris(Protos.CommandInfo.URI.newBuilder().setValue(url));
String cfgName = resourceProvider.configName();
@@ -155,7 +158,7 @@ public class IgniteScheduler implements Scheduler {
.setSlaveId(offer.getSlaveId())
.setCommand(builder)
.addResources(Protos.Resource.newBuilder()
-.setName(CPUS)
+.setName(CPU)
.setType(Protos.Value.Type.SCALAR)
.setScalar(Protos.Value.Scalar.newBuilder().setValue(igniteTask.cpuCores(
.addResources(Protos.Resource.newBuilder()
@@ -210,7 +213,7 @@ public class IgniteScheduler implements Scheduler {
// Collect resource on slave.
for (Protos.Reso
[43/50] [abbrv] incubator-ignite git commit: ignite-866 NPE during clean up
ignite-866 NPE during clean up
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2d9a938a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2d9a938a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2d9a938a
Branch: refs/heads/ignite-648
Commit: 2d9a938a281887fdae804ac68a89e93e5ad1b02b
Parents: 8455c7a
Author: agura
Authored: Thu May 14 14:40:38 2015 +0300
Committer: agura
Committed: Fri May 29 16:43:38 2015 +0300
--
.../processors/cache/CacheMetricsImpl.java | 62 +++-
.../processors/cache/GridCacheAdapter.java | 12 +++-
2 files changed, 55 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2d9a938a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java
index 560de97..af19077 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache;
import org.apache.ignite.*;
import org.apache.ignite.cache.*;
+import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.processors.cache.store.*;
import org.apache.ignite.internal.util.tostring.*;
import org.apache.ignite.internal.util.typedef.internal.*;
@@ -118,7 +119,9 @@ public class CacheMetricsImpl implements CacheMetrics {
/** {@inheritDoc} */
@Override public long getOverflowSize() {
try {
-return cctx.cache().overflowSize();
+GridCacheAdapter cache = cctx.cache();
+
+return cache != null ? cache.overflowSize() : -1;
}
catch (IgniteCheckedException ignored) {
return -1;
@@ -127,34 +130,47 @@ public class CacheMetricsImpl implements CacheMetrics {
/** {@inheritDoc} */
@Override public long getOffHeapEntriesCount() {
-return cctx.cache().offHeapEntriesCount();
+GridCacheAdapter cache = cctx.cache();
+
+return cache != null ? cache.offHeapEntriesCount() : -1;
}
/** {@inheritDoc} */
@Override public long getOffHeapAllocatedSize() {
-return cctx.cache().offHeapAllocatedSize();
+GridCacheAdapter cache = cctx.cache();
+
+return cache != null ? cache.offHeapAllocatedSize() : -1;
}
/** {@inheritDoc} */
@Override public int getSize() {
-return cctx.cache().size();
+GridCacheAdapter cache = cctx.cache();
+
+return cache != null ? cache.size() : 0;
}
/** {@inheritDoc} */
@Override public int getKeySize() {
-return cctx.cache().size();
+return getSize();
}
/** {@inheritDoc} */
@Override public boolean isEmpty() {
-return cctx.cache().isEmpty();
+GridCacheAdapter cache = cctx.cache();
+
+return cache == null || cache.isEmpty();
}
/** {@inheritDoc} */
@Override public int getDhtEvictQueueCurrentSize() {
-return cctx.isNear() ?
-dhtCtx != null ? dhtCtx.evicts().evictQueueSize() : -1
-: cctx.evicts().evictQueueSize();
+GridCacheContext ctx = cctx.isNear() ? dhtCtx : cctx;
+
+if (ctx == null)
+return -1;
+
+GridCacheEvictionManager evictMgr = ctx.evicts();
+
+return evictMgr != null ? evictMgr.evictQueueSize() : -1;
}
/** {@inheritDoc} */
@@ -548,37 +564,51 @@ public class CacheMetricsImpl implements CacheMetrics {
/** {@inheritDoc} */
@Override public String getKeyType() {
-return cctx.config().getKeyType().getName();
+CacheConfiguration ccfg = cctx.config();
+
+return ccfg != null ? ccfg.getKeyType().getName() : null;
}
/** {@inheritDoc} */
@Override public String getValueType() {
-return cctx.config().getValueType().getName();
+CacheConfiguration ccfg = cctx.config();
+
+return ccfg != null ? ccfg.getValueType().getName() : null;
}
/** {@inheritDoc} */
@Override public boolean isReadThrough() {
-return cctx.config().isReadThrough();
+CacheConfiguration ccfg = cctx.config();
+
+return ccfg != null && ccfg.isReadThrough();
}
/** {@inheritDoc} */
@Override public boolean isWriteThrough() {
-return cctx.config().isWriteThrough();
+CacheConfiguration ccfg = cctx.config();
+
[50/50] [abbrv] incubator-ignite git commit: Merge branch 'ignite-sprint-5' into ignite-648
Merge branch 'ignite-sprint-5' into ignite-648 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c6fafea9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c6fafea9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c6fafea9 Branch: refs/heads/ignite-648 Commit: c6fafea985167d4cf94f8ea3cfe52a9f95c5579e Parents: 69c3450 00848cc Author: ashutak Authored: Mon Jun 1 15:35:29 2015 +0300 Committer: ashutak Committed: Mon Jun 1 15:35:29 2015 +0300 -- .gitignore | 3 +- dev-tools/build.gradle | 35 +- .../gradle/wrapper/gradle-wrapper.properties| 20 + dev-tools/gradlew | 233 dev-tools/slurp.sh | 76 +++ dev-tools/src/main/groovy/jiraslurp.groovy | 592 --- examples/pom.xml| 2 +- modules/aop/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- .../ClientAbstractConnectivitySelfTest.java | 14 + modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml| 2 +- modules/core/src/main/java/META-INF/LICENSE | 238 modules/core/src/main/java/META-INF/NOTICE | 12 + .../src/main/java/org/apache/ignite/Ignite.java | 8 +- .../java/org/apache/ignite/IgniteServices.java | 5 +- .../org/apache/ignite/cache/CacheMetrics.java | 187 +- .../configuration/IgniteConfiguration.java | 6 + .../org/apache/ignite/igfs/IgfsUserContext.java | 119 .../igfs/secondary/IgfsSecondaryFileSystem.java | 7 + .../apache/ignite/internal/IgniteKernal.java| 30 +- .../internal/igfs/common/IgfsMarshaller.java| 35 +- .../igfs/common/IgfsPathControlRequest.java | 22 + .../internal/interop/InteropException.java | 71 +++ .../interop/InteropNoCallbackException.java | 50 ++ .../internal/managers/GridManagerAdapter.java | 59 +- .../processors/cache/CacheMetricsImpl.java | 367 +++- .../cache/CacheMetricsMXBeanImpl.java | 100 .../processors/cache/CacheMetricsSnapshot.java | 380 +--- .../processors/cache/GridCacheAdapter.java | 28 +- .../processors/cache/GridCacheIoManager.java| 6 +- .../GridCachePartitionExchangeManager.java | 4 +- .../processors/cache/GridCacheSwapManager.java | 118 ++-- .../processors/cache/IgniteCacheProxy.java | 3 +- .../distributed/GridDistributedTxMapping.java | 5 +- .../GridDistributedTxRemoteAdapter.java | 10 +- .../distributed/dht/GridDhtCacheAdapter.java| 6 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 1 + .../dht/atomic/GridDhtAtomicCache.java | 4 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 42 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 36 +- .../colocated/GridDhtColocatedLockFuture.java | 4 +- .../distributed/near/GridNearCacheEntry.java| 2 +- .../cache/distributed/near/GridNearTxLocal.java | 5 +- .../near/GridNearTxPrepareFutureAdapter.java| 9 +- .../near/GridNearTxPrepareResponse.java | 28 +- .../transactions/IgniteTxLocalAdapter.java | 4 +- .../cache/transactions/IgniteTxManager.java | 24 + .../internal/processors/hadoop/HadoopJob.java | 2 +- .../ignite/internal/processors/igfs/IgfsEx.java | 8 +- .../internal/processors/igfs/IgfsImpl.java | 8 +- .../processors/igfs/IgfsIpcHandler.java | 184 +++--- .../igfs/IgfsSecondaryFileSystemImpl.java | 9 +- .../internal/processors/igfs/IgfsServer.java| 4 +- .../internal/processors/igfs/IgfsUtils.java | 16 + .../processors/query/GridQueryIndexing.java | 16 + .../processors/query/GridQueryProcessor.java| 52 +- .../ignite/internal/util/GridJavaProcess.java | 30 +- .../ignite/internal/util/IgniteUtils.java | 6 +- .../shmem/IpcSharedMemoryServerEndpoint.java| 2 +- .../ignite/mxbean/CacheMetricsMXBean.java | 80 +++ .../apache/ignite/plugin/PluginProvider.java| 26 +- .../org/apache/ignite/services/Service.java | 5 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 35 +- .../org/apache/ignite/spi/IgniteSpiContext.java | 47 -- .../spi/swapspace/file/FileSwapSpaceSpi.java| 8 +- .../core/src/main/resources/ignite.properties | 2 +- .../cache/IgniteCacheNearLockValueSelfTest.java | 145 + .../cache/IgniteDynamicCacheStartSelfTest.java | 20 +- .../RandomEvictionPolicyCacheSizeSelfTest.java | 72 +++ ...CacheLocalOffHeapAndSwapMetricsSelfTest.java | 412 + .../service/ClosureServiceClientsNodesTest.java
[46/50] [abbrv] incubator-ignite git commit: # regenerated PDF
# regenerated PDF
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5c30f9cf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5c30f9cf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5c30f9cf
Branch: refs/heads/ignite-648
Commit: 5c30f9cf5c490b0d6c065e89557a8b8f3040eda5
Parents: 6cd1a6e 3f012b7
Author: Yakov Zhdanov
Authored: Fri May 29 18:42:16 2015 +0300
Committer: Yakov Zhdanov
Committed: Fri May 29 18:42:16 2015 +0300
--
.../org/apache/ignite/cache/CacheMetrics.java | 187 +++--
.../internal/managers/GridManagerAdapter.java | 59 +--
.../processors/cache/CacheMetricsImpl.java | 305 +-
.../cache/CacheMetricsMXBeanImpl.java | 100 +
.../processors/cache/CacheMetricsSnapshot.java | 380 +
.../processors/cache/GridCacheSwapManager.java | 118 --
.../ignite/mxbean/CacheMetricsMXBean.java | 80
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 35 +-
.../org/apache/ignite/spi/IgniteSpiContext.java | 47 ---
.../spi/swapspace/file/FileSwapSpaceSpi.java| 8 +-
...CacheLocalOffHeapAndSwapMetricsSelfTest.java | 412 +++
.../testframework/GridSpiTestContext.java | 25 +-
.../IgniteCacheMetricsSelfTestSuite.java| 1 +
13 files changed, 1457 insertions(+), 300 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5c30f9cf/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java
--
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java
index af19077,3dcda3c..4e6a447
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java
@@@ -129,24 -161,162 +164,168 @@@ public class CacheMetricsImpl implement
}
/** {@inheritDoc} */
+ @Override public long getOffHeapGets() {
+ return offHeapGets.get();
+ }
+
+ /** {@inheritDoc} */
+ @Override public long getOffHeapPuts() {
+ return offHeapPuts.get();
+ }
+
+ /** {@inheritDoc} */
+ @Override public long getOffHeapRemovals() {
+ return offHeapRemoves.get();
+ }
+
+ /** {@inheritDoc} */
+ @Override public long getOffHeapEvictions() {
+ return offHeapEvicts.get();
+ }
+
+ /** {@inheritDoc} */
+ @Override public long getOffHeapHits() {
+ return offHeapHits.get();
+ }
+
+ /** {@inheritDoc} */
+ @Override public float getOffHeapHitPercentage() {
+ long hits0 = offHeapHits.get();
+ long gets0 = offHeapGets.get();
+
+ if (hits0 == 0)
+ return 0;
+
+ return (float) hits0 / gets0 * 100.0f;
+ }
+
+ /** {@inheritDoc} */
+ @Override public long getOffHeapMisses() {
+ return offHeapMisses.get();
+ }
+
+ /** {@inheritDoc} */
+ @Override public float getOffHeapMissPercentage() {
+ long misses0 = offHeapMisses.get();
+ long reads0 = offHeapGets.get();
+
+ if (misses0 == 0)
+ return 0;
+
+ return (float) misses0 / reads0 * 100.0f;
+ }
+
+ /** {@inheritDoc} */
@Override public long getOffHeapEntriesCount() {
-return cctx.cache().offHeapEntriesCount();
+GridCacheAdapter cache = cctx.cache();
+
+return cache != null ? cache.offHeapEntriesCount() : -1;
}
/** {@inheritDoc} */
+ @Override public long getOffHeapPrimaryEntriesCount() {
+ try {
+ return cctx.swap().offheapEntriesCount(true, false, NONE);
+ }
+ catch (IgniteCheckedException e) {
+ return 0;
+ }
+ }
+
+ /** {@inheritDoc} */
+ @Override public long getOffHeapBackupEntriesCount() {
+ try {
+ return cctx.swap().offheapEntriesCount(false, true, NONE);
+ }
+ catch (IgniteCheckedException e) {
+ return 0;
+ }
+ }
+
+ /** {@inheritDoc} */
@Override public long getOffHeapAllocatedSize() {
-return cctx.cache().offHeapAllocatedSize();
+GridCacheAdapter cache = cctx.cache();
+
+return cache != null ? cache.offHeapAllocatedSize() : -1;
}
/** {@inheritDoc} */
+ @Override public long getOffHeapMaxSize() {
+ return cctx.config().getOffHeapMaxMemory();
+ }
+
+ /** {@inheritDoc} */
+ @Override public long getSwapGets() {
+ return swapGets.get();
+ }
+
+ /** {@inheritDoc} */
+ @Override public long getSwapPuts() {
+ return swapPu
[12/50] [abbrv] incubator-ignite git commit: #IGNITE-857 Added constraint on host. Added test.
#IGNITE-857 Added constraint on host. Added test.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9a951e0c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9a951e0c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9a951e0c
Branch: refs/heads/ignite-648
Commit: 9a951e0ccdd63295632babc48519bc672c0ad0e2
Parents: 9bed1ff
Author: nikolay_tikhonov
Authored: Wed May 27 16:14:55 2015 +0300
Committer: nikolay_tikhonov
Committed: Wed May 27 16:14:55 2015 +0300
--
.../apache/ignite/mesos/ClusterProperties.java | 53
.../apache/ignite/mesos/IgniteScheduler.java| 5 ++
.../ignite/mesos/IgniteSchedulerSelfTest.java | 45 +
3 files changed, 85 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a951e0c/modules/mesos/src/main/java/org/apache/ignite/mesos/ClusterProperties.java
--
diff --git
a/modules/mesos/src/main/java/org/apache/ignite/mesos/ClusterProperties.java
b/modules/mesos/src/main/java/org/apache/ignite/mesos/ClusterProperties.java
index 25216ca..9f0b304 100644
--- a/modules/mesos/src/main/java/org/apache/ignite/mesos/ClusterProperties.java
+++ b/modules/mesos/src/main/java/org/apache/ignite/mesos/ClusterProperties.java
@@ -17,14 +17,20 @@
package org.apache.ignite.mesos;
+import org.slf4j.*;
+
import java.io.*;
import java.net.*;
import java.util.*;
+import java.util.regex.*;
/**
* Cluster settings.
*/
public class ClusterProperties {
+/** */
+private static final Logger log =
LoggerFactory.getLogger(ClusterProperties.class);
+
/** Unlimited. */
public static final double UNLIMITED = Double.MAX_VALUE;
@@ -170,6 +176,12 @@ public class ClusterProperties {
private String igniteCfgUrl = null;
/** */
+public static final String IGNITE_HOSTNAME_CONSTRAINT =
"IGNITE_HOSTNAME_CONSTRAINT";
+
+/** Url to ignite config. */
+private Pattern hostnameConstraint = null;
+
+/** */
public ClusterProperties() {
// No-op.
}
@@ -184,21 +196,21 @@ public class ClusterProperties {
/**
* @return CPU count limit.
*/
-public double cpus(){
+public double cpus() {
return cpu;
}
/**
* Set CPU count limit.
*/
-public void cpus(double cpu){
+public void cpus(double cpu) {
this.cpu = cpu;
}
/**
* @return CPU count limit.
*/
-public double cpusPerNode(){
+public double cpusPerNode() {
return cpuPerNode;
}
@@ -216,7 +228,6 @@ public class ClusterProperties {
this.mem = mem;
}
-
/**
* @return mem limit.
*/
@@ -262,6 +273,15 @@ public class ClusterProperties {
}
/**
+ * Sets hostname constraint.
+ *
+ * @param pattern Hostname pattern.
+ */
+public void hostnameConstraint(Pattern pattern) {
+this.hostnameConstraint = pattern;
+}
+
+/**
* @return min cpu count per node.
*/
public double minCpuPerNode() {
@@ -348,6 +368,13 @@ public class ClusterProperties {
}
/**
+ * @return Host name constraint.
+ */
+public Pattern hostnameConstraint() {
+return hostnameConstraint;
+}
+
+/**
* @param config path to config file.
* @return Cluster configuration.
*/
@@ -396,6 +423,17 @@ public class ClusterProperties {
prop.igniteCfg = getStringProperty(IGNITE_CONFIG_XML, props, null);
prop.userLibs = getStringProperty(IGNITE_USERS_LIBS, props, null);
+String pattern = getStringProperty(IGNITE_HOSTNAME_CONSTRAINT,
props, null);
+
+if (pattern != null) {
+try {
+prop.hostnameConstraint = Pattern.compile(pattern);
+}
+catch (PatternSyntaxException e) {
+log.warn("IGNITE_HOSTNAME_CONSTRAINT has invalid pattern.
It will be ignore.", e);
+}
+}
+
return prop;
}
catch (IOException e) {
@@ -440,11 +478,8 @@ public class ClusterProperties {
/**
* Finds a local, non-loopback, IPv4 address
*
- * @return The first non-loopback IPv4 address found, or
- * null if no such addresses found
- * @throws java.net.SocketException
- *If there was a problem querying the network
- *interfaces
+ * @return The first non-loopback IPv4 address found, or null
if no such addresses found
+ * @throws java.net.SocketException If there was a problem querying the
network interfaces
*/
public static String getNonLoopbackAddress()
[18/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-5' into ignite-sprint-5
Merge remote-tracking branch 'origin/ignite-sprint-5' into ignite-sprint-5 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/afe841c6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/afe841c6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/afe841c6 Branch: refs/heads/ignite-648 Commit: afe841c6adcd85edcb0964158dcec914384ea7d7 Parents: 80f4ac2 5ec2407 Author: null Authored: Wed May 27 21:19:07 2015 +0300 Committer: null Committed: Wed May 27 21:19:07 2015 +0300 -- .../licenses/jcraft-revised-bsd.txt | 28 1 file changed, 28 deletions(-) --
[03/50] [abbrv] incubator-ignite git commit: # ignite-456: format jira comment
# ignite-456: format jira comment
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/26b1d0d3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/26b1d0d3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/26b1d0d3
Branch: refs/heads/ignite-648
Commit: 26b1d0d346bf42abf82ecb48c8c11ebdbe61f659
Parents: c75caba
Author: artem.shutak
Authored: Tue May 26 21:10:24 2015 +0300
Committer: artem.shutak
Committed: Tue May 26 21:10:24 2015 +0300
--
dev-tools/src/main/groovy/jiraslurp.groovy | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26b1d0d3/dev-tools/src/main/groovy/jiraslurp.groovy
--
diff --git a/dev-tools/src/main/groovy/jiraslurp.groovy
b/dev-tools/src/main/groovy/jiraslurp.groovy
index 93349ef..610060f 100644
--- a/dev-tools/src/main/groovy/jiraslurp.groovy
+++ b/dev-tools/src/main/groovy/jiraslurp.groovy
@@ -407,10 +407,17 @@ def runAllTestBuilds = {builds, jiraNum ->
}
}
+// Format comment for jira.
def triggeredBuildsComment = "There was triggered next test builds for
last attached patch-file:\\n"
+def n = 1;
+
triggeredBuilds.each { name, url ->
-triggeredBuildsComment += "${name as String} - ${url as String}\\n"
+def prefix = n < 10 ? "0" : ""
+
+triggeredBuildsComment += "${prefix}${n}. ${url as String} - ${name as
String}\\n"
+
+n++
}
addJiraComment(jiraNum, triggeredBuildsComment)
[20/50] [abbrv] incubator-ignite git commit: # sprint-5 use vm ip finder in test
# sprint-5 use vm ip finder in test
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c3bf8031
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c3bf8031
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c3bf8031
Branch: refs/heads/ignite-648
Commit: c3bf803132c9d048f9f5236339eb71ed24d28625
Parents: e16cb03
Author: sboikov
Authored: Thu May 28 09:06:04 2015 +0300
Committer: sboikov
Committed: Thu May 28 09:06:04 2015 +0300
--
.../cache/IgniteDynamicCacheStartSelfTest.java | 20
1 file changed, 12 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c3bf8031/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java
index 72b76d7..095221e 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java
@@ -26,6 +26,9 @@ import org.apache.ignite.internal.*;
import org.apache.ignite.internal.managers.discovery.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.lang.*;
+import org.apache.ignite.spi.discovery.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
import org.apache.ignite.testframework.*;
import org.apache.ignite.testframework.junits.common.*;
@@ -40,6 +43,9 @@ import java.util.concurrent.atomic.*;
@SuppressWarnings("unchecked")
public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest {
/** */
+private static TcpDiscoveryIpFinder ipFinder = new
TcpDiscoveryVmIpFinder(true);
+
+/** */
private static final String DYNAMIC_CACHE_NAME = "TestDynamicCache";
/** */
@@ -51,8 +57,7 @@ public class IgniteDynamicCacheStartSelfTest extends
GridCommonAbstractTest {
/** */
public static final IgnitePredicate NODE_FILTER = new
IgnitePredicate() {
/** {@inheritDoc} */
-@Override
-public boolean apply(ClusterNode n) {
+@Override public boolean apply(ClusterNode n) {
Boolean val = n.attribute(TEST_ATTRIBUTE_NAME);
return val != null && val;
@@ -78,6 +83,8 @@ public class IgniteDynamicCacheStartSelfTest extends
GridCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
+((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder);
+
cfg.setUserAttributes(F.asMap(TEST_ATTRIBUTE_NAME, testAttribute));
CacheConfiguration cacheCfg = new CacheConfiguration();
@@ -157,8 +164,7 @@ public class IgniteDynamicCacheStartSelfTest extends
GridCommonAbstractTest {
futs.clear();
GridTestUtils.runMultiThreaded(new Callable() {
-@Override
-public Object call() throws Exception {
+@Override public Object call() throws Exception {
futs.add(kernal.context().cache().dynamicStopCache(DYNAMIC_CACHE_NAME));
return null;
@@ -218,8 +224,7 @@ public class IgniteDynamicCacheStartSelfTest extends
GridCommonAbstractTest {
futs.clear();
GridTestUtils.runMultiThreaded(new Callable() {
-@Override
-public Object call() throws Exception {
+@Override public Object call() throws Exception {
IgniteEx kernal =
grid(ThreadLocalRandom.current().nextInt(nodeCount()));
futs.add(kernal.context().cache().dynamicStopCache(DYNAMIC_CACHE_NAME));
@@ -940,8 +945,7 @@ public class IgniteDynamicCacheStartSelfTest extends
GridCommonAbstractTest {
latches[i] = new CountDownLatch(1);
lsnrs[i] = new IgnitePredicate() {
-@Override
-public boolean apply(CacheEvent e) {
+@Override public boolean apply(CacheEvent e) {
switch (e.type()) {
case EventType.EVT_CACHE_NODES_LEFT:
latches[idx].countDown();
[13/50] [abbrv] incubator-ignite git commit: #IGNITE-857 WIP
#IGNITE-857 WIP
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8deb5772
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8deb5772
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8deb5772
Branch: refs/heads/ignite-648
Commit: 8deb57728022d79239602070bdd90857606d0942
Parents: 9a951e0
Author: nikolay_tikhonov
Authored: Wed May 27 16:34:50 2015 +0300
Committer: nikolay_tikhonov
Committed: Wed May 27 16:34:50 2015 +0300
--
.../src/main/java/org/apache/ignite/mesos/IgniteScheduler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8deb5772/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteScheduler.java
--
diff --git
a/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteScheduler.java
b/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteScheduler.java
index 9b8553e..17daf45 100644
--- a/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteScheduler.java
+++ b/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteScheduler.java
@@ -87,7 +87,7 @@ public class IgniteScheduler implements Scheduler {
// Generate a unique task ID.
Protos.TaskID taskId = Protos.TaskID.newBuilder()
-.setValue(taskIdGenerator.incrementAndGet() + "-" +
clusterProps.clusterName()).build();
+
.setValue(Integer.toString(taskIdGenerator.incrementAndGet())).build();
log.info("Launching task: [{}]", igniteTask);
[30/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-857' into ignite-857
Merge remote-tracking branch 'origin/ignite-857' into ignite-857 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/62d15409 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/62d15409 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/62d15409 Branch: refs/heads/ignite-648 Commit: 62d15409cbe2af2f91092c9bd248cb1109218812 Parents: 1c04c8b a36214c Author: nikolay_tikhonov Authored: Thu May 28 17:48:06 2015 +0300 Committer: nikolay_tikhonov Committed: Thu May 28 17:48:06 2015 +0300 -- dev-tools/gradle/wrapper/gradle-wrapper.jar | Bin 51017 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties| 18 +- dev-tools/gradlew | 163 dev-tools/slurp.sh | 2 +- dev-tools/src/main/groovy/jiraslurp.groovy | 73 -- examples/pom.xml| 2 +- modules/aop/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml| 2 +- .../src/main/java/org/apache/ignite/Ignite.java | 8 +- .../java/org/apache/ignite/IgniteServices.java | 5 +- .../apache/ignite/internal/IgniteKernal.java| 4 +- .../org/apache/ignite/services/Service.java | 5 +- .../core/src/main/resources/ignite.properties | 2 +- .../cache/IgniteDynamicCacheStartSelfTest.java | 20 +- .../service/ClosureServiceClientsNodesTest.java | 245 +++ .../ignite/testsuites/IgniteBasicTestSuite.java | 2 + modules/extdata/p2p/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml| 2 +- .../query/h2/sql/GridSqlQuerySplitter.java | 4 + .../query/h2/sql/BaseH2CompareQueryTest.java| 16 ++ modules/jcl/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- .../apache/ignite/mesos/IgniteScheduler.java| 10 +- .../ignite/mesos/IgniteSchedulerSelfTest.java | 8 +- modules/rest-http/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml| 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- .../licenses/jcraft-revised-bsd.txt | 28 --- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- modules/yardstick/pom.xml | 2 +- pom.xml | 2 +- 49 files changed, 508 insertions(+), 167 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/62d15409/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteScheduler.java -- diff --cc modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteScheduler.java index bca064f,9507642..64e2931 --- a/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteScheduler.java +++ b/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteScheduler.java @@@ -44,10 -44,10 +44,10 @@@ public class IgniteScheduler implement public static final String DELIM = ","; /** Logger. */ -private static final Logger log = LoggerFactory.getLogger(IgniteScheduler.class); +private static final Logger log = LogManager.getLogger(IgniteScheduler.class); /** Mutex. */ - private static final Object mux = new Object(); + private final Object mux = new Object(); /** ID generator. */ private AtomicInteger taskIdGenerator = new AtomicInteger();
[31/50] [abbrv] incubator-ignite git commit: #IGNITE-857 Fixed review notes.
#IGNITE-857 Fixed review notes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3a0b5daf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3a0b5daf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3a0b5daf
Branch: refs/heads/ignite-648
Commit: 3a0b5daf0e23b456f68a15b2faa7080af671fca2
Parents: 62d1540
Author: nikolay_tikhonov
Authored: Thu May 28 18:02:28 2015 +0300
Committer: nikolay_tikhonov
Committed: Thu May 28 18:02:28 2015 +0300
--
modules/mesos/README.txt| 26 +++-
modules/mesos/pom.xml | 2 +-
.../apache/ignite/mesos/ClusterProperties.java | 8 +++---
.../apache/ignite/mesos/IgniteScheduler.java| 13 +-
4 files changed, 36 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a0b5daf/modules/mesos/README.txt
--
diff --git a/modules/mesos/README.txt b/modules/mesos/README.txt
index 084ccce..75a62f8 100644
--- a/modules/mesos/README.txt
+++ b/modules/mesos/README.txt
@@ -1,4 +1,28 @@
Apache Ignite Mesos Module
-TODO
\ No newline at end of file
+Apache Ignite Mesos module provides integration Apache Ignite with Apache
Mesos.
+
+Importing Apache Ignite Mesos Module In Maven Project
+-
+
+If you are using Maven to manage dependencies of your project, you can add
Cloud module
+dependency like this (replace '${ignite.version}' with actual Ignite version
you are
+interested in):
+
+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";>
+...
+
+...
+
+org.apache.ignite
+ignite-mesos
+${ignite.version}
+
+...
+
+...
+
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a0b5daf/modules/mesos/pom.xml
--
diff --git a/modules/mesos/pom.xml b/modules/mesos/pom.xml
index d3a2cef..3cf9028 100644
--- a/modules/mesos/pom.xml
+++ b/modules/mesos/pom.xml
@@ -25,7 +25,7 @@
org.apache.ignite
ignite-mesos
-1.1.0-SNAPSHOT
+1.1.1-SNAPSHOT
9.2.10.v20150310
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a0b5daf/modules/mesos/src/main/java/org/apache/ignite/mesos/ClusterProperties.java
--
diff --git
a/modules/mesos/src/main/java/org/apache/ignite/mesos/ClusterProperties.java
b/modules/mesos/src/main/java/org/apache/ignite/mesos/ClusterProperties.java
index 785eddc..956dd6e 100644
--- a/modules/mesos/src/main/java/org/apache/ignite/mesos/ClusterProperties.java
+++ b/modules/mesos/src/main/java/org/apache/ignite/mesos/ClusterProperties.java
@@ -201,7 +201,7 @@ public class ClusterProperties {
}
/**
- * Set CPU count limit.
+ * Sets CPU count limit.
*/
public void cpus(double cpu) {
this.cpu = cpu;
@@ -215,7 +215,7 @@ public class ClusterProperties {
}
/**
- * Set CPU count limit.
+ * Sets CPU count limit.
*/
public void cpusPerNode(double cpu) {
this.cpuPerNode = cpu;
@@ -229,7 +229,7 @@ public class ClusterProperties {
}
/**
- * Set mem limit.
+ * Sets mem limit.
*
* @param mem Memory.
*/
@@ -245,7 +245,7 @@ public class ClusterProperties {
}
/**
- * Set mem limit.
+ * Sets mem limit.
*
* @param mem Memory.
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a0b5daf/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteScheduler.java
--
diff --git
a/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteScheduler.java
b/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteScheduler.java
index 64e2931..263123c 100644
--- a/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteScheduler.java
+++ b/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteScheduler.java
@@ -77,9 +77,10 @@ public class IgniteScheduler implements Scheduler {
for (Protos.Offer offer : offers) {
Protos.TaskID taskId;
Protos.TaskInfo task;
+IgniteTask igniteTask;
synchronized (mux) {
-IgniteTask igniteTask = checkOffer(offer);
+igniteTask = checkOffer(offer);
// Decline offer which doesn't match by mem or cpu.
[08/50] [abbrv] incubator-ignite git commit: ignite-37 Improve offheap metrics for cache
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3f012b77/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/CacheLocalOffHeapAndSwapMetricsSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/CacheLocalOffHeapAndSwapMetricsSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/CacheLocalOffHeapAndSwapMetricsSelfTest.java
new file mode 100644
index 000..3d44600
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/CacheLocalOffHeapAndSwapMetricsSelfTest.java
@@ -0,0 +1,412 @@
+/*
+ * 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.local;
+
+import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.eviction.fifo.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.spi.swapspace.file.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+/**
+ *
+ */
+public class CacheLocalOffHeapAndSwapMetricsSelfTest extends
GridCommonAbstractTest {
+/** Grid count. */
+private static final int GRID_CNT = 1;
+
+/** Keys count. */
+private static final int KEYS_CNT = 1000;
+
+/** Max size. */
+private static final int MAX_SIZE = 100;
+
+/** Entry size. */
+private static final int ENTRY_SIZE = 86; // Calculated as allocated size
divided on entries count.
+
+/** Offheap max count. */
+private static final int OFFHEAP_MAX_CNT = KEYS_CNT / 2;
+
+/** Offheap max size. */
+private static final int OFFHEAP_MAX_SIZE = ENTRY_SIZE * OFFHEAP_MAX_CNT;
+
+/** Cache. */
+private IgniteCache cache;
+
+/** {@inheritDoc} */
+@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
+IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+cfg.setSwapSpaceSpi(new FileSwapSpaceSpi());
+
+return cfg;
+}
+
+/**
+ * @param offHeapSize Max off-heap size.
+ * @param swapEnabled Swap enabled.
+ */
+private void createCache(int offHeapSize, boolean swapEnabled) {
+CacheConfiguration ccfg = defaultCacheConfiguration();
+
+ccfg.setStatisticsEnabled(true);
+
+ccfg.setCacheMode(CacheMode.LOCAL);
+ccfg.setAtomicityMode(CacheAtomicityMode.ATOMIC);
+ccfg.setMemoryMode(CacheMemoryMode.ONHEAP_TIERED);
+
+ccfg.setOffHeapMaxMemory(offHeapSize);
+ccfg.setSwapEnabled(swapEnabled);
+
+ccfg.setEvictionPolicy(new FifoEvictionPolicy(MAX_SIZE));
+
+cache = grid(0).getOrCreateCache(ccfg);
+}
+
+/** {@inheritDoc} */
+@Override protected void beforeTestsStarted() throws Exception {
+super.beforeTestsStarted();
+
+startGrids(GRID_CNT);
+}
+
+/** {@inheritDoc} */
+@Override protected void afterTestsStopped() throws Exception {
+super.afterTestsStopped();
+
+stopAllGrids();
+}
+
+/** {@inheritDoc} */
+@Override protected void afterTest() throws Exception {
+if (cache != null)
+cache.close();
+}
+
+/**
+ * @throws Exception if failed.
+ */
+public void testOffHeapMetrics() throws Exception {
+createCache(0, false);
+
+for (int i = 0; i < KEYS_CNT; i++)
+cache.put(i, i);
+
+printStat();
+
+assertEquals(cache.metrics().getCacheEvictions(),
cache.metrics().getOffHeapPuts());
+assertEquals(KEYS_CNT, cache.metrics().getOffHeapGets());
+assertEquals(0, cache.metrics().getOffHeapHits());
+assertEquals(0f, cache.metrics().getOffHeapHitPercentage());
+assertEquals(KEYS_CNT, cache.metrics().getOffHeapMisses());
+assertEquals(100f, cache.metrics().getOffHeapMissPercentage());
+assertEquals(0, cache.metrics().getOffHeapRemovals());
+
+assertEquals(0, cache.metrics().getOffHeapEvictions());
+assertEquals(cache.metrics().getCacheEvictions(),
cache.metrics().getOffHeapEntriesCount());
+assertEquals(cache.metrics().getCacheEvictions(
[15/50] [abbrv] incubator-ignite git commit: Merge branch 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-857
Merge branch 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-857 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b7f554a6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b7f554a6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b7f554a6 Branch: refs/heads/ignite-648 Commit: b7f554a65270c6eacb6dc7ff1c28866abdfd0a15 Parents: 8574a19 4be517c Author: Yakov Zhdanov Authored: Wed May 27 19:17:02 2015 +0300 Committer: Yakov Zhdanov Committed: Wed May 27 19:17:02 2015 +0300 -- .gitignore | 3 +- LICENSE | 238 LICENSE.txt | 238 NOTICE | 12 + NOTICE.txt | 12 - assembly/release-base.xml | 4 +- dev-tools/build.gradle | 35 +- dev-tools/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 51017 bytes .../gradle/wrapper/gradle-wrapper.properties| 6 + dev-tools/gradlew | 164 ++ dev-tools/slurp.sh | 76 +++ dev-tools/src/main/groovy/jiraslurp.groovy | 570 +++ examples/pom.xml| 2 +- modules/aop/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- .../ClientAbstractConnectivitySelfTest.java | 14 + modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml| 2 +- modules/core/src/main/java/META-INF/LICENSE | 238 modules/core/src/main/java/META-INF/NOTICE | 12 + .../internal/GridEventConsumeHandler.java | 26 + .../apache/ignite/internal/IgniteKernal.java| 26 +- .../interop/InteropAwareEventFilter.java| 37 ++ .../internal/interop/InteropException.java | 71 +++ .../interop/InteropLocalEventListener.java | 28 + .../interop/InteropNoCallbackException.java | 50 ++ .../managers/communication/GridIoManager.java | 6 +- .../GridLifecycleAwareMessageFilter.java| 5 +- .../eventstorage/GridEventStorageManager.java | 24 +- .../processors/cache/GridCacheAdapter.java | 16 +- .../processors/cache/GridCacheIoManager.java| 6 +- .../GridCachePartitionExchangeManager.java | 4 +- .../processors/cache/IgniteCacheProxy.java | 3 +- .../distributed/GridDistributedTxMapping.java | 5 +- .../GridDistributedTxRemoteAdapter.java | 10 +- .../distributed/dht/GridDhtCacheAdapter.java| 6 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 1 + .../dht/atomic/GridDhtAtomicCache.java | 4 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 42 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 36 +- .../colocated/GridDhtColocatedLockFuture.java | 4 +- .../distributed/near/GridNearCacheEntry.java| 2 +- .../cache/distributed/near/GridNearTxLocal.java | 5 +- .../near/GridNearTxPrepareFutureAdapter.java| 9 +- .../near/GridNearTxPrepareResponse.java | 28 +- .../transactions/IgniteTxLocalAdapter.java | 4 +- .../cache/transactions/IgniteTxManager.java | 24 + .../processors/query/GridQueryIndexing.java | 16 + .../processors/query/GridQueryProcessor.java| 52 +- .../ignite/internal/util/IgniteUtils.java | 6 +- .../core/src/main/resources/ignite.properties | 2 +- .../cache/IgniteCacheNearLockValueSelfTest.java | 145 + .../RandomEvictionPolicyCacheSizeSelfTest.java | 72 +++ .../IgniteCacheEvictionSelfTestSuite.java | 1 + .../ignite/testsuites/IgniteCacheTestSuite.java | 2 + modules/extdata/p2p/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- .../query/h2/GridH2IndexingGeoSelfTest.java | 20 +- modules/hadoop/pom.xml | 2 +- .../processors/hadoop/v2/HadoopV2Context.java | 10 +- .../testsuites/IgniteHadoopTestSuite.java | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml| 2 +- .../processors/query/h2/IgniteH2Indexing.java | 17 + .../query/h2/opt/GridH2AbstractKeyValueRow.java | 18 +- .../query/h2/opt/GridH2KeyValueRowOffheap.java | 4 +- .../query/h2/sql/GridSqlOperationType.java | 2 +- .../h2/twostep/GridReduceQueryExecutor.java | 2 +- .../IgniteCacheQueryMultiThreadedSelfTest.java | 2 +
[24/50] [abbrv] incubator-ignite git commit: 1.1.1-SNAPSHOT
1.1.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/70429eb7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/70429eb7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/70429eb7 Branch: refs/heads/ignite-648 Commit: 70429eb7b48c10c096ebf52ea80ae00241b8a196 Parents: c3bf803 Author: Ignite Teamcity Authored: Thu May 28 12:11:40 2015 +0300 Committer: Ignite Teamcity Committed: Thu May 28 12:11:40 2015 +0300 -- examples/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- modules/core/src/main/resources/ignite.properties | 2 +- modules/extdata/p2p/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml| 2 +- modules/hadoop/pom.xml| 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml | 2 +- modules/jcl/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/rest-http/pom.xml | 2 +- modules/scalar/pom.xml| 2 +- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spring/pom.xml| 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- modules/yardstick/pom.xml | 2 +- pom.xml | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/70429eb7/examples/pom.xml -- diff --git a/examples/pom.xml b/examples/pom.xml index f38ff9d..2b2bfeb 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ ignite-examples -1.1.0-SNAPSHOT +1.1.1-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/70429eb7/modules/aop/pom.xml -- diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml index 1b03acd..a796bdd 100644 --- a/modules/aop/pom.xml +++ b/modules/aop/pom.xml @@ -31,7 +31,7 @@ ignite-aop -1.1.0-SNAPSHOT +1.1.1-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/70429eb7/modules/aws/pom.xml -- diff --git a/modules/aws/pom.xml b/modules/aws/pom.xml index 057f246..50e3c3e 100644 --- a/modules/aws/pom.xml +++ b/modules/aws/pom.xml @@ -31,7 +31,7 @@ ignite-aws -1.1.0-SNAPSHOT +1.1.1-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/70429eb7/modules/clients/pom.xml -- diff --git a/modules/clients/pom.xml b/modules/clients/pom.xml index 19d6a25..58722e8 100644 --- a/modules/clients/pom.xml +++ b/modules/clients/pom.xml @@ -31,7 +31,7 @@ ignite-clients -1.1.0-SNAPSHOT +1.1.1-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/70429eb7/modules/cloud/pom.xml -- diff --git a/modules/cloud/pom.xml b/modules/cloud/pom.xml index 11a8c78..fc05d9b 100644 --- a/modules/cloud/pom.xml +++ b/modules/cloud/pom.xml @@ -29,7 +29,7 @@ ignite-cloud -1.1.0-SNAPSHOT +1.1.1-SNAPSHOT 1.9.0 http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/70429eb7/modules/codegen/pom.xml -- diff --git a/modules/codegen/pom.xml b/modules/codegen/pom.xml index 7cce037..a1a8875 100644 --- a/modules/codegen/pom.xml +++ b/modules/codegen/pom.xml @@ -31,7 +31,7 @@ ignite-codegen -
[14/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-857' into ignite-857
Merge remote-tracking branch 'origin/ignite-857' into ignite-857 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8574a19b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8574a19b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8574a19b Branch: refs/heads/ignite-648 Commit: 8574a19bc010e73cccecfa1cd648709dc55b47aa Parents: fd6f398 8deb577 Author: Yakov Zhdanov Authored: Wed May 27 19:16:25 2015 +0300 Committer: Yakov Zhdanov Committed: Wed May 27 19:16:25 2015 +0300 -- modules/mesos/licenses/jetty-epl-license.txt| 69 +++ modules/mesos/pom.xml | 42 +- .../apache/ignite/mesos/ClusterProperties.java | 502 +++ .../apache/ignite/mesos/IgniteFramework.java| 119 + .../apache/ignite/mesos/IgniteScheduler.java| 349 + .../org/apache/ignite/mesos/IgniteTask.java | 86 .../org/apache/ignite/mesos/package-info.java | 22 + .../ignite/mesos/resource/IgniteProvider.java | 234 + .../ignite/mesos/resource/JettyServer.java | 61 +++ .../ignite/mesos/resource/ResourceHandler.java | 142 ++ .../ignite/mesos/resource/ResourceProvider.java | 120 + .../ignite/mesos/resource/package-info.java | 22 + .../ignite/messo/IgniteAmazonScheduler.java | 81 --- .../apache/ignite/messo/IgniteFramework.java| 108 .../apache/ignite/messo/IgniteScheduler.java| 229 - .../org/apache/ignite/messo/package-info.java | 22 - .../main/resources/ignite-default-config.xml| 35 ++ modules/mesos/src/main/resources/log4j2.xml | 35 ++ .../org/apache/ignite/IgniteMesosTestSuite.java | 38 ++ .../ignite/mesos/IgniteSchedulerSelfTest.java | 420 20 files changed, 2293 insertions(+), 443 deletions(-) --
[49/50] [abbrv] incubator-ignite git commit: Merge branch 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-5
Merge branch 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-5 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/00848cce Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/00848cce Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/00848cce Branch: refs/heads/ignite-648 Commit: 00848ccedd6ad1490461069d5039cf7306626377 Parents: 52d64bb 31fcc3e Author: ashutak Authored: Mon Jun 1 12:16:44 2015 +0300 Committer: ashutak Committed: Mon Jun 1 12:16:44 2015 +0300 -- .../org/apache/ignite/cache/CacheMetrics.java | 187 +++-- .../configuration/IgniteConfiguration.java | 6 + .../org/apache/ignite/igfs/IgfsUserContext.java | 119 ++ .../igfs/secondary/IgfsSecondaryFileSystem.java | 7 + .../internal/igfs/common/IgfsMarshaller.java| 35 +- .../igfs/common/IgfsPathControlRequest.java | 22 + .../internal/managers/GridManagerAdapter.java | 59 +-- .../processors/cache/CacheMetricsImpl.java | 367 - .../cache/CacheMetricsMXBeanImpl.java | 100 + .../processors/cache/CacheMetricsSnapshot.java | 380 + .../processors/cache/GridCacheAdapter.java | 12 +- .../processors/cache/GridCacheSwapManager.java | 118 -- .../internal/processors/hadoop/HadoopJob.java | 2 +- .../ignite/internal/processors/igfs/IgfsEx.java | 8 +- .../internal/processors/igfs/IgfsImpl.java | 8 +- .../processors/igfs/IgfsIpcHandler.java | 184 + .../igfs/IgfsSecondaryFileSystemImpl.java | 9 +- .../internal/processors/igfs/IgfsServer.java| 4 +- .../internal/processors/igfs/IgfsUtils.java | 16 + .../ignite/internal/util/GridJavaProcess.java | 30 +- .../ignite/mxbean/CacheMetricsMXBean.java | 80 .../apache/ignite/plugin/PluginProvider.java| 26 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 35 +- .../org/apache/ignite/spi/IgniteSpiContext.java | 47 --- .../spi/swapspace/file/FileSwapSpaceSpi.java| 8 +- ...CacheLocalOffHeapAndSwapMetricsSelfTest.java | 412 +++ .../testframework/GridSpiTestContext.java | 25 +- .../IgniteCacheMetricsSelfTestSuite.java| 1 + .../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 165 +--- .../hadoop/fs/v1/IgniteHadoopFileSystem.java| 107 +++-- .../hadoop/fs/v2/IgniteHadoopFileSystem.java| 32 +- .../internal/processors/hadoop/HadoopUtils.java | 10 +- .../hadoop/SecondaryFileSystemProvider.java | 53 ++- .../hadoop/fs/HadoopDistributedFileSystem.java | 91 .../hadoop/fs/HadoopFileSystemsUtils.java | 17 - .../hadoop/fs/HadoopLazyConcurrentMap.java | 204 + .../processors/hadoop/igfs/HadoopIgfsEx.java| 6 + .../hadoop/igfs/HadoopIgfsInProc.java | 170 ++-- .../processors/hadoop/igfs/HadoopIgfsIpcIo.java | 2 +- .../hadoop/igfs/HadoopIgfsOutProc.java | 33 +- .../hadoop/igfs/HadoopIgfsWrapper.java | 19 +- .../hadoop/v2/HadoopV2TaskContext.java | 4 +- .../HadoopIgfs20FileSystemAbstractSelfTest.java | 56 ++- ...oopSecondaryFileSystemConfigurationTest.java | 4 +- .../IgniteHadoopFileSystemAbstractSelfTest.java | 63 ++- .../IgniteHadoopFileSystemClientSelfTest.java | 2 +- .../IgniteHadoopFileSystemIpcCacheSelfTest.java | 2 + .../hadoop/HadoopFileSystemsTest.java | 23 +- .../collections/HadoopSkipListSelfTest.java | 4 +- modules/mesos/pom.xml | 8 +- 50 files changed, 2569 insertions(+), 813 deletions(-) --
[42/50] [abbrv] incubator-ignite git commit: [IGNITE-958]: IGNITE-218 (Wrong staging permissions while running MR job under hadoop accelerator): IGFS part.
[IGNITE-958]: IGNITE-218 (Wrong staging permissions while running MR job under
hadoop accelerator): IGFS part.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8455c7a6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8455c7a6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8455c7a6
Branch: refs/heads/ignite-648
Commit: 8455c7a6ed6f7449c7ad31b1ef7b129705262e1b
Parents: 3538819
Author: iveselovskiy
Authored: Fri May 29 15:40:26 2015 +0300
Committer: iveselovskiy
Committed: Fri May 29 15:40:26 2015 +0300
--
.../org/apache/ignite/igfs/IgfsUserContext.java | 119 +++
.../hadoop/fs/HadoopLazyConcurrentMap.java | 204 +++
2 files changed, 323 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8455c7a6/modules/core/src/main/java/org/apache/ignite/igfs/IgfsUserContext.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsUserContext.java
b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsUserContext.java
new file mode 100644
index 000..5a65bdb
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsUserContext.java
@@ -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.
+ */
+
+package org.apache.ignite.igfs;
+
+import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.lang.*;
+import org.jetbrains.annotations.*;
+
+import java.util.concurrent.*;
+
+/**
+ * Provides ability to execute IGFS code in a context of a specific user.
+ */
+public abstract class IgfsUserContext {
+/** Thread local to hold the current user context. */
+private static final ThreadLocal userStackThreadLocal = new
ThreadLocal<>();
+
+/**
+ * Executes given callable in the given user context.
+ * The main contract of this method is that {@link #currentUser()} method
invoked
+ * inside closure always returns 'user' this callable executed with.
+ * @param user the user name to invoke closure on behalf of.
+ * @param clo the closure to execute
+ * @param The type of closure result.
+ * @return the result of closure execution.
+ * @throws IllegalArgumentException if user name is null or empty String
or if the closure is null.
+ */
+public static T doAs(String user, final IgniteOutClosure clo) {
+if (F.isEmpty(user))
+throw new IllegalArgumentException("Failed to use null or empty
user name.");
+
+final String ctxUser = userStackThreadLocal.get();
+
+if (F.eq(ctxUser, user))
+return clo.apply(); // correct context is already there
+
+userStackThreadLocal.set(user);
+
+try {
+return clo.apply();
+}
+finally {
+userStackThreadLocal.set(ctxUser);
+}
+}
+
+/**
+ * Same contract that {@link #doAs(String, IgniteOutClosure)} has, but
accepts
+ * callable that throws checked Exception.
+ * The Exception is not ever wrapped anyhow.
+ * If your Callable throws Some specific checked Exceptions, the
recommended usage pattern is:
+ *
+ * public Foo myOperation() throws MyCheckedException1,
MyCheckedException2 {
+ * try {
+ * return IgfsUserContext.doAs(user, new Callable() {
+ * @Override public Foo call() throws
MyCheckedException1, MyCheckedException2 {
+ * return makeSomeFoo(); // do the job
+ * }
+ * });
+ * }
+ * catch (MyCheckedException1 | MyCheckedException2 |
RuntimeException | Error e) {
+ * throw e;
+ * }
+ * catch (Exception e) {
+ * throw new AssertionError("Must never go there.");
+ * }
+ * }
+ *
+ * @param user the user name to invoke closure on behalf of.
+ * @param clbl the Callable to execute
+ * @param The type of callable result.
+ *
[16/50] [abbrv] incubator-ignite git commit: IGNITE-927
IGNITE-927 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5ec24072 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5ec24072 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5ec24072 Branch: refs/heads/ignite-648 Commit: 5ec240720429034ed388e2f916b71e04f7437041 Parents: 4be517c Author: avinogradov Authored: Wed May 27 19:34:03 2015 +0300 Committer: avinogradov Committed: Wed May 27 19:34:03 2015 +0300 -- .../licenses/jcraft-revised-bsd.txt | 28 1 file changed, 28 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5ec24072/modules/visor-console/licenses/jcraft-revised-bsd.txt -- diff --git a/modules/visor-console/licenses/jcraft-revised-bsd.txt b/modules/visor-console/licenses/jcraft-revised-bsd.txt deleted file mode 100644 index 3748f98..000 --- a/modules/visor-console/licenses/jcraft-revised-bsd.txt +++ /dev/null @@ -1,28 +0,0 @@ -3-clause BSD license --- -Copyright (c) 2002-2014 Atsuhiko Yamanaka, JCraft,Inc. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the distribution. - - 3. The names of the authors may not be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT, -INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, -OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, -EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file
[11/50] [abbrv] incubator-ignite git commit: #IGNITE-857 Code format
#IGNITE-857 Code format
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9bed1ffe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9bed1ffe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9bed1ffe
Branch: refs/heads/ignite-648
Commit: 9bed1ffef6cdb4b69550e443637c61523733b0f5
Parents: b7ef1a8
Author: nikolay_tikhonov
Authored: Wed May 27 15:40:04 2015 +0300
Committer: nikolay_tikhonov
Committed: Wed May 27 15:40:04 2015 +0300
--
.../apache/ignite/mesos/ClusterProperties.java | 2 +-
.../apache/ignite/mesos/IgniteScheduler.java| 58 +---
2 files changed, 27 insertions(+), 33 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9bed1ffe/modules/mesos/src/main/java/org/apache/ignite/mesos/ClusterProperties.java
--
diff --git
a/modules/mesos/src/main/java/org/apache/ignite/mesos/ClusterProperties.java
b/modules/mesos/src/main/java/org/apache/ignite/mesos/ClusterProperties.java
index c23fcea..25216ca 100644
--- a/modules/mesos/src/main/java/org/apache/ignite/mesos/ClusterProperties.java
+++ b/modules/mesos/src/main/java/org/apache/ignite/mesos/ClusterProperties.java
@@ -164,7 +164,7 @@ public class ClusterProperties {
private String igniteCfg = null;
/** */
-public static final String IGNITE_CONFIG_XML_URL = "IGNITE_XML_CONFIG_URL";
+public static final String IGNITE_CONFIG_XML_URL = "IGNITE_CONFIG_XML_URL";
/** Url to ignite config. */
private String igniteCfgUrl = null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9bed1ffe/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteScheduler.java
--
diff --git
a/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteScheduler.java
b/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteScheduler.java
index 05d8c4f..9041629 100644
--- a/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteScheduler.java
+++ b/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteScheduler.java
@@ -112,6 +112,9 @@ public class IgniteScheduler implements Scheduler {
* @return Task.
*/
protected Protos.TaskInfo createTask(Protos.Offer offer, IgniteTask
igniteTask, Protos.TaskID taskId) {
+String cfgUrl = clusterProps.igniteConfigUrl() != null ?
+clusterProps.igniteConfigUrl() :
resourceProvider.igniteConfigUrl();
+
Protos.CommandInfo.Builder builder = Protos.CommandInfo.newBuilder()
.setEnvironment(Protos.Environment.newBuilder().addVariables(Protos.Environment.Variable.newBuilder()
.setName("IGNITE_TCP_DISCOVERY_ADDRESSES")
@@ -121,39 +124,30 @@ public class IgniteScheduler implements Scheduler {
clusterProps.ignitePackageUrl() :
resourceProvider.igniteUrl())
.setExtract(true))
.addUris(Protos.CommandInfo.URI.newBuilder()
-.setValue(clusterProps.igniteConfigUrl() != null ?
-clusterProps.igniteConfigUrl() :
resourceProvider.igniteConfigUrl()));
-
-if (resourceProvider.resourceUrl() != null ||
clusterProps.usersLibsUrl() != null) {
-if (clusterProps.igniteConfigUrl() != null) {
-builder.addUris(Protos.CommandInfo.URI.newBuilder()
-.setValue(clusterProps.igniteConfigUrl())
-.setExtract(true));
-
-String[] split = clusterProps.igniteConfigUrl().split("/");
-
-builder.setValue("cp *.jar ./gridgain-community-*/libs/ "
-+ "&& ./gridgain-community-*/bin/ignite.sh "
-+ split[split.length - 1]
-+ " -J-Xmx" + String.valueOf((int)igniteTask.mem() + "m")
-+ " -J-Xms" + String.valueOf((int)igniteTask.mem()) + "m");
-}
-else {
-for (String url : resourceProvider.resourceUrl())
-
builder.addUris(Protos.CommandInfo.URI.newBuilder().setValue(url));
-
-builder.setValue("cp *.jar ./gridgain-community-*/libs/ "
-+ "&& ./gridgain-community-*/bin/ignite.sh "
-+ resourceProvider.configName()
-+ " -J-Xmx" + String.valueOf((int)igniteTask.mem() + "m")
-+ " -J-Xms" + String.valueOf((int)igniteTask.mem()) + "m");
-}
+.setValue(cfgUrl));
+
+if (clusterProps.usersLibsUrl() != null)
+builder.addUris(Protos.CommandInfo.URI.newBuilder()
+.setValue(clusterProps.usersLibsUrl())
+.setExtract(true));
+else if (res
[09/50] [abbrv] incubator-ignite git commit: ignite-37 Improve offheap metrics for cache
ignite-37 Improve offheap metrics for cache
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3f012b77
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3f012b77
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3f012b77
Branch: refs/heads/ignite-648
Commit: 3f012b77699405c06e5014ffe5ba4a7d4e7ab5f3
Parents: 036d68d
Author: agura
Authored: Thu Apr 30 20:53:53 2015 +0300
Committer: agura
Committed: Wed May 27 15:02:39 2015 +0300
--
.../org/apache/ignite/cache/CacheMetrics.java | 187 +++--
.../internal/managers/GridManagerAdapter.java | 59 +--
.../processors/cache/CacheMetricsImpl.java | 305 +-
.../cache/CacheMetricsMXBeanImpl.java | 100 +
.../processors/cache/CacheMetricsSnapshot.java | 380 +
.../processors/cache/GridCacheSwapManager.java | 118 --
.../ignite/mxbean/CacheMetricsMXBean.java | 80
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 35 +-
.../org/apache/ignite/spi/IgniteSpiContext.java | 47 ---
.../spi/swapspace/file/FileSwapSpaceSpi.java| 8 +-
...CacheLocalOffHeapAndSwapMetricsSelfTest.java | 412 +++
.../testframework/GridSpiTestContext.java | 25 +-
.../IgniteCacheMetricsSelfTestSuite.java| 1 +
13 files changed, 1457 insertions(+), 300 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3f012b77/modules/core/src/main/java/org/apache/ignite/cache/CacheMetrics.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/CacheMetrics.java
b/modules/core/src/main/java/org/apache/ignite/cache/CacheMetrics.java
index 0d87326..799aace 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheMetrics.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheMetrics.java
@@ -30,21 +30,21 @@ public interface CacheMetrics {
/**
* The number of get requests that were satisfied by the cache.
*
- * @return the number of hits
+ * @return The number of hits.
*/
public long getCacheHits();
/**
* This is a measure of cache efficiency.
*
- * @return the percentage of successful hits, as a decimal e.g 75.
+ * @return The percentage of successful hits, as a decimal e.g 75.
*/
public float getCacheHitPercentage();
/**
* A miss is a get request that is not satisfied.
*
- * @return the number of misses
+ * @return The number of misses.
*/
public long getCacheMisses();
@@ -52,7 +52,7 @@ public interface CacheMetrics {
* Returns the percentage of cache accesses that did not find a requested
entry
* in the cache.
*
- * @return the percentage of accesses that failed to find anything
+ * @return The percentage of accesses that failed to find anything.
*/
public float getCacheMissPercentage();
@@ -60,14 +60,14 @@ public interface CacheMetrics {
* The total number of requests to the cache. This will be equal to the
sum of
* the hits and misses.
*
- * @return the number of gets
+ * @return The number of gets.
*/
public long getCacheGets();
/**
* The total number of puts to the cache.
*
- * @return the number of puts
+ * @return The number of puts.
*/
public long getCachePuts();
@@ -75,7 +75,7 @@ public interface CacheMetrics {
* The total number of removals from the cache. This does not include
evictions,
* where the cache itself initiates the removal to make space.
*
- * @return the number of removals
+ * @return The number of removals.
*/
public long getCacheRemovals();
@@ -84,28 +84,28 @@ public interface CacheMetrics {
* initiated by the cache itself to free up space. An eviction is not
treated as
* a removal and does not appear in the removal counts.
*
- * @return the number of evictions
+ * @return The number of evictions.
*/
public long getCacheEvictions();
/**
* The mean time to execute gets.
*
- * @return the time in µs
+ * @return The time in µs.
*/
public float getAverageGetTime();
/**
* The mean time to execute puts.
*
- * @return the time in µs
+ * @return The time in µs.
*/
public float getAveragePutTime();
/**
* The mean time to execute removes.
*
- * @return the time in µs
+ * @return The time in µs.
*/
public float getAverageRemoveTime();
@@ -113,7 +113,7 @@ public interface CacheMetrics {
/**
* The mean time to execute tx commit.
*
- * @return the time
