ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nizhi...@apache.org
Subject ignite git commit: IGNITE-8712: Synchronous notification of non-affinity nodes. - Fixes #4139.
Date Thu, 14 Jun 2018 11:14:22 GMT
Repository: ignite
Updated Branches:
  refs/heads/master e539a0cbd -> 5e37dde5e


IGNITE-8712: Synchronous notification of non-affinity nodes. - Fixes #4139.

Signed-off-by: Nikolay Izhikov <nizhikov@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5e37dde5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5e37dde5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5e37dde5

Branch: refs/heads/master
Commit: 5e37dde5e505ef3f4449e941ed4125a30e9d0057
Parents: e539a0c
Author: pereslegin-pa <xxtern@gmail.com>
Authored: Thu Jun 14 14:03:33 2018 +0300
Committer: Nikolay Izhikov <nizhikov@apache.org>
Committed: Thu Jun 14 14:03:33 2018 +0300

----------------------------------------------------------------------
 .../cache/datastructures/CacheDataStructuresManager.java       | 1 +
 .../cache/query/continuous/CacheContinuousQueryManager.java    | 6 ++++--
 .../processors/datastructures/DataStructuresProcessor.java     | 3 ++-
 .../internal/processors/service/GridServiceProcessor.java      | 2 +-
 .../datastructures/IgniteDataStructureUniqueNameTest.java      | 5 +++++
 .../CacheContinuousQueryFactoryFilterRandomOperationTest.java  | 2 +-
 .../processors/hadoop/jobtracker/HadoopJobTracker.java         | 1 +
 7 files changed, 15 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/5e37dde5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
index cd0edf3..4771582 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
@@ -323,6 +323,7 @@ public class CacheDataStructuresManager extends GridCacheManagerAdapter
{
                     new QueueHeaderPredicate(),
                     cctx.isLocal() || (cctx.isReplicated() && cctx.affinityNode()),
                     true,
+                    false,
                     false);
             }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/5e37dde5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
index 5e6af2f..1cdc014 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
@@ -555,6 +555,7 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter
{
      * @param rmtFilter Remote filter.
      * @param loc Local flag.
      * @param notifyExisting Notify existing flag.
+     * @param sync Synchronous flag.
      * @return Continuous routine ID.
      * @throws IgniteCheckedException In case of error.
      */
@@ -562,7 +563,8 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter
{
         final CacheEntryEventSerializableFilter rmtFilter,
         final boolean loc,
         final boolean notifyExisting,
-        final boolean ignoreClassNotFound)
+        final boolean ignoreClassNotFound,
+        final boolean sync)
         throws IgniteCheckedException
     {
         return executeQuery0(
@@ -575,7 +577,7 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter
{
                         locLsnr,
                         rmtFilter,
                         true,
-                        false,
+                        sync,
                         true,
                         ignoreClassNotFound);
                 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/5e37dde5/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
index b942dc2..57d3d6e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
@@ -212,7 +212,8 @@ public final class DataStructuresProcessor extends GridProcessorAdapter
implemen
                             new DataStructuresEntryFilter(),
                             cctx.isReplicated() && cctx.affinityNode(),
                             false,
-                            false
+                            false,
+                            true
                         ));
                 }
             }

http://git-wip-us.apache.org/repos/asf/ignite/blob/5e37dde5/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 b8022a3..377a592 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
@@ -255,7 +255,7 @@ public class GridServiceProcessor extends GridProcessorAdapter implements
Ignite
                 // It is also invoked on rebalancing.
                 // Otherwise remote listener is registered.
                 serviceCache.context().continuousQueries().executeInternalQuery(
-                    new ServiceEntriesListener(), null, isLocLsnr, true, false
+                    new ServiceEntriesListener(), null, isLocLsnr, true, false, false
                 );
             }
             else { // Listener for client nodes is registered in onContinuousProcessorStarted
method.

http://git-wip-us.apache.org/repos/asf/ignite/blob/5e37dde5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureUniqueNameTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureUniqueNameTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureUniqueNameTest.java
index d3954cd..db4754c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureUniqueNameTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureUniqueNameTest.java
@@ -225,6 +225,8 @@ public class IgniteDataStructureUniqueNameTest extends IgniteCollectionAbstractT
         assertNotNull(ref);
 
         assertSame(ref, ignite.atomicReference(name, 0, true));
+
+        ref.close();
     }
 
     /**
@@ -258,6 +260,9 @@ public class IgniteDataStructureUniqueNameTest extends IgniteCollectionAbstractT
 
         assert atomicLong != null;
         assert atomicSeq != null;
+
+        atomicLong.close();
+        atomicSeq.close();
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/5e37dde5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFactoryFilterRandomOperationTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFactoryFilterRandomOperationTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFactoryFilterRandomOperationTest.java
index 8713aaf..69799ef 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFactoryFilterRandomOperationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFactoryFilterRandomOperationTest.java
@@ -116,7 +116,7 @@ public class CacheContinuousQueryFactoryFilterRandomOperationTest extends
CacheC
             };
 
             uuid = grid(0).context().cache().cache(cache.getName()).context().continuousQueries()
-                .executeInternalQuery(lsnr, new SerializableFilter(), false, true, true);
+                .executeInternalQuery(lsnr, new SerializableFilter(), false, true, true,
false);
 
             for (int i = 10; i < 20; i++)
                 cache.put(i, i);

http://git-wip-us.apache.org/repos/asf/ignite/blob/5e37dde5/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobTracker.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobTracker.java
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobTracker.java
index 3c2bbb1..3331628 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobTracker.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobTracker.java
@@ -259,6 +259,7 @@ public class HadoopJobTracker extends HadoopComponent {
             null,
             true,
             true,
+            false,
             false
         );
 


Mime
View raw message