http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterImpl.java index 3566830..cb8325b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterImpl.java @@ -235,7 +235,7 @@ public class GridTcpRouterImpl implements GridTcpRouter, GridTcpRouterMBean, Lif // This name is required to be unique in order to avoid collisions with // ThreadWorkerGroups running in the same JVM by other routers/nodes. - String gridName = "router-" + id; + String igniteInstanceName = "router-" + id; GridNioFilter[] filters; @@ -257,7 +257,7 @@ public class GridTcpRouterImpl implements GridTcpRouter, GridTcpRouterMBean, Lif .listener(lsnr) .logger(log) .selectorCount(Runtime.getRuntime().availableProcessors()) - .gridName(gridName) + .igniteInstanceName(igniteInstanceName) .serverName("router") .tcpNoDelay(tcpNoDelay) .directBuffer(false)
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java index dec9b7d..5d5c06f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java @@ -83,8 +83,8 @@ public class ClusterGroupAdapter implements ClusterGroupEx, Externalizable { /** Services. */ private transient IgniteServices svcs; - /** Grid name. */ - private String gridName; + /** Ignite instance name. */ + private String igniteInstanceName; /** Subject ID. */ protected UUID subjId; @@ -188,7 +188,7 @@ public class ClusterGroupAdapter implements ClusterGroupEx, Externalizable { this.ctx = ctx; - gridName = ctx.gridName(); + igniteInstanceName = ctx.igniteInstanceName(); } /** {@inheritDoc} */ @@ -699,7 +699,7 @@ public class ClusterGroupAdapter implements ClusterGroupEx, Externalizable { /** {@inheritDoc} */ @Override public void writeExternal(ObjectOutput out) throws IOException { - U.writeString(out, gridName); + U.writeString(out, igniteInstanceName); U.writeUuid(out, subjId); out.writeBoolean(ids != null); @@ -712,7 +712,7 @@ public class ClusterGroupAdapter implements ClusterGroupEx, Externalizable { /** {@inheritDoc} */ @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { - gridName = U.readString(in); + igniteInstanceName = U.readString(in); subjId = U.readUuid(in); if (in.readBoolean()) http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterNodeLocalMapImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterNodeLocalMapImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterNodeLocalMapImpl.java index 26a9013..1537bb8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterNodeLocalMapImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterNodeLocalMapImpl.java @@ -73,7 +73,7 @@ public class ClusterNodeLocalMapImpl<K, V> extends ConcurrentHashMap8<K, V> impl /** {@inheritDoc} */ @Override public void writeExternal(ObjectOutput out) throws IOException { - U.writeString(out, ctx.gridName()); + U.writeString(out, ctx.igniteInstanceName()); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java index aa5e63f..58a2128 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java @@ -557,6 +557,6 @@ public class IgniteClusterImpl extends ClusterGroupAdapter implements IgniteClus /** {@inheritDoc} */ public String toString() { - return "IgniteCluster [igniteName=" + ctx.gridName() + ']'; + return "IgniteCluster [igniteInstanceName=" + ctx.igniteInstanceName() + ']'; } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcConnection.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcConnection.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcConnection.java index 4244602..18c13ca 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcConnection.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcConnection.java @@ -249,8 +249,8 @@ public class JdbcConnection implements Connection { IgniteConfiguration cfg = F.first(cfgMap.get1()); - if (cfg.getGridName() == null) - cfg.setGridName("ignite-jdbc-driver-" + UUID.randomUUID().toString()); + if (cfg.getIgniteInstanceName() == null) + cfg.setIgniteInstanceName("ignite-jdbc-driver-" + UUID.randomUUID().toString()); cfg.setClientMode(true); // Force client mode. http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java index d993376..7883913 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java @@ -268,7 +268,7 @@ public abstract class GridManagerAdapter<T extends IgniteSpi> implements GridMan onBeforeSpiStart(); try { - spi.spiStart(ctx.gridName()); + spi.spiStart(ctx.igniteInstanceName()); } catch (IgniteSpiException e) { throw new IgniteCheckedException("Failed to start SPI: " + spi, e); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java index 8ce8b0b..ab32a3e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java @@ -405,7 +405,7 @@ public class GridCheckpointManager extends GridManagerAdapter<CheckpointSpi> { /** {@inheritDoc} */ @Override public void printMemoryStats() { X.println(">>>"); - X.println(">>> Checkpoint manager memory stats [grid=" + ctx.gridName() + ']'); + X.println(">>> Checkpoint manager memory stats [igniteInstanceName=" + ctx.igniteInstanceName() + ']'); X.println(">>> keyMap: " + (keyMap != null ? keyMap.size() : 0)); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java index 5e91ea9..0c0dbf7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java @@ -1977,7 +1977,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa /** {@inheritDoc} */ @Override public void printMemoryStats() { X.println(">>>"); - X.println(">>> IO manager memory stats [grid=" + ctx.gridName() + ']'); + X.println(">>> IO manager memory stats [igniteInstanceName=" + ctx.igniteInstanceName() + ']'); X.println(">>> lsnrMapSize: " + lsnrMap.size()); X.println(">>> msgSetMapSize: " + msgSetMap.size()); X.println(">>> closedTopicsSize: " + closedTopics.sizex()); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/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 c735f21..d637de4 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 @@ -1260,7 +1260,8 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> { ">>> +----------------+" + U.nl() + ">>> " + PREFIX + "." + U.nl() + ">>> +----------------+" + U.nl() + - ">>> Grid name: " + (ctx.gridName() == null ? "default" : ctx.gridName()) + U.nl() + + ">>> Ignite instance name: " + + (ctx.igniteInstanceName() == null ? "default" : ctx.igniteInstanceName()) + U.nl() + ">>> Number of server nodes: " + srvNodes.size() + U.nl() + ">>> Number of client nodes: " + clientNodes.size() + U.nl() + (discoOrdered ? ">>> Topology version: " + topVer + U.nl() : "") + @@ -2036,7 +2037,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> { @Override public void run() { ctx.markSegmented(); - G.stop(ctx.gridName(), true); + G.stop(ctx.igniteInstanceName(), true); } } ).start(); @@ -2064,7 +2065,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> { * */ private SegmentCheckWorker() { - super(ctx.gridName(), "disco-net-seg-chk-worker", GridDiscoveryManager.this.log); + super(ctx.igniteInstanceName(), "disco-net-seg-chk-worker", GridDiscoveryManager.this.log); assert hasRslvrs; assert segChkFreq > 0; @@ -2149,7 +2150,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> { * */ private DiscoveryWorker() { - super(ctx.gridName(), "disco-event-worker", GridDiscoveryManager.this.log); + super(ctx.igniteInstanceName(), "disco-event-worker", GridDiscoveryManager.this.log); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java index 474bdc1..9194b10 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java @@ -207,7 +207,7 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi> lsnrsCnt += lsnrs0.size(); X.println(">>>"); - X.println(">>> Event storage manager memory stats [grid=" + ctx.gridName() + ']'); + X.println(">>> Event storage manager memory stats [igniteInstanceName=" + ctx.igniteInstanceName() + ']'); X.println(">>> Total listeners: " + lsnrsCnt); X.println(">>> Recordable events size: " + recordableEvts.length); X.println(">>> User recordable events size: " + userRecordableEvts.length); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java index b6efafb..4112238 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java @@ -586,7 +586,7 @@ public class GridAffinityProcessor extends GridProcessorAdapter { /** {@inheritDoc} */ @Override public void printMemoryStats() { X.println(">>>"); - X.println(">>> Affinity processor memory stats [grid=" + ctx.gridName() + ']'); + X.println(">>> Affinity processor memory stats [igniteInstanceName=" + ctx.igniteInstanceName() + ']'); X.println(">>> affMapSize: " + affMap.size()); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java index 08ef251..71be718 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java @@ -4500,7 +4500,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V /** {@inheritDoc} */ @Override public void writeExternal(ObjectOutput out) throws IOException { - U.writeString(out, ctx.gridName()); + U.writeString(out, ctx.igniteInstanceName()); U.writeString(out, ctx.namex()); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java index 3b44b50..5573cea 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java @@ -682,10 +682,10 @@ public class GridCacheContext<K, V> implements Externalizable { } /** - * @return Grid name. + * @return Ignite instance name. */ - public String gridName() { - return ctx.gridName(); + public String igniteInstanceName() { + return ctx.igniteInstanceName(); } /** @@ -2024,7 +2024,8 @@ public class GridCacheContext<K, V> implements Externalizable { */ public void printMemoryStats() { X.println(">>> "); - X.println(">>> Cache memory stats [grid=" + ctx.gridName() + ", cache=" + name() + ']'); + X.println(">>> Cache memory stats [igniteInstanceName=" + ctx.igniteInstanceName() + + ", cache=" + name() + ']'); cache().printMemoryStats(); @@ -2084,7 +2085,7 @@ public class GridCacheContext<K, V> implements Externalizable { /** {@inheritDoc} */ @Override public void writeExternal(ObjectOutput out) throws IOException { - U.writeString(out, gridName()); + U.writeString(out, igniteInstanceName()); U.writeString(out, namex()); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java index 5c0e407..30a7302 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java @@ -746,7 +746,7 @@ public class GridCacheDeploymentManager<K, V> extends GridCacheSharedManagerAdap /** {@inheritDoc} */ @Override public void printMemoryStats() { X.println(">>> "); - X.println(">>> Cache deployment manager memory stats [grid=" + cctx.gridName() + ']'); + X.println(">>> Cache deployment manager memory stats [igniteInstanceName=" + cctx.igniteInstanceName() + ']'); X.println(">>> Undeploys: " + undeploys.size()); X.println(">>> Cached deployments: " + deps.size()); X.println(">>> All participants: " + allParticipants.size()); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java index 1c18738..be5b539 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java @@ -384,7 +384,7 @@ public class GridCacheEventManager extends GridCacheManagerAdapter { /** {@inheritDoc} */ @Override public void printMemoryStats() { X.println(">>> "); - X.println(">>> Cache event manager memory stats [grid=" + cctx.gridName() + ", cache=" + cctx.name() + - ", stats=" + "N/A" + ']'); + X.println(">>> Cache event manager memory stats [igniteInstanceName=" + cctx.igniteInstanceName() + + ", cache=" + cctx.name() + ", stats=" + "N/A" + ']'); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java index 9284143..06c707e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java @@ -1454,14 +1454,15 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter { * Prints out eviction stats. */ public void printStats() { - X.println("Eviction stats [grid=" + cctx.gridName() + ", cache=" + cctx.cache().name() + - ", buffEvictQ=" + bufEvictQ.sizex() + ']'); + X.println("Eviction stats [igniteInstanceName=" + cctx.igniteInstanceName() + + ", cache=" + cctx.cache().name() + ", buffEvictQ=" + bufEvictQ.sizex() + ']'); } /** {@inheritDoc} */ @Override public void printMemoryStats() { X.println(">>> "); - X.println(">>> Eviction manager memory stats [grid=" + cctx.gridName() + ", cache=" + cctx.name() + ']'); + X.println(">>> Eviction manager memory stats [igniteInstanceName=" + cctx.igniteInstanceName() + + ", cache=" + cctx.name() + ']'); X.println(">>> buffEvictQ size: " + bufEvictQ.sizex()); X.println(">>> futsSize: " + futs.size()); X.println(">>> futsCreated: " + idGen.get()); @@ -1481,7 +1482,7 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter { * */ private BackupWorker() { - super(cctx.gridName(), "cache-eviction-backup-worker", GridCacheEvictionManager.this.log); + super(cctx.igniteInstanceName(), "cache-eviction-backup-worker", GridCacheEvictionManager.this.log); assert plcEnabled; } http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java index 1bf9468..830b796 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java @@ -93,7 +93,8 @@ public class GridCacheGateway<K, V> { assert reconnectFut != null; throw new CacheException( - new IgniteClientDisconnectedException(reconnectFut, "Client node disconnected: " + ctx.gridName())); + new IgniteClientDisconnectedException(reconnectFut, "Client node disconnected: " + + ctx.igniteInstanceName())); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java index 50f58cc..1f28201 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java @@ -1316,7 +1316,7 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter { /** {@inheritDoc} */ @Override public void printMemoryStats() { X.println(">>> "); - X.println(">>> Cache IO manager memory stats [grid=" + cctx.gridName() + ']'); + X.println(">>> Cache IO manager memory stats [igniteInstanceName=" + cctx.igniteInstanceName() + ']'); X.println(">>> clsHandlersSize: " + clsHandlers.size()); X.println(">>> orderedHandlersSize: " + orderedHandlers.size()); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java index 0d0e9ee..4ec13fc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java @@ -996,7 +996,7 @@ public class GridCacheMvccManager extends GridCacheSharedManagerAdapter { /** {@inheritDoc} */ @Override public void printMemoryStats() { X.println(">>> "); - X.println(">>> Mvcc manager memory stats [grid=" + cctx.gridName() + ']'); + X.println(">>> Mvcc manager memory stats [igniteInstanceName=" + cctx.igniteInstanceName() + ']'); X.println(">>> rmvLocksSize: " + rmvLocks.sizex()); X.println(">>> lockedSize: " + locked.size()); X.println(">>> futsSize: " + (mvccFuts.size() + futs.size())); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java index 86dd4ea..3e72efb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java @@ -402,7 +402,7 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana } } - new IgniteThread(cctx.gridName(), "exchange-worker", exchWorker).start(); + new IgniteThread(cctx.igniteInstanceName(), "exchange-worker", exchWorker).start(); if (reconnect) { fut.listen(new CI1<IgniteInternalFuture<AffinityTopologyVersion>>() { @@ -479,8 +479,8 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana stopErr = cctx.kernalContext().clientDisconnected() ? new IgniteClientDisconnectedCheckedException(cctx.kernalContext().cluster().clientReconnectFuture(), - "Client node disconnected: " + cctx.gridName()) : - new IgniteInterruptedCheckedException("Node is stopping: " + cctx.gridName()); + "Client node disconnected: " + cctx.igniteInstanceName()) : + new IgniteInterruptedCheckedException("Node is stopping: " + cctx.igniteInstanceName()); // Finish all exchange futures. ExchangeFutureSet exchFuts0 = exchFuts; @@ -1602,7 +1602,7 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana * */ private ExchangeWorker() { - super(cctx.gridName(), "partition-exchanger", GridCachePartitionExchangeManager.this.log); + super(cctx.igniteInstanceName(), "partition-exchanger", GridCachePartitionExchangeManager.this.log); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index 32e9150..f7ac812 100755 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -214,7 +214,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { jCacheProxies = new ConcurrentHashMap<>(); stopSeq = new LinkedList<>(); - marsh = MarshallerUtils.jdkMarshaller(ctx.gridName()); + marsh = MarshallerUtils.jdkMarshaller(ctx.igniteInstanceName()); } /** @@ -3489,7 +3489,8 @@ public class GridCacheProcessor extends GridProcessorAdapter { X.println(">>> "); for (GridCacheAdapter c : caches.values()) { - X.println(">>> Cache memory stats [grid=" + ctx.gridName() + ", cache=" + c.name() + ']'); + X.println(">>> Cache memory stats [igniteInstanceName=" + ctx.igniteInstanceName() + + ", cache=" + c.name() + ']'); c.context().printMemoryStats(); } @@ -3562,7 +3563,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { for (Class<?> itf : o.getClass().getInterfaces()) { if (itf.getName().endsWith("MBean") || itf.getName().endsWith("MXBean")) { try { - U.registerCacheMBean(srvr, ctx.gridName(), cacheName, o.getClass().getName(), o, + U.registerCacheMBean(srvr, ctx.igniteInstanceName(), cacheName, o.getClass().getName(), o, (Class<Object>)itf); } catch (JMException e) { @@ -3595,7 +3596,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { for (Class<?> itf : o.getClass().getInterfaces()) { if (itf.getName().endsWith("MBean") || itf.getName().endsWith("MXBean")) { try { - srvr.unregisterMBean(U.makeCacheMBeanName(ctx.gridName(), cacheName, o.getClass().getName())); + srvr.unregisterMBean(U.makeCacheMBeanName(ctx.igniteInstanceName(), cacheName, o.getClass().getName())); } catch (JMException e) { U.error(log, "Failed to unregister MBean for component: " + o, e); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java index 117a5c3..0f79100 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java @@ -393,10 +393,10 @@ public class GridCacheSharedContext<K, V> { } /** - * @return Grid name. + * @return Ignite instance name. */ - public String gridName() { - return kernalCtx.gridName(); + public String igniteInstanceName() { + return kernalCtx.igniteInstanceName(); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedTtlCleanupManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedTtlCleanupManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedTtlCleanupManager.java index d7d2cad..adcde5d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedTtlCleanupManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedTtlCleanupManager.java @@ -108,7 +108,7 @@ public class GridCacheSharedTtlCleanupManager extends GridCacheSharedManagerAdap * Creates cleanup worker. */ CleanupWorker() { - super(cctx.gridName(), "ttl-cleanup-worker", cctx.logger(GridCacheSharedTtlCleanupManager.class)); + super(cctx.igniteInstanceName(), "ttl-cleanup-worker", cctx.logger(GridCacheSharedTtlCleanupManager.class)); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManager.java index 9e033c4..78610a7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManager.java @@ -91,7 +91,8 @@ public class GridCacheTtlManager extends GridCacheManagerAdapter { /** {@inheritDoc} */ @Override public void printMemoryStats() { X.println(">>>"); - X.println(">>> TTL processor memory stats [grid=" + cctx.gridName() + ", cache=" + cctx.name() + ']'); + X.println(">>> TTL processor memory stats [igniteInstanceName=" + cctx.igniteInstanceName() + + ", cache=" + cctx.name() + ']'); X.println(">>> pendingEntriesSize: " + pendingEntries.size()); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java index 9c4e4ef..2af822a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java @@ -535,7 +535,7 @@ public class GridClientPartitionTopology implements GridDhtPartitionTopology { try { assert node2part != null && node2part.valid() : "Invalid node2part [node2part: " + node2part + ", locNodeId=" + cctx.localNodeId() + - ", gridName=" + cctx.gridName() + ']'; + ", igniteInstanceName=" + cctx.igniteInstanceName() + ']'; GridDhtPartitionFullMap m = node2part; @@ -916,7 +916,7 @@ public class GridClientPartitionTopology implements GridDhtPartitionTopology { try { assert node2part != null && node2part.valid() : "Invalid node2part [node2part: " + node2part + ", locNodeId=" + cctx.localNodeId() + - ", gridName=" + cctx.gridName() + ']'; + ", igniteInstanceName=" + cctx.igniteInstanceName() + ']'; for (GridDhtPartitionMap2 map : node2part.values()) { if (map.hasMovingPartitions()) @@ -932,7 +932,8 @@ public class GridClientPartitionTopology implements GridDhtPartitionTopology { /** {@inheritDoc} */ @Override public void printMemoryStats(int threshold) { - X.println(">>> Cache partition topology stats [grid=" + cctx.gridName() + ", cacheId=" + cacheId + ']'); + X.println(">>> Cache partition topology stats [igniteInstanceName=" + cctx.igniteInstanceName() + + ", cacheId=" + cacheId + ']'); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java index 84ff96b..49de280 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java @@ -838,7 +838,7 @@ class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology { try { assert node2part != null && node2part.valid() : "Invalid node-to-partitions map [topVer1=" + topVer + ", topVer2=" + this.topVer + - ", node=" + cctx.gridName() + + ", node=" + cctx.igniteInstanceName() + ", cache=" + cctx.name() + ", node2part=" + node2part + ']'; @@ -968,7 +968,7 @@ class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology { ", started=" + cctx.started() + ", stopping=" + stopping + ", locNodeId=" + cctx.localNode().id() + - ", locName=" + cctx.gridName() + ']'; + ", locName=" + cctx.igniteInstanceName() + ']'; GridDhtPartitionFullMap m = node2part; @@ -1551,7 +1551,7 @@ class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology { ", started=" + cctx.started() + ", stopping=" + stopping + ", locNodeId=" + cctx.localNode().id() + - ", locName=" + cctx.gridName() + ']'; + ", locName=" + cctx.igniteInstanceName() + ']'; for (GridDhtPartitionMap2 map : node2part.values()) { if (map.hasMovingPartitions()) @@ -1567,7 +1567,8 @@ class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology { /** {@inheritDoc} */ @Override public void printMemoryStats(int threshold) { - X.println(">>> Cache partition topology stats [grid=" + cctx.gridName() + ", cache=" + cctx.name() + ']'); + X.println(">>> Cache partition topology stats [igniteInstanceName=" + cctx.igniteInstanceName() + + ", cache=" + cctx.name() + ']'); lock.readLock().lock(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/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 73154be..e585b56 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 @@ -633,8 +633,8 @@ public class GridDhtPartitionDemander { if (part.state() == MOVING) { boolean reserved = part.reserve(); - assert reserved : "Failed to reserve partition [gridName=" + - cctx.gridName() + ", cacheName=" + cctx.namex() + ", part=" + part + ']'; + assert reserved : "Failed to reserve partition [igniteInstanceName=" + + cctx.igniteInstanceName() + ", cacheName=" + cctx.namex() + ", part=" + part + ']'; part.lock(); @@ -1392,8 +1392,9 @@ public class GridDhtPartitionDemander { if (part.state() == MOVING) { boolean reserved = part.reserve(); - assert reserved : "Failed to reserve partition [gridName=" + - cctx.gridName() + ", cacheName=" + cctx.namex() + ", part=" + part + ']'; + assert reserved : "Failed to reserve partition [igniteInstanceName=" + + cctx.igniteInstanceName() + ", cacheName=" + cctx.namex() + + ", part=" + part + ']'; part.lock(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java index 5ce3353..de9cabe 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java @@ -2370,7 +2370,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte */ @Override public void printMemoryStats() { X.println(">>>"); - X.println(">>> Query manager memory stats [grid=" + cctx.gridName() + ", cache=" + cctx.name() + ']'); + X.println(">>> Query manager memory stats [igniteInstanceName=" + cctx.igniteInstanceName() + ", cache=" + cctx.name() + ']'); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java index a830186..d448446 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java @@ -172,7 +172,7 @@ public abstract class GridCacheStoreManagerAdapter extends GridCacheManagerAdapt return cfgStore; GridCacheWriteBehindStore store = new GridCacheWriteBehindStore(this, - ctx.gridName(), + ctx.igniteInstanceName(), cfg.getName(), ctx.log(GridCacheWriteBehindStore.class), cfgStore); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStore.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStore.java index 0f70da5..91008ce 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStore.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStore.java @@ -97,8 +97,8 @@ public class GridCacheWriteBehindStore<K, V> implements CacheStore<K, V>, Lifecy /** Maximum batch size for put and remove operations */ private int batchSize = CacheConfiguration.DFLT_WRITE_BEHIND_BATCH_SIZE; - /** Grid name. */ - private String gridName; + /** Ignite instance name. */ + private String igniteInstanceName; /** Cache name. */ private String cacheName; @@ -140,19 +140,19 @@ public class GridCacheWriteBehindStore<K, V> implements CacheStore<K, V>, Lifecy * Creates a write-behind cache store for the given store. * * @param storeMgr Store manager. - * @param gridName Grid name. + * @param igniteInstanceName Ignite instance name. * @param cacheName Cache name. * @param log Grid logger. * @param store {@code GridCacheStore} that need to be wrapped. */ public GridCacheWriteBehindStore( CacheStoreManager storeMgr, - String gridName, + String igniteInstanceName, String cacheName, IgniteLogger log, CacheStore<K, V> store) { this.storeMgr = storeMgr; - this.gridName = gridName; + this.igniteInstanceName = igniteInstanceName; this.cacheName = cacheName; this.log = log; this.store = store; @@ -297,7 +297,7 @@ public class GridCacheWriteBehindStore<K, V> implements CacheStore<K, V>, Lifecy writeCache = new ConcurrentLinkedHashMap<>(initCap, 0.75f, concurLvl); for (int i = 0; i < flushThreads.length; i++) { - flushThreads[i] = new Flusher(gridName, "flusher-" + i, log); + flushThreads[i] = new Flusher(igniteInstanceName, "flusher-" + i, log); new IgniteThread(flushThreads[i]).start(); } @@ -742,8 +742,8 @@ public class GridCacheWriteBehindStore<K, V> implements CacheStore<K, V>, Lifecy */ private class Flusher extends GridWorker { /** {@inheritDoc */ - protected Flusher(String gridName, String name, IgniteLogger log) { - super(gridName, name, log); + protected Flusher(String igniteInstanceName, String name, IgniteLogger log) { + super(igniteInstanceName, name, log); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java index f4a5629..df3bad2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java @@ -408,7 +408,7 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter { */ @Override public void printMemoryStats() { X.println(">>> "); - X.println(">>> Transaction manager memory stats [grid=" + cctx.gridName() + ']'); + X.println(">>> Transaction manager memory stats [igniteInstanceName=" + cctx.igniteInstanceName() + ']'); X.println(">>> threadMapSize: " + threadMap.size()); X.println(">>> idMap [size=" + idMap.size() + ']'); X.println(">>> completedVersSortedSize: " + completedVersSorted.size()); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockServer.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockServer.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockServer.java index 8daef31..51d396a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockServer.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockServer.java @@ -186,7 +186,7 @@ public class GridClockServer { * Creates read worker. */ protected ReadWorker() { - super(ctx.gridName(), "grid-time-server-reader", GridClockServer.this.log); + super(ctx.igniteInstanceName(), "grid-time-server-reader", GridClockServer.this.log); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java index d644261..c10b6d1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java @@ -356,7 +356,7 @@ public class GridClockSyncProcessor extends GridProcessorAdapter { * @param evt Discovery event on which this node became a coordinator. */ protected TimeCoordinator(DiscoveryEvent evt) { - super(ctx.gridName(), "grid-time-coordinator", GridClockSyncProcessor.this.log); + super(ctx.igniteInstanceName(), "grid-time-coordinator", GridClockSyncProcessor.this.log); lastSnapshot = new GridDiscoveryTopologySnapshot(evt.topologyVersion(), evt.topologyNodes()); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java index 61291c0..55f170f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java @@ -181,7 +181,7 @@ public class GridClosureProcessor extends GridProcessorAdapter { try { if (stopping) { return ComputeTaskInternalFuture.finishedFuture(ctx, T1.class, - new IgniteCheckedException("Closure processor cannot be used on stopped grid: " + ctx.gridName())); + new IgniteCheckedException("Closure processor cannot be used on stopped grid: " + ctx.igniteInstanceName())); } if (F.isEmpty(nodes)) @@ -776,7 +776,7 @@ public class GridClosureProcessor extends GridProcessorAdapter { final GridWorkerFuture fut = new GridWorkerFuture(); - GridWorker w = new GridWorker(ctx.gridName(), "closure-proc-worker", log) { + GridWorker w = new GridWorker(ctx.igniteInstanceName(), "closure-proc-worker", log) { @Override protected void body() { try { if (ldr != null) @@ -918,7 +918,7 @@ public class GridClosureProcessor extends GridProcessorAdapter { final GridWorkerFuture<R> fut = new GridWorkerFuture<>(); - GridWorker w = new GridWorker(ctx.gridName(), "closure-proc-worker", log) { + GridWorker w = new GridWorker(ctx.igniteInstanceName(), "closure-proc-worker", log) { @Override protected void body() { try { if (ldr != null) http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterProcessor.java index d1c8b2d..cfe94b2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterProcessor.java @@ -162,7 +162,7 @@ public class ClusterProcessor extends GridProcessorAdapter { @Override public void onKernalStart() throws IgniteCheckedException { if (notifyEnabled.get()) { try { - verChecker = new GridUpdateNotifier(ctx.gridName(), + verChecker = new GridUpdateNotifier(ctx.igniteInstanceName(), VER_STR, ctx.gateway(), ctx.plugins().allProviders(), http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridUpdateNotifier.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridUpdateNotifier.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridUpdateNotifier.java index 5b2edcd..b7c8241 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridUpdateNotifier.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridUpdateNotifier.java @@ -76,8 +76,8 @@ class GridUpdateNotifier { /** Download url for latest version. */ private volatile String downloadUrl; - /** Grid name. */ - private final String gridName; + /** Ignite instance name. */ + private final String igniteInstanceName; /** Whether or not to report only new version. */ private volatile boolean reportOnlyNew; @@ -106,18 +106,18 @@ class GridUpdateNotifier { /** * Creates new notifier with default values. * - * @param gridName gridName + * @param igniteInstanceName igniteInstanceName * @param ver Compound Ignite version. * @param gw Kernal gateway. * @param pluginProviders Kernal gateway. * @param reportOnlyNew Whether or not to report only new version. * @throws IgniteCheckedException If failed. */ - GridUpdateNotifier(String gridName, String ver, GridKernalGateway gw, Collection<PluginProvider> pluginProviders, + GridUpdateNotifier(String igniteInstanceName, String ver, GridKernalGateway gw, Collection<PluginProvider> pluginProviders, boolean reportOnlyNew) throws IgniteCheckedException { try { this.ver = ver; - this.gridName = gridName == null ? "null" : gridName; + this.igniteInstanceName = igniteInstanceName == null ? "null" : igniteInstanceName; this.gw = gw; SB pluginsBuilder = new SB(); @@ -295,7 +295,7 @@ class GridUpdateNotifier { * @param log Logger. */ UpdateChecker(IgniteLogger log) { - super(gridName, "grid-version-checker", log); + super(igniteInstanceName, "grid-version-checker", log); this.log = log.getLogger(getClass()); } @@ -306,7 +306,7 @@ class GridUpdateNotifier { String stackTrace = gw != null ? gw.userStackTrace() : null; String postParams = - "gridName=" + encode(gridName, CHARSET) + + "igniteInstanceName=" + encode(igniteInstanceName, CHARSET) + (!F.isEmpty(UPD_STATUS_PARAMS) ? "&" + UPD_STATUS_PARAMS : "") + (topSize > 0 ? "&topSize=" + topSize : "") + (!F.isEmpty(stackTrace) ? "&stackTrace=" + encode(stackTrace, CHARSET) : "") + http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java index 55f65c3..ffdf3ba 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java @@ -1199,7 +1199,7 @@ public class GridContinuousProcessor extends GridProcessorAdapter { log.debug("Register handler: [nodeId=" + nodeId + ", routineId=" + routineId + ", info=" + info + ']'); if (interval > 0) { - IgniteThread checker = new IgniteThread(new GridWorker(ctx.gridName(), "continuous-buffer-checker", log) { + IgniteThread checker = new IgniteThread(new GridWorker(ctx.igniteInstanceName(), "continuous-buffer-checker", log) { @SuppressWarnings("ConstantConditions") @Override protected void body() { long interval0 = interval; http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java index 74d5f4a..70b3103 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java @@ -101,7 +101,7 @@ public class DataStreamProcessor<K, V> extends GridProcessorAdapter { marshErrBytes = U.marshal(marsh, new IgniteCheckedException("Failed to marshal response error, " + "see node log for details.")); - flusher = new IgniteThread(new GridWorker(ctx.gridName(), "grid-data-loader-flusher", log) { + flusher = new IgniteThread(new GridWorker(ctx.igniteInstanceName(), "grid-data-loader-flusher", log) { @Override protected void body() throws InterruptedException { while (!isCancelled()) { DataStreamerImpl<K, V> ldr = flushQ.take(); @@ -468,7 +468,7 @@ public class DataStreamProcessor<K, V> extends GridProcessorAdapter { /** {@inheritDoc} */ @Override public void printMemoryStats() { X.println(">>>"); - X.println(">>> Data streamer processor memory stats [grid=" + ctx.gridName() + ']'); + X.println(">>> Data streamer processor memory stats [igniteInstanceName=" + ctx.igniteInstanceName() + ']'); X.println(">>> ldrsSize: " + ldrs.size()); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java index 698efd9..96644a3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java @@ -1750,7 +1750,7 @@ public final class DataStructuresProcessor extends GridProcessorAdapter { /** {@inheritDoc} */ @Override public void printMemoryStats() { X.println(">>> "); - X.println(">>> Data structure processor memory stats [grid=" + ctx.gridName() + + X.println(">>> Data structure processor memory stats [igniteInstanceName=" + ctx.igniteInstanceName() + ", cache=" + (dsCacheCtx != null ? dsCacheCtx.name() : null) + ']'); X.println(">>> dsMapSize: " + dsMap.size()); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java index dc845ee..74fc175 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java @@ -181,7 +181,7 @@ public class IgfsDataManager extends IgfsManager { } }, EVT_NODE_LEFT, EVT_NODE_FAILED); - delWorker = new AsyncDeleteWorker(igfsCtx.kernalContext().gridName(), + delWorker = new AsyncDeleteWorker(igfsCtx.kernalContext().igniteInstanceName(), "igfs-" + igfsName + "-delete-worker", log); dataCacheName = igfsCtx.configuration().getDataCacheConfiguration().getName(); @@ -1492,12 +1492,12 @@ public class IgfsDataManager extends IgfsManager { new LinkedBlockingQueue<>(); /** - * @param gridName Grid name. + * @param igniteInstanceName Ignite instance name. * @param name Worker name. * @param log Log. */ - protected AsyncDeleteWorker(@Nullable String gridName, String name, IgniteLogger log) { - super(gridName, name, log); + protected AsyncDeleteWorker(@Nullable String igniteInstanceName, String name, IgniteLogger log) { + super(igniteInstanceName, name, log); stopInfo = IgfsUtils.createDirectory(IgniteUuid.randomUuid()); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerManager.java index 2e82f33..7797f89 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerManager.java @@ -355,7 +355,7 @@ public class IgfsFragmentizerManager extends IgfsManager { * Constructor. */ protected FragmentizerCoordinator() { - super(igfsCtx.kernalContext().gridName(), "fragmentizer-coordinator", + super(igfsCtx.kernalContext().igniteInstanceName(), "fragmentizer-coordinator", igfsCtx.kernalContext().log(IgfsFragmentizerManager.class)); igfsCtx.kernalContext().event().addLocalEventListener(this, EVT_NODE_LEFT, EVT_NODE_FAILED); @@ -668,7 +668,7 @@ public class IgfsFragmentizerManager extends IgfsManager { * Constructor. */ protected FragmentizerWorker() { - super(igfsCtx.kernalContext().gridName(), "fragmentizer-worker", + super(igfsCtx.kernalContext().igniteInstanceName(), "fragmentizer-worker", igfsCtx.kernalContext().log(IgfsFragmentizerManager.class)); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsIpcHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsIpcHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsIpcHandler.java index aed0961..efa39fa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsIpcHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsIpcHandler.java @@ -101,7 +101,7 @@ class IgfsIpcHandler implements IgfsServerHandler { String prefix = "igfs-" + igfsCtx.igfs().name() + (mgmt ? "mgmt-" : "") + "-ipc"; - pool = new IgniteThreadPoolExecutor(prefix, igfsCtx.kernalContext().gridName(), threadCnt, threadCnt, + pool = new IgniteThreadPoolExecutor(prefix, igfsCtx.kernalContext().igniteInstanceName(), threadCnt, threadCnt, Long.MAX_VALUE, new LinkedBlockingQueue<Runnable>()); log = ctx.log(IgfsIpcHandler.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNoopProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNoopProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNoopProcessor.java index 08eef8a..68bb1bc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNoopProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNoopProcessor.java @@ -45,7 +45,7 @@ public class IgfsNoopProcessor extends IgfsProcessorAdapter { /** {@inheritDoc} */ @Override public void printMemoryStats() { X.println(">>>"); - X.println(">>> IGFS processor memory stats [grid=" + ctx.gridName() + ']'); + X.println(">>> IGFS processor memory stats [igniteInstanceName=" + ctx.igniteInstanceName() + ']'); X.println(">>> igfsCacheSize: " + 0); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java index 405016c..3178e92 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java @@ -239,7 +239,7 @@ public class IgfsProcessor extends IgfsProcessorAdapter { /** {@inheritDoc} */ @Override public void printMemoryStats() { X.println(">>>"); - X.println(">>> IGFS processor memory stats [grid=" + ctx.gridName() + ']'); + X.println(">>> IGFS processor memory stats [igniteInstanceName=" + ctx.igniteInstanceName() + ']'); X.println(">>> igfsCacheSize: " + igfsCache.size()); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServer.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServer.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServer.java index b2c3c83..d9725dc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServer.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServer.java @@ -270,7 +270,7 @@ public class IgfsServer { * @throws IgniteCheckedException If endpoint output stream cannot be obtained. */ protected ClientWorker(IpcEndpoint endpoint, int idx) throws IgniteCheckedException { - super(igfsCtx.kernalContext().gridName(), "igfs-client-worker-" + idx, IgfsServer.this.log); + super(igfsCtx.kernalContext().igniteInstanceName(), "igfs-client-worker-" + idx, IgfsServer.this.log); this.endpoint = endpoint; @@ -438,7 +438,7 @@ public class IgfsServer { * Creates accept worker. */ protected AcceptWorker() { - super(igfsCtx.kernalContext().gridName(), "igfs-accept-worker", IgfsServer.this.log); + super(igfsCtx.kernalContext().igniteInstanceName(), "igfs-accept-worker", IgfsServer.this.log); } /** {@inheritDoc} */ @@ -448,7 +448,7 @@ public class IgfsServer { IpcEndpoint client = srvEndpoint.accept(); if (log.isDebugEnabled()) - log.debug("IGFS client connected [igfsName=" + igfsCtx.kernalContext().gridName() + + log.debug("IGFS client connected [igfsName=" + igfsCtx.kernalContext().igniteInstanceName() + ", client=" + client + ']'); ClientWorker worker = new ClientWorker(client, acceptCnt++); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServerManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServerManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServerManager.java index c12b367..94b72de 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServerManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServerManager.java @@ -163,7 +163,7 @@ public class IgfsServerManager extends IgfsManager { * Constructor. */ private BindWorker() { - super(igfsCtx.kernalContext().gridName(), "bind-worker", + super(igfsCtx.kernalContext().igniteInstanceName(), "bind-worker", igfsCtx.kernalContext().log(IgfsServerManager.class)); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsThreadFactory.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsThreadFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsThreadFactory.java index 32cab0f..fd4d807 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsThreadFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsThreadFactory.java @@ -31,11 +31,11 @@ public class IgfsThreadFactory extends IgniteThreadFactory { /** * Constructor. * - * @param gridName Grid name. + * @param igniteInstanceName Ignite instance name. * @param threadName Thread name. */ - public IgfsThreadFactory(String gridName, String threadName) { - super(gridName, threadName); + public IgfsThreadFactory(String igniteInstanceName, String threadName) { + super(igniteInstanceName, threadName); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java index 9ed6ff3..16ab30e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java @@ -1481,7 +1481,7 @@ public class GridJobProcessor extends GridProcessorAdapter { /** {@inheritDoc} */ @Override public void printMemoryStats() { X.println(">>>"); - X.println(">>> Job processor memory stats [grid=" + ctx.gridName() + ']'); + X.println(">>> Job processor memory stats [igniteInstanceName=" + ctx.igniteInstanceName() + ']'); X.println(">>> activeJobsSize: " + activeJobs.size()); X.println(">>> passiveJobsSize: " + (jobAlwaysActivate ? "n/a" : passiveJobs.size())); X.println(">>> cancelledJobsSize: " + cancelledJobs.size()); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobWorker.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobWorker.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobWorker.java index 9b7615f..5c9b9e2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobWorker.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobWorker.java @@ -197,7 +197,7 @@ public class GridJobWorker extends GridWorker implements GridTimeoutObject { GridJobHoldListener holdLsnr, GridReservable partsReservation, AffinityTopologyVersion reqTopVer) { - super(ctx.gridName(), "grid-job-worker", ctx.log(GridJobWorker.class)); + super(ctx.igniteInstanceName(), "grid-job-worker", ctx.log(GridJobWorker.class)); assert ctx != null; assert ses != null; http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/jobmetrics/GridJobMetricsProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/jobmetrics/GridJobMetricsProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/jobmetrics/GridJobMetricsProcessor.java index 72ffe23..2e400bb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/jobmetrics/GridJobMetricsProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/jobmetrics/GridJobMetricsProcessor.java @@ -212,7 +212,8 @@ public class GridJobMetricsProcessor extends GridProcessorAdapter { /** {@inheritDoc} */ @Override public void printMemoryStats() { X.println(">>>"); - X.println(">>> Job metrics processor processor memory stats [grid=" + ctx.gridName() + ']'); + X.println(">>> Job metrics processor processor memory stats [igniteInstanceName=" + + ctx.igniteInstanceName() + ']'); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcProcessor.java index 7cba9bb..c3ded76 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcProcessor.java @@ -104,7 +104,7 @@ public class OdbcProcessor extends GridProcessorAdapter { odbcExecSvc = new IgniteThreadPoolExecutor( "odbc", - cfg.getGridName(), + cfg.getIgniteInstanceName(), odbcCfg.getThreadPoolSize(), odbcCfg.getThreadPoolSize(), 0, @@ -124,7 +124,7 @@ public class OdbcProcessor extends GridProcessorAdapter { for (int port = hostPort.portFrom(); port <= hostPort.portTo(); port++) { try { GridNioFilter[] filters = new GridNioFilter[] { - new GridNioAsyncNotifyFilter(ctx.gridName(), odbcExecSvc, log) { + new GridNioAsyncNotifyFilter(ctx.igniteInstanceName(), odbcExecSvc, log) { @Override public void onSessionOpened(GridNioSession ses) throws IgniteCheckedException { proceedSessionOpened(ses); } @@ -138,7 +138,7 @@ public class OdbcProcessor extends GridProcessorAdapter { .listener(new OdbcNioListener(ctx, busyLock, odbcCfg.getMaxOpenCursors())) .logger(log) .selectorCount(DFLT_SELECTOR_CNT) - .gridName(ctx.gridName()) + .igniteInstanceName(ctx.igniteInstanceName()) .serverName("odbc") .tcpNoDelay(DFLT_TCP_NODELAY) .directBuffer(DFLT_TCP_DIRECT_BUF) http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformIgnition.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformIgnition.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformIgnition.java index d754b7c..422e16e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformIgnition.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformIgnition.java @@ -45,14 +45,14 @@ public class PlatformIgnition { * Start Ignite node in platform mode. * * @param springCfgPath Spring configuration path. - * @param gridName Grid name. + * @param igniteInstanceName Ignite instance name. * @param factoryId Factory ID. * @param envPtr Environment pointer. * @param dataPtr Optional pointer to additional data required for startup. * @return Ignite instance. */ - public static synchronized PlatformProcessor start(@Nullable String springCfgPath, @Nullable String gridName, - int factoryId, long envPtr, long dataPtr) { + public static synchronized PlatformProcessor start(@Nullable String springCfgPath, + @Nullable String igniteInstanceName, int factoryId, long envPtr, long dataPtr) { if (envPtr <= 0) throw new IgniteException("Environment pointer must be positive."); @@ -68,14 +68,14 @@ public class PlatformIgnition { IgniteBiTuple<IgniteConfiguration, GridSpringResourceContext> cfg = configuration(springCfgPath); - if (gridName != null) - cfg.get1().setGridName(gridName); + if (igniteInstanceName != null) + cfg.get1().setIgniteInstanceName(igniteInstanceName); else - gridName = cfg.get1().getGridName(); + igniteInstanceName = cfg.get1().getIgniteInstanceName(); PlatformProcessor proc = bootstrap.start(cfg.get1(), cfg.get2(), envPtr, dataPtr); - PlatformProcessor old = instances.put(gridName, proc); + PlatformProcessor old = instances.put(igniteInstanceName, proc); assert old == null; @@ -89,21 +89,21 @@ public class PlatformIgnition { /** * Get instance by environment pointer. * - * @param gridName Grid name. + * @param igniteInstanceName Ignite instance name. * @return Instance or {@code null} if it doesn't exist (never started or stopped). */ - @Nullable public static synchronized PlatformProcessor instance(@Nullable String gridName) { - return instances.get(gridName); + @Nullable public static synchronized PlatformProcessor instance(@Nullable String igniteInstanceName) { + return instances.get(igniteInstanceName); } /** * Get environment pointer of the given instance. * - * @param gridName Grid name. + * @param igniteInstanceName Ignite instance name. * @return Environment pointer or {@code 0} in case grid with such name doesn't exist. */ - public static synchronized long environmentPointer(@Nullable String gridName) { - PlatformProcessor proc = instance(gridName); + public static synchronized long environmentPointer(@Nullable String igniteInstanceName) { + PlatformProcessor proc = instance(igniteInstanceName); return proc != null ? proc.environmentPointer() : 0; } @@ -111,13 +111,13 @@ public class PlatformIgnition { /** * Stop single instance. * - * @param gridName Grid name, + * @param igniteInstanceName Ignite instance name, * @param cancel Cancel flag. * @return {@code True} if instance was found and stopped. */ - public static synchronized boolean stop(@Nullable String gridName, boolean cancel) { - if (Ignition.stop(gridName, cancel)) { - PlatformProcessor old = instances.remove(gridName); + public static synchronized boolean stop(@Nullable String igniteInstanceName, boolean cancel) { + if (Ignition.stop(igniteInstanceName, cancel)) { + PlatformProcessor old = instances.remove(igniteInstanceName); assert old != null; http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java index a3d01c3..1da3112 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java @@ -153,7 +153,7 @@ public class PlatformProcessorImpl extends GridProcessorAdapter implements Platf BinaryRawWriterEx writer = platformCtx.writer(out); - writer.writeString(ctx.gridName()); + writer.writeString(ctx.igniteInstanceName()); out.synchronize(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformAbstractJob.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformAbstractJob.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformAbstractJob.java index 56875c4..771866e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformAbstractJob.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformAbstractJob.java @@ -37,7 +37,7 @@ public abstract class PlatformAbstractJob implements PlatformJob, Externalizable /** Marker object denoting the job execution result is stored in native platform. */ static final Object LOC_JOB_RES = new Object(); - /** Grid name. */ + /** Ignite instance. */ @IgniteInstanceResource protected transient Ignite ignite; http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/port/GridPortProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/port/GridPortProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/port/GridPortProcessor.java index e573649..5d75a4a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/port/GridPortProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/port/GridPortProcessor.java @@ -193,7 +193,7 @@ public class GridPortProcessor extends GridProcessorAdapter { } X.println(">>>"); - X.println(">>> Task session processor memory stats [grid=" + ctx.gridName() + ']'); + X.println(">>> Task session processor memory stats [igniteInstanceName=" + ctx.igniteInstanceName() + ']'); X.println(">>> recsSize: " + recsSize); X.println(">>> lsnrsSize: " + lsnrsSize); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceProcessor.java index c31587a..a434e05 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceProcessor.java @@ -570,7 +570,7 @@ public class GridResourceProcessor extends GridProcessorAdapter { /** {@inheritDoc} */ @Override public void printMemoryStats() { X.println(">>>"); - X.println(">>> Resource processor memory stats [grid=" + ctx.gridName() + ']'); + X.println(">>> Resource processor memory stats [igniteInstanceName=" + ctx.igniteInstanceName() + ']'); ioc.printMemoryStats(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java index 3f04785..7ed918a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java @@ -147,7 +147,7 @@ public class GridRestProcessor extends GridProcessorAdapter { workersCnt.increment(); - GridWorker w = new GridWorker(ctx.gridName(), "rest-proc-worker", log) { + GridWorker w = new GridWorker(ctx.igniteInstanceName(), "rest-proc-worker", log) { @Override protected void body() { try { IgniteInternalFuture<GridRestResponse> res = handleRequest(req); @@ -414,8 +414,8 @@ public class GridRestProcessor extends GridProcessorAdapter { sesTtl = sesExpTime0; - sesTimeoutCheckerThread = new IgniteThread(ctx.gridName(), "session-timeout-worker", - new GridWorker(ctx.gridName(), "session-timeout-worker", log) { + sesTimeoutCheckerThread = new IgniteThread(ctx.igniteInstanceName(), "session-timeout-worker", + new GridWorker(ctx.igniteInstanceName(), "session-timeout-worker", log) { @Override protected void body() throws InterruptedException { while (!isCancelled()) { Thread.sleep(SES_TIMEOUT_CHECK_DELAY); @@ -887,7 +887,7 @@ public class GridRestProcessor extends GridProcessorAdapter { /** {@inheritDoc} */ @Override public void printMemoryStats() { X.println(">>>"); - X.println(">>> REST processor memory stats [grid=" + ctx.gridName() + ']'); + X.println(">>> REST processor memory stats [igniteInstanceName=" + ctx.igniteInstanceName() + ']'); X.println(">>> protosSize: " + protos.size()); X.println(">>> handlersSize: " + handlers.size()); }
