You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by av...@apache.org on 2018/07/26 19:56:36 UTC
[48/50] [abbrv] ignite git commit: IGNITE-8935 toString() or
exclusion for most classes accessible from IgniteConfiguration. - Fixes #4318
IGNITE-8935 toString() or exclusion for most classes accessible from IgniteConfiguration. - Fixes #4318
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/48179449
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/48179449
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/48179449
Branch: refs/heads/ignite-8446
Commit: 481794496a2385bb0b5664face501e4c21c8ded6
Parents: 818fea7
Author: Ilya Kasnacheev <il...@gmail.com>
Authored: Thu Jul 26 16:56:49 2018 +0300
Committer: Dmitriy Pavlov <dp...@apache.org>
Committed: Thu Jul 26 16:56:49 2018 +0300
----------------------------------------------------------------------
.../rendezvous/RendezvousAffinityFunction.java | 6 ++++
.../configuration/BasicAddressResolver.java | 9 +++++
.../configuration/ConnectorConfiguration.java | 8 +++++
.../configuration/DataStorageConfiguration.java | 2 ++
.../configuration/HadoopConfiguration.java | 4 +--
.../configuration/MemoryConfiguration.java | 6 ++++
.../MemoryPolicyConfiguration.java | 6 ++++
.../configuration/TransactionConfiguration.java | 6 ++++
.../apache/ignite/internal/IgniteKernal.java | 4 +++
.../ignite/internal/LongJVMPauseDetector.java | 9 +++++
.../internal/binary/BinaryMarshaller.java | 8 +++++
.../optimized/OptimizedMarshaller.java | 8 ++++-
.../util/nio/GridNioMetricsListener.java | 6 ++--
.../util/nio/GridNioServerListener.java | 5 +--
.../communication/CommunicationListener.java | 5 +--
.../communication/tcp/TcpCommunicationSpi.java | 36 ++++++++++++--------
.../spi/deployment/DeploymentListener.java | 6 ++--
.../ignite/startup/BasicWarmupClosure.java | 10 +++++-
.../spi/deployment/uri/UriDeploymentSpi.java | 4 +++
.../internal/ZookeeperDiscoveryStatistics.java | 7 ++++
20 files changed, 128 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/48179449/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java b/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java
index 0e9afb7..4b52f77 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java
@@ -37,6 +37,7 @@ import org.apache.ignite.internal.processors.cache.GridCacheUtils;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.A;
import org.apache.ignite.internal.util.typedef.internal.LT;
+import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteBiPredicate;
import org.apache.ignite.lang.IgniteBiTuple;
@@ -588,4 +589,9 @@ public class RendezvousAffinityFunction implements AffinityFunction, Serializabl
}
}
}
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(RendezvousAffinityFunction.class, this);
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/48179449/modules/core/src/main/java/org/apache/ignite/configuration/BasicAddressResolver.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/BasicAddressResolver.java b/modules/core/src/main/java/org/apache/ignite/configuration/BasicAddressResolver.java
index d29689f..3101291 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/BasicAddressResolver.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/BasicAddressResolver.java
@@ -24,7 +24,9 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Map;
import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
/**
@@ -79,9 +81,11 @@ import org.apache.ignite.internal.util.typedef.internal.U;
*/
public class BasicAddressResolver implements AddressResolver {
/** Address map. */
+ @GridToStringInclude
private final Map<InetAddress, InetAddress> inetAddrMap;
/** Socket address map. */
+ @GridToStringInclude
private final Map<InetSocketAddress, InetSocketAddress> inetSockAddrMap;
/**
@@ -143,4 +147,9 @@ public class BasicAddressResolver implements AddressResolver {
return Collections.emptyList();
}
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(BasicAddressResolver.class, this);
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/48179449/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorConfiguration.java
index 0ee1388..23e5a8f 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorConfiguration.java
@@ -22,6 +22,8 @@ import javax.cache.configuration.Factory;
import javax.net.ssl.SSLContext;
import org.apache.ignite.IgniteSystemProperties;
import org.apache.ignite.internal.client.ssl.GridSslContextFactory;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.ssl.SslContextFactory;
import org.jetbrains.annotations.Nullable;
@@ -69,6 +71,7 @@ public class ConnectorConfiguration {
private String jettyPath;
/** REST secret key. */
+ @GridToStringExclude
private String secretKey;
/** TCP host. */
@@ -668,4 +671,9 @@ public class ConnectorConfiguration {
public long getIdleQueryCursorCheckFrequency() {
return idleQryCurCheckFreq;
}
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(ConnectorConfiguration.class, this);
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/48179449/modules/core/src/main/java/org/apache/ignite/configuration/DataStorageConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/DataStorageConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/DataStorageConfiguration.java
index ccabf3f..d8619aa 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/DataStorageConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/DataStorageConfiguration.java
@@ -22,6 +22,7 @@ import org.apache.ignite.IgniteSystemProperties;
import org.apache.ignite.internal.processors.cache.persistence.file.AsyncFileIOFactory;
import org.apache.ignite.internal.processors.cache.persistence.file.FileIOFactory;
import org.apache.ignite.internal.processors.cache.persistence.file.RandomAccessFileIOFactory;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
import org.apache.ignite.internal.util.typedef.internal.A;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
@@ -168,6 +169,7 @@ public class DataStorageConfiguration implements Serializable {
private DataRegionConfiguration dfltDataRegConf = new DataRegionConfiguration();
/** Data regions. */
+ @GridToStringInclude
private DataRegionConfiguration[] dataRegions;
/** Directory where index and partition files are stored. */
http://git-wip-us.apache.org/repos/asf/ignite/blob/48179449/modules/core/src/main/java/org/apache/ignite/configuration/HadoopConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/HadoopConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/HadoopConfiguration.java
index 8d8e96c..a20f95e 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/HadoopConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/HadoopConfiguration.java
@@ -225,6 +225,6 @@ public class HadoopConfiguration {
/** {@inheritDoc} */
@Override public String toString() {
- return S.toString(HadoopConfiguration.class, this, super.toString());
+ return S.toString(HadoopConfiguration.class, this);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/48179449/modules/core/src/main/java/org/apache/ignite/configuration/MemoryConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/MemoryConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/MemoryConfiguration.java
index 75fe11b..16e0939 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/MemoryConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/MemoryConfiguration.java
@@ -19,6 +19,7 @@ package org.apache.ignite.configuration;
import java.io.Serializable;
import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
/**
@@ -305,4 +306,9 @@ public class MemoryConfiguration implements Serializable {
return this;
}
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(MemoryConfiguration.class, this);
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/48179449/modules/core/src/main/java/org/apache/ignite/configuration/MemoryPolicyConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/MemoryPolicyConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/MemoryPolicyConfiguration.java
index a144050..0213b7f 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/MemoryPolicyConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/MemoryPolicyConfiguration.java
@@ -19,6 +19,7 @@ package org.apache.ignite.configuration;
import java.io.Serializable;
import org.apache.ignite.MemoryMetrics;
import org.apache.ignite.internal.mem.IgniteOutOfMemoryException;
+import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.mxbean.DataRegionMetricsMXBean;
import static org.apache.ignite.configuration.MemoryConfiguration.DFLT_MEM_PLC_DEFAULT_NAME;
@@ -376,4 +377,9 @@ public final class MemoryPolicyConfiguration implements Serializable {
return this;
}
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(MemoryPolicyConfiguration.class, this);
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/48179449/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java
index 818f823..0ac215f 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java
@@ -19,6 +19,7 @@ package org.apache.ignite.configuration;
import java.io.Serializable;
import javax.cache.configuration.Factory;
+import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.transactions.Transaction;
import org.apache.ignite.transactions.TransactionConcurrency;
import org.apache.ignite.transactions.TransactionIsolation;
@@ -381,4 +382,9 @@ public class TransactionConfiguration implements Serializable {
return this;
}
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(TransactionConfiguration.class, this);
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/48179449/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 4c8fa9b..9b8ae5a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -4104,7 +4104,11 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
// No-op.
}
}
+ }
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(ReconnectState.class, this);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/48179449/modules/core/src/main/java/org/apache/ignite/internal/LongJVMPauseDetector.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/LongJVMPauseDetector.java b/modules/core/src/main/java/org/apache/ignite/internal/LongJVMPauseDetector.java
index 08b118e..d98b6d9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/LongJVMPauseDetector.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/LongJVMPauseDetector.java
@@ -21,6 +21,8 @@ import java.util.Map;
import java.util.TreeMap;
import java.util.concurrent.atomic.AtomicReference;
import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_JVM_PAUSE_DETECTOR_DISABLED;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_JVM_PAUSE_DETECTOR_LAST_EVENTS_COUNT;
@@ -61,9 +63,11 @@ class LongJVMPauseDetector {
private long longPausesTotalDuration;
/** Long pauses timestamps. */
+ @GridToStringInclude
private final long[] longPausesTimestamps = new long[EVT_CNT];
/** Long pauses durations. */
+ @GridToStringInclude
private final long[] longPausesDurations = new long[EVT_CNT];
/**
@@ -176,4 +180,9 @@ class LongJVMPauseDetector {
return evts;
}
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(LongJVMPauseDetector.class, this);
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/48179449/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMarshaller.java
index bfb0e10..87f9a22 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMarshaller.java
@@ -24,6 +24,8 @@ import java.io.OutputStream;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.binary.BinaryObjectException;
import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.marshaller.AbstractNodeNameAwareMarshaller;
import org.jetbrains.annotations.Nullable;
import sun.misc.Unsafe;
@@ -34,6 +36,7 @@ import sun.misc.Unsafe;
*/
public class BinaryMarshaller extends AbstractNodeNameAwareMarshaller {
/** */
+ @GridToStringExclude
private GridBinaryMarshaller impl;
/**
@@ -133,4 +136,9 @@ public class BinaryMarshaller extends AbstractNodeNameAwareMarshaller {
public GridBinaryMarshaller binaryMarshaller() {
return impl;
}
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(BinaryMarshaller.class, this);
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/48179449/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshaller.java
index d93daab..66461de 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshaller.java
@@ -22,14 +22,15 @@ import java.io.InputStream;
import java.io.ObjectOutputStream;
import java.io.OutputStream;
import java.io.Serializable;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteSystemProperties;
+import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.marshaller.AbstractNodeNameAwareMarshaller;
import org.jetbrains.annotations.Nullable;
-import java.util.concurrent.ConcurrentHashMap;
import sun.misc.Unsafe;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_OPTIMIZED_MARSHALLER_USE_DEFAULT_SUID;
@@ -311,4 +312,9 @@ public class OptimizedMarshaller extends AbstractNodeNameAwareMarshaller {
U.clearClassCache(ldr);
}
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(OptimizedMarshaller.class, this);
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/48179449/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioMetricsListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioMetricsListener.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioMetricsListener.java
index 7f458fd..1bdae30 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioMetricsListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioMetricsListener.java
@@ -17,10 +17,12 @@
package org.apache.ignite.internal.util.nio;
+import java.util.EventListener;
+
/**
* Metrics listener for NIO communication.
*/
-public interface GridNioMetricsListener {
+public interface GridNioMetricsListener extends EventListener {
/**
* @param bytesCnt Number of sent bytes.
*/
@@ -30,4 +32,4 @@ public interface GridNioMetricsListener {
* @param bytesCnt Number of received bytes.
*/
public void onBytesReceived(int bytesCnt);
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/48179449/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServerListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServerListener.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServerListener.java
index 14c5a74..67abce9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServerListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServerListener.java
@@ -17,13 +17,14 @@
package org.apache.ignite.internal.util.nio;
+import java.util.EventListener;
import org.apache.ignite.failure.FailureType;
import org.jetbrains.annotations.Nullable;
/**
* Listener passed in to the {@link GridNioServer} that will be notified on client events.
*/
-public interface GridNioServerListener<T> {
+public interface GridNioServerListener<T> extends EventListener {
/**
* This method is called whenever a new client is connected and session is created.
*
@@ -75,4 +76,4 @@ public interface GridNioServerListener<T> {
* Called when critical failure occurs in server implementation.
*/
public void onFailure(FailureType failureType, Throwable failure);
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/48179449/modules/core/src/main/java/org/apache/ignite/spi/communication/CommunicationListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/CommunicationListener.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/CommunicationListener.java
index 9b9ee79..36b57c5 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/CommunicationListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/CommunicationListener.java
@@ -18,6 +18,7 @@
package org.apache.ignite.spi.communication;
import java.io.Serializable;
+import java.util.EventListener;
import java.util.UUID;
import org.apache.ignite.lang.IgniteRunnable;
@@ -27,7 +28,7 @@ import org.apache.ignite.lang.IgniteRunnable;
* {@link CommunicationSpi} should ignore very first 4 bytes received from
* sender node and pass the rest of the message to the listener.
*/
-public interface CommunicationListener<T extends Serializable> {
+public interface CommunicationListener<T extends Serializable> extends EventListener {
/**
* <b>NOTE:</b> {@link CommunicationSpi} should ignore very first 4 bytes received from
* sender node and pass the rest of the received message to the listener.
@@ -44,4 +45,4 @@ public interface CommunicationListener<T extends Serializable> {
* @param nodeId Node ID.
*/
public void onDisconnected(UUID nodeId);
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/48179449/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
index 1d902c2..6617568 100755
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
@@ -368,7 +368,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter implements Communicati
private ConnectGateway connectGate;
/** */
- private ConnectionPolicy connPlc;
+ private ConnectionPolicy connPlc = new FirstConnectionPolicy();
/** */
private boolean enableForcibleNodeKill = IgniteSystemProperties
@@ -2089,20 +2089,10 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter implements Communicati
"Specified 'unackedMsgsBufSize' is too low, it should be at least 'ackSndThreshold * 5'.");
}
- if (connectionsPerNode > 1) {
- connPlc = new ConnectionPolicy() {
- @Override public int connectionIndex() {
- return (int)(U.safeAbs(Thread.currentThread().getId()) % connectionsPerNode);
- }
- };
- }
- else {
- connPlc = new ConnectionPolicy() {
- @Override public int connectionIndex() {
- return 0;
- }
- };
- }
+ if (connectionsPerNode > 1)
+ connPlc = new RoundRobinConnectionPolicy();
+ else
+ connPlc = new FirstConnectionPolicy();
try {
locHost = U.resolveLocalHost(locAddr);
@@ -4767,6 +4757,22 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter implements Communicati
int connectionIndex();
}
+ /** */
+ private static class FirstConnectionPolicy implements ConnectionPolicy {
+ /** {@inheritDoc} */
+ @Override public int connectionIndex() {
+ return 0;
+ }
+ }
+
+ /** */
+ private class RoundRobinConnectionPolicy implements ConnectionPolicy {
+ /** {@inheritDoc} */
+ @Override public int connectionIndex() {
+ return (int)(U.safeAbs(Thread.currentThread().getId()) % connectionsPerNode);
+ }
+ }
+
/**
* MBean implementation for TcpCommunicationSpi.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/48179449/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentListener.java b/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentListener.java
index 3ae24b9..500c8f0 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentListener.java
@@ -17,15 +17,17 @@
package org.apache.ignite.spi.deployment;
+import java.util.EventListener;
+
/**
* Listener for deployment events. It is used by grid implementation
* to properly create or release resources associated with any deployment.
*/
-public interface DeploymentListener {
+public interface DeploymentListener extends EventListener {
/**
* Called when a deployment has been unregistered..
*
* @param ldr Registered class loader.
*/
public void onUnregistered(ClassLoader ldr);
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/48179449/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java b/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java
index aa84706..1be4947 100644
--- a/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java
+++ b/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java
@@ -37,8 +37,10 @@ import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteKernal;
import org.apache.ignite.internal.processors.cache.IgniteCacheProxy;
import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteInClosure;
import org.apache.ignite.logger.NullLogger;
@@ -81,6 +83,7 @@ public class BasicWarmupClosure implements IgniteInClosure<IgniteConfiguration>
private int discoveryPort = 27000;
/** Methods to warmup. */
+ @GridToStringInclude
private String[] warmupMethods = {"put", "putx", "get", "remove", "removex", "putIfAbsent", "replace"};
/**
@@ -567,4 +570,9 @@ public class BasicWarmupClosure implements IgniteInClosure<IgniteConfiguration>
cache.replace(key, key, key);
}
}
-}
\ No newline at end of file
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(BasicWarmupClosure.class, this);
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/48179449/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java
----------------------------------------------------------------------
diff --git a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java
index f149804..bea3132 100644
--- a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java
+++ b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java
@@ -41,6 +41,8 @@ import org.apache.ignite.IgniteLogger;
import org.apache.ignite.compute.ComputeTask;
import org.apache.ignite.compute.ComputeTaskName;
import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.A;
import org.apache.ignite.internal.util.typedef.internal.LT;
@@ -334,6 +336,7 @@ public class UriDeploymentSpi extends IgniteSpiAdapter implements DeploymentSpi
private String deployTmpDirPath;
/** List of URIs to be scanned. */
+ @GridToStringInclude
private List<String> uriList = new ArrayList<>();
/** List of encoded URIs. */
@@ -348,6 +351,7 @@ public class UriDeploymentSpi extends IgniteSpiAdapter implements DeploymentSpi
/** */
@SuppressWarnings({"TypeMayBeWeakened"})
+ @GridToStringExclude
private final LastTimeUnitDescriptorComparator unitComp = new LastTimeUnitDescriptorComparator();
/** List of scanner managers. Every URI has it's own manager. */
http://git-wip-us.apache.org/repos/asf/ignite/blob/48179449/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryStatistics.java
----------------------------------------------------------------------
diff --git a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryStatistics.java b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryStatistics.java
index 082203a..678cf11 100644
--- a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryStatistics.java
+++ b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryStatistics.java
@@ -16,6 +16,8 @@
*/
package org.apache.ignite.spi.discovery.zk.internal;
+import org.apache.ignite.internal.util.typedef.internal.S;
+
/**
* Zookeeper discovery statistics.
*/
@@ -45,4 +47,9 @@ public class ZookeeperDiscoveryStatistics {
public void onNodeFailed() {
failedNodesCnt++;
}
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(ZookeeperDiscoveryStatistics.class, this);
+ }
}