You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by yz...@apache.org on 2015/04/01 15:26:39 UTC
[1/2] incubator-ignite git commit: sp-3
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-sprint-3 dc628223a -> 6413426c4
sp-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/39cfcbdf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/39cfcbdf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/39cfcbdf
Branch: refs/heads/ignite-sprint-3
Commit: 39cfcbdf68a20aad45fd8f5802f2f1d78a16e6ea
Parents: 091369c
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Wed Apr 1 16:26:10 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Wed Apr 1 16:26:10 2015 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/39cfcbdf/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 02d373c..74a070f 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
@@ -4695,7 +4695,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
// Ping.
if (msg instanceof TcpDiscoveryPingRequest) {
- if (!getSpiContext().isStopping()) {
+ if (ctxInitLatch.getCount() > 0 || !getSpiContext().isStopping()) {
TcpDiscoveryPingRequest req = (TcpDiscoveryPingRequest)msg;
TcpDiscoveryPingResponse res = new TcpDiscoveryPingResponse(locNodeId);
[2/2] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-sprint-3' into ignite-sprint-3
Posted by yz...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6413426c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6413426c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6413426c
Branch: refs/heads/ignite-sprint-3
Commit: 6413426c4fe672a6f75bb89db9531bd72d761783
Parents: 39cfcbd dc62822
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Wed Apr 1 16:26:33 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Wed Apr 1 16:26:33 2015 +0300
----------------------------------------------------------------------
.../store/jdbc/CacheAbstractJdbcStore.java | 2 +-
.../cache/store/jdbc/CacheJdbcBlobStore.java | 9 +-
.../configuration/FileSystemConfiguration.java | 6 +
.../apache/ignite/internal/IgniteKernal.java | 5 +-
.../cache/DynamicCacheDescriptor.java | 2 +-
.../processors/cache/GridCacheAdapter.java | 4 +-
.../processors/cache/GridCacheProcessor.java | 66 +++++------
.../continuous/CacheContinuousQueryManager.java | 28 +++++
.../processors/igfs/IgfsDataManager.java | 11 +-
.../processors/igfs/IgfsFileAffinityRange.java | 23 +---
.../processors/igfs/IgfsHelperImpl.java | 3 +-
.../ignite/startup/BasicWarmupClosure.java | 2 +-
...IgniteCacheJdbcBlobStoreNodeRestartTest.java | 52 +++++++++
...IgniteCacheStoreNodeRestartAbstractTest.java | 116 +++++++++++++++++++
.../ignite/testsuites/IgniteCacheTestSuite.java | 2 +
.../hibernate/CacheHibernateBlobStore.java | 9 +-
.../CacheHibernateBlobStoreNodeRestartTest.java | 52 +++++++++
.../testsuites/IgniteHibernateTestSuite.java | 2 +
.../processors/query/h2/IgniteH2Indexing.java | 4 +-
19 files changed, 320 insertions(+), 78 deletions(-)
----------------------------------------------------------------------