[35/50] [abbrv] ignite git commit: IGNITE-10238 Fixed intermittent ClientNodes suite hang - Fixes #5439.
IGNITE-10238 Fixed intermittent ClientNodes suite hang - Fixes #5439.
Signed-off-by: Alexey Goncharuk
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5a2ef66c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5a2ef66c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5a2ef66c
Branch: refs/heads/ignite-601
Commit: 5a2ef66cb2c33590c145639ff24732a81e29fa56
Parents: 4187780
Author: NSAmelchev
Authored: Mon Dec 24 16:57:38 2018 +0300
Committer: Alexey Goncharuk
Committed: Mon Dec 24 16:57:38 2018 +0300
--
.../discovery/GridDiscoveryManager.java | 12 +-
...IgniteContinuousQueryMetadataUpdateTest.java | 129 +++
.../testsuites/IgniteCacheMvccTestSuite2.java | 2 +
.../testsuites/IgniteCacheTestSuite2.java | 2 +
4 files changed, 143 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/5a2ef66c/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 bbe0c78..cc3109f 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
@@ -928,7 +928,7 @@ public class GridDiscoveryManager extends
GridManagerAdapter {
}
});
-new IgniteThread(discoNtfWrk).start();
+new DiscoveryMessageNotifierThread(discoNtfWrk).start();
startSpi();
@@ -2632,10 +2632,18 @@ public class GridDiscoveryManager extends
GridManagerAdapter {
}
}
+/** */
+private class DiscoveryMessageNotifierThread extends IgniteThread
implements IgniteDiscoveryThread {
+/** {@inheritDoc} */
+public DiscoveryMessageNotifierThread(GridWorker worker) {
+super(worker);
+}
+}
+
/**
*
*/
-private class DiscoveryMessageNotifierWorker extends GridWorker implements
IgniteDiscoveryThread {
+private class DiscoveryMessageNotifierWorker extends GridWorker {
/** Queue. */
private final BlockingQueue> queue =
new LinkedBlockingQueue<>();
http://git-wip-us.apache.org/repos/asf/ignite/blob/5a2ef66c/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/IgniteContinuousQueryMetadataUpdateTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/IgniteContinuousQueryMetadataUpdateTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/IgniteContinuousQueryMetadataUpdateTest.java
new file mode 100644
index 000..fec561e
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/IgniteContinuousQueryMetadataUpdateTest.java
@@ -0,0 +1,129 @@
+/*
+ * 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.continuous;
+
+import org.apache.ignite.Ignite;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage;
+import
org.apache.ignite.internal.processors.cache.binary.MetadataUpdateAcceptedMessage;
+import org.apache.ignite.internal.util.IgniteUtils;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteCallable;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage;
+import
ignite git commit: IGNITE-10238 Fixed intermittent ClientNodes suite hang - Fixes #5439.
Repository: ignite
Updated Branches:
refs/heads/master 418778076 -> 5a2ef66cb
IGNITE-10238 Fixed intermittent ClientNodes suite hang - Fixes #5439.
Signed-off-by: Alexey Goncharuk
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5a2ef66c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5a2ef66c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5a2ef66c
Branch: refs/heads/master
Commit: 5a2ef66cb2c33590c145639ff24732a81e29fa56
Parents: 4187780
Author: NSAmelchev
Authored: Mon Dec 24 16:57:38 2018 +0300
Committer: Alexey Goncharuk
Committed: Mon Dec 24 16:57:38 2018 +0300
--
.../discovery/GridDiscoveryManager.java | 12 +-
...IgniteContinuousQueryMetadataUpdateTest.java | 129 +++
.../testsuites/IgniteCacheMvccTestSuite2.java | 2 +
.../testsuites/IgniteCacheTestSuite2.java | 2 +
4 files changed, 143 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/5a2ef66c/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 bbe0c78..cc3109f 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
@@ -928,7 +928,7 @@ public class GridDiscoveryManager extends
GridManagerAdapter {
}
});
-new IgniteThread(discoNtfWrk).start();
+new DiscoveryMessageNotifierThread(discoNtfWrk).start();
startSpi();
@@ -2632,10 +2632,18 @@ public class GridDiscoveryManager extends
GridManagerAdapter {
}
}
+/** */
+private class DiscoveryMessageNotifierThread extends IgniteThread
implements IgniteDiscoveryThread {
+/** {@inheritDoc} */
+public DiscoveryMessageNotifierThread(GridWorker worker) {
+super(worker);
+}
+}
+
/**
*
*/
-private class DiscoveryMessageNotifierWorker extends GridWorker implements
IgniteDiscoveryThread {
+private class DiscoveryMessageNotifierWorker extends GridWorker {
/** Queue. */
private final BlockingQueue> queue =
new LinkedBlockingQueue<>();
http://git-wip-us.apache.org/repos/asf/ignite/blob/5a2ef66c/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/IgniteContinuousQueryMetadataUpdateTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/IgniteContinuousQueryMetadataUpdateTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/IgniteContinuousQueryMetadataUpdateTest.java
new file mode 100644
index 000..fec561e
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/IgniteContinuousQueryMetadataUpdateTest.java
@@ -0,0 +1,129 @@
+/*
+ * 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.continuous;
+
+import org.apache.ignite.Ignite;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage;
+import
org.apache.ignite.internal.processors.cache.binary.MetadataUpdateAcceptedMessage;
+import org.apache.ignite.internal.util.IgniteUtils;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteCallable;
+import org.apache.ignite.lang.IgnitePredicate;
+import
