You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/01/17 10:44:24 UTC
[14/50] [abbrv] ignite git commit: IGNITE-4462: IGFS: removed grid
name from HadoopIgfsEndpoint. This closes #1368.
IGNITE-4462: IGFS: removed grid name from HadoopIgfsEndpoint. This closes #1368.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2e691d80
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2e691d80
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2e691d80
Branch: refs/heads/ignite-3477
Commit: 2e691d80ea4870c3e7b5b127792b66c920f72c39
Parents: 2df39a8
Author: tledkov-gridgain <tl...@gridgain.com>
Authored: Thu Dec 29 11:00:01 2016 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Thu Dec 29 11:00:01 2016 +0300
----------------------------------------------------------------------
.../igfs/common/IgfsHandshakeRequest.java | 17 ---------
.../internal/igfs/common/IgfsMarshaller.java | 2 --
.../processors/igfs/IgfsIpcHandler.java | 4 ---
.../mapreduce/IgniteHadoopMapReducePlanner.java | 6 ++--
.../IgniteHadoopWeightedMapReducePlanner.java | 5 +--
.../hadoop/igfs/HadoopIgfsEndpoint.java | 38 +++++++++-----------
.../hadoop/impl/igfs/HadoopIgfsOutProc.java | 24 ++++++-------
.../hadoop/impl/igfs/HadoopIgfsWrapper.java | 33 +++++++++--------
.../impl/HadoopAbstractMapReduceTest.java | 2 +-
.../hadoop/impl/HadoopAbstractSelfTest.java | 3 +-
.../impl/HadoopTaskExecutionSelfTest.java | 19 +++++-----
.../client/HadoopClientProtocolSelfTest.java | 2 +-
.../impl/igfs/Hadoop1DualAbstractTest.java | 7 ++--
.../igfs/HadoopFIleSystemFactorySelfTest.java | 6 ++--
...Igfs20FileSystemLoopbackPrimarySelfTest.java | 2 +-
...oopIgfs20FileSystemShmemPrimarySelfTest.java | 2 +-
.../igfs/HadoopIgfsDualAbstractSelfTest.java | 6 ++--
...oopSecondaryFileSystemConfigurationTest.java | 4 +--
.../hadoop/impl/igfs/IgfsEventsTestSuite.java | 4 +--
.../IgniteHadoopFileSystemAbstractSelfTest.java | 4 +--
.../IgniteHadoopFileSystemClientSelfTest.java | 2 +-
...IgniteHadoopFileSystemHandshakeSelfTest.java | 32 ++++++++---------
...niteHadoopFileSystemLoggerStateSelfTest.java | 6 ++--
...condaryFileSystemInitializationSelfTest.java | 4 +--
24 files changed, 104 insertions(+), 130 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2e691d80/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsHandshakeRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsHandshakeRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsHandshakeRequest.java
index 21da5b1..1335ca8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsHandshakeRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsHandshakeRequest.java
@@ -25,9 +25,6 @@ import static org.apache.ignite.internal.igfs.common.IgfsIpcCommand.HANDSHAKE;
* Handshake request.
*/
public class IgfsHandshakeRequest extends IgfsMessage {
- /** Expected Grid name. */
- private String gridName;
-
/** Expected IGFS name. */
private String igfsName;
@@ -45,20 +42,6 @@ public class IgfsHandshakeRequest extends IgfsMessage {
}
/**
- * @return Grid name.
- */
- public String gridName() {
- return gridName;
- }
-
- /**
- * @param gridName Grid name.
- */
- public void gridName(String gridName) {
- this.gridName = gridName;
- }
-
- /**
* @return IGFS name.
*/
public String igfsName() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/2e691d80/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMarshaller.java
index 91656fd..859069a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMarshaller.java
@@ -97,7 +97,6 @@ public class IgfsMarshaller {
IgfsHandshakeRequest req = (IgfsHandshakeRequest)msg;
- U.writeString(out, req.gridName());
U.writeString(out, req.igfsName());
U.writeString(out, req.logDirectory());
@@ -214,7 +213,6 @@ public class IgfsMarshaller {
case HANDSHAKE: {
IgfsHandshakeRequest req = new IgfsHandshakeRequest();
- req.gridName(U.readString(in));
req.igfsName(U.readString(in));
req.logDirectory(U.readString(in));
http://git-wip-us.apache.org/repos/asf/ignite/blob/2e691d80/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 6047604..aed0961 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
@@ -258,10 +258,6 @@ class IgfsIpcHandler implements IgfsServerHandler {
* @throws IgniteCheckedException In case of handshake failure.
*/
private IgfsMessage processHandshakeRequest(IgfsHandshakeRequest req) throws IgniteCheckedException {
- if (req.gridName() != null && !F.eq(ctx.gridName(), req.gridName()))
- throw new IgniteCheckedException("Failed to perform handshake because existing Grid name " +
- "differs from requested [requested=" + req.gridName() + ", existing=" + ctx.gridName() + ']');
-
if (req.igfsName() != null && !F.eq(igfs.name(), req.igfsName()))
throw new IgniteCheckedException("Failed to perform handshake because existing IGFS name " +
"differs from requested [requested=" + req.igfsName() + ", existing=" + igfs.name() + ']');
http://git-wip-us.apache.org/repos/asf/ignite/blob/2e691d80/modules/hadoop/src/main/java/org/apache/ignite/hadoop/mapreduce/IgniteHadoopMapReducePlanner.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/mapreduce/IgniteHadoopMapReducePlanner.java b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/mapreduce/IgniteHadoopMapReducePlanner.java
index e1101c5..ac42381 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/mapreduce/IgniteHadoopMapReducePlanner.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/mapreduce/IgniteHadoopMapReducePlanner.java
@@ -123,6 +123,7 @@ public class IgniteHadoopMapReducePlanner extends HadoopAbstractMapReducePlanner
* @param nodes Nodes.
* @param nodeLoads Node load tracker.
* @return Node ID.
+ * @throws IgniteCheckedException On error.
*/
@SuppressWarnings("unchecked")
private UUID nodeForSplit(HadoopInputSplit split, Collection<UUID> topIds, Map<String, Collection<UUID>> nodes,
@@ -133,10 +134,7 @@ public class IgniteHadoopMapReducePlanner extends HadoopAbstractMapReducePlanner
if (IGFS_SCHEME.equalsIgnoreCase(split0.file().getScheme())) {
HadoopIgfsEndpoint endpoint = new HadoopIgfsEndpoint(split0.file().getAuthority());
- IgfsEx igfs = null;
-
- if (F.eq(ignite.name(), endpoint.grid()))
- igfs = (IgfsEx)((IgniteEx)ignite).igfsx(endpoint.igfs());
+ IgfsEx igfs = (IgfsEx)((IgniteEx)ignite).igfsx(endpoint.igfs());
if (igfs != null && !igfs.isProxy(split0.file())) {
IgfsPath path = new IgfsPath(split0.file());
http://git-wip-us.apache.org/repos/asf/ignite/blob/2e691d80/modules/hadoop/src/main/java/org/apache/ignite/hadoop/mapreduce/IgniteHadoopWeightedMapReducePlanner.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/mapreduce/IgniteHadoopWeightedMapReducePlanner.java b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/mapreduce/IgniteHadoopWeightedMapReducePlanner.java
index 2d1ac0b..178cdb5 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/mapreduce/IgniteHadoopWeightedMapReducePlanner.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/mapreduce/IgniteHadoopWeightedMapReducePlanner.java
@@ -212,10 +212,7 @@ public class IgniteHadoopWeightedMapReducePlanner extends HadoopAbstractMapReduc
if (IgniteFileSystem.IGFS_SCHEME.equalsIgnoreCase(split0.file().getScheme())) {
HadoopIgfsEndpoint endpoint = new HadoopIgfsEndpoint(split0.file().getAuthority());
- IgfsEx igfs = null;
-
- if (F.eq(ignite.name(), endpoint.grid()))
- igfs = (IgfsEx)((IgniteEx)ignite).igfsx(endpoint.igfs());
+ IgfsEx igfs = (IgfsEx)((IgniteEx)ignite).igfsx(endpoint.igfs());
if (igfs != null && !igfs.isProxy(split0.file())) {
IgfsPath path = new IgfsPath(split0.file());
http://git-wip-us.apache.org/repos/asf/ignite/blob/2e691d80/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/igfs/HadoopIgfsEndpoint.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/igfs/HadoopIgfsEndpoint.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/igfs/HadoopIgfsEndpoint.java
index a44e1ae..3771520 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/igfs/HadoopIgfsEndpoint.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/igfs/HadoopIgfsEndpoint.java
@@ -20,6 +20,10 @@ package org.apache.ignite.internal.processors.hadoop.igfs;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteFileSystem;
import org.apache.ignite.igfs.IgfsIpcEndpointConfiguration;
@@ -32,15 +36,18 @@ import org.jetbrains.annotations.Nullable;
* IGFS endpoint abstraction.
*/
public class HadoopIgfsEndpoint {
+ /** Guard ensuring that warning about grid name is printed only once. */
+ private static final AtomicBoolean LOG_WARN_GUARD = new AtomicBoolean();
+
+ /** Logger. */
+ private static final Log LOG = LogFactory.getLog(HadoopIgfsEndpoint.class);
+
/** Localhost. */
public static final String LOCALHOST = "127.0.0.1";
/** IGFS name. */
private final String igfsName;
- /** Grid name. */
- private final String gridName;
-
/** Host. */
private final String host;
@@ -66,9 +73,6 @@ public class HadoopIgfsEndpoint {
if (endpoint.igfs() != null)
sb.append(endpoint.igfs());
- if (endpoint.grid() != null)
- sb.append(":").append(endpoint.grid());
-
return new URI(uri.getScheme(), sb.length() != 0 ? sb.toString() : null, endpoint.host(), endpoint.port(),
uri.getPath(), uri.getQuery(), uri.getFragment());
}
@@ -93,27 +97,24 @@ public class HadoopIgfsEndpoint {
if (tokens.length == 1) {
igfsName = null;
- gridName = null;
hostPort = hostPort(connStr, connStr);
}
else if (tokens.length == 2) {
String authStr = tokens[0];
- if (authStr.isEmpty()) {
- gridName = null;
+ if (authStr.isEmpty())
igfsName = null;
- }
else {
String[] authTokens = authStr.split(":", -1);
igfsName = F.isEmpty(authTokens[0]) ? null : authTokens[0];
- if (authTokens.length == 1)
- gridName = null;
- else if (authTokens.length == 2)
- gridName = F.isEmpty(authTokens[1]) ? null : authTokens[1];
- else
+ if (authTokens.length == 2) {
+ if (!LOG_WARN_GUARD.get() && LOG_WARN_GUARD.compareAndSet(false, true))
+ LOG.warn("Grid name in IGFS connection string is deprecated and will be ignored: " + connStr);
+ }
+ else if (authTokens.length > 2)
throw new IgniteCheckedException("Invalid connection string format: " + connStr);
}
@@ -176,13 +177,6 @@ public class HadoopIgfsEndpoint {
}
/**
- * @return Grid name.
- */
- @Nullable public String grid() {
- return gridName;
- }
-
- /**
* @return Host.
*/
public String host() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/2e691d80/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsOutProc.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsOutProc.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsOutProc.java
index 4dc3c7f..88f26f1 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsOutProc.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsOutProc.java
@@ -103,9 +103,6 @@ public class HadoopIgfsOutProc implements HadoopIgfsEx, HadoopIgfsIpcIoListener
private static final IgniteClosure<IgniteInternalFuture<IgfsMessage>,
Collection<IgfsBlockLocation>> BLOCK_LOCATION_COL_RES = createClosure();
- /** Grid name. */
- private final String grid;
-
/** IGFS name. */
private final String igfs;
@@ -126,26 +123,26 @@ public class HadoopIgfsOutProc implements HadoopIgfsEx, HadoopIgfsIpcIoListener
*
* @param host Host.
* @param port Port.
- * @param grid Grid name.
* @param igfs IGFS name.
* @param log Client logger.
+ * @param user User name.
* @throws IOException If failed.
*/
- public HadoopIgfsOutProc(String host, int port, String grid, String igfs, Log log, String user) throws IOException {
- this(host, port, grid, igfs, false, log, user);
+ public HadoopIgfsOutProc(String host, int port, String igfs, Log log, String user) throws IOException {
+ this(host, port, igfs, false, log, user);
}
/**
* Constructor for shmem endpoint.
*
* @param port Port.
- * @param grid Grid name.
* @param igfs IGFS name.
* @param log Client logger.
+ * @param user User name.
* @throws IOException If failed.
*/
- public HadoopIgfsOutProc(int port, String grid, String igfs, Log log, String user) throws IOException {
- this(null, port, grid, igfs, true, log, user);
+ public HadoopIgfsOutProc(int port, String igfs, Log log, String user) throws IOException {
+ this(null, port, igfs, true, log, user);
}
/**
@@ -153,20 +150,19 @@ public class HadoopIgfsOutProc implements HadoopIgfsEx, HadoopIgfsIpcIoListener
*
* @param host Host.
* @param port Port.
- * @param grid Grid name.
* @param igfs IGFS name.
* @param shmem Shared memory flag.
* @param log Client logger.
+ * @param user User name.
* @throws IOException If failed.
*/
- private HadoopIgfsOutProc(String host, int port, String grid, String igfs, boolean shmem, Log log, String user)
+ private HadoopIgfsOutProc(String host, int port, String igfs, boolean shmem, Log log, String user)
throws IOException {
assert host != null && !shmem || host == null && shmem :
"Invalid arguments [host=" + host + ", port=" + port + ", shmem=" + shmem + ']';
String endpoint = host != null ? host + ":" + port : "shmem:" + port;
- this.grid = grid;
this.igfs = igfs;
this.log = log;
this.userName = IgfsUtils.fixUserName(user);
@@ -180,7 +176,6 @@ public class HadoopIgfsOutProc implements HadoopIgfsEx, HadoopIgfsIpcIoListener
@Override public IgfsHandshakeResponse handshake(String logDir) throws IgniteCheckedException {
final IgfsHandshakeRequest req = new IgfsHandshakeRequest();
- req.gridName(grid);
req.igfsName(igfs);
req.logDirectory(logDir);
@@ -223,7 +218,8 @@ public class HadoopIgfsOutProc implements HadoopIgfsEx, HadoopIgfsIpcIoListener
}
/** {@inheritDoc} */
- @Override public Boolean setTimes(IgfsPath path, long accessTime, long modificationTime) throws IgniteCheckedException {
+ @Override public Boolean setTimes(IgfsPath path, long accessTime, long modificationTime)
+ throws IgniteCheckedException {
final IgfsPathControlRequest msg = new IgfsPathControlRequest();
msg.command(SET_TIMES);
http://git-wip-us.apache.org/repos/asf/ignite/blob/2e691d80/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsWrapper.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsWrapper.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsWrapper.java
index 1fda1c3..aaf79de 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsWrapper.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsWrapper.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.hadoop.impl.igfs;
import org.apache.commons.logging.Log;
import org.apache.hadoop.conf.Configuration;
+import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteFileSystem;
import org.apache.ignite.IgniteIllegalStateException;
@@ -81,8 +82,10 @@ public class HadoopIgfsWrapper implements HadoopIgfs {
*
* @param authority Authority (connection string).
* @param logDir Log directory for server.
+ * @param user User name.
* @param conf Configuration.
* @param log Current logger.
+ * @throws IOException On error.
*/
public HadoopIgfsWrapper(String authority, String logDir, Configuration conf, Log log, String user)
throws IOException {
@@ -349,6 +352,7 @@ public class HadoopIgfsWrapper implements HadoopIgfs {
* Get delegate creating it if needed.
*
* @return Delegate.
+ * @throws HadoopIgfsCommunicationException On error.
*/
private Delegate delegate() throws HadoopIgfsCommunicationException {
// These fields will contain possible exceptions from shmem and TCP endpoints.
@@ -365,7 +369,7 @@ public class HadoopIgfsWrapper implements HadoopIgfs {
boolean skipInProc = parameter(conf, PARAM_IGFS_ENDPOINT_NO_EMBED, authority, false);
if (!skipInProc) {
- IgfsEx igfs = getIgfsEx(endpoint.grid(), endpoint.igfs());
+ IgfsEx igfs = getIgfsEx(endpoint.igfs());
if (igfs != null) {
HadoopIgfsEx hadoop = null;
@@ -393,7 +397,7 @@ public class HadoopIgfsWrapper implements HadoopIgfs {
HadoopIgfsEx hadoop = null;
try {
- hadoop = new HadoopIgfsOutProc(endpoint.port(), endpoint.grid(), endpoint.igfs(), log, userName);
+ hadoop = new HadoopIgfsOutProc(endpoint.port(), endpoint.igfs(), log, userName);
curDelegate = new Delegate(hadoop, hadoop.handshake(logDir));
}
@@ -415,7 +419,7 @@ public class HadoopIgfsWrapper implements HadoopIgfs {
HadoopIgfsEx hadoop = null;
try {
- hadoop = new HadoopIgfsOutProc(LOCALHOST, endpoint.port(), endpoint.grid(), endpoint.igfs(),
+ hadoop = new HadoopIgfsOutProc(LOCALHOST, endpoint.port(), endpoint.igfs(),
log, userName);
curDelegate = new Delegate(hadoop, hadoop.handshake(logDir));
@@ -437,7 +441,7 @@ public class HadoopIgfsWrapper implements HadoopIgfs {
HadoopIgfsEx hadoop = null;
try {
- hadoop = new HadoopIgfsOutProc(endpoint.host(), endpoint.port(), endpoint.grid(), endpoint.igfs(),
+ hadoop = new HadoopIgfsOutProc(endpoint.host(), endpoint.port(), endpoint.igfs(),
log, userName);
curDelegate = new Delegate(hadoop, hadoop.handshake(logDir));
@@ -532,20 +536,21 @@ public class HadoopIgfsWrapper implements HadoopIgfs {
/**
* Helper method to find Igfs of the given name in the given Ignite instance.
*
- * @param gridName The name of the grid to check.
* @param igfsName The name of Igfs.
* @return The file system instance, or null if not found.
*/
- private static IgfsEx getIgfsEx(@Nullable String gridName, @Nullable String igfsName) {
- if (Ignition.state(gridName) == STARTED) {
- try {
- for (IgniteFileSystem fs : Ignition.ignite(gridName).fileSystems()) {
- if (F.eq(fs.name(), igfsName))
- return (IgfsEx)fs;
+ private static IgfsEx getIgfsEx(@Nullable String igfsName) {
+ for (Ignite ignite : Ignition.allGrids()) {
+ if (Ignition.state(ignite.name()) == STARTED) {
+ try {
+ for (IgniteFileSystem fs : ignite.fileSystems()) {
+ if (F.eq(fs.name(), igfsName))
+ return (IgfsEx)fs;
+ }
+ }
+ catch (IgniteIllegalStateException ignore) {
+ // May happen if the grid state has changed:
}
- }
- catch (IgniteIllegalStateException ignore) {
- // May happen if the grid state has changed:
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/2e691d80/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractMapReduceTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractMapReduceTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractMapReduceTest.java
index 89005f6..d516179 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractMapReduceTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractMapReduceTest.java
@@ -86,7 +86,7 @@ public class HadoopAbstractMapReduceTest extends HadoopAbstractWordCountTest {
protected static final int SEQ_READS_BEFORE_PREFETCH = 2;
/** Secondary file system URI. */
- protected static final String SECONDARY_URI = "igfs://igfs-secondary:grid-secondary@127.0.0.1:11500/";
+ protected static final String SECONDARY_URI = "igfs://igfs-secondary@127.0.0.1:11500/";
/** Secondary file system configuration path. */
protected static final String SECONDARY_CFG = "modules/core/src/test/config/hadoop/core-site-loopback-secondary.xml";
http://git-wip-us.apache.org/repos/asf/ignite/blob/2e691d80/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractSelfTest.java
index 5666cbc..e2e8295 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractSelfTest.java
@@ -101,6 +101,7 @@ public abstract class HadoopAbstractSelfTest extends GridCommonAbstractTest {
/**
* Performs additional initialization in the beginning of test class execution.
+ * @throws Exception If failed.
*/
protected void beforeTestsStarted0() throws Exception {
// noop
@@ -245,6 +246,6 @@ public abstract class HadoopAbstractSelfTest extends GridCommonAbstractTest {
* @return IGFS scheme for test.
*/
protected String igfsScheme() {
- return "igfs://:" + getTestGridName(0) + "@/";
+ return "igfs://@/";
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/2e691d80/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopTaskExecutionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopTaskExecutionSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopTaskExecutionSelfTest.java
index 9d45b03..21e2f3d 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopTaskExecutionSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopTaskExecutionSelfTest.java
@@ -137,8 +137,8 @@ public class HadoopTaskExecutionSelfTest extends HadoopAbstractSelfTest {
job.setInputFormatClass(TextInputFormat.class);
- FileInputFormat.setInputPaths(job, new Path("igfs://:" + getTestGridName(0) + "@/"));
- FileOutputFormat.setOutputPath(job, new Path("igfs://:" + getTestGridName(0) + "@/output/"));
+ FileInputFormat.setInputPaths(job, new Path("igfs://@/"));
+ FileOutputFormat.setOutputPath(job, new Path("igfs://@/output/"));
job.setJarByClass(getClass());
@@ -181,8 +181,8 @@ public class HadoopTaskExecutionSelfTest extends HadoopAbstractSelfTest {
job.setInputFormatClass(TextInputFormat.class);
- FileInputFormat.setInputPaths(job, new Path("igfs://:" + getTestGridName(0) + "@/"));
- FileOutputFormat.setOutputPath(job, new Path("igfs://:" + getTestGridName(0) + "@/output"));
+ FileInputFormat.setInputPaths(job, new Path("igfs://@/"));
+ FileOutputFormat.setOutputPath(job, new Path("igfs://@/output"));
job.setJarByClass(getClass());
@@ -220,8 +220,8 @@ public class HadoopTaskExecutionSelfTest extends HadoopAbstractSelfTest {
job.setInputFormatClass(TextInputFormat.class);
- FileInputFormat.setInputPaths(job, new Path("igfs://:" + getTestGridName(0) + "@/"));
- FileOutputFormat.setOutputPath(job, new Path("igfs://:" + getTestGridName(0) + "@/output/"));
+ FileInputFormat.setInputPaths(job, new Path("igfs://@/"));
+ FileOutputFormat.setOutputPath(job, new Path("igfs://@/output/"));
job.setJarByClass(getClass());
@@ -282,8 +282,8 @@ public class HadoopTaskExecutionSelfTest extends HadoopAbstractSelfTest {
job.setInputFormatClass(InFormat.class);
- FileInputFormat.setInputPaths(job, new Path("igfs://:" + getTestGridName(0) + "@/"));
- FileOutputFormat.setOutputPath(job, new Path("igfs://:" + getTestGridName(0) + "@/output/"));
+ FileInputFormat.setInputPaths(job, new Path("igfs://@/"));
+ FileOutputFormat.setOutputPath(job, new Path("igfs://@/output/"));
job.setJarByClass(getClass());
@@ -409,6 +409,9 @@ public class HadoopTaskExecutionSelfTest extends HadoopAbstractSelfTest {
assertFalse(killRes);
}
+ /**
+ *
+ */
private static class CancellingTestMapper extends Mapper<Object, Text, Text, IntWritable> {
private int mapperId;
http://git-wip-us.apache.org/repos/asf/ignite/blob/2e691d80/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/client/HadoopClientProtocolSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/client/HadoopClientProtocolSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/client/HadoopClientProtocolSelfTest.java
index 44fc46e..b3ff3e4 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/client/HadoopClientProtocolSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/client/HadoopClientProtocolSelfTest.java
@@ -482,7 +482,7 @@ public class HadoopClientProtocolSelfTest extends HadoopAbstractSelfTest {
conf.set(MRConfig.FRAMEWORK_NAME, IgniteHadoopClientProtocolProvider.FRAMEWORK_NAME);
conf.set(MRConfig.MASTER_ADDRESS, "127.0.0.1:" + port);
- conf.set("fs.defaultFS", "igfs://:" + getTestGridName(0) + "@/");
+ conf.set("fs.defaultFS", "igfs://@/");
return conf;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/2e691d80/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/Hadoop1DualAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/Hadoop1DualAbstractTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/Hadoop1DualAbstractTest.java
index 367a406..cc9ea92 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/Hadoop1DualAbstractTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/Hadoop1DualAbstractTest.java
@@ -56,7 +56,7 @@ public abstract class Hadoop1DualAbstractTest extends IgfsDualAbstractSelfTest {
}};
/** Secondary file system authority. */
- private static final String SECONDARY_AUTHORITY = IGFS_NAME + ":" + GRID_NAME + "@127.0.0.1:" + PORT;
+ private static final String SECONDARY_AUTHORITY = IGFS_NAME + "@127.0.0.1:" + PORT;
/** Secondary file system authority. */
private static final String SECONDARY_WORKDIR = "workdir/test";
@@ -67,7 +67,10 @@ public abstract class Hadoop1DualAbstractTest extends IgfsDualAbstractSelfTest {
/** Secondary Fs URI. */
protected String secondaryUri;
- /** Constructor. */
+ /** Constructor.
+ *
+ * @param mode IGFS mode.
+ */
public Hadoop1DualAbstractTest(IgfsMode mode) {
super(mode);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/2e691d80/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopFIleSystemFactorySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopFIleSystemFactorySelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopFIleSystemFactorySelfTest.java
index 5d955d4..5f64845 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopFIleSystemFactorySelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopFIleSystemFactorySelfTest.java
@@ -125,7 +125,7 @@ public class HadoopFIleSystemFactorySelfTest extends IgfsCommonAbstractTest {
assert secondary.exists(IGFS_PATH_DUAL);
// Create remote instance.
- FileSystem fs = FileSystem.get(URI.create("igfs://primary:primary@127.0.0.1:10500/"), baseConfiguration());
+ FileSystem fs = FileSystem.get(URI.create("igfs://primary@127.0.0.1:10500/"), baseConfiguration());
// Ensure lifecycle callback was invoked.
assert START_CNT.get() == 2;
@@ -181,14 +181,14 @@ public class HadoopFIleSystemFactorySelfTest extends IgfsCommonAbstractTest {
// Prepare configuration.
Configuration conf = baseConfiguration();
- conf.set("fs.defaultFS", "igfs://secondary:secondary@127.0.0.1:11500/");
+ conf.set("fs.defaultFS", "igfs://secondary@127.0.0.1:11500/");
writeConfigurationToFile(conf);
// Get file system instance to be used.
CachingHadoopFileSystemFactory delegate = new CachingHadoopFileSystemFactory();
- delegate.setUri("igfs://secondary:secondary@127.0.0.1:11500/");
+ delegate.setUri("igfs://secondary@127.0.0.1:11500/");
delegate.setConfigPaths(SECONDARY_CFG_PATH);
// Configure factory.
http://git-wip-us.apache.org/repos/asf/ignite/blob/2e691d80/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfs20FileSystemLoopbackPrimarySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfs20FileSystemLoopbackPrimarySelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfs20FileSystemLoopbackPrimarySelfTest.java
index ee167d1..13996b9 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfs20FileSystemLoopbackPrimarySelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfs20FileSystemLoopbackPrimarySelfTest.java
@@ -36,7 +36,7 @@ public class HadoopIgfs20FileSystemLoopbackPrimarySelfTest extends HadoopIgfs20F
/** {@inheritDoc} */
@Override protected String primaryFileSystemUriPath() {
- return "igfs://igfs:" + getTestGridName(0) + "@/";
+ return "igfs://igfs@/";
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/2e691d80/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfs20FileSystemShmemPrimarySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfs20FileSystemShmemPrimarySelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfs20FileSystemShmemPrimarySelfTest.java
index 5f45488..3a4160d 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfs20FileSystemShmemPrimarySelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfs20FileSystemShmemPrimarySelfTest.java
@@ -36,7 +36,7 @@ public class HadoopIgfs20FileSystemShmemPrimarySelfTest extends HadoopIgfs20File
/** {@inheritDoc} */
@Override protected String primaryFileSystemUriPath() {
- return "igfs://igfs:" + getTestGridName(0) + "@/";
+ return "igfs://igfs@/";
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/2e691d80/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsDualAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsDualAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsDualAbstractSelfTest.java
index 8816182..cf1ccda 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsDualAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsDualAbstractSelfTest.java
@@ -77,13 +77,13 @@ public abstract class HadoopIgfsDualAbstractSelfTest extends IgfsCommonAbstractT
protected static final int SEQ_READS_BEFORE_PREFETCH = 2;
/** Secondary file system URI. */
- protected static final String SECONDARY_URI = "igfs://igfs-secondary:grid-secondary@127.0.0.1:11500/";
+ protected static final String SECONDARY_URI = "igfs://igfs-secondary@127.0.0.1:11500/";
/** Secondary file system configuration path. */
protected static final String SECONDARY_CFG = "modules/core/src/test/config/hadoop/core-site-loopback-secondary.xml";
/** Primary file system URI. */
- protected static final String PRIMARY_URI = "igfs://igfs:grid@/";
+ protected static final String PRIMARY_URI = "igfs://igfs@/";
/** Primary file system configuration path. */
protected static final String PRIMARY_CFG = "modules/core/src/test/config/hadoop/core-site-loopback.xml";
@@ -268,7 +268,7 @@ public abstract class HadoopIgfsDualAbstractSelfTest extends IgfsCommonAbstractT
int seqReads = SEQ_READS_BEFORE_PREFETCH + 1;
- cfg.setInt(String.format(PARAM_IGFS_SEQ_READS_BEFORE_PREFETCH, "igfs:grid@"), seqReads);
+ cfg.setInt(String.format(PARAM_IGFS_SEQ_READS_BEFORE_PREFETCH, "igfs@"), seqReads);
FileSystem fs = FileSystem.get(new URI(PRIMARY_URI), cfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/2e691d80/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopSecondaryFileSystemConfigurationTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopSecondaryFileSystemConfigurationTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopSecondaryFileSystemConfigurationTest.java
index 78f457b..9d49537 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopSecondaryFileSystemConfigurationTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopSecondaryFileSystemConfigurationTest.java
@@ -72,13 +72,13 @@ public class HadoopSecondaryFileSystemConfigurationTest extends IgfsCommonAbstra
static final String IGFS_SCHEME = "igfs";
/** Primary file system authority. */
- private static final String PRIMARY_AUTHORITY = "igfs:grid0@";
+ private static final String PRIMARY_AUTHORITY = "igfs@";
/** Autogenerated secondary file system configuration path. */
private static final String PRIMARY_CFG_PATH = "/work/core-site-primary-test.xml";
/** Secondary file system authority. */
- private static final String SECONDARY_AUTHORITY = "igfs_secondary:grid_secondary@127.0.0.1:11500";
+ private static final String SECONDARY_AUTHORITY = "igfs_secondary@127.0.0.1:11500";
/** Autogenerated secondary file system configuration path. */
static final String SECONDARY_CFG_PATH = "/work/core-site-test.xml";
http://git-wip-us.apache.org/repos/asf/ignite/blob/2e691d80/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgfsEventsTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgfsEventsTestSuite.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgfsEventsTestSuite.java
index 6d7dc99..2395338 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgfsEventsTestSuite.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgfsEventsTestSuite.java
@@ -131,7 +131,7 @@ public class IgfsEventsTestSuite extends TestSuite {
FileSystemConfiguration igfsCfg = super.getIgfsConfiguration();
igfsCfg.setSecondaryFileSystem(new IgniteHadoopIgfsSecondaryFileSystem(
- "igfs://igfs-secondary:grid-secondary@127.0.0.1:11500/",
+ "igfs://igfs-secondary@127.0.0.1:11500/",
"modules/core/src/test/config/hadoop/core-site-secondary.xml"));
return igfsCfg;
@@ -235,7 +235,7 @@ public class IgfsEventsTestSuite extends TestSuite {
igfsCfg.setDefaultMode(IgfsMode.PRIMARY);
igfsCfg.setSecondaryFileSystem(new IgniteHadoopIgfsSecondaryFileSystem(
- "igfs://igfs-secondary:grid-secondary@127.0.0.1:11500/",
+ "igfs://igfs-secondary@127.0.0.1:11500/",
"modules/core/src/test/config/hadoop/core-site-loopback-secondary.xml"));
return igfsCfg;
http://git-wip-us.apache.org/repos/asf/ignite/blob/2e691d80/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemAbstractSelfTest.java
index bd17edc..1bcbdaa 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemAbstractSelfTest.java
@@ -99,13 +99,13 @@ import static org.apache.ignite.igfs.IgfsMode.PROXY;
@SuppressWarnings("all")
public abstract class IgniteHadoopFileSystemAbstractSelfTest extends IgfsCommonAbstractTest {
/** Primary file system authority. */
- private static final String PRIMARY_AUTHORITY = "igfs:grid0@";
+ private static final String PRIMARY_AUTHORITY = "igfs@";
/** Primary file systme URI. */
private static final String PRIMARY_URI = "igfs://" + PRIMARY_AUTHORITY + "/";
/** Secondary file system authority. */
- private static final String SECONDARY_AUTHORITY = "igfs_secondary:grid_secondary@127.0.0.1:11500";
+ private static final String SECONDARY_AUTHORITY = "igfs_secondary@127.0.0.1:11500";
/** Secondary file systme URI. */
private static final String SECONDARY_URI = "igfs://" + SECONDARY_AUTHORITY + "/";
http://git-wip-us.apache.org/repos/asf/ignite/blob/2e691d80/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientSelfTest.java
index 555da1e..92956b0 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientSelfTest.java
@@ -142,7 +142,7 @@ public class IgniteHadoopFileSystemClientSelfTest extends IgfsCommonAbstractTest
try {
switchHandlerErrorFlag(true);
- HadoopIgfs client = new HadoopIgfsOutProc("127.0.0.1", 10500, getTestGridName(0), "igfs", LOG, null);
+ HadoopIgfs client = new HadoopIgfsOutProc("127.0.0.1", 10500, "igfs", LOG, null);
client.handshake(null);
http://git-wip-us.apache.org/repos/asf/ignite/blob/2e691d80/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemHandshakeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemHandshakeSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemHandshakeSelfTest.java
index 9891c60..a01c015 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemHandshakeSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemHandshakeSelfTest.java
@@ -110,7 +110,7 @@ public class IgniteHadoopFileSystemHandshakeSelfTest extends IgfsCommonAbstractT
checkValid(IGFS_NAME + ":" + GRID_NAME + "@" + HOST_PORT_UNUSED);
checkValid(IGFS_NAME + "@"); // Embedded mode fails, but remote tcp succeeds.
- checkInvalid(IGFS_NAME + "@" + HOST_PORT_UNUSED);
+ checkValid(IGFS_NAME + "@" + HOST_PORT_UNUSED);
checkValid(":" + GRID_NAME + "@"); // Embedded mode fails, but remote tcp succeeds.
checkInvalid(":" + GRID_NAME + "@" + HOST_PORT_UNUSED);
@@ -129,17 +129,17 @@ public class IgniteHadoopFileSystemHandshakeSelfTest extends IgfsCommonAbstractT
tcp = true;
- checkInvalid(IGFS_NAME + ":" + GRID_NAME + "@");
- checkInvalid(IGFS_NAME + ":" + GRID_NAME + "@127.0.0.1");
- checkInvalid(IGFS_NAME + ":" + GRID_NAME + "@127.0.0.1:" + DFLT_IPC_PORT);
+ checkValid(IGFS_NAME + ":" + GRID_NAME + "@");
+ checkValid(IGFS_NAME + ":" + GRID_NAME + "@127.0.0.1");
+ checkValid(IGFS_NAME + ":" + GRID_NAME + "@127.0.0.1:" + DFLT_IPC_PORT);
checkValid(IGFS_NAME + "@");
checkValid(IGFS_NAME + "@127.0.0.1");
checkValid(IGFS_NAME + "@127.0.0.1:" + DFLT_IPC_PORT);
- checkInvalid(":" + GRID_NAME + "@");
- checkInvalid(":" + GRID_NAME + "@127.0.0.1");
- checkInvalid(":" + GRID_NAME + "@127.0.0.1:" + DFLT_IPC_PORT);
+ checkValid(":" + GRID_NAME + "@");
+ checkValid(":" + GRID_NAME + "@127.0.0.1");
+ checkValid(":" + GRID_NAME + "@127.0.0.1:" + DFLT_IPC_PORT);
checkValid("");
checkValid("127.0.0.1");
@@ -147,13 +147,13 @@ public class IgniteHadoopFileSystemHandshakeSelfTest extends IgfsCommonAbstractT
tcp = false; // Embedded mode:
- checkInvalid(IGFS_NAME + ":" + GRID_NAME + "@");
- checkInvalid(IGFS_NAME + ":" + GRID_NAME + "@" + HOST_PORT_UNUSED);
+ checkValid(IGFS_NAME + ":" + GRID_NAME + "@");
+ checkValid(IGFS_NAME + ":" + GRID_NAME + "@" + HOST_PORT_UNUSED);
checkValid(IGFS_NAME + "@");
checkValid(IGFS_NAME + "@" + HOST_PORT_UNUSED);
- checkInvalid(":" + GRID_NAME + "@");
+ checkValid(":" + GRID_NAME + "@");
checkInvalid(":" + GRID_NAME + "@" + HOST_PORT_UNUSED);
checkValid("@"); // Embedded mode fails, but remote tcp succeeds.
@@ -198,7 +198,7 @@ public class IgniteHadoopFileSystemHandshakeSelfTest extends IgfsCommonAbstractT
checkValid(":" + GRID_NAME + "@" + HOST_PORT_UNUSED);
checkValid("@"); // NB: in embedded mode this fails, but remote TCP still succeeds.
- checkInvalid("@" + HOST_PORT_UNUSED);
+ checkValid("@" + HOST_PORT_UNUSED);
}
/**
@@ -219,9 +219,9 @@ public class IgniteHadoopFileSystemHandshakeSelfTest extends IgfsCommonAbstractT
checkInvalid(IGFS_NAME + "@127.0.0.1");
checkInvalid(IGFS_NAME + "@127.0.0.1:" + DFLT_IPC_PORT);
- checkInvalid(":" + GRID_NAME + "@");
- checkInvalid(":" + GRID_NAME + "@127.0.0.1");
- checkInvalid(":" + GRID_NAME + "@127.0.0.1:" + DFLT_IPC_PORT);
+ checkValid(":" + GRID_NAME + "@");
+ checkValid(":" + GRID_NAME + "@127.0.0.1");
+ checkValid(":" + GRID_NAME + "@127.0.0.1:" + DFLT_IPC_PORT);
checkValid("");
checkValid("127.0.0.1");
@@ -235,8 +235,8 @@ public class IgniteHadoopFileSystemHandshakeSelfTest extends IgfsCommonAbstractT
checkInvalid(IGFS_NAME + "@");
checkInvalid(IGFS_NAME + "@" + HOST_PORT_UNUSED);
- checkInvalid(":" + GRID_NAME + "@");
- checkInvalid(":" + GRID_NAME + "@" + HOST_PORT_UNUSED);
+ checkValid(":" + GRID_NAME + "@");
+ checkValid(":" + GRID_NAME + "@" + HOST_PORT_UNUSED);
checkValid("@");
checkValid("@" + HOST_PORT_UNUSED);
http://git-wip-us.apache.org/repos/asf/ignite/blob/2e691d80/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemLoggerStateSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemLoggerStateSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemLoggerStateSelfTest.java
index e30779f..8b6635e 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemLoggerStateSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemLoggerStateSelfTest.java
@@ -307,11 +307,11 @@ public class IgniteHadoopFileSystemLoggerStateSelfTest extends IgfsCommonAbstrac
fsCfg.setBoolean("fs.igfs.impl.disable.cache", true);
if (logging)
- fsCfg.setBoolean(String.format(PARAM_IGFS_LOG_ENABLED, "igfs:igfs-grid@"), logging);
+ fsCfg.setBoolean(String.format(PARAM_IGFS_LOG_ENABLED, "igfs@"), logging);
- fsCfg.setStrings(String.format(PARAM_IGFS_LOG_DIR, "igfs:igfs-grid@"), U.getIgniteHome());
+ fsCfg.setStrings(String.format(PARAM_IGFS_LOG_DIR, "igfs@"), U.getIgniteHome());
- return (IgniteHadoopFileSystem)FileSystem.get(new URI("igfs://igfs:igfs-grid@/"), fsCfg);
+ return (IgniteHadoopFileSystem)FileSystem.get(new URI("igfs://igfs@/"), fsCfg);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/2e691d80/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemSecondaryFileSystemInitializationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemSecondaryFileSystemInitializationSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemSecondaryFileSystemInitializationSelfTest.java
index 4c96244..fd56137 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemSecondaryFileSystemInitializationSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemSecondaryFileSystemInitializationSelfTest.java
@@ -84,7 +84,7 @@ public class IgniteHadoopFileSystemSecondaryFileSystemInitializationSelfTest ext
igfsCfg.setManagementPort(-1);
igfsCfg.setSecondaryFileSystem(new IgniteHadoopIgfsSecondaryFileSystem(
- "igfs://igfs-secondary:igfs-grid-secondary@127.0.0.1:11500/",
+ "igfs://igfs-secondary@127.0.0.1:11500/",
"modules/core/src/test/config/hadoop/core-site-loopback-secondary.xml"));
CacheConfiguration cacheCfg = defaultCacheConfiguration();
@@ -126,7 +126,7 @@ public class IgniteHadoopFileSystemSecondaryFileSystemInitializationSelfTest ext
fsCfg.setBoolean("fs.igfs.impl.disable.cache", true);
- fs = (IgniteHadoopFileSystem)FileSystem.get(new URI("igfs://igfs:igfs-grid@/"), fsCfg);
+ fs = (IgniteHadoopFileSystem)FileSystem.get(new URI("igfs://igfs@/"), fsCfg);
}
/**