Repository: ignite Updated Branches: refs/heads/ignite-zk f6aae4d96 -> 7f73a2aaa
zk Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7f73a2aa Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7f73a2aa Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7f73a2aa Branch: refs/heads/ignite-zk Commit: 7f73a2aaac33f789a84f7bab481339d1065ca80a Parents: f6aae4d Author: sboikov <[email protected]> Authored: Thu Dec 21 12:45:16 2017 +0300 Committer: sboikov <[email protected]> Committed: Thu Dec 21 12:45:16 2017 +0300 ---------------------------------------------------------------------- .../processors/datastreamer/DataStreamerImpl.java | 7 ++----- .../testsuites/IgniteClientReconnectTestSuite.java | 13 ------------- 2 files changed, 2 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/7f73a2aa/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java index da07e91..4e3f233 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java @@ -1114,8 +1114,8 @@ public class DataStreamerImpl<K, V> implements IgniteDataStreamer<K, V>, Delayed throw new IgniteDataStreamerTimeoutException("Data streamer exceeded timeout on flush.", e); } catch (IgniteCheckedException e) { - if (log.isDebugEnabled()) - log.debug("Failed to flush buffer: " + e); + //if (log.isDebugEnabled()) + log.error("Failed to flush buffer: " + e, e); err = true; } @@ -1146,9 +1146,6 @@ public class DataStreamerImpl<K, V> implements IgniteDataStreamer<K, V>, Delayed if (doneCnt == activeFuts0.size()) return; - - if (disconnectErr != null) - throw disconnectErr; } } http://git-wip-us.apache.org/repos/asf/ignite/blob/7f73a2aa/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientReconnectTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientReconnectTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientReconnectTestSuite.java index d0e907c..5b4461a 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientReconnectTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientReconnectTestSuite.java @@ -44,20 +44,7 @@ public class IgniteClientReconnectTestSuite extends TestSuite { public static TestSuite suite() throws Exception { TestSuite suite = new TestSuite("Ignite Client Reconnect Test Suite"); - suite.addTestSuite(IgniteClientConnectAfterCommunicationFailureTest.class); - suite.addTestSuite(IgniteClientReconnectStopTest.class); - suite.addTestSuite(IgniteClientReconnectApiExceptionTest.class); - suite.addTestSuite(IgniteClientReconnectDiscoveryStateTest.class); - suite.addTestSuite(IgniteClientReconnectCacheTest.class); - suite.addTestSuite(IgniteClientReconnectBinaryContexTest.class); - suite.addTestSuite(IgniteClientReconnectContinuousProcessorTest.class); - suite.addTestSuite(IgniteClientReconnectComputeTest.class); - suite.addTestSuite(IgniteClientReconnectAtomicsTest.class); - suite.addTestSuite(IgniteClientReconnectCollectionsTest.class); - suite.addTestSuite(IgniteClientReconnectServicesTest.class); - suite.addTestSuite(IgniteClientReconnectStreamerTest.class); suite.addTestSuite(IgniteClientReconnectFailoverTest.class); - suite.addTestSuite(IgniteClientRejoinTest.class); return suite; }
