You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/03/13 11:53:04 UTC
[23/28] ignite git commit: ignite-3207 Rename
IgniteConfiguration.gridName -> igniteInstanceName.
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/version/GridVersionCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/version/GridVersionCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/version/GridVersionCommandHandler.java
index 0e1e164..087200e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/version/GridVersionCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/version/GridVersionCommandHandler.java
@@ -61,7 +61,7 @@ public class GridVersionCommandHandler extends GridRestCommandHandlerAdapter {
return new GridFinishedFuture<>(new GridRestResponse(VER_STR));
case NAME:
- return new GridFinishedFuture<>(new GridRestResponse(ctx.gridName()));
+ return new GridFinishedFuture<>(new GridRestResponse(ctx.igniteInstanceName()));
}
return new GridFinishedFuture<>();
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
index 2a002a3..df0e569 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
@@ -256,7 +256,7 @@ public class GridTcpRestProtocol extends GridRestProtocolAdapter {
.listener(lsnr)
.logger(log)
.selectorCount(cfg.getSelectorCount())
- .gridName(ctx.gridName())
+ .igniteInstanceName(ctx.igniteInstanceName())
.serverName("tcp-rest")
.tcpNoDelay(cfg.isNoDelay())
.directBuffer(cfg.isDirectBuffer())
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
index 4be7f10..41dbdd0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
@@ -160,7 +160,7 @@ public class GridServiceProcessor extends GridProcessorAdapter {
private final GridSpinBusyLock busyLock = new GridSpinBusyLock();
/** Thread factory. */
- private ThreadFactory threadFactory = new IgniteThreadFactory(ctx.gridName());
+ private ThreadFactory threadFactory = new IgniteThreadFactory(ctx.igniteInstanceName());
/** Thread local for service name. */
private ThreadLocal<String> svcName = new ThreadLocal<>();
@@ -202,7 +202,7 @@ public class GridServiceProcessor extends GridProcessorAdapter {
public GridServiceProcessor(GridKernalContext ctx) {
super(ctx);
- depExe = Executors.newSingleThreadExecutor(new IgniteThreadFactory(ctx.gridName(), "srvc-deploy"));
+ depExe = Executors.newSingleThreadExecutor(new IgniteThreadFactory(ctx.igniteInstanceName(), "srvc-deploy"));
String servicesCompatibilityMode = getString(IGNITE_SERVICES_COMPATIBILITY_MODE);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/session/GridTaskSessionProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/session/GridTaskSessionProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/session/GridTaskSessionProcessor.java
index d660948..982530b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/session/GridTaskSessionProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/session/GridTaskSessionProcessor.java
@@ -177,7 +177,7 @@ public class GridTaskSessionProcessor extends GridProcessorAdapter {
/** {@inheritDoc} */
@Override public void printMemoryStats() {
X.println(">>>");
- X.println(">>> Task session processor memory stats [grid=" + ctx.gridName() + ']');
+ X.println(">>> Task session processor memory stats [igniteInstanceName=" + ctx.igniteInstanceName() + ']');
X.println(">>> sesMapSize: " + sesMap.size());
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
index ec5d4c2..9a98aeb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
@@ -1097,7 +1097,7 @@ public class GridTaskProcessor extends GridProcessorAdapter {
/** {@inheritDoc} */
@Override public void printMemoryStats() {
X.println(">>>");
- X.println(">>> Task processor memory stats [grid=" + ctx.gridName() + ']');
+ X.println(">>> Task processor memory stats [igniteInstanceName=" + ctx.igniteInstanceName() + ']');
X.println(">>> tasksSize: " + tasks.size());
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java
index 02ef0fc..b8a9e43 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java
@@ -294,7 +294,7 @@ class GridTaskWorker<T, R> extends GridWorker implements GridTimeoutObject {
GridTaskEventListener evtLsnr,
@Nullable Map<GridTaskThreadContextKey, Object> thCtx,
UUID subjId) {
- super(ctx.config().getGridName(), "grid-task-worker", ctx.log(GridTaskWorker.class));
+ super(ctx.config().getIgniteInstanceName(), "grid-task-worker", ctx.log(GridTaskWorker.class));
assert ses != null;
assert fut != null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/processors/timeout/GridTimeoutProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/timeout/GridTimeoutProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/timeout/GridTimeoutProcessor.java
index 0bbf9c3..9deca9a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/timeout/GridTimeoutProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/timeout/GridTimeoutProcessor.java
@@ -62,7 +62,7 @@ public class GridTimeoutProcessor extends GridProcessorAdapter {
public GridTimeoutProcessor(GridKernalContext ctx) {
super(ctx);
- timeoutWorker = new IgniteThread(ctx.config().getGridName(), "grid-timeout-worker",
+ timeoutWorker = new IgniteThread(ctx.config().getIgniteInstanceName(), "grid-timeout-worker",
new TimeoutWorker());
}
@@ -138,7 +138,7 @@ public class GridTimeoutProcessor extends GridProcessorAdapter {
*
*/
TimeoutWorker() {
- super(ctx.config().getGridName(), "grid-timeout-worker", GridTimeoutProcessor.this.log);
+ super(ctx.config().getIgniteInstanceName(), "grid-timeout-worker", GridTimeoutProcessor.this.log);
}
/** {@inheritDoc} */
@@ -196,7 +196,7 @@ public class GridTimeoutProcessor extends GridProcessorAdapter {
/** {@inheritDoc} */
@Override public void printMemoryStats() {
X.println(">>>");
- X.println(">>> Timeout processor memory stats [grid=" + ctx.gridName() + ']');
+ X.println(">>> Timeout processor memory stats [igniteInstanceName=" + ctx.igniteInstanceName() + ']');
X.println(">>> timeoutObjsSize: " + timeoutObjs.size());
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/suggestions/GridPerformanceSuggestions.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/suggestions/GridPerformanceSuggestions.java b/modules/core/src/main/java/org/apache/ignite/internal/suggestions/GridPerformanceSuggestions.java
index 291840c..e814d51 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/suggestions/GridPerformanceSuggestions.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/suggestions/GridPerformanceSuggestions.java
@@ -76,15 +76,15 @@ public class GridPerformanceSuggestions {
/**
* @param log Log.
- * @param gridName Grid name.
+ * @param igniteInstanceName Ignite instance name.
*/
- public synchronized void logSuggestions(IgniteLogger log, @Nullable String gridName) {
+ public synchronized void logSuggestions(IgniteLogger log, @Nullable String igniteInstanceName) {
if (disabled)
return;
if (!F.isEmpty(perfs) && !suppressed.containsAll(perfs)) {
U.quietAndInfo(log, "Performance suggestions for grid " +
- (gridName == null ? "" : '\'' + gridName + '\'') + " (fix if possible)");
+ (igniteInstanceName == null ? "" : '\'' + igniteInstanceName + '\'') + " (fix if possible)");
U.quietAndInfo(log, "To disable, set -D" + IGNITE_PERFORMANCE_SUGGESTIONS_DISABLED + "=true");
for (String s : perfs)
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index 260847d..4620f12 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -4359,13 +4359,13 @@ public abstract class IgniteUtils {
* Constructs JMX object name with given properties.
* Map with ordered {@code groups} used for proper object name construction.
*
- * @param gridName Grid name.
+ * @param igniteInstanceName Ignite instance name.
* @param grp Name of the group.
* @param name Name of mbean.
* @return JMX object name.
* @throws MalformedObjectNameException Thrown in case of any errors.
*/
- public static ObjectName makeMBeanName(@Nullable String gridName, @Nullable String grp, String name)
+ public static ObjectName makeMBeanName(@Nullable String igniteInstanceName, @Nullable String grp, String name)
throws MalformedObjectNameException {
SB sb = new SB(JMX_DOMAIN + ':');
@@ -4373,8 +4373,8 @@ public abstract class IgniteUtils {
appendJvmId(sb);
- if (gridName != null && !gridName.isEmpty())
- sb.a("grid=").a(gridName).a(',');
+ if (igniteInstanceName != null && !igniteInstanceName.isEmpty())
+ sb.a("igniteInstanceName=").a(igniteInstanceName).a(',');
if (grp != null)
sb.a("group=").a(grp).a(',');
@@ -4420,22 +4420,23 @@ public abstract class IgniteUtils {
* Constructs JMX object name with given properties.
* Map with ordered {@code groups} used for proper object name construction.
*
- * @param gridName Grid name.
+ * @param igniteInstanceName Ignite instance name.
* @param cacheName Name of the cache.
* @param name Name of mbean.
* @return JMX object name.
* @throws MalformedObjectNameException Thrown in case of any errors.
*/
- public static ObjectName makeCacheMBeanName(@Nullable String gridName, @Nullable String cacheName, String name)
- throws MalformedObjectNameException {
+ public static ObjectName makeCacheMBeanName(
+ @Nullable String igniteInstanceName, @Nullable String cacheName, String name
+ ) throws MalformedObjectNameException {
SB sb = new SB(JMX_DOMAIN + ':');
appendClassLoaderHash(sb);
appendJvmId(sb);
- if (gridName != null && !gridName.isEmpty())
- sb.a("grid=").a(gridName).a(',');
+ if (igniteInstanceName != null && !igniteInstanceName.isEmpty())
+ sb.a("igniteInstanceName=").a(igniteInstanceName).a(',');
cacheName = maskName(cacheName);
@@ -4454,7 +4455,7 @@ public abstract class IgniteUtils {
*
* @param <T> Type of mbean.
* @param mbeanSrv MBean server.
- * @param gridName Grid name.
+ * @param igniteInstanceName Ignite instance name.
* @param grp Name of the group.
* @param name Name of mbean.
* @param impl MBean implementation.
@@ -4462,8 +4463,8 @@ public abstract class IgniteUtils {
* @return JMX object name.
* @throws JMException If MBean creation failed.
*/
- public static <T> ObjectName registerMBean(MBeanServer mbeanSrv, @Nullable String gridName, @Nullable String grp,
- String name, T impl, @Nullable Class<T> itf) throws JMException {
+ public static <T> ObjectName registerMBean(MBeanServer mbeanSrv, @Nullable String igniteInstanceName,
+ @Nullable String grp, String name, T impl, @Nullable Class<T> itf) throws JMException {
assert mbeanSrv != null;
assert name != null;
assert itf != null;
@@ -4472,7 +4473,7 @@ public abstract class IgniteUtils {
mbean.getMBeanInfo();
- return mbeanSrv.registerMBean(mbean, makeMBeanName(gridName, grp, name)).getObjectName();
+ return mbeanSrv.registerMBean(mbean, makeMBeanName(igniteInstanceName, grp, name)).getObjectName();
}
/**
@@ -4504,7 +4505,7 @@ public abstract class IgniteUtils {
*
* @param <T> Type of mbean.
* @param mbeanSrv MBean server.
- * @param gridName Grid name.
+ * @param igniteInstanceName Ignite instance name.
* @param cacheName Name of the cache.
* @param name Name of mbean.
* @param impl MBean implementation.
@@ -4512,7 +4513,7 @@ public abstract class IgniteUtils {
* @return JMX object name.
* @throws JMException If MBean creation failed.
*/
- public static <T> ObjectName registerCacheMBean(MBeanServer mbeanSrv, @Nullable String gridName,
+ public static <T> ObjectName registerCacheMBean(MBeanServer mbeanSrv, @Nullable String igniteInstanceName,
@Nullable String cacheName, String name, T impl, Class<T> itf) throws JMException {
assert mbeanSrv != null;
assert name != null;
@@ -4522,7 +4523,7 @@ public abstract class IgniteUtils {
mbean.getMBeanInfo();
- return mbeanSrv.registerMBean(mbean, makeCacheMBeanName(gridName, cacheName, name)).getObjectName();
+ return mbeanSrv.registerMBean(mbean, makeCacheMBeanName(igniteInstanceName, cacheName, name)).getObjectName();
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/util/StripedExecutor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/StripedExecutor.java b/modules/core/src/main/java/org/apache/ignite/internal/util/StripedExecutor.java
index b5ef431..53096ab 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/StripedExecutor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/StripedExecutor.java
@@ -60,7 +60,7 @@ public class StripedExecutor implements ExecutorService {
* @param poolName Pool name.
* @param log Logger.
*/
- public StripedExecutor(int cnt, String gridName, String poolName, final IgniteLogger log) {
+ public StripedExecutor(int cnt, String igniteInstanceName, String poolName, final IgniteLogger log) {
A.ensure(cnt > 0, "cnt > 0");
boolean success = false;
@@ -76,7 +76,7 @@ public class StripedExecutor implements ExecutorService {
try {
for (int i = 0; i < cnt; i++) {
stripes[i] = new StripeConcurrentQueue(
- gridName,
+ igniteInstanceName,
poolName,
i,
log);
@@ -390,7 +390,7 @@ public class StripedExecutor implements ExecutorService {
*/
private static abstract class Stripe implements Runnable {
/** */
- private final String gridName;
+ private final String igniteInstanceName;
/** */
private final String poolName;
@@ -414,18 +414,18 @@ public class StripedExecutor implements ExecutorService {
protected Thread thread;
/**
- * @param gridName Grid name.
+ * @param igniteInstanceName Ignite instance name.
* @param poolName Pool name.
* @param idx Stripe index.
* @param log Logger.
*/
public Stripe(
- String gridName,
+ String igniteInstanceName,
String poolName,
int idx,
IgniteLogger log
) {
- this.gridName = gridName;
+ this.igniteInstanceName = igniteInstanceName;
this.poolName = poolName;
this.idx = idx;
this.log = log;
@@ -435,7 +435,7 @@ public class StripedExecutor implements ExecutorService {
* Starts the stripe.
*/
void start() {
- thread = new IgniteThread(gridName, poolName + "-stripe-" + idx, this);
+ thread = new IgniteThread(igniteInstanceName, poolName + "-stripe-" + idx, this);
thread.start();
}
@@ -537,18 +537,18 @@ public class StripedExecutor implements ExecutorService {
private volatile boolean parked;
/**
- * @param gridName Grid name.
+ * @param igniteInstanceName Ignite instance name.
* @param poolName Pool name.
* @param idx Stripe index.
* @param log Logger.
*/
public StripeConcurrentQueue(
- String gridName,
+ String igniteInstanceName,
String poolName,
int idx,
IgniteLogger log
) {
- super(gridName,
+ super(igniteInstanceName,
poolName,
idx,
log);
@@ -617,18 +617,18 @@ public class StripedExecutor implements ExecutorService {
private final Queue<Runnable> queue = new ConcurrentLinkedQueue<>();
/**
- * @param gridName Grid name.
+ * @param igniteInstanceName Ignite instance name.
* @param poolName Pool name.
* @param idx Stripe index.
* @param log Logger.
*/
public StripeConcurrentQueueNoPark(
- String gridName,
+ String igniteInstanceName,
String poolName,
int idx,
IgniteLogger log
) {
- super(gridName,
+ super(igniteInstanceName,
poolName,
idx,
log);
@@ -673,18 +673,18 @@ public class StripedExecutor implements ExecutorService {
private final BlockingQueue<Runnable> queue = new LinkedBlockingQueue<>();
/**
- * @param gridName Grid name.
+ * @param igniteInstanceName Ignite instance name.
* @param poolName Pool name.
* @param idx Stripe index.
* @param log Logger.
*/
public StripeConcurrentBlockingQueue(
- String gridName,
+ String igniteInstanceName,
String poolName,
int idx,
IgniteLogger log
) {
- super(gridName,
+ super(igniteInstanceName,
poolName,
idx,
log);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryServerEndpoint.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryServerEndpoint.java b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryServerEndpoint.java
index 178e608..7c865e8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryServerEndpoint.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryServerEndpoint.java
@@ -117,8 +117,8 @@ public class IpcSharedMemoryServerEndpoint implements IpcServerEndpoint {
/** Local node ID. */
private UUID locNodeId;
- /** Grid name. */
- private String gridName;
+ /** Ignite instance name. */
+ private String igniteInstanceName;
/** Work directory. */
private final String workDir;
@@ -154,13 +154,13 @@ public class IpcSharedMemoryServerEndpoint implements IpcServerEndpoint {
*
* @param log Log.
* @param locNodeId Node id.
- * @param gridName Grid name.
+ * @param igniteInstanceName Ignite instance name.
* @param workDir Work directory.
*/
- public IpcSharedMemoryServerEndpoint(IgniteLogger log, UUID locNodeId, String gridName, String workDir) {
+ public IpcSharedMemoryServerEndpoint(IgniteLogger log, UUID locNodeId, String igniteInstanceName, String workDir) {
this.log = log;
this.locNodeId = locNodeId;
- this.gridName = gridName;
+ this.igniteInstanceName = igniteInstanceName;
this.workDir = workDir;
}
@@ -207,7 +207,7 @@ public class IpcSharedMemoryServerEndpoint implements IpcServerEndpoint {
"in use?): " + port, e);
}
- gcWorker = new GcWorker(gridName, "ipc-shmem-gc", log);
+ gcWorker = new GcWorker(igniteInstanceName, "ipc-shmem-gc", log);
new IgniteThread(gcWorker).start();
@@ -355,12 +355,12 @@ public class IpcSharedMemoryServerEndpoint implements IpcServerEndpoint {
private void injectResources(Ignite ignite){
if (ignite != null) {
// Inject resources.
- gridName = ignite.name();
+ igniteInstanceName = ignite.name();
locNodeId = ignite.configuration().getNodeId();
}
else {
// Cleanup resources.
- gridName = null;
+ igniteInstanceName = null;
locNodeId = null;
}
}
@@ -537,12 +537,12 @@ public class IpcSharedMemoryServerEndpoint implements IpcServerEndpoint {
*/
private class GcWorker extends GridWorker {
/**
- * @param gridName Grid name.
+ * @param igniteInstanceName Ignite instance name.
* @param name Name.
* @param log Log.
*/
- protected GcWorker(@Nullable String gridName, String name, IgniteLogger log) {
- super(gridName, name, log);
+ protected GcWorker(@Nullable 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/util/nio/GridNioAsyncNotifyFilter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioAsyncNotifyFilter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioAsyncNotifyFilter.java
index 40c87cb..5d90cdb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioAsyncNotifyFilter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioAsyncNotifyFilter.java
@@ -34,20 +34,20 @@ public class GridNioAsyncNotifyFilter extends GridNioFilterAdapter {
/** Worker pool. */
private GridWorkerPool workerPool;
- /** Grid name. */
- private String gridName;
+ /** Ignite instance name. */
+ private String igniteInstanceName;
/**
* Assigns filter name to a filter.
*
- * @param gridName Grid name.
+ * @param igniteInstanceName Ignite instance name.
* @param exec Executor.
* @param log Logger.
*/
- public GridNioAsyncNotifyFilter(String gridName, Executor exec, IgniteLogger log) {
+ public GridNioAsyncNotifyFilter(String igniteInstanceName, Executor exec, IgniteLogger log) {
super(GridNioAsyncNotifyFilter.class.getSimpleName());
- this.gridName = gridName;
+ this.igniteInstanceName = igniteInstanceName;
this.log = log;
workerPool = new GridWorkerPool(exec, log);
@@ -60,7 +60,7 @@ public class GridNioAsyncNotifyFilter extends GridNioFilterAdapter {
/** {@inheritDoc} */
@Override public void onSessionOpened(final GridNioSession ses) throws IgniteCheckedException {
- workerPool.execute(new GridWorker(gridName, "session-opened-notify", log) {
+ workerPool.execute(new GridWorker(igniteInstanceName, "session-opened-notify", log) {
@Override protected void body() {
try {
proceedSessionOpened(ses);
@@ -74,7 +74,7 @@ public class GridNioAsyncNotifyFilter extends GridNioFilterAdapter {
/** {@inheritDoc} */
@Override public void onSessionClosed(final GridNioSession ses) throws IgniteCheckedException {
- workerPool.execute(new GridWorker(gridName, "session-closed-notify", log) {
+ workerPool.execute(new GridWorker(igniteInstanceName, "session-closed-notify", log) {
@Override protected void body() {
try {
proceedSessionClosed(ses);
@@ -89,7 +89,7 @@ public class GridNioAsyncNotifyFilter extends GridNioFilterAdapter {
/** {@inheritDoc} */
@Override public void onMessageReceived(final GridNioSession ses, final Object msg) throws IgniteCheckedException {
- workerPool.execute(new GridWorker(gridName, "message-received-notify", log) {
+ workerPool.execute(new GridWorker(igniteInstanceName, "message-received-notify", log) {
@Override protected void body() {
try {
proceedMessageReceived(ses, msg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
index a59adba..fefdf15 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
@@ -235,7 +235,7 @@ public class GridNioServer<T> {
* @param port Port.
* @param log Log.
* @param selectorCnt Count of selectors and selecting threads.
- * @param gridName Grid name.
+ * @param igniteInstanceName Ignite instance name.
* @param srvName Logical server name for threads identification.
* @param selectorSpins Defines how many non-blocking {@code selector.selectNow()} should be made before
* falling into {@code selector.select(long)} in NIO server. Long value. Default is {@code 0}.
@@ -262,7 +262,7 @@ public class GridNioServer<T> {
int port,
IgniteLogger log,
int selectorCnt,
- @Nullable String gridName,
+ @Nullable String igniteInstanceName,
@Nullable String srvName,
long selectorSpins,
boolean tcpNoDelay,
@@ -324,7 +324,7 @@ public class GridNioServer<T> {
// This method will throw exception if address already in use.
Selector acceptSelector = createSelector(locAddr);
- acceptThread = new IgniteThread(new GridNioAcceptWorker(gridName, "nio-acceptor", log, acceptSelector));
+ acceptThread = new IgniteThread(new GridNioAcceptWorker(igniteInstanceName, "nio-acceptor", log, acceptSelector));
}
else {
locAddr = null;
@@ -343,8 +343,8 @@ public class GridNioServer<T> {
threadName = "grid-nio-worker-" + srvName + "-" + i;
AbstractNioClientWorker worker = directMode ?
- new DirectNioClientWorker(i, gridName, threadName, log) :
- new ByteBufferNioClientWorker(i, gridName, threadName, log);
+ new DirectNioClientWorker(i, igniteInstanceName, threadName, log) :
+ new ByteBufferNioClientWorker(i, igniteInstanceName, threadName, log);
clientWorkers.add(worker);
@@ -880,14 +880,14 @@ public class GridNioServer<T> {
/**
* @param idx Index of this worker in server's array.
- * @param gridName Grid name.
+ * @param igniteInstanceName Ignite instance name.
* @param name Worker name.
* @param log Logger.
* @throws IgniteCheckedException If selector could not be created.
*/
- protected ByteBufferNioClientWorker(int idx, @Nullable String gridName, String name, IgniteLogger log)
+ protected ByteBufferNioClientWorker(int idx, @Nullable String igniteInstanceName, String name, IgniteLogger log)
throws IgniteCheckedException {
- super(idx, gridName, name, log);
+ super(idx, igniteInstanceName, name, log);
readBuf = directBuf ? ByteBuffer.allocateDirect(8 << 10) : ByteBuffer.allocate(8 << 10);
@@ -1050,14 +1050,14 @@ public class GridNioServer<T> {
private class DirectNioClientWorker extends AbstractNioClientWorker {
/**
* @param idx Index of this worker in server's array.
- * @param gridName Grid name.
+ * @param igniteInstanceName Ignite instance name.
* @param name Worker name.
* @param log Logger.
* @throws IgniteCheckedException If selector could not be created.
*/
- protected DirectNioClientWorker(int idx, @Nullable String gridName, String name, IgniteLogger log)
+ protected DirectNioClientWorker(int idx, @Nullable String igniteInstanceName, String name, IgniteLogger log)
throws IgniteCheckedException {
- super(idx, gridName, name, log);
+ super(idx, igniteInstanceName, name, log);
}
/**
@@ -1541,14 +1541,14 @@ public class GridNioServer<T> {
/**
* @param idx Index of this worker in server's array.
- * @param gridName Grid name.
+ * @param igniteInstanceName Ignite instance name.
* @param name Worker name.
* @param log Logger.
* @throws IgniteCheckedException If selector could not be created.
*/
- protected AbstractNioClientWorker(int idx, @Nullable String gridName, String name, IgniteLogger log)
+ protected AbstractNioClientWorker(int idx, @Nullable String igniteInstanceName, String name, IgniteLogger log)
throws IgniteCheckedException {
- super(gridName, name, log);
+ super(igniteInstanceName, name, log);
createSelector();
@@ -2386,13 +2386,15 @@ public class GridNioServer<T> {
private Selector selector;
/**
- * @param gridName Grid name.
+ * @param igniteInstanceName Ignite instance name.
* @param name Thread name.
* @param log Log.
* @param selector Which will accept incoming connections.
*/
- protected GridNioAcceptWorker(@Nullable String gridName, String name, IgniteLogger log, Selector selector) {
- super(gridName, name, log);
+ protected GridNioAcceptWorker(
+ @Nullable String igniteInstanceName, String name, IgniteLogger log, Selector selector
+ ) {
+ super(igniteInstanceName, name, log);
this.selector = selector;
}
@@ -3087,8 +3089,8 @@ public class GridNioServer<T> {
/** Selector count. */
private int selectorCnt;
- /** Grid name. */
- private String gridName;
+ /** Ignite instance name. */
+ private String igniteInstanceName;
/** TCP_NO_DELAY flag. */
private boolean tcpNoDelay;
@@ -3159,7 +3161,7 @@ public class GridNioServer<T> {
port,
log,
selectorCnt,
- gridName,
+ igniteInstanceName,
srvName,
selectorSpins,
tcpNoDelay,
@@ -3240,11 +3242,11 @@ public class GridNioServer<T> {
}
/**
- * @param gridName Grid name.
+ * @param igniteInstanceName Ignite instance name.
* @return This for chaining.
*/
- public Builder<T> gridName(@Nullable String gridName) {
- this.gridName = gridName;
+ public Builder<T> igniteInstanceName(@Nullable String igniteInstanceName) {
+ this.igniteInstanceName = igniteInstanceName;
return this;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorker.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorker.java b/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorker.java
index 499c097..9dd5e13 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorker.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorker.java
@@ -39,7 +39,7 @@ public abstract class GridWorker implements Runnable {
private final String name;
/** */
- private final String gridName;
+ private final String igniteInstanceName;
/** */
private final GridWorkerListener lsnr;
@@ -59,18 +59,18 @@ public abstract class GridWorker implements Runnable {
/**
* Creates new grid worker with given parameters.
*
- * @param gridName Name of grid this runnable is used in.
+ * @param igniteInstanceName Name of the Ignite instance this runnable is used in.
* @param name Worker name. Note that in general thread name and worker (runnable) name are two
* different things. The same worker can be executed by multiple threads and therefore
* for logging and debugging purposes we separate the two.
* @param log Grid logger to be used.
* @param lsnr Listener for life-cycle events.
*/
- protected GridWorker(String gridName, String name, IgniteLogger log, @Nullable GridWorkerListener lsnr) {
+ protected GridWorker(String igniteInstanceName, String name, IgniteLogger log, @Nullable GridWorkerListener lsnr) {
assert name != null;
assert log != null;
- this.gridName = gridName;
+ this.igniteInstanceName = igniteInstanceName;
this.name = name;
this.lsnr = lsnr;
this.log = log;
@@ -79,14 +79,14 @@ public abstract class GridWorker implements Runnable {
/**
* Creates new grid worker with given parameters.
*
- * @param gridName Name of grid this runnable is used in.
+ * @param igniteInstanceName Name of the Ignite instance this runnable is used in.
* @param name Worker name. Note that in general thread name and worker (runnable) name are two
* different things. The same worker can be executed by multiple threads and therefore
* for logging and debugging purposes we separate the two.
* @param log Grid logger to be used.
*/
- protected GridWorker(@Nullable String gridName, String name, IgniteLogger log) {
- this(gridName, name, log, null);
+ protected GridWorker(@Nullable String igniteInstanceName, String name, IgniteLogger log) {
+ this(igniteInstanceName, name, log, null);
}
/** {@inheritDoc} */
@@ -182,12 +182,12 @@ public abstract class GridWorker implements Runnable {
}
/**
- * Gets name of the grid this runnable belongs to.
+ * Gets name of the Ignite instance this runnable belongs to.
*
- * @return Name of the grid this runnable belongs to.
+ * @return Name of the Ignite instance this runnable belongs to.
*/
- public String gridName() {
- return gridName;
+ public String igniteInstanceName() {
+ return igniteInstanceName;
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsEndpoint.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsEndpoint.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsEndpoint.java
index c2178cb..8ddd883 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsEndpoint.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsEndpoint.java
@@ -32,8 +32,8 @@ public class VisorIgfsEndpoint implements Serializable, LessNamingBean {
/** IGFS name. */
private final String igfsName;
- /** Grid name. */
- private final String gridName;
+ /** Ignite instance name. */
+ private final String igniteInstanceName;
/** Host address / name. */
private final String hostName;
@@ -45,13 +45,15 @@ public class VisorIgfsEndpoint implements Serializable, LessNamingBean {
* Create IGFS endpoint descriptor with given parameters.
*
* @param igfsName IGFS name.
- * @param gridName Grid name.
+ * @param igniteInstanceName Ignite instance name.
* @param hostName Host address / name.
* @param port Port number.
*/
- public VisorIgfsEndpoint(@Nullable String igfsName, String gridName, @Nullable String hostName, int port) {
+ public VisorIgfsEndpoint(
+ @Nullable String igfsName, String igniteInstanceName, @Nullable String hostName, int port
+ ) {
this.igfsName = igfsName;
- this.gridName = gridName;
+ this.igniteInstanceName = igniteInstanceName;
this.hostName = hostName;
this.port = port;
}
@@ -64,10 +66,10 @@ public class VisorIgfsEndpoint implements Serializable, LessNamingBean {
}
/**
- * @return Grid name.
+ * @return Ignite instance name.
*/
- public String gridName() {
- return gridName;
+ public String igniteInstanceName() {
+ return igniteInstanceName;
}
/**
@@ -90,14 +92,14 @@ public class VisorIgfsEndpoint implements Serializable, LessNamingBean {
public String authority() {
String addr = hostName + ":" + port;
- if (igfsName == null && gridName == null)
+ if (igfsName == null && igniteInstanceName == null)
return addr;
else if (igfsName == null)
- return gridName + "@" + addr;
- else if (gridName == null)
+ return igniteInstanceName + "@" + addr;
+ else if (igniteInstanceName == null)
return igfsName + "@" + addr;
else
- return igfsName + ":" + gridName + "@" + addr;
+ return igfsName + ":" + igniteInstanceName + "@" + addr;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java
index 9d46064..0dae4da 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java
@@ -47,8 +47,8 @@ public class VisorBasicConfiguration implements Serializable, LessNamingBean {
/** */
private static final long serialVersionUID = 0L;
- /** Grid name. */
- private String gridName;
+ /** Ignite instance name. */
+ private String igniteInstanceName;
/** IGNITE_HOME determined at startup. */
private String ggHome;
@@ -118,7 +118,7 @@ public class VisorBasicConfiguration implements Serializable, LessNamingBean {
public static VisorBasicConfiguration from(IgniteEx ignite, IgniteConfiguration c) {
VisorBasicConfiguration cfg = new VisorBasicConfiguration();
- cfg.gridName = c.getGridName();
+ cfg.igniteInstanceName = c.getIgniteInstanceName();
cfg.ggHome = getProperty(IGNITE_HOME, c.getIgniteHome());
cfg.locHost = getProperty(IGNITE_LOCAL_HOST, c.getLocalHost());
cfg.nodeId = ignite.localNode().id();
@@ -144,10 +144,10 @@ public class VisorBasicConfiguration implements Serializable, LessNamingBean {
}
/**
- * @return Grid name.
+ * @return Ignite instance name.
*/
- @Nullable public String gridName() {
- return gridName;
+ @Nullable public String igniteInstanceName() {
+ return igniteInstanceName;
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
index 48487ed..f45725f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
@@ -269,7 +269,7 @@ public class VisorNodeDataCollectorJob extends VisorJob<VisorNodeDataCollectorTa
*/
protected VisorNodeDataCollectorJobResult run(VisorNodeDataCollectorJobResult res,
VisorNodeDataCollectorTaskArg arg) {
- res.gridName(ignite.name());
+ res.igniteInstanceName(ignite.name());
res.topologyVersion(ignite.cluster().topologyVersion());
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJobResult.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJobResult.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJobResult.java
index 0c90aa8..f1d2165 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJobResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJobResult.java
@@ -32,8 +32,8 @@ public class VisorNodeDataCollectorJobResult implements Serializable {
/** */
private static final long serialVersionUID = 0L;
- /** Grid name. */
- private String gridName;
+ /** Ignite instance name. */
+ private String igniteInstanceName;
/** Node topology version. */
private long topVer;
@@ -66,17 +66,17 @@ public class VisorNodeDataCollectorJobResult implements Serializable {
private long errCnt;
/**
- * @return Grid name.
+ * @return Ignite instance name.
*/
- public String gridName() {
- return gridName;
+ public String igniteInstanceName() {
+ return igniteInstanceName;
}
/**
- * @param gridName New grid name value.
+ * @param igniteInstanceName New Ignite instance name.
*/
- public void gridName(String gridName) {
- this.gridName = gridName;
+ public void igniteInstanceName(String igniteInstanceName) {
+ this.igniteInstanceName = igniteInstanceName;
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java
index 746583d..50879e7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java
@@ -83,7 +83,7 @@ public class VisorNodeDataCollectorTask extends VisorMultiNodeTask<VisorNodeData
*/
protected void reduceJobResult(VisorNodeDataCollectorTaskResult taskRes,
VisorNodeDataCollectorJobResult jobRes, UUID nid) {
- taskRes.gridNames().put(nid, jobRes.gridName());
+ taskRes.igniteInstanceNames().put(nid, jobRes.igniteInstanceName());
taskRes.topologyVersions().put(nid, jobRes.topologyVersion());
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskResult.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskResult.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskResult.java
index baab350..3cea146 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskResult.java
@@ -42,7 +42,7 @@ public class VisorNodeDataCollectorTaskResult implements Serializable, LessNamin
private final Map<UUID, VisorExceptionWrapper> unhandledEx = new HashMap<>();
/** Nodes grid names. */
- private final Map<UUID, String> gridNames = new HashMap<>();
+ private final Map<UUID, String> igniteInstanceNames = new HashMap<>();
/** Nodes topology versions. */
private final Map<UUID, Long> topVersions = new HashMap<>();
@@ -79,7 +79,7 @@ public class VisorNodeDataCollectorTaskResult implements Serializable, LessNamin
*/
public boolean isEmpty() {
return
- gridNames.isEmpty() &&
+ igniteInstanceNames.isEmpty() &&
topVersions.isEmpty() &&
unhandledEx.isEmpty() &&
taskMonitoringEnabled.isEmpty() &&
@@ -100,10 +100,10 @@ public class VisorNodeDataCollectorTaskResult implements Serializable, LessNamin
}
/**
- * @return Nodes grid names.
+ * @return Nodes Ignite instance names.
*/
- public Map<UUID, String> gridNames() {
- return gridNames;
+ public Map<UUID, String> igniteInstanceNames() {
+ return igniteInstanceNames;
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/mxbean/IgnitionMXBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/IgnitionMXBean.java b/modules/core/src/main/java/org/apache/ignite/mxbean/IgnitionMXBean.java
index 2ee2def..13a9e27 100644
--- a/modules/core/src/main/java/org/apache/ignite/mxbean/IgnitionMXBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/mxbean/IgnitionMXBean.java
@@ -69,26 +69,26 @@ public interface IgnitionMXBean {
public boolean stop(boolean cancel);
/**
- * Stops named grid. If {@code cancel} flag is set to {@code true} then
+ * Stops named Ignite instance. If {@code cancel} flag is set to {@code true} then
* all jobs currently executing on local node will be interrupted. If
- * grid name is {@code null}, then default no-name grid will be stopped.
+ * Ignite instance name is {@code null}, then default no-name Ignite instance will be stopped.
* It does not wait for the tasks to finish their execution.
*
- * @param name Grid name. If {@code null}, then default no-name grid will
- * be stopped.
+ * @param name Ignite instance name. If {@code null}, then default no-name
+ * Ignite instance will be stopped.
* @param cancel If {@code true} then all jobs currently will be cancelled
* by calling {@link org.apache.ignite.compute.ComputeJob#cancel()} method. Note that just like with
* {@link Thread#interrupt()}, it is up to the actual job to exit from
* execution. If {@code false}, then jobs currently running will not be
* canceled. In either case, grid node will wait for completion of all
* jobs running on it before stopping.
- * @return {@code true} if named grid instance was indeed found and stopped,
+ * @return {@code true} if named Ignite instance instance was indeed found and stopped,
* {@code false} otherwise (the instance with given {@code name} was
* not found).
* @see org.apache.ignite.Ignition#stop(String, boolean)
*/
- @MXBeanDescription("Stops grid by name. Cancels running jobs if cancel is true. Returns true if named " +
- "grid instance was indeed found and stopped, false otherwise.")
+ @MXBeanDescription("Stops Ignite instance by name. Cancels running jobs if cancel is true. Returns true if named " +
+ "Ignite instance was indeed found and stopped, false otherwise.")
@MXBeanParametersNames(
{
"name",
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpi.java
index 3ab3b42..db117b1 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpi.java
@@ -59,11 +59,11 @@ public interface IgniteSpi {
* This method is called to start SPI. After this method returns
* successfully kernel assumes that SPI is fully operational.
*
- * @param gridName Name of grid instance this SPI is being started for
- * ({@code null} for default grid).
+ * @param igniteInstanceName Name of Ignite instance this SPI is being started for
+ * ({@code null} for default Ignite instance).
* @throws IgniteSpiException Throws in case of any error during SPI start.
*/
- public void spiStart(@Nullable String gridName) throws IgniteSpiException;
+ public void spiStart(@Nullable String igniteInstanceName) throws IgniteSpiException;
/**
* Callback invoked when SPI context is initialized. SPI implementation
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
index 219d07b..709a8e9 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
@@ -79,8 +79,8 @@ public abstract class IgniteSpiAdapter implements IgniteSpi, IgniteSpiManagement
/** Ignite instance. */
protected Ignite ignite;
- /** Grid instance name. */
- protected String gridName;
+ /** Ignite instance name. */
+ protected String igniteInstanceName;
/** SPI name. */
private String name;
@@ -279,7 +279,7 @@ public abstract class IgniteSpiAdapter implements IgniteSpi, IgniteSpiManagement
this.ignite = ignite;
if (ignite != null)
- gridName = ignite.name();
+ igniteInstanceName = ignite.name();
}
/**
@@ -401,22 +401,23 @@ public abstract class IgniteSpiAdapter implements IgniteSpi, IgniteSpiManagement
/**
* Registers SPI MBean. Note that SPI can only register one MBean.
*
- * @param gridName Grid name. If null, then name will be empty.
+ * @param igniteInstanceName Ignite instance name. If null, then name will be empty.
* @param impl MBean implementation.
* @param mbeanItf MBean interface (if {@code null}, then standard JMX
* naming conventions are used.
* @param <T> Type of the MBean
* @throws IgniteSpiException If registration failed.
*/
- protected final <T extends IgniteSpiManagementMBean> void registerMBean(String gridName, T impl, Class<T> mbeanItf)
- throws IgniteSpiException {
+ protected final <T extends IgniteSpiManagementMBean> void registerMBean(
+ String igniteInstanceName, T impl, Class<T> mbeanItf
+ ) throws IgniteSpiException {
MBeanServer jmx = ignite.configuration().getMBeanServer();
assert mbeanItf == null || mbeanItf.isInterface();
assert jmx != null;
try {
- spiMBean = U.registerMBean(jmx, gridName, "SPIs", getName(), impl, mbeanItf);
+ spiMBean = U.registerMBean(jmx, igniteInstanceName, "SPIs", getName(), impl, mbeanItf);
if (log.isDebugEnabled())
log.debug("Registered SPI MBean: " + spiMBean);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiThread.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiThread.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiThread.java
index 1667891..6b3cf06 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiThread.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiThread.java
@@ -43,12 +43,12 @@ public abstract class IgniteSpiThread extends IgniteThread {
/**
* Creates thread with given {@code name}.
*
- * @param gridName Name of grid this thread is created in.
+ * @param igniteInstanceName Name of grid this thread is created in.
* @param name Thread's name.
* @param log Grid logger to use.
*/
- protected IgniteSpiThread(String gridName, String name, IgniteLogger log) {
- super(gridName, DFLT_GRP, createName(cntr.incrementAndGet(), name, gridName));
+ protected IgniteSpiThread(String igniteInstanceName, String name, IgniteLogger log) {
+ super(igniteInstanceName, DFLT_GRP, createName(cntr.incrementAndGet(), name, igniteInstanceName));
assert log != null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiThreadFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiThreadFactory.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiThreadFactory.java
index c40925d..d052423 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiThreadFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiThreadFactory.java
@@ -29,28 +29,28 @@ public class IgniteSpiThreadFactory implements ThreadFactory {
private final IgniteLogger log;
/** */
- private final String gridName;
+ private final String igniteInstanceName;
/** */
private final String threadName;
/**
- * @param gridName Grid name, possibly {@code null} for default grid.
+ * @param igniteInstanceName Ignite instance name, possibly {@code null} for default Ignite instance.
* @param threadName Name for threads created by this factory.
* @param log Grid logger.
*/
- public IgniteSpiThreadFactory(String gridName, String threadName, IgniteLogger log) {
+ public IgniteSpiThreadFactory(String igniteInstanceName, String threadName, IgniteLogger log) {
assert log != null;
assert threadName != null;
- this.gridName = gridName;
+ this.igniteInstanceName = igniteInstanceName;
this.threadName = threadName;
this.log = log;
}
/** {@inheritDoc} */
@Override public Thread newThread(final Runnable r) {
- return new IgniteSpiThread(gridName, threadName, log) {
+ return new IgniteSpiThread(igniteInstanceName, threadName, log) {
/** {@inheritDoc} */
@Override protected void body() {
r.run();
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpi.java
index e090420..619c468 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpi.java
@@ -136,7 +136,7 @@ public class CacheCheckpointSpi extends IgniteSpiAdapter implements CheckpointSp
}
/** {@inheritDoc} */
- @Override public void spiStart(@Nullable String gridName) throws IgniteSpiException {
+ @Override public void spiStart(@Nullable String igniteInstanceName) throws IgniteSpiException {
assertParameter(!F.isEmpty(cacheName), "!F.isEmpty(cacheName)");
// Start SPI start stopwatch.
@@ -146,7 +146,7 @@ public class CacheCheckpointSpi extends IgniteSpiAdapter implements CheckpointSp
if (log.isDebugEnabled())
log.debug(configInfo("cacheName", cacheName));
- registerMBean(gridName, this, CacheCheckpointSpiMBean.class);
+ registerMBean(igniteInstanceName, this, CacheCheckpointSpiMBean.class);
if (log.isDebugEnabled())
log.debug(startInfo());
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpi.java
index aac9b59..a052704 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpi.java
@@ -442,7 +442,7 @@ public class JdbcCheckpointSpi extends IgniteSpiAdapter implements CheckpointSpi
}
/** {@inheritDoc} */
- @Override public void spiStart(String gridName) throws IgniteSpiException {
+ @Override public void spiStart(String igniteInstanceName) throws IgniteSpiException {
// Start SPI start stopwatch.
startStopwatch();
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/noop/NoopCheckpointSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/noop/NoopCheckpointSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/noop/NoopCheckpointSpi.java
index bf44e8c..c3ac202 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/noop/NoopCheckpointSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/noop/NoopCheckpointSpi.java
@@ -41,7 +41,7 @@ public class NoopCheckpointSpi extends IgniteSpiAdapter implements CheckpointSpi
private IgniteLogger log;
/** {@inheritDoc} */
- @Override public void spiStart(@Nullable String gridName) throws IgniteSpiException {
+ @Override public void spiStart(@Nullable String igniteInstanceName) throws IgniteSpiException {
U.warn(log, "Checkpoints are disabled (to enable configure any GridCheckpointSpi implementation)");
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java
index 21011a7..1917d38 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java
@@ -158,8 +158,8 @@ public class SharedFsCheckpointSpi extends IgniteSpiAdapter implements Checkpoin
/** Local host name. */
private String host;
- /** Grid name. */
- private String gridName;
+ /** Ignite instance name. */
+ private String igniteInstanceName;
/** Task that takes care about outdated files. */
private SharedFsTimeoutTask timeoutTask;
@@ -206,13 +206,13 @@ public class SharedFsCheckpointSpi extends IgniteSpiAdapter implements Checkpoin
}
/** {@inheritDoc} */
- @Override public void spiStart(String gridName) throws IgniteSpiException {
+ @Override public void spiStart(String igniteInstanceName) throws IgniteSpiException {
// Start SPI start stopwatch.
startStopwatch();
assertParameter(!F.isEmpty(dirPaths), "!F.isEmpty(dirPaths)");
- this.gridName = gridName;
+ this.igniteInstanceName = igniteInstanceName;
if (ignite.configuration().getMarshaller() instanceof BinaryMarshaller)
marsh = MarshallerUtils.jdkMarshaller(ignite.name());
@@ -227,7 +227,7 @@ public class SharedFsCheckpointSpi extends IgniteSpiAdapter implements Checkpoin
if (!folder.isDirectory())
throw new IgniteSpiException("Checkpoint directory path is not a valid directory: " + curDirPath);
- registerMBean(gridName, this, SharedFsCheckpointSpiMBean.class);
+ registerMBean(igniteInstanceName, this, SharedFsCheckpointSpiMBean.class);
// Ack parameters.
if (log.isDebugEnabled()) {
@@ -345,7 +345,7 @@ public class SharedFsCheckpointSpi extends IgniteSpiAdapter implements Checkpoin
}
}
- timeoutTask = new SharedFsTimeoutTask(gridName, marsh, log);
+ timeoutTask = new SharedFsTimeoutTask(igniteInstanceName, marsh, log);
timeoutTask.setCheckpointListener(lsnr);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsTimeoutTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsTimeoutTask.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsTimeoutTask.java
index 3cf11f8..9b734cf 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsTimeoutTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsTimeoutTask.java
@@ -59,12 +59,12 @@ class SharedFsTimeoutTask extends IgniteSpiThread {
/**
* Creates new instance of task that looks after files.
*
- * @param gridName Grid name.
+ * @param igniteInstanceName Ignite instance name.
* @param marshaller Messages marshaller.
* @param log Messages logger.
*/
- SharedFsTimeoutTask(String gridName, Marshaller marshaller, IgniteLogger log) {
- super(gridName, "grid-sharedfs-timeout-worker", log);
+ SharedFsTimeoutTask(String igniteInstanceName, Marshaller marshaller, IgniteLogger log) {
+ super(igniteInstanceName, "grid-sharedfs-timeout-worker", log);
assert marshaller != null;
assert log != null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/spi/collision/fifoqueue/FifoQueueCollisionSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/fifoqueue/FifoQueueCollisionSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/fifoqueue/FifoQueueCollisionSpi.java
index bc4bce6..d94b453 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/collision/fifoqueue/FifoQueueCollisionSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/fifoqueue/FifoQueueCollisionSpi.java
@@ -157,7 +157,7 @@ public class FifoQueueCollisionSpi extends IgniteSpiAdapter implements Collision
}
/** {@inheritDoc} */
- @Override public void spiStart(String gridName) throws IgniteSpiException {
+ @Override public void spiStart(String igniteInstanceName) throws IgniteSpiException {
assertParameter(parallelJobsNum > 0, "parallelJobsNum > 0");
assertParameter(waitJobsNum >= 0, "waitingJobsNum >= 0");
@@ -168,7 +168,7 @@ public class FifoQueueCollisionSpi extends IgniteSpiAdapter implements Collision
if (log.isDebugEnabled())
log.debug(configInfo("parallelJobsNum", parallelJobsNum));
- registerMBean(gridName, this, FifoQueueCollisionSpiMBean.class);
+ registerMBean(igniteInstanceName, this, FifoQueueCollisionSpiMBean.class);
// Ack start.
if (log.isDebugEnabled())
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java
index f778bfc..37db103 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java
@@ -428,7 +428,7 @@ public class JobStealingCollisionSpi extends IgniteSpiAdapter implements Collisi
}
/** {@inheritDoc} */
- @Override public void spiStart(String gridName) throws IgniteSpiException {
+ @Override public void spiStart(String igniteInstanceName) throws IgniteSpiException {
assertParameter(activeJobsThreshold >= 0, "activeJobsThreshold >= 0");
assertParameter(waitJobsThreshold >= 0, "waitJobsThreshold >= 0");
assertParameter(msgExpireTime > 0, "messageExpireTime > 0");
@@ -445,7 +445,7 @@ public class JobStealingCollisionSpi extends IgniteSpiAdapter implements Collisi
log.debug(configInfo("maxStealingAttempts", maxStealingAttempts));
}
- registerMBean(gridName, this, JobStealingCollisionSpiMBean.class);
+ registerMBean(igniteInstanceName, this, JobStealingCollisionSpiMBean.class);
// Ack start.
if (log.isDebugEnabled())
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/spi/collision/noop/NoopCollisionSpi.java
----------------------------------------------------------------------
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 2586d6d..8b75220 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
@@ -39,7 +39,7 @@ import org.jetbrains.annotations.Nullable;
@IgniteSpiMultipleInstancesSupport(true)
public class NoopCollisionSpi extends IgniteSpiAdapter implements CollisionSpi {
/** {@inheritDoc} */
- @Override public void spiStart(@Nullable String gridName) throws IgniteSpiException {
+ @Override public void spiStart(@Nullable String igniteInstanceName) throws IgniteSpiException {
// No-op.
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpi.java
index 4e00574..9a6eb0e 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpi.java
@@ -366,7 +366,7 @@ public class PriorityQueueCollisionSpi extends IgniteSpiAdapter implements Colli
}
/** {@inheritDoc} */
- @Override public void spiStart(String gridName) throws IgniteSpiException {
+ @Override public void spiStart(String igniteInstanceName) throws IgniteSpiException {
assertParameter(parallelJobsNum > 0, "parallelJobsNum > 0");
assertParameter(waitJobsNum >= 0, "waitingJobsNum >= 0");
assertParameter(starvationInc >= 0, "starvationInc >= 0");
@@ -386,7 +386,7 @@ public class PriorityQueueCollisionSpi extends IgniteSpiAdapter implements Colli
log.debug(configInfo("preventStarvation", preventStarvation));
}
- registerMBean(gridName, this, PriorityQueueCollisionSpiMBean.class);
+ registerMBean(igniteInstanceName, this, PriorityQueueCollisionSpiMBean.class);
// Ack start.
if (log.isDebugEnabled())
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
index 30c6976..35568c3 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
@@ -1832,7 +1832,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
}
/** {@inheritDoc} */
- @Override public void spiStart(String gridName) throws IgniteSpiException {
+ @Override public void spiStart(String igniteInstanceName) throws IgniteSpiException {
assert locHost != null;
// Start SPI start stopwatch.
@@ -1882,7 +1882,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
"potential OOMEs when running cache operations in FULL_ASYNC or PRIMARY_SYNC modes " +
"due to message queues growth on sender and receiver sides.");
- registerMBean(gridName, this, TcpCommunicationSpiMBean.class);
+ registerMBean(igniteInstanceName, this, TcpCommunicationSpiMBean.class);
connectGate = new ConnectGateway();
@@ -1894,7 +1894,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
nioSrvr.start();
- commWorker = new CommunicationWorker(gridName);
+ commWorker = new CommunicationWorker(igniteInstanceName);
commWorker.start();
@@ -2049,7 +2049,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
.listener(srvLsnr)
.logger(log)
.selectorCount(selectorsCnt)
- .gridName(gridName)
+ .igniteInstanceName(igniteInstanceName)
.serverName("tcp-comm")
.tcpNoDelay(tcpNoDelay)
.directBuffer(directBuf)
@@ -2126,7 +2126,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
IgniteConfiguration cfg = ignite.configuration();
IpcSharedMemoryServerEndpoint srv =
- new IpcSharedMemoryServerEndpoint(log, cfg.getNodeId(), gridName, cfg.getWorkDirectory());
+ new IpcSharedMemoryServerEndpoint(log, cfg.getNodeId(), igniteInstanceName, cfg.getWorkDirectory());
srv.setPort(port);
@@ -3464,7 +3464,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
* @param srv Server.
*/
ShmemAcceptWorker(IpcSharedMemoryServerEndpoint srv) {
- super(gridName, "shmem-communication-acceptor", TcpCommunicationSpi.this.log);
+ super(igniteInstanceName, "shmem-communication-acceptor", TcpCommunicationSpi.this.log);
this.srv = srv;
}
@@ -3508,7 +3508,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
* @param endpoint Endpoint.
*/
private ShmemWorker(IpcEndpoint endpoint) {
- super(gridName, "shmem-worker", TcpCommunicationSpi.this.log);
+ super(igniteInstanceName, "shmem-worker", TcpCommunicationSpi.this.log);
this.endpoint = endpoint;
}
@@ -3610,10 +3610,10 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
private final BlockingQueue<DisconnectedSessionInfo> q = new LinkedBlockingQueue<>();
/**
- * @param gridName Grid name.
+ * @param igniteInstanceName Ignite instance name.
*/
- private CommunicationWorker(String gridName) {
- super(gridName, "tcp-comm-worker", log);
+ private CommunicationWorker(String igniteInstanceName) {
+ super(igniteInstanceName, "tcp-comm-worker", log);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/LocalDeploymentSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/LocalDeploymentSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/LocalDeploymentSpi.java
index 68ef178..66b715a 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/LocalDeploymentSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/LocalDeploymentSpi.java
@@ -80,11 +80,11 @@ public class LocalDeploymentSpi extends IgniteSpiAdapter implements DeploymentSp
private volatile DeploymentListener lsnr;
/** {@inheritDoc} */
- @Override public void spiStart(@Nullable String gridName) throws IgniteSpiException {
+ @Override public void spiStart(@Nullable String igniteInstanceName) throws IgniteSpiException {
// Start SPI start stopwatch.
startStopwatch();
- registerMBean(gridName, this, LocalDeploymentSpiMBean.class);
+ registerMBean(igniteInstanceName, this, LocalDeploymentSpiMBean.class);
if (log.isDebugEnabled())
log.debug(startInfo());
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
index 8ef9848..5c13449 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
@@ -232,7 +232,7 @@ class ClientImpl extends TcpDiscoveryImpl {
}
/** {@inheritDoc} */
- @Override public void spiStart(@Nullable String gridName) throws IgniteSpiException {
+ @Override public void spiStart(@Nullable String igniteInstanceName) throws IgniteSpiException {
spi.initLocalNode(
0,
true);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
index 562b4c3..d86731e 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
@@ -291,7 +291,7 @@ class ServerImpl extends TcpDiscoveryImpl {
}
/** {@inheritDoc} */
- @Override public void spiStart(String gridName) throws IgniteSpiException {
+ @Override public void spiStart(String igniteInstanceName) throws IgniteSpiException {
synchronized (mux) {
spiState = DISCONNECTED;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java
index f199c20..48e4ddc 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java
@@ -231,10 +231,10 @@ abstract class TcpDiscoveryImpl {
public abstract void failNode(UUID nodeId, @Nullable String warning);
/**
- * @param gridName Grid name.
+ * @param igniteInstanceName Ignite instance name.
* @throws IgniteSpiException If failed.
*/
- public abstract void spiStart(@Nullable String gridName) throws IgniteSpiException;
+ public abstract void spiStart(@Nullable String igniteInstanceName) throws IgniteSpiException;
/**
* @throws IgniteSpiException If failed.
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
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 1f2f328..ca10cbe 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
@@ -1725,7 +1725,7 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi, T
}
/** {@inheritDoc} */
- @Override public void spiStart(@Nullable String gridName) throws IgniteSpiException {
+ @Override public void spiStart(@Nullable String igniteInstanceName) throws IgniteSpiException {
initFailureDetectionTimeout();
if (!forceSrvMode && (Boolean.TRUE.equals(ignite.configuration().isClientMode()))) {
@@ -1819,7 +1819,7 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi, T
if (netTimeout < 3000)
U.warn(log, "Network timeout is too low (at least 3000 ms recommended): " + netTimeout);
- registerMBean(gridName, this, TcpDiscoverySpiMBean.class);
+ registerMBean(igniteInstanceName, this, TcpDiscoverySpiMBean.class);
if (ipFinder instanceof TcpDiscoveryMulticastIpFinder) {
TcpDiscoveryMulticastIpFinder mcastIpFinder = ((TcpDiscoveryMulticastIpFinder)ipFinder);
@@ -1830,7 +1830,7 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi, T
cfgNodeId = ignite.configuration().getNodeId();
- impl.spiStart(gridName);
+ impl.spiStart(igniteInstanceName);
}
/** {@inheritDoc} */
@@ -1989,7 +1989,7 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi, T
* @return Marshaller.
*/
protected Marshaller marshaller() {
- MarshallerUtils.setNodeName(marsh, gridName);
+ MarshallerUtils.setNodeName(marsh, igniteInstanceName);
return marsh;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpi.java
index c7c635e..dcfbde1 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpi.java
@@ -138,7 +138,7 @@ public class MemoryEventStorageSpi extends IgniteSpiAdapter implements EventStor
}
/** {@inheritDoc} */
- @Override public void spiStart(String gridName) throws IgniteSpiException {
+ @Override public void spiStart(String igniteInstanceName) throws IgniteSpiException {
// Start SPI start stopwatch.
startStopwatch();
@@ -151,7 +151,7 @@ public class MemoryEventStorageSpi extends IgniteSpiAdapter implements EventStor
log.debug(configInfo("expireCnt", expireCnt));
}
- registerMBean(gridName, this, MemoryEventStorageSpiMBean.class);
+ registerMBean(igniteInstanceName, this, MemoryEventStorageSpiMBean.class);
// Ack ok start.
if (log.isDebugEnabled())
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/spi/failover/always/AlwaysFailoverSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/failover/always/AlwaysFailoverSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/failover/always/AlwaysFailoverSpi.java
index 63c990e..4b916e7 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/failover/always/AlwaysFailoverSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/failover/always/AlwaysFailoverSpi.java
@@ -151,7 +151,7 @@ public class AlwaysFailoverSpi extends IgniteSpiAdapter implements FailoverSpi,
}
/** {@inheritDoc} */
- @Override public void spiStart(String gridName) throws IgniteSpiException {
+ @Override public void spiStart(String igniteInstanceName) throws IgniteSpiException {
// Start SPI start stopwatch.
startStopwatch();
@@ -160,7 +160,7 @@ public class AlwaysFailoverSpi extends IgniteSpiAdapter implements FailoverSpi,
if (log.isDebugEnabled())
log.debug(configInfo("maximumFailoverAttempts", maxFailoverAttempts));
- registerMBean(gridName, this, AlwaysFailoverSpiMBean.class);
+ registerMBean(igniteInstanceName, this, AlwaysFailoverSpiMBean.class);
// Ack ok start.
if (log.isDebugEnabled())
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/spi/failover/jobstealing/JobStealingFailoverSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/failover/jobstealing/JobStealingFailoverSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/failover/jobstealing/JobStealingFailoverSpi.java
index 60e8c07..05c681d 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/failover/jobstealing/JobStealingFailoverSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/failover/jobstealing/JobStealingFailoverSpi.java
@@ -173,7 +173,7 @@ public class JobStealingFailoverSpi extends IgniteSpiAdapter implements Failover
}
/** {@inheritDoc} */
- @Override public void spiStart(String gridName) throws IgniteSpiException {
+ @Override public void spiStart(String igniteInstanceName) throws IgniteSpiException {
// Start SPI start stopwatch.
startStopwatch();
@@ -182,7 +182,7 @@ public class JobStealingFailoverSpi extends IgniteSpiAdapter implements Failover
if (log.isDebugEnabled())
log.debug(configInfo("maxFailoverAttempts", maxFailoverAttempts));
- registerMBean(gridName, this, JobStealingFailoverSpiMBean.class);
+ registerMBean(igniteInstanceName, this, JobStealingFailoverSpiMBean.class);
// Ack ok start.
if (log.isDebugEnabled())
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/spi/failover/never/NeverFailoverSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/failover/never/NeverFailoverSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/failover/never/NeverFailoverSpi.java
index 9876265..1056d2e 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/failover/never/NeverFailoverSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/failover/never/NeverFailoverSpi.java
@@ -70,11 +70,11 @@ public class NeverFailoverSpi extends IgniteSpiAdapter implements FailoverSpi, N
private IgniteLogger log;
/** {@inheritDoc} */
- @Override public void spiStart(String gridName) throws IgniteSpiException {
+ @Override public void spiStart(String igniteInstanceName) throws IgniteSpiException {
// Start SPI start stopwatch.
startStopwatch();
- registerMBean(gridName, this, NeverFailoverSpiMBean.class);
+ registerMBean(igniteInstanceName, this, NeverFailoverSpiMBean.class);
// Ack ok start.
if (log.isDebugEnabled())
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/spi/indexing/noop/NoopIndexingSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/indexing/noop/NoopIndexingSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/indexing/noop/NoopIndexingSpi.java
index cbcf429..5c8bfd2 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/indexing/noop/NoopIndexingSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/indexing/noop/NoopIndexingSpi.java
@@ -60,7 +60,7 @@ public class NoopIndexingSpi extends IgniteSpiAdapter implements IndexingSpi {
}
/** {@inheritDoc} */
- @Override public void spiStart(@Nullable String gridName) throws IgniteSpiException {
+ @Override public void spiStart(@Nullable String igniteInstanceName) throws IgniteSpiException {
// No-op.
}