IGNITE-6668 Do not block metadata read when calling from discovery thread - Fixes #2880.
Signed-off-by: Alexey Goncharuk <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/78109702 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/78109702 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/78109702 Branch: refs/heads/ignite-5937 Commit: 78109702ca47dbf960ccf23c551bca2941891242 Parents: 0e77ea1 Author: Sergey Chugunov <[email protected]> Authored: Mon Oct 23 17:18:33 2017 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Mon Oct 23 17:18:33 2017 +0300 ---------------------------------------------------------------------- .../binary/CacheObjectBinaryProcessorImpl.java | 10 ++++++++- .../spi/discovery/IgniteDiscoveryThread.java | 23 ++++++++++++++++++++ .../ignite/spi/discovery/tcp/ServerImpl.java | 3 ++- 3 files changed, 34 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/78109702/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java index 0b85d2b..6a70936 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java @@ -82,6 +82,8 @@ import org.apache.ignite.marshaller.Marshaller; import org.apache.ignite.spi.IgniteNodeValidationResult; import org.apache.ignite.spi.discovery.DiscoveryDataBag; import org.apache.ignite.spi.discovery.DiscoveryDataBag.GridDiscoveryData; +import org.apache.ignite.spi.discovery.IgniteDiscoveryThread; +import org.apache.ignite.thread.IgniteThread; import org.jetbrains.annotations.Nullable; import org.jsr166.ConcurrentHashMap8; @@ -495,6 +497,9 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm } if (holder != null) { + if (IgniteThread.current() instanceof IgniteDiscoveryThread) + return holder.metadata(); + if (holder.pendingVersion() - holder.acceptedVersion() > 0) { GridFutureAdapter<MetadataUpdateResult> fut = transport.awaitMetadataUpdate(typeId, holder.pendingVersion()); @@ -534,7 +539,10 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm } } } - else { + else if (holder != null) { + if (IgniteThread.current() instanceof IgniteDiscoveryThread) + return holder.metadata().wrap(binaryCtx); + if (holder.pendingVersion() - holder.acceptedVersion() > 0) { GridFutureAdapter<MetadataUpdateResult> fut = transport.awaitMetadataUpdate( typeId, http://git-wip-us.apache.org/repos/asf/ignite/blob/78109702/modules/core/src/main/java/org/apache/ignite/spi/discovery/IgniteDiscoveryThread.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/IgniteDiscoveryThread.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/IgniteDiscoveryThread.java new file mode 100644 index 0000000..a3e376c --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/IgniteDiscoveryThread.java @@ -0,0 +1,23 @@ +/* + * 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.spi.discovery; + +/** + * Marker interface for discovery thread on cluster server node. + */ +public interface IgniteDiscoveryThread { +} http://git-wip-us.apache.org/repos/asf/ignite/blob/78109702/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java index 60f9d4e..58e1ba4 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java @@ -101,6 +101,7 @@ import org.apache.ignite.spi.IgniteSpiOperationTimeoutHelper; import org.apache.ignite.spi.IgniteSpiThread; import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; import org.apache.ignite.spi.discovery.DiscoverySpiListener; +import org.apache.ignite.spi.discovery.IgniteDiscoveryThread; import org.apache.ignite.spi.discovery.tcp.internal.DiscoveryDataPacket; import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNode; import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNodesRing; @@ -2444,7 +2445,7 @@ class ServerImpl extends TcpDiscoveryImpl { /** * Message worker thread for messages processing. */ - private class RingMessageWorker extends MessageWorkerAdapter<TcpDiscoveryAbstractMessage> { + private class RingMessageWorker extends MessageWorkerAdapter<TcpDiscoveryAbstractMessage> implements IgniteDiscoveryThread { /** Next node. */ @SuppressWarnings({"FieldAccessedSynchronizedAndUnsynchronized"}) private TcpDiscoveryNode next;
