You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/05/26 14:06:38 UTC
[38/39] ignite git commit: Merge branch 'ignite-5075-cc' into
ignite-5075-cc-debug
Merge branch 'ignite-5075-cc' into ignite-5075-cc-debug
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEventBuffer.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1f3ceeb6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1f3ceeb6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1f3ceeb6
Branch: refs/heads/ignite-5075-cc-debug
Commit: 1f3ceeb69f074fd1956556951cd1dabd4be286b2
Parents: 7e56f3a
Author: sboikov <sb...@gridgain.com>
Authored: Fri May 26 16:46:00 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri May 26 16:46:00 2017 +0300
----------------------------------------------------------------------
.../CacheContinuousQueryEventBuffer.java | 33 +++++++++++---------
...ContinuousQueryFailoverAbstractSelfTest.java | 10 ++++++
2 files changed, 28 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1f3ceeb6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEventBuffer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEventBuffer.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEventBuffer.java
index d0950ef..e66918c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEventBuffer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEventBuffer.java
@@ -166,28 +166,31 @@ public class CacheContinuousQueryEventBuffer {
if (batch == null || cntr < batch.startCntr) {
if (backup)
backupQ.add(entry);
+ TestDebugLog.addEntryMessage(part,
+ cntr,
+ "buffer rcd small start=" + batch.startCntr +
+ " cntr=" + cntr +
+ ", backup=" + backup +
+ " topVer=" + ((CacheContinuousQueryEntry)entry).topologyVersion());
- TestDebugLog.addEntryMessage(part,
- cntr,
- "buffer rcd small start=" + batch.startCntr +
- " cntr=" + cntr +
- ", backup=" + backup +
- " topVer=" + ((CacheContinuousQueryEntry)entry).topologyVersion());return entry;
- }
+ return entry;
+ }
if (cntr <= batch.endCntr) {
res = batch.processEntry0(null, cntr, entry, backup);
- if (
- res = = RETRY)
+ if (res == RETRY)
continue;
}
- else{
- TestDebugLog.addEntryMessage(part,
- cntr,
- "buffer add pending start=" + batch.startCntr +
- " cntr=" + cntr +
- " topVer=" + ((CacheContinuousQueryEntry)entry).topologyVersion());pending.put(cntr, entry);}
+ else {
+ TestDebugLog.addEntryMessage(part,
+ cntr,
+ "buffer add pending start=" + batch.startCntr +
+ " cntr=" + cntr +
+ " topVer=" + ((CacheContinuousQueryEntry)entry).topologyVersion());
+
+ pending.put(cntr, entry);
+ }
break;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/1f3ceeb6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java
index 3e13359..e63e9bd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java
@@ -880,6 +880,8 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC
filtered = !filtered;
}
+ TestDebugLog.addMessage("Stop node " + i);
+
stopGrid(i);
boolean check = GridTestUtils.waitForCondition(new PAX() {
@@ -895,6 +897,14 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC
log.info("Missed events for keys: " + keys0);
+ Integer k = keys0.iterator().next();
+
+ TestDebugLog.addEntryMessage(ignite(4).affinity(DEFAULT_CACHE_NAME).partition(k), null, "missed event");
+
+ TestDebugLog.printKeyMessages(true, ignite(4).affinity(DEFAULT_CACHE_NAME).partition(k));
+
+ System.exit(2);
+
fail("Failed to wait for notifications [exp=" + keys.size() + ", left=" + keys0.size() + ']');
}