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 a6e7a2db23b29..10bd7b1fb869e 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
@@ -23,6 +23,7 @@
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.GridToStringExclude;
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;
@@ -301,6 +302,7 @@ public class DataStorageConfiguration implements Serializable {
private boolean alwaysWriteFullPages = DFLT_WAL_ALWAYS_WRITE_FULL_PAGES;
/** Factory to provide I/O interface for data storage files */
+ @GridToStringExclude
private FileIOFactory fileIOFactory =
IgniteSystemProperties.getBoolean(IGNITE_USE_ASYNC_FILE_IO_FACTORY, DFLT_USE_ASYNC_FILE_IO_FACTORY) ?
new AsyncFileIOFactory() : new RandomAccessFileIOFactory();
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/EncryptionConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/EncryptionConfiguration.java
index 6b9345d4c7550..320795026ec2e 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/EncryptionConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/EncryptionConfiguration.java
@@ -18,11 +18,14 @@
package org.apache.ignite.configuration;
import java.io.Serializable;
+
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
import org.apache.ignite.internal.util.typedef.internal.A;
/**
* Encryption configuration.
*/
+@GridToStringExclude
public class EncryptionConfiguration implements Serializable {
/** */
private static final long serialVersionUID = 0L;
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index 16d0bac76cf53..de602002a695a 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@ -49,6 +49,7 @@
import org.apache.ignite.failure.FailureHandler;
import org.apache.ignite.internal.managers.eventstorage.GridEventStorageManager;
import org.apache.ignite.internal.processors.odbc.ClientListenerProcessor;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
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;
@@ -326,6 +327,7 @@ public class IgniteConfiguration {
private String igniteWorkDir;
/** MBean server. */
+ @GridToStringExclude
private MBeanServer mbeanSrv;
/** Local node ID. */
@@ -410,6 +412,7 @@ public class IgniteConfiguration {
private LoadBalancingSpi[] loadBalancingSpi;
/** Indexing SPI. */
+ @GridToStringExclude
private IndexingSpi indexingSpi;
/** Address resolver. */
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/SystemDataRegionConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/SystemDataRegionConfiguration.java
index bfa20048a7d6e..76b2b1e3a0a59 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/SystemDataRegionConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/SystemDataRegionConfiguration.java
@@ -18,6 +18,7 @@
import java.io.Serializable;
import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
/**
* This class allows defining system data region configuration with various parameters for Apache Ignite
@@ -90,4 +91,9 @@ public SystemDataRegionConfiguration setMaxSize(long maxSize) {
return this;
}
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(SystemDataRegionConfiguration.class, this);
+ }
}
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/IgniteMarshallerClassFilter.java b/modules/core/src/main/java/org/apache/ignite/marshaller/IgniteMarshallerClassFilter.java
index 2c215465f9b5f..bc6c20b1a9039 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/IgniteMarshallerClassFilter.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/IgniteMarshallerClassFilter.java
@@ -67,4 +67,9 @@ public IgniteMarshallerClassFilter(ClassSet whiteList, ClassSet blackList) {
@Override public int hashCode() {
return Objects.hash(whiteList, blackList);
}
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return "IgniteMarshallerClassFilter";
+ }
}
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/noop/NoopCollisionSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/noop/NoopCollisionSpi.java
index a7c7feef2b3b9..1400a417777d1 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/collision/noop/NoopCollisionSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/noop/NoopCollisionSpi.java
@@ -17,7 +17,6 @@
package org.apache.ignite.spi.collision.noop;
-import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.spi.IgniteSpiAdapter;
import org.apache.ignite.spi.IgniteSpiException;
import org.apache.ignite.spi.IgniteSpiMultipleInstancesSupport;
@@ -67,6 +66,6 @@ public class NoopCollisionSpi extends IgniteSpiAdapter implements CollisionSpi {
/** {@inheritDoc} */
@Override public String toString() {
- return S.toString(NoopCollisionSpi.class, this);
+ return "NoopCollisionSpi";
}
}
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 cf1a42cf8402c..3078e20a0e9fc 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
@@ -54,7 +54,7 @@
import org.apache.ignite.internal.util.nio.GridNioServer;
import org.apache.ignite.internal.util.nio.GridNioSession;
import org.apache.ignite.internal.util.nio.GridNioSessionMetaKey;
-import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.internal.worker.WorkersRegistry;
import org.apache.ignite.lang.IgniteFuture;
@@ -194,6 +194,7 @@
*/
@IgniteSpiMultipleInstancesSupport(true)
@IgniteSpiConsistencyChecked(optional = false)
+@GridToStringInclude
public class TcpCommunicationSpi extends TcpCommunicationConfigInitializer {
/** Node attribute that is mapped to node IP addresses (value is comm.tcp.addrs). */
public static final String ATTR_ADDRS = "comm.tcp.addrs";
@@ -1153,7 +1154,10 @@ public void simulateNodeFailure() {
/** {@inheritDoc} */
@Override public String toString() {
- return S.toString(TcpCommunicationSpi.class, this);
+ return "TcpCommunicationSpi [" +
+ "ctxInitLatch=" + ctxInitLatch.getCount() +
+ ", stopping=" + stopping +
+ "]";
}
/**
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 f11ab667db0c2..2bd434080eae8 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
@@ -255,6 +255,7 @@ class ServerImpl extends TcpDiscoveryImpl {
private long connCheckTick;
/** */
+ @GridToStringExclude
private final IgniteThreadPoolExecutor utilityPool;
/** Pool size to ping remote DC if a corner node loses the ring connection. */
@@ -292,6 +293,7 @@ class ServerImpl extends TcpDiscoveryImpl {
private StatisticsPrinter statsPrinter;
/** Metric for max message queue size. */
+ @GridToStringExclude
private MaxValueMetric maxMsgQueueSizeMetric;
/** Failed nodes (but still in topology). */
@@ -310,6 +312,7 @@ class ServerImpl extends TcpDiscoveryImpl {
private Queue pendingCustomMsgs = new ArrayDeque<>();
/** Messages history used for client reconnect. */
+ @GridToStringExclude
private final EnsuredMessageHistory msgHist = new EnsuredMessageHistory();
/** If non-shared IP finder is used this flag shows whether IP finder contains local address. */
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index 6e14dfa8f272f..b005c79d3765b 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -350,9 +350,11 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements IgniteDiscovery
protected long connRecoveryTimeout = DFLT_CONNECTION_RECOVERY_TIMEOUT;
/** Grid discovery listener. */
+ @GridToStringExclude
protected volatile DiscoverySpiListener lsnr;
/** Data exchange. */
+ @GridToStringExclude
protected DiscoverySpiDataExchange exchange;
/** Metrics provider. */
@@ -383,6 +385,7 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements IgniteDiscovery
private Marshaller marsh;
/** Statistics. */
+ @GridToStringExclude
protected final TcpDiscoveryStatistics stats = new TcpDiscoveryStatistics();
/** Local port which node uses. */
@@ -455,9 +458,11 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements IgniteDiscovery
private IgniteBiTuple, Collection> addrs;
/** */
+ @GridToStringExclude
protected IgniteSpiContext spiCtx;
/** Discovery messages factory. */
+ @GridToStringExclude
private MessageFactory msgFactory;
/** For test purposes. */
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/encryption/keystore/KeystoreEncryptionSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/encryption/keystore/KeystoreEncryptionSpi.java
index 7613c5bccc664..1f2e1b244e913 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/encryption/keystore/KeystoreEncryptionSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/encryption/keystore/KeystoreEncryptionSpi.java
@@ -546,4 +546,9 @@ private KeystoreEncryptionKey loadMasterKey(String masterKeyName) {
throw new IgniteSpiException(e);
}
}
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return "KeystoreEncryptionSpi";
+ }
}
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/encryption/noop/NoopEncryptionSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/encryption/noop/NoopEncryptionSpi.java
index 31e52498b32c8..13e6d51aca54e 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/encryption/noop/NoopEncryptionSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/encryption/noop/NoopEncryptionSpi.java
@@ -124,4 +124,9 @@ public class NoopEncryptionSpi extends IgniteSpiAdapter implements EncryptionSpi
@Override public void spiStop() throws IgniteSpiException {
// No-op.
}
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return "NoopEncryptionSpi";
+ }
}
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/tracing/NoopTracingSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/tracing/NoopTracingSpi.java
index c12714bc5e60d..23a51c0120479 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/tracing/NoopTracingSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/tracing/NoopTracingSpi.java
@@ -67,4 +67,9 @@ public class NoopTracingSpi extends IgniteSpiAdapter implements TracingSpi