Repository: ignite Updated Branches: refs/heads/ignite-1093-2 b12bf542e -> afcfb5b72
1093 Logs to handle race Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/afcfb5b7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/afcfb5b7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/afcfb5b7 Branch: refs/heads/ignite-1093-2 Commit: afcfb5b72a341b70f00be2205a4372814a68870f Parents: b12bf54 Author: Anton Vinogradov <[email protected]> Authored: Thu Oct 15 23:16:50 2015 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Thu Oct 15 23:16:50 2015 +0300 ---------------------------------------------------------------------- .../dht/preloader/GridDhtPartitionDemander.java | 13 +++++++------ .../dht/preloader/GridDhtPartitionSupplier.java | 20 ++++++++++++-------- .../IgniteCacheClientNodeConcurrentStart.java | 3 --- 3 files changed, 19 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/afcfb5b7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java index 5b5136e..3caff69 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java @@ -398,8 +398,9 @@ public class GridDhtPartitionDemander { cctx.io().sendOrderedMessage(node, GridCachePartitionExchangeManager.rebalanceTopic(cnt), initD, cctx.ioPolicy(), d.timeout()); - if (log.isDebugEnabled()) - log.debug("Requested rebalancing [from node=" + node.id() + ", listener index=" + +// if (log.isDebugEnabled()) +// log.debug( + U.log(log,"Requested rebalancing [from node=" + node.id() + ", listener index=" + cnt + ", partitions count=" + sParts.get(cnt).size() + " (" + partitionsList(sParts.get(cnt)) + ")]"); } @@ -499,13 +500,13 @@ public class GridDhtPartitionDemander { return; } - if (log.isDebugEnabled()) - log.debug("Received supply message: " + supply); +// if (log.isDebugEnabled()) +// log.debug( + U.log(log,"Received supply message: " + supply); // Check whether there were class loading errors on unmarshal if (supply.classError() != null) { - if (log.isDebugEnabled()) - log.debug("Class got undeployed during preloading: " + supply.classError()); + U.warn(log, "Class got undeployed during preloading: " + supply.classError()); fut.cancel(id); http://git-wip-us.apache.org/repos/asf/ignite/blob/afcfb5b7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java index 9ad82ac..f908d0c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java @@ -225,8 +225,9 @@ class GridDhtPartitionSupplier { maxBatchesCnt = 1; } else { - if (log.isDebugEnabled()) - log.debug("Starting supplying rebalancing [cache=" + cctx.name() + +// if (log.isDebugEnabled()) +// log.debug + U.log(log, "Starting supplying rebalancing [cache=" + cctx.name() + ", fromNode=" + node.id() + ", partitionsCount=" + d.partitions().size() + ", topology=" + d.topologyVersion() + ", updateSeq=" + d.updateSequence() + ", idx=" + idx + "]"); @@ -567,8 +568,9 @@ class GridDhtPartitionSupplier { reply(node, d, s, scId); - if (log.isDebugEnabled()) - log.debug("Finished supplying rebalancing [cache=" + cctx.name() + +// if (log.isDebugEnabled()) +// log.debug( + U.log(log, "Finished supplying rebalancing [cache=" + cctx.name() + ", fromNode=" + node.id() + ", topology=" + d.topologyVersion() + ", updateSeq=" + d.updateSequence() + ", idx=" + idx + "]"); @@ -592,8 +594,9 @@ class GridDhtPartitionSupplier { throws IgniteCheckedException { try { - if (log.isDebugEnabled()) - log.debug("Replying to partition demand [node=" + n.id() + ", demand=" + d + ", supply=" + s + ']'); +// if (log.isDebugEnabled()) +// log.debug + U.log(log, "Replying to partition demand [node=" + n.id() + ", demand=" + d + ", supply=" + s + ']'); cctx.io().sendOrderedMessage(n, d.topic(), s, cctx.ioPolicy(), d.timeout()); @@ -604,8 +607,9 @@ class GridDhtPartitionSupplier { return true; } catch (ClusterTopologyCheckedException ignore) { - if (log.isDebugEnabled()) - log.debug("Failed to send partition supply message because node left grid: " + n.id()); +// if (log.isDebugEnabled()) +// log.debug + U.log(log,"Failed to send partition supply message because node left grid: " + n.id()); clearContext(scMap.remove(scId), log); http://git-wip-us.apache.org/repos/asf/ignite/blob/afcfb5b7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeConcurrentStart.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeConcurrentStart.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeConcurrentStart.java index fdc5cc4..4392690 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeConcurrentStart.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeConcurrentStart.java @@ -23,7 +23,6 @@ import java.util.concurrent.ThreadLocalRandom; import org.apache.ignite.Ignite; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; @@ -71,8 +70,6 @@ public class IgniteCacheClientNodeConcurrentStart extends GridCommonAbstractTest cfg.setCacheConfiguration(ccfg); - ((TcpCommunicationSpi)cfg.getCommunicationSpi()).setSharedMemoryPort(-1);//todo: TO BE REMOVED!!! - return cfg; }
