http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServer.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServer.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServer.java index 59a9d71..0ff2f3a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServer.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServer.java @@ -36,16 +36,16 @@ import java.util.*; import static org.apache.ignite.spi.IgnitePortProtocol.*; /** - * GGFS server. Handles requests passed from GGFS clients. + * IGFS server. Handles requests passed from IGFS clients. */ public class IgfsServer { - /** GGFS context. */ + /** IGFS context. */ private final IgfsContext igfsCtx; /** Logger. */ private final IgniteLogger log; - /** GGFS marshaller. */ + /** IGFS marshaller. */ private final IgfsMarshaller marsh; /** Endpoint configuration. */ @@ -68,7 +68,7 @@ public class IgfsServer { /** * Constructs igfs server manager. - * @param igfsCtx GGFS context. + * @param igfsCtx IGFS context. * @param endpointCfg Endpoint configuration to start. * @param mgmt Management flag - if true, server is intended to be started for Visor. */ @@ -163,7 +163,7 @@ public class IgfsServer { hnd.stop(); } catch (IgniteCheckedException e) { - U.error(log, "Failed to stop GGFS server handler (will close client connections anyway).", e); + U.error(log, "Failed to stop IGFS server handler (will close client connections anyway).", e); } // Stop existing client connections. @@ -394,7 +394,7 @@ public class IgfsServer { IpcEndpoint client = srvEndpoint.accept(); if (log.isDebugEnabled()) - log.debug("GGFS client connected [igfsName=" + igfsCtx.kernalContext().gridName() + + log.debug("IGFS client connected [igfsName=" + igfsCtx.kernalContext().gridName() + ", client=" + client + ']'); ClientWorker worker = new ClientWorker(client, acceptCnt++);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServerHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServerHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServerHandler.java index f3870ab..42d92f5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServerHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServerHandler.java @@ -25,7 +25,7 @@ import org.jetbrains.annotations.*; import java.io.*; /** - * GGFS server message handler. Server component that is plugged in to the server implementation + * IGFS server message handler. Server component that is plugged in to the server implementation * to handle incoming messages asynchronously. */ public interface IgfsServerHandler { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServerManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServerManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServerManager.java index cf99401..7fc0865 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServerManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServerManager.java @@ -32,7 +32,7 @@ import java.util.concurrent.*; import static org.apache.ignite.configuration.IgfsConfiguration.*; /** - * GGFS server manager. + * IGFS server manager. */ public class IgfsServerManager extends IgfsManager { /** IPC server rebind interval. */ @@ -100,7 +100,7 @@ public class IgfsServerManager extends IgfsManager { String portMsg = port != -1 ? " Failed to bind to port (is port already in use?): " + port : ""; - U.warn(log, "Failed to start GGFS " + (mgmt ? "management " : "") + "endpoint " + + U.warn(log, "Failed to start IGFS " + (mgmt ? "management " : "") + "endpoint " + "(will retry every " + (REBIND_INTERVAL / 1000) + "s)." + portMsg); @@ -199,7 +199,7 @@ public class IgfsServerManager extends IgfsManager { } catch (IgniteCheckedException e) { if (GridWorker.log.isDebugEnabled()) - GridWorker.log.debug("Failed to bind GGFS endpoint [cfg=" + cfg + ", err=" + e.getMessage() + ']'); + GridWorker.log.debug("Failed to bind IGFS endpoint [cfg=" + cfg + ", err=" + e.getMessage() + ']'); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsStatus.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsStatus.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsStatus.java index 65ce0ce..5592abe 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsStatus.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsStatus.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.igfs; import java.io.*; /** - * GGFS response for status request. + * IGFS response for status request. */ public class IgfsStatus implements Externalizable { /** */ @@ -29,7 +29,7 @@ public class IgfsStatus implements Externalizable { /** Total space size. */ private long spaceTotal; - /** Used space in GGFS. */ + /** Used space in IGFS. */ private long spaceUsed; /** @@ -40,8 +40,8 @@ public class IgfsStatus implements Externalizable { } /** - * @param spaceUsed Used space in GGFS. - * @param spaceTotal Total space available in GGFS. + * @param spaceUsed Used space in IGFS. + * @param spaceTotal Total space available in IGFS. */ public IgfsStatus(long spaceUsed, long spaceTotal) { this.spaceUsed = spaceUsed; @@ -49,14 +49,14 @@ public class IgfsStatus implements Externalizable { } /** - * @return Total space available in GGFS. + * @return Total space available in IGFS. */ public long spaceTotal() { return spaceTotal; } /** - * @return Used space in GGFS. + * @return Used space in IGFS. */ public long spaceUsed() { return spaceUsed; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsTaskArgsImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsTaskArgsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsTaskArgsImpl.java index 1763690..62dc68d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsTaskArgsImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsTaskArgsImpl.java @@ -25,13 +25,13 @@ import java.io.*; import java.util.*; /** - * GGFS task arguments implementation. + * IGFS task arguments implementation. */ public class IgfsTaskArgsImpl<T> implements IgfsTaskArgs<T>, Externalizable { /** */ private static final long serialVersionUID = 0L; - /** GGFS name. */ + /** IGFS name. */ private String ggfsName; /** Paths. */ @@ -59,7 +59,7 @@ public class IgfsTaskArgsImpl<T> implements IgfsTaskArgs<T>, Externalizable { /** * Constructor. * - * @param ggfsName GGFS name. + * @param ggfsName IGFS name. * @param paths Paths. * @param recRslvr Record resolver. * @param skipNonExistentFiles Skip non existent files flag. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsThread.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsThread.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsThread.java index 4ada131..3523bc8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsThread.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsThread.java @@ -20,18 +20,18 @@ package org.apache.ignite.internal.processors.igfs; import org.apache.ignite.internal.util.typedef.*; /** - * GGFS ad-hoc thread. + * IGFS ad-hoc thread. */ public abstract class IgfsThread extends Thread { /** - * Creates {@code GGFS} add-hoc thread. + * Creates {@code IGFS} add-hoc thread. */ protected IgfsThread() { super("igfs-worker"); } /** - * Creates {@code GGFS} add-hoc thread. + * Creates {@code IGFS} add-hoc thread. * * @param name Thread name. */ @@ -49,7 +49,7 @@ public abstract class IgfsThread extends Thread { } // Catch all. catch (Throwable e) { - X.error("Failed to execute GGFS ad-hoc thread: " + e.getMessage()); + X.error("Failed to execute IGFS ad-hoc thread: " + e.getMessage()); e.printStackTrace(); } @@ -59,7 +59,7 @@ public abstract class IgfsThread extends Thread { } // Catch all. catch (Throwable e) { - X.error("Failed to clean up GGFS ad-hoc thread: " + e.getMessage()); + X.error("Failed to clean up IGFS ad-hoc thread: " + e.getMessage()); e.printStackTrace(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcEndpoint.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcEndpoint.java b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcEndpoint.java index 3e91100..94696a0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcEndpoint.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcEndpoint.java @@ -22,7 +22,7 @@ import org.apache.ignite.*; import java.io.*; /** - * GGFS IPC endpoint used for point-to-point communication. + * IGFS IPC endpoint used for point-to-point communication. */ public interface IpcEndpoint extends Closeable { /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfs.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfs.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfs.java index e91fa57..b418fae 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfs.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfs.java @@ -30,25 +30,25 @@ public class VisorIgfs implements Serializable { /** */ private static final long serialVersionUID = 0L; - /** GGFS instance name. */ + /** IGFS instance name. */ private final String name; - /** GGFS instance working mode. */ + /** IGFS instance working mode. */ private final IgfsMode mode; - /** GGFS metrics. */ + /** IGFS metrics. */ private final VisorIgfsMetrics metrics; - /** Whether GGFS has configured secondary file system. */ + /** Whether IGFS has configured secondary file system. */ private final boolean secondaryFsConfigured; /** * Create data transfer object. * - * @param name GGFS name. - * @param mode GGFS mode. - * @param metrics GGFS metrics. - * @param secondaryFsConfigured Whether GGFS has configured secondary file system. + * @param name IGFS name. + * @param mode IGFS mode. + * @param metrics IGFS metrics. + * @param secondaryFsConfigured Whether IGFS has configured secondary file system. */ public VisorIgfs( String name, @@ -63,8 +63,8 @@ public class VisorIgfs implements Serializable { } /** - * @param igfs Source GGFS. - * @return Data transfer object for given GGFS. + * @param igfs Source IGFS. + * @return Data transfer object for given IGFS. * @throws IgniteCheckedException */ public static VisorIgfs from(IgniteFs igfs) throws IgniteCheckedException { @@ -79,28 +79,28 @@ public class VisorIgfs implements Serializable { } /** - * @return GGFS instance name. + * @return IGFS instance name. */ public String name() { return name; } /** - * @return GGFS instance working mode. + * @return IGFS instance working mode. */ public IgfsMode mode() { return mode; } /** - * @return GGFS metrics. + * @return IGFS metrics. */ public VisorIgfsMetrics metrics() { return metrics; } /** - * @return Whether GGFS has configured secondary file system. + * @return Whether IGFS has configured secondary file system. */ public boolean secondaryFileSystemConfigured() { return secondaryFsConfigured; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/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 47bfff9..13401eb 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 @@ -23,13 +23,13 @@ import org.jetbrains.annotations.*; import java.io.*; /** - * GGFS endpoint descriptor. + * IGFS endpoint descriptor. */ public class VisorIgfsEndpoint implements Serializable{ /** */ private static final long serialVersionUID = 0L; - /** GGFS name. */ + /** IGFS name. */ private final String igfsName; /** Grid name. */ @@ -42,8 +42,8 @@ public class VisorIgfsEndpoint implements Serializable{ private final int port; /** - * Create GGFS endpoint descriptor with given parameters. - * @param igfsName GGFS name. + * Create IGFS endpoint descriptor with given parameters. + * @param igfsName IGFS name. * @param gridName Grid name. * @param hostName Host address / name. * @param port Port number. @@ -56,7 +56,7 @@ public class VisorIgfsEndpoint implements Serializable{ } /** - * @return GGFS name. + * @return IGFS name. */ @Nullable public String igfsName() { return igfsName; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsFormatTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsFormatTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsFormatTask.java index 2b5a39d..50893cb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsFormatTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsFormatTask.java @@ -23,7 +23,7 @@ import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.internal.visor.*; /** - * Format GGFS instance. + * Format IGFS instance. */ @GridInternal public class VisorIgfsFormatTask extends VisorOneNodeTask<String, Void> { @@ -36,14 +36,14 @@ public class VisorIgfsFormatTask extends VisorOneNodeTask<String, Void> { } /** - * Job that format GGFS. + * Job that format IGFS. */ private static class VisorIgfsFormatJob extends VisorJob<String, Void> { /** */ private static final long serialVersionUID = 0L; /** - * @param arg GGFS name to format. + * @param arg IGFS name to format. * @param debug Debug flag. */ private VisorIgfsFormatJob(String arg, boolean debug) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsMetrics.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsMetrics.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsMetrics.java index cec1e92..2a82d4a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsMetrics.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsMetrics.java @@ -72,8 +72,8 @@ public class VisorIgfsMetrics implements Serializable { private long bytesWrtTm; /** - * @param m GGFS metrics. - * @return Data transfer object for given GGFS metrics. + * @param m IGFS metrics. + * @return Data transfer object for given IGFS metrics. */ public static VisorIgfsMetrics from(IgfsMetrics m) { assert m != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfiler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfiler.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfiler.java index 61751e3..2f5158a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfiler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfiler.java @@ -23,7 +23,7 @@ import org.apache.ignite.internal.util.typedef.*; import java.util.*; /** - * Various global constants for GGFS profiler. + * Various global constants for IGFS profiler. */ public class VisorIgfsProfiler { /** Default file block size to calculate uniformity. */ @@ -33,7 +33,7 @@ public class VisorIgfsProfiler { public static final int UNIFORMITY_BLOCKS = 100; /** - * Aggregate GGFS profiler entries. + * Aggregate IGFS profiler entries. * * @param entries Entries to sum. * @return Single aggregated entry. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerClearTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerClearTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerClearTask.java index 06041ae..f63e669 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerClearTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerClearTask.java @@ -29,7 +29,7 @@ import java.nio.file.*; import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*; /** - * Remove all GGFS profiler logs. + * Remove all IGFS profiler logs. */ @GridInternal public class VisorIgfsProfilerClearTask extends VisorOneNodeTask<String, IgniteBiTuple<Integer, Integer>> { @@ -92,7 +92,7 @@ public class VisorIgfsProfilerClearTask extends VisorOneNodeTask<String, IgniteB } } catch (IOException | IllegalArgumentException e) { - throw new IgniteException("Failed to clear profiler logs for GGFS: " + arg, e); + throw new IgniteException("Failed to clear profiler logs for IGFS: " + arg, e); } catch (IgniteCheckedException e) { throw U.convertException(e); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerEntry.java index 4ec4975..5f6a580 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerEntry.java @@ -24,7 +24,7 @@ import java.io.*; import java.util.*; /** - * Visor GGFS profiler information about one file. + * Visor IGFS profiler information about one file. */ public class VisorIgfsProfilerEntry implements Serializable { /** */ @@ -44,7 +44,7 @@ public class VisorIgfsProfilerEntry implements Serializable { /** Timestamp of last file operation. */ private final long timestamp; - /** GGFS mode. */ + /** IGFS mode. */ private final IgfsMode mode; /** File size. */ @@ -145,7 +145,7 @@ public class VisorIgfsProfilerEntry implements Serializable { } /** - * @return GGFS mode. + * @return IGFS mode. */ public IgfsMode mode() { return mode; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerTask.java index 6395d41..c0edfa3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerTask.java @@ -53,7 +53,7 @@ public class VisorIgfsProfilerTask extends VisorOneNodeTask<String, Collection<V /** File path. */ private final String path; - /** File GGFS mode. */ + /** File IGFS mode. */ private final IgfsMode mode; /** Stream ID. */ @@ -152,7 +152,7 @@ public class VisorIgfsProfilerTask extends VisorOneNodeTask<String, Collection<V /** * Create job with given argument. * - * @param arg GGFS name. + * @param arg IGFS name. * @param debug Debug flag. */ private VisorIgfsProfilerJob(String arg, boolean debug) { @@ -170,7 +170,7 @@ public class VisorIgfsProfilerTask extends VisorOneNodeTask<String, Collection<V return Collections.emptyList(); } catch (IOException | IllegalArgumentException e) { - throw new IgniteException("Failed to parse profiler logs for GGFS: " + arg, e); + throw new IgniteException("Failed to parse profiler logs for IGFS: " + arg, e); } catch (IgniteCheckedException e) { throw U.convertException(e); @@ -244,11 +244,11 @@ public class VisorIgfsProfilerTask extends VisorOneNodeTask<String, Collection<V } /** - * Parse GGFS mode from string. + * Parse IGFS mode from string. * * @param ss Array of source strings. * @param ix Index of array item to parse. - * @return Parsed GGFS mode or {@code null} if string is empty. + * @return Parsed IGFS mode or {@code null} if string is empty. */ private IgfsMode parseIgfsMode(String[] ss, int ix) { if (ss.length <= ix) @@ -319,7 +319,7 @@ public class VisorIgfsProfilerTask extends VisorOneNodeTask<String, Collection<V ts = line.ts; // Remember last timestamp. - // Remember last GGFS mode. + // Remember last IGFS mode. if (line.mode != null) mode = line.mode; @@ -363,7 +363,7 @@ public class VisorIgfsProfilerTask extends VisorOneNodeTask<String, Collection<V break; default: - throw new IllegalStateException("Unexpected GGFS profiler log entry type: " + line.entryType); + throw new IllegalStateException("Unexpected IGFS profiler log entry type: " + line.entryType); } } @@ -465,7 +465,7 @@ public class VisorIgfsProfilerTask extends VisorOneNodeTask<String, Collection<V } /** - * Parse all GGFS log files in specified log directory. + * Parse all IGFS log files in specified log directory. * * @param logDir Folder were log files located. * @return List of line with aggregated information by files. @@ -485,7 +485,7 @@ public class VisorIgfsProfilerTask extends VisorOneNodeTask<String, Collection<V // Files was deleted, skip it. } catch (Exception e) { - ignite.log().warning("Failed to parse GGFS profiler log file: " + p, e); + ignite.log().warning("Failed to parse IGFS profiler log file: " + p, e); } } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsResetMetricsTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsResetMetricsTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsResetMetricsTask.java index 4be5066..bf0e6b4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsResetMetricsTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsResetMetricsTask.java @@ -25,7 +25,7 @@ import org.apache.ignite.internal.visor.*; import java.util.*; /** - * Resets GGFS metrics. + * Resets IGFS metrics. */ @GridInternal public class VisorIgfsResetMetricsTask extends VisorOneNodeTask<Set<String>, Void> { @@ -38,14 +38,14 @@ public class VisorIgfsResetMetricsTask extends VisorOneNodeTask<Set<String>, Voi } /** - * Job that reset GGFS metrics. + * Job that reset IGFS metrics. */ private static class VisorIgfsResetMetricsJob extends VisorJob<Set<String>, Void> { /** */ private static final long serialVersionUID = 0L; /** - * @param arg GGFS names. + * @param arg IGFS names. * @param debug Debug flag. */ private VisorIgfsResetMetricsJob(Set<String> arg, boolean debug) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsSamplingStateTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsSamplingStateTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsSamplingStateTask.java index 1f98c47..b6e901d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsSamplingStateTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsSamplingStateTask.java @@ -25,7 +25,7 @@ import org.apache.ignite.internal.visor.*; import org.apache.ignite.lang.*; /** - * Task to set GGFS instance sampling state. + * Task to set IGFS instance sampling state. */ @GridInternal public class VisorIgfsSamplingStateTask extends VisorOneNodeTask<IgniteBiTuple<String, Boolean>, Void> { @@ -33,7 +33,7 @@ public class VisorIgfsSamplingStateTask extends VisorOneNodeTask<IgniteBiTuple<S private static final long serialVersionUID = 0L; /** - * Job that perform parsing of GGFS profiler logs. + * Job that perform parsing of IGFS profiler logs. */ private static class VisorIgfsSamplingStateJob extends VisorJob<IgniteBiTuple<String, Boolean>, Void> { /** */ @@ -57,7 +57,7 @@ public class VisorIgfsSamplingStateTask extends VisorOneNodeTask<IgniteBiTuple<S return null; } catch (IllegalArgumentException iae) { - throw new IgniteException("Failed to set sampling state for GGFS: " + arg.get1(), iae); + throw new IgniteException("Failed to set sampling state for IGFS: " + arg.get1(), iae); } catch(IgniteCheckedException e) { throw U.convertException(e); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java index 13b315a..6c22a65 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java @@ -108,7 +108,7 @@ public class VisorGridConfiguration implements Serializable { rest(VisorRestConfiguration.from(c)); userAttributes(c.getUserAttributes()); caches(VisorCacheConfiguration.list(ignite, c.getCacheConfiguration())); - ggfss(VisorGgfsConfiguration.list(c.getIgfsConfiguration())); + ggfss(VisorIgfsConfiguration.list(c.getIgfsConfiguration())); streamers(VisorStreamerConfiguration.list(c.getStreamerConfiguration())); env(new HashMap<>(getenv())); systemProperties(getProperties()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java index 4ac93aa..a34834a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java @@ -28,7 +28,7 @@ import java.util.*; import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*; /** - * Data transfer object for GGFS configuration properties. + * Data transfer object for IGFS configuration properties. */ public class VisorIgfsConfiguration implements Serializable { /** Property name for path to Hadoop configuration. */ @@ -40,13 +40,13 @@ public class VisorIgfsConfiguration implements Serializable { /** */ private static final long serialVersionUID = 0L; - /** GGFS instance name. */ + /** IGFS instance name. */ private String name; - /** Cache name to store GGFS meta information. */ + /** Cache name to store IGFS meta information. */ private String metaCacheName; - /** Cache name to store GGFS data. */ + /** Cache name to store IGFS data. */ private String dataCacheName; /** File's data block size. */ @@ -55,7 +55,7 @@ public class VisorIgfsConfiguration implements Serializable { /** Number of pre-fetched blocks if specific file's chunk is requested. */ private int prefetchBlocks; - /** Read/write buffer size for GGFS stream operations in bytes. */ + /** Read/write buffer size for IGFS stream operations in bytes. */ private int streamBufferSize; /** Number of file blocks buffered on local node before sending batch to remote node. */ @@ -70,10 +70,10 @@ public class VisorIgfsConfiguration implements Serializable { /** Path for the secondary hadoop file system config. */ private String secondaryHadoopFileSystemConfigPath; - /** GGFS instance mode. */ + /** IGFS instance mode. */ private IgfsMode defaultMode; - /** Map of paths to GGFS modes. */ + /** Map of paths to IGFS modes. */ private Map<String, IgfsMode> pathModes; /** Dual mode PUT operations executor service. */ @@ -103,7 +103,7 @@ public class VisorIgfsConfiguration implements Serializable { /** Fragmentizer throttling delay. */ private long fragmentizerThrottlingDelay; - /** IPC endpoint config (in JSON format) to publish GGFS over. */ + /** IPC endpoint config (in JSON format) to publish IGFS over. */ private String ipcEndpointCfg; /** IPC endpoint enabled flag. */ @@ -122,8 +122,8 @@ public class VisorIgfsConfiguration implements Serializable { private long trashPurgeTimeout; /** - * @param ggfs GGFS configuration. - * @return Data transfer object for GGFS configuration properties. + * @param ggfs IGFS configuration. + * @return Data transfer object for IGFS configuration properties. */ public static VisorIgfsConfiguration from(IgfsConfiguration ggfs) { VisorIgfsConfiguration cfg = new VisorIgfsConfiguration(); @@ -189,7 +189,7 @@ public class VisorIgfsConfiguration implements Serializable { } /** - * @return GGFS instance name. + * @return IGFS instance name. */ @Nullable public String name() { return name; @@ -203,28 +203,28 @@ public class VisorIgfsConfiguration implements Serializable { } /** - * @return Cache name to store GGFS meta information. + * @return Cache name to store IGFS meta information. */ @Nullable public String metaCacheName() { return metaCacheName; } /** - * @param metaCacheName New cache name to store GGFS meta information. + * @param metaCacheName New cache name to store IGFS meta information. */ public void metaCacheName(@Nullable String metaCacheName) { this.metaCacheName = metaCacheName; } /** - * @return Cache name to store GGFS data. + * @return Cache name to store IGFS data. */ @Nullable public String dataCacheName() { return dataCacheName; } /** - * @param dataCacheName New cache name to store GGFS data. + * @param dataCacheName New cache name to store IGFS data. */ public void dataCacheName(@Nullable String dataCacheName) { this.dataCacheName = dataCacheName; @@ -259,14 +259,14 @@ public class VisorIgfsConfiguration implements Serializable { } /** - * @return Read/write buffer size for GGFS stream operations in bytes. + * @return Read/write buffer size for IGFS stream operations in bytes. */ public int streamBufferSize() { return streamBufferSize; } /** - * @param streamBufSize New read/write buffer size for GGFS stream operations in bytes. + * @param streamBufSize New read/write buffer size for IGFS stream operations in bytes. */ public void streamBufferSize(int streamBufSize) { streamBufferSize = streamBufSize; @@ -329,7 +329,7 @@ public class VisorIgfsConfiguration implements Serializable { } /** - * @return GGFS instance mode. + * @return IGFS instance mode. */ public IgfsMode defaultMode() { return defaultMode; @@ -343,14 +343,14 @@ public class VisorIgfsConfiguration implements Serializable { } /** - * @return Map of paths to GGFS modes. + * @return Map of paths to IGFS modes. */ @Nullable public Map<String, IgfsMode> pathModes() { return pathModes; } /** - * @param pathModes New map of paths to GGFS modes. + * @param pathModes New map of paths to IGFS modes. */ public void pathModes(@Nullable Map<String, IgfsMode> pathModes) { this.pathModes = pathModes; @@ -483,14 +483,14 @@ public class VisorIgfsConfiguration implements Serializable { } /** - * @return IPC endpoint config (in JSON format) to publish GGFS over. + * @return IPC endpoint config (in JSON format) to publish IGFS over. */ @Nullable public String ipcEndpointConfiguration() { return ipcEndpointCfg; } /** - * @param ipcEndpointCfg New IPC endpoint config (in JSON format) to publish GGFS over. + * @param ipcEndpointCfg New IPC endpoint config (in JSON format) to publish IGFS over. */ public void ipcEndpointConfiguration(@Nullable String ipcEndpointCfg) { this.ipcEndpointCfg = ipcEndpointCfg; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/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 ba47c8c..f1102f7 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 @@ -120,7 +120,7 @@ public class VisorNodeDataCollectorJob extends VisorJob<VisorNodeDataCollectorTa } } - /** Collect GGFS. */ + /** Collect IGFS. */ private void igfs(VisorNodeDataCollectorJobResult res) { try { IgfsProcessorAdapter ggfsProc = ((IgniteKernal)ignite).context().igfs(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/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 c807857..3147726 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 @@ -53,13 +53,13 @@ public class VisorNodeDataCollectorJobResult implements Serializable { /** Exception while collecting node caches. */ private Throwable cachesEx; - /** Node GGFSs. */ + /** Node IGFSs. */ private final Collection<VisorIgfs> ggfss = new ArrayList<>(); - /** All GGFS endpoints collected from nodes. */ + /** All IGFS endpoints collected from nodes. */ private final Collection<VisorIgfsEndpoint> ggfsEndpoints = new ArrayList<>(); - /** Exception while collecting node GGFSs. */ + /** Exception while collecting node IGFSs. */ private Throwable ggfssEx; /** Node streamers. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/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 bd86895..755e358 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 @@ -56,13 +56,13 @@ public class VisorNodeDataCollectorTaskResult implements Serializable { /** Exceptions caught during collecting caches from nodes. */ private final Map<UUID, Throwable> cachesEx = new HashMap<>(); - /** All GGFS collected from nodes. */ + /** All IGFS collected from nodes. */ private final Map<UUID, Collection<VisorIgfs>> ggfss = new HashMap<>(); - /** All GGFS endpoints collected from nodes. */ + /** All IGFS endpoints collected from nodes. */ private final Map<UUID, Collection<VisorIgfsEndpoint>> ggfsEndpoints = new HashMap<>(); - /** Exceptions caught during collecting GGFS from nodes. */ + /** Exceptions caught during collecting IGFS from nodes. */ private final Map<UUID, Throwable> ggfssEx = new HashMap<>(); /** All streamers collected from nodes. */ @@ -148,21 +148,21 @@ public class VisorNodeDataCollectorTaskResult implements Serializable { } /** - * @return All GGFS collected from nodes. + * @return All IGFS collected from nodes. */ public Map<UUID, Collection<VisorIgfs>> igfss() { return ggfss; } /** - * @return All GGFS endpoints collected from nodes. + * @return All IGFS endpoints collected from nodes. */ public Map<UUID, Collection<VisorIgfsEndpoint>> igfsEndpoints() { return ggfsEndpoints; } /** - * @return Exceptions caught during collecting GGFS from nodes. + * @return Exceptions caught during collecting IGFS from nodes. */ public Map<UUID, Throwable> igfssEx() { return ggfssEx; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java index 11c88fa..0abf041 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java @@ -597,9 +597,9 @@ public class VisorTaskUtils { } /** - * Resolve GGFS profiler logs directory. + * Resolve IGFS profiler logs directory. * - * @param igfs GGFS instance to resolve logs dir for. + * @param igfs IGFS instance to resolve logs dir for. * @return {@link Path} to log dir or {@code null} if not found. * @throws IgniteCheckedException if failed to resolve. */ @@ -609,9 +609,9 @@ public class VisorTaskUtils { if (igfs instanceof IgfsEx) logsDir = ((IgfsEx)igfs).clientLogDirectory(); else if (igfs == null) - throw new IgniteCheckedException("Failed to get profiler log folder (GGFS instance not found)"); + throw new IgniteCheckedException("Failed to get profiler log folder (IGFS instance not found)"); else - throw new IgniteCheckedException("Failed to get profiler log folder (unexpected GGFS instance type)"); + throw new IgniteCheckedException("Failed to get profiler log folder (unexpected IGFS instance type)"); URL logsDirUrl = U.resolveIgniteUrl(logsDir != null ? logsDir : DFLT_IGFS_LOG_DIR); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/test/config/igfs-loopback.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/igfs-loopback.xml b/modules/core/src/test/config/igfs-loopback.xml index d30f885..5d5f546 100644 --- a/modules/core/src/test/config/igfs-loopback.xml +++ b/modules/core/src/test/config/igfs-loopback.xml @@ -50,7 +50,7 @@ </bean> <!-- - Configuration below demonstrates how to setup a GGFS node with file data. + Configuration below demonstrates how to setup a IGFS node with file data. --> <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> <!-- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/test/config/igfs-shmem.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/igfs-shmem.xml b/modules/core/src/test/config/igfs-shmem.xml index 9649a2e..a1c8625 100644 --- a/modules/core/src/test/config/igfs-shmem.xml +++ b/modules/core/src/test/config/igfs-shmem.xml @@ -50,7 +50,7 @@ </bean> <!-- - Configuration below demonstrates how to setup a GGFS node with file data. + Configuration below demonstrates how to setup a IGFS node with file data. --> <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> <!-- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java index abd3cb5..364eaa1 100644 --- a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java @@ -43,7 +43,7 @@ import static org.apache.ignite.testframework.GridTestUtils.*; * Tests events, generated by {@link org.apache.ignite.IgniteFs} implementation. */ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest { - /** GGFS. */ + /** IGFS. */ private static IgfsImpl igfs; /** Event listener. */ @@ -82,7 +82,7 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest } /** - * @return GGFS configuration for this test. + * @return IGFS configuration for this test. */ protected IgfsConfiguration getIgfsConfiguration() throws IgniteCheckedException { IgfsConfiguration igfsCfg = new IgfsConfiguration(); @@ -102,10 +102,10 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest } /** - * The same as getConfiguration(String gridName) but it sets custom GGFS configuration + * The same as getConfiguration(String gridName) but it sets custom IGFS configuration * * @param gridName Grid name. - * @param igfsCfg GGFS configuration. + * @param igfsCfg IGFS configuration. * @return Grid configuration. * @throws Exception If failed. */ @@ -206,15 +206,15 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest IgfsPath file = new IgfsPath(dir, "file1"); - // Will generate 3 EVT_GGFS_DIR_CREATED + EVT_GGFS_FILE_CREATED + EVT_GGFS_FILE_OPENED_WRITE + - // EVT_GGFS_FILE_CLOSED and a number of EVT_GGFS_META_UPDATED. + // Will generate 3 EVT_IGFS_DIR_CREATED + EVT_IGFS_FILE_CREATED + EVT_IGFS_FILE_OPENED_WRITE + + // EVT_IGFS_FILE_CLOSED and a number of EVT_IGFS_META_UPDATED. igfs.create(file, true).close(); IgfsPath mvFile = new IgfsPath(dir, "mvFile1"); - igfs.rename(file, mvFile); // Will generate EVT_GGFS_FILE_RENAMED. + igfs.rename(file, mvFile); // Will generate EVT_IGFS_FILE_RENAMED. - // Will generate EVT_GGFS_DIR_DELETED event. + // Will generate EVT_IGFS_DIR_DELETED event. assertTrue(igfs.delete(dir.parent(), true)); assertTrue(latch.await(10, TimeUnit.SECONDS)); @@ -288,15 +288,15 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest IgfsPath file1 = new IgfsPath(dir, "file1"); IgfsPath file2 = new IgfsPath(dir, "file2"); - // Will generate EVT_GGFS_DIR_CREATED + EVT_GGFS_FILE_CREATED + EVT_GGFS_FILE_OPENED_WRITE + - // EVT_GGFS_FILE_CLOSED_WRITE. + // Will generate EVT_IGFS_DIR_CREATED + EVT_IGFS_FILE_CREATED + EVT_IGFS_FILE_OPENED_WRITE + + // EVT_IGFS_FILE_CLOSED_WRITE. igfs.create(file1, true).close(); - // Will generate EVT_GGFS_FILE_CREATED + EVT_GGFS_FILE_OPENED_WRITE + - // EVT_GGFS_FILE_CLOSED. + // Will generate EVT_IGFS_FILE_CREATED + EVT_IGFS_FILE_OPENED_WRITE + + // EVT_IGFS_FILE_CLOSED. igfs.create(file2, true).close(); - // Will generate EVT_GGFS_DIR_DELETED event. + // Will generate EVT_IGFS_DIR_DELETED event. assertTrue(igfs.delete(dir, true)); assertTrue(latch.await(10, TimeUnit.SECONDS)); @@ -366,15 +366,15 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest IgfsPath dir = new IgfsPath("/dir1"); - igfs.mkdirs(dir); // Will generate EVT_GGFS_DIR_CREATED. + igfs.mkdirs(dir); // Will generate EVT_IGFS_DIR_CREATED. IgfsPath mvDir = new IgfsPath("/mvDir1"); - igfs.rename(dir, mvDir); // Will generate EVT_GGFS_DIR_RENAMED. + igfs.rename(dir, mvDir); // Will generate EVT_IGFS_DIR_RENAMED. assertFalse(igfs.delete(dir, true)); // Will generate no event. - assertTrue(igfs.delete(mvDir, true)); // Will generate EVT_GGFS_DIR_DELETED events. + assertTrue(igfs.delete(mvDir, true)); // Will generate EVT_IGFS_DIR_DELETED events. assertTrue(latch.await(10, TimeUnit.SECONDS)); @@ -425,18 +425,18 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest IgfsPath file1 = new IgfsPath(dir, "file1"); - // Will generate EVT_GGFS_FILE_CREATED event + EVT_GGFS_DIR_CREATED event + OPEN + CLOSE. + // Will generate EVT_IGFS_FILE_CREATED event + EVT_IGFS_DIR_CREATED event + OPEN + CLOSE. igfs.create(file1, true).close(); IgfsPath file2 = new IgfsPath(dir, "file2"); - igfs.create(file2, true).close(); // Will generate 1 EVT_GGFS_FILE_CREATED event + OPEN + CLOSE. + igfs.create(file2, true).close(); // Will generate 1 EVT_IGFS_FILE_CREATED event + OPEN + CLOSE. assertTrue(igfs.exists(dir)); assertTrue(igfs.exists(file1)); assertTrue(igfs.exists(file2)); - assertTrue(igfs.delete(file1, false)); // Will generate 1 EVT_GGFS_FILE_DELETED and 1 EVT_GGFS_FILE_PURGED. + assertTrue(igfs.delete(file1, false)); // Will generate 1 EVT_IGFS_FILE_DELETED and 1 EVT_IGFS_FILE_PURGED. assertTrue(igfs.delete(file2, false)); // Same. assertTrue(latch.await(10, TimeUnit.SECONDS)); @@ -510,7 +510,7 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest IgfsPath dir = new IgfsPath("/dir1/dir2"); - igfs.mkdirs(dir); // Will generate 2 EVT_GGFS_DIR_CREATED events. + igfs.mkdirs(dir); // Will generate 2 EVT_IGFS_DIR_CREATED events. try { igfs.delete(dir.parent(), false); // Will generate no events. @@ -519,7 +519,7 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest // No-op. } - assertTrue(igfs.delete(dir, false)); // Will generate 1 EVT_GGFS_DIR_DELETED event. + assertTrue(igfs.delete(dir, false)); // Will generate 1 EVT_IGFS_DIR_DELETED event. assertTrue(latch.await(10, TimeUnit.SECONDS)); @@ -566,10 +566,10 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest IgfsPath file = new IgfsPath(dir, "file1"); - // Will generate 2 EVT_GGFS_DIR_CREATED events + EVT_GGFS_FILE_CREATED_EVENT + OPEN + CLOSE. + // Will generate 2 EVT_IGFS_DIR_CREATED events + EVT_IGFS_FILE_CREATED_EVENT + OPEN + CLOSE. igfs.create(file, true).close(); - igfs.rename(file, dir.parent()); // Will generate 1 EVT_GGFS_FILE_RENAMED. + igfs.rename(file, dir.parent()); // Will generate 1 EVT_IGFS_FILE_RENAMED. assertTrue(igfs.exists(new IgfsPath(dir.parent(), file.name()))); @@ -633,9 +633,9 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest assertFalse(igfs.exists(dir.parent())); - igfs.mkdirs(dir); // Will generate 2 EVT_GGFS_DIR_RENAMED events. + igfs.mkdirs(dir); // Will generate 2 EVT_IGFS_DIR_RENAMED events. - assertTrue(igfs.delete(dir.parent(), true)); // Will generate EVT_GGFS_DIR_DELETED event. + assertTrue(igfs.delete(dir.parent(), true)); // Will generate EVT_IGFS_DIR_DELETED event. assertTrue(latch.await(10, TimeUnit.SECONDS)); @@ -781,12 +781,12 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest byte[] buf = new byte[dataSize]; - // Will generate GGFS_FILE_CREATED, GGFS_FILE_OPENED_WRITE, GGFS_FILE_CLOSED_WRITE. + // Will generate IGFS_FILE_CREATED, IGFS_FILE_OPENED_WRITE, IGFS_FILE_CLOSED_WRITE. try (IgfsOutputStream os = igfs.create(file, false)) { os.write(buf); // Will generate no events. } - // Will generate EVT_GGFS_FILE_OPENED_READ, GGFS_FILE_CLOSED_READ. + // Will generate EVT_IGFS_FILE_OPENED_READ, IGFS_FILE_CLOSED_READ. try (IgfsInputStream is = igfs.open(file, 256)) { is.readFully(0, buf); // Will generate no events. } @@ -830,7 +830,7 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest /** * @param evt Event type. - * @param path GGFS path. + * @param path IGFS path. */ EventPredicate(int evt, IgfsPath path) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java index 8a5d2c0..6ae9c86 100644 --- a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java @@ -39,10 +39,10 @@ public class IgfsFragmentizerAbstractSelfTest extends IgfsCommonAbstractTest { /** Test nodes count. */ protected static final int NODE_CNT = 4; - /** GGFS block size. */ + /** IGFS block size. */ protected static final int IGFS_BLOCK_SIZE = 1024; - /** GGFS group size. */ + /** IGFS group size. */ protected static final int IGFS_GROUP_SIZE = 32; /** Metadata cache name. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/GridCacheIgfsPerBlockLruEvictionPolicySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/GridCacheIgfsPerBlockLruEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/GridCacheIgfsPerBlockLruEvictionPolicySelfTest.java index 07d3af3..f0e2c70 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/GridCacheIgfsPerBlockLruEvictionPolicySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/GridCacheIgfsPerBlockLruEvictionPolicySelfTest.java @@ -39,14 +39,14 @@ import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.igfs.IgfsMode.*; /** - * Tests for GGFS per-block LR eviction policy. + * Tests for IGFS per-block LR eviction policy. */ @SuppressWarnings({"ConstantConditions", "ThrowableResultOfMethodCallIgnored"}) public class GridCacheIgfsPerBlockLruEvictionPolicySelfTest extends IgfsCommonAbstractTest { - /** Primary GGFS name. */ + /** Primary IGFS name. */ private static final String IGFS_PRIMARY = "igfs-primary"; - /** Primary GGFS name. */ + /** Primary IGFS name. */ private static final String IGFS_SECONDARY = "igfs-secondary"; /** Secondary file system REST endpoint configuration map. */ @@ -61,10 +61,10 @@ public class GridCacheIgfsPerBlockLruEvictionPolicySelfTest extends IgfsCommonAb /** File working in DUAL mode. */ public static final IgfsPath FILE_RMT = new IgfsPath("/fileRemote"); - /** Primary GGFS instances. */ + /** Primary IGFS instances. */ private static IgfsImpl igfsPrimary; - /** Secondary GGFS instance. */ + /** Secondary IGFS instance. */ private static IgniteFs secondaryFs; /** Primary file system data cache. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java index ee6edde..2a908b8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java @@ -47,7 +47,7 @@ import static org.apache.ignite.igfs.IgfsMode.*; * Test fo regular GGFs operations. */ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest { - /** GGFS block size. */ + /** IGFS block size. */ protected static final int IGFS_BLOCK_SIZE = 512 * 1024; /** Default block size (32Mb). */ @@ -110,13 +110,13 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest { /** Default data chunk (128 bytes). */ protected static byte[] chunk; - /** Primary GGFS. */ + /** Primary IGFS. */ protected static IgfsImpl igfs; - /** Secondary GGFS. */ + /** Secondary IGFS. */ protected static IgfsImpl igfsSecondary; - /** GGFS mode. */ + /** IGFS mode. */ protected final IgfsMode mode; /** Dual mode flag. */ @@ -128,7 +128,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest { /** * Constructor. * - * @param mode GGFS mode. + * @param mode IGFS mode. */ protected IgfsAbstractSelfTest(IgfsMode mode) { this(mode, ONHEAP_TIERED); @@ -170,11 +170,11 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest { } /** - * Start grid with GGFS. + * Start grid with IGFS. * * @param gridName Grid name. - * @param ggfsName GGFS name - * @param mode GGFS mode. + * @param ggfsName IGFS name + * @param mode IGFS mode. * @param secondaryFs Secondary file system (optional). * @param restCfg Rest configuration string (optional). * @return Started grid instance. @@ -634,7 +634,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest { if (dual) assertEquals(props, igfsSecondary.info(SUBSUBDIR).properties()); - // We check only permission because GGFS client adds username and group name explicitly. + // We check only permission because IGFS client adds username and group name explicitly. assertEquals(props.get(PROP_PERMISSION), igfs.info(SUBSUBDIR).properties().get(PROP_PERMISSION)); } @@ -653,7 +653,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest { if (dual) assertEquals(props, igfsSecondary.info(DIR).properties()); - // We check only permission because GGFS client adds username and group name explicitly. + // We check only permission because IGFS client adds username and group name explicitly. assertEquals(props.get(PROP_PERMISSION), igfs.info(DIR).properties().get(PROP_PERMISSION)); } @@ -1496,7 +1496,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest { } /** - * Ensure that GGFS is able to stop in case not closed output stream exist. + * Ensure that IGFS is able to stop in case not closed output stream exist. * * @throws Exception If failed. */ @@ -1614,7 +1614,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest { else { assert res2.get(); // Rename failed because delete succeeded. - checkExist(igfs, DIR); // DIR_NEW should not be synchronized with he primary GGFS. + checkExist(igfs, DIR); // DIR_NEW should not be synchronized with he primary IGFS. if (dual) checkExist(igfsSecondary, DIR, DIR_NEW); @@ -2130,9 +2130,9 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest { } /** - * Create the given directories and files in the given GGFS. + * Create the given directories and files in the given IGFS. * - * @param ggfs GGFS. + * @param ggfs IGFS. * @param dirs Directories. * @param files Files. * @throws Exception If failed. @@ -2154,9 +2154,9 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest { } /** - * Create the file in the given GGFS and write provided data chunks to it. + * Create the file in the given IGFS and write provided data chunks to it. * - * @param igfs GGFS. + * @param igfs IGFS. * @param file File. * @param overwrite Overwrite flag. * @param chunks Data chunks. @@ -2180,9 +2180,9 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest { } /** - * Create the file in the given GGFS and write provided data chunks to it. + * Create the file in the given IGFS and write provided data chunks to it. * - * @param ggfs GGFS. + * @param ggfs IGFS. * @param file File. * @param overwrite Overwrite flag. * @param blockSize Block size. @@ -2206,9 +2206,9 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest { } /** - * Append to the file in the given GGFS provided data chunks. + * Append to the file in the given IGFS provided data chunks. * - * @param igfs GGFS. + * @param igfs IGFS. * @param file File. * @param chunks Data chunks. * @throws Exception If failed. @@ -2246,7 +2246,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest { /** * Await for previously opened output stream to close. This is achieved by requesting dummy update on the file. * - * @param ggfs GGFS. + * @param ggfs IGFS. * @param file File. */ public static void awaitFileClose(Igfs ggfs, IgfsPath file) { @@ -2259,10 +2259,10 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest { } /** - * Ensure that the given paths exist in the given GGFSs. + * Ensure that the given paths exist in the given IGFSs. * - * @param ggfs First GGFS. - * @param ggfsSecondary Second GGFS. + * @param ggfs First IGFS. + * @param ggfsSecondary Second IGFS. * @param paths Paths. * @throws Exception If failed. */ @@ -2274,9 +2274,9 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest { } /** - * Ensure that the given paths exist in the given GGFS. + * Ensure that the given paths exist in the given IGFS. * - * @param ggfs GGFS. + * @param ggfs IGFS. * @param paths Paths. * @throws IgniteCheckedException If failed. */ @@ -2289,10 +2289,10 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest { } /** - * Ensure that the given paths don't exist in the given GGFSs. + * Ensure that the given paths don't exist in the given IGFSs. * - * @param ggfs First GGFS. - * @param ggfsSecondary Second GGFS. + * @param ggfs First IGFS. + * @param ggfsSecondary Second IGFS. * @param paths Paths. * @throws Exception If failed. */ @@ -2305,9 +2305,9 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest { } /** - * Ensure that the given paths don't exist in the given GGFS. + * Ensure that the given paths don't exist in the given IGFS. * - * @param ggfs GGFS. + * @param ggfs IGFS. * @param paths Paths. * @throws Exception If failed. */ @@ -2320,11 +2320,11 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest { } /** - * Ensure that the given file exists in the given GGFSs and that it has exactly the same content as provided in the + * Ensure that the given file exists in the given IGFSs and that it has exactly the same content as provided in the * "data" parameter. * - * @param ggfs First GGFS. - * @param ggfsSecondary Second GGFS. + * @param ggfs First IGFS. + * @param ggfsSecondary Second IGFS. * @param file File. * @param chunks Expected data. * @throws Exception If failed. @@ -2343,7 +2343,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest { /** * Ensure that the given file has exactly the same content as provided in the "data" parameter. * - * @param ggfs GGFS. + * @param ggfs IGFS. * @param file File. * @param chunks Expected data. * @throws IOException In case of IO exception. @@ -2413,10 +2413,10 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest { } /** - * Safely clear GGFSs. + * Safely clear IGFSs. * - * @param ggfs First GGFS. - * @param ggfsSecondary Second GGFS. + * @param ggfs First IGFS. + * @param ggfsSecondary Second IGFS. * @throws Exception If failed. */ protected void clear(IgniteFs ggfs, IgniteFs ggfsSecondary) throws Exception { @@ -2427,9 +2427,9 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest { } /** - * Clear particular GGFS. + * Clear particular IGFS. * - * @param ggfs GGFS. + * @param ggfs IGFS. * @throws Exception If failed. */ public static void clear(IgniteFs ggfs) throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java index e9eceb2..76b7a92 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java @@ -31,7 +31,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheMode.*; /** - * Tests ensuring that GGFS data and meta caches are not "visible" through public API. + * Tests ensuring that IGFS data and meta caches are not "visible" through public API. */ public class IgfsCacheSelfTest extends IgfsCommonAbstractTest { /** Meta-information cache name. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCommonAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCommonAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCommonAbstractTest.java index b1ac849..fa7f048 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCommonAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCommonAbstractTest.java @@ -22,7 +22,7 @@ import org.apache.ignite.testframework.junits.*; import org.apache.ignite.testframework.junits.common.*; /** - * Common subclass for all GGFS tests. Aimed to disabled peer class loading which is restricted for Hadoop edition. + * Common subclass for all IGFS tests. Aimed to disabled peer class loading which is restricted for Hadoop edition. */ public class IgfsCommonAbstractTest extends GridCommonAbstractTest { /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java index 639cf2e..a294ab1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java @@ -58,7 +58,7 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest { /** Groups count for data blocks. */ private static final int DATA_BLOCK_GROUP_CNT = 2; - /** GGFS block size. */ + /** IGFS block size. */ private static final int BLOCK_SIZE = 32 * 1024; /** Test nodes count. */ @@ -67,7 +67,7 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest { /** Busy wait sleep interval in milliseconds. */ private static final int BUSY_WAIT_SLEEP_INTERVAL = 200; - /** GGFS block size. */ + /** IGFS block size. */ private static final int IGFS_BLOCK_SIZE = 64 * 1024; /** Random numbers generator. */ @@ -448,7 +448,7 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest { Collection<IgfsBlockLocation> affinity = mgr.affinity(info, 0, info.length()); for (IgfsBlockLocation loc : affinity) { - info("Going to check GGFS block location: " + loc); + info("Going to check IGFS block location: " + loc); int block = (int)(loc.start() / blockSize); @@ -521,7 +521,7 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest { GridCache<Object, Object> dataCache = grid(0).cachex(DATA_CACHE_NAME); for (IgfsBlockLocation loc : affinity) { - info("Going to check GGFS block location: " + loc); + info("Going to check IGFS block location: " + loc); int block = (int)(loc.start() / blockSize); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDualAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDualAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDualAbstractSelfTest.java index 7b9ac01..327d7fa 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDualAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDualAbstractSelfTest.java @@ -32,13 +32,13 @@ import static org.apache.ignite.IgniteFs.*; import static org.apache.ignite.igfs.IgfsMode.*; /** - * Tests for GGFS working in mode when remote file system exists: DUAL_SYNC, DUAL_ASYNC. + * Tests for IGFS working in mode when remote file system exists: DUAL_SYNC, DUAL_ASYNC. */ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest { /** * Constructor. * - * @param mode GGFS mode. + * @param mode IGFS mode. */ protected IgfsDualAbstractSelfTest(IgfsMode mode) { super(mode); @@ -964,7 +964,7 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest { assertEquals(props, igfsSecondary.info(SUBSUBDIR).properties()); - // We check only permission because GGFS client adds username and group name explicitly. + // We check only permission because IGFS client adds username and group name explicitly. assertEquals(props.get(PROP_PERMISSION), igfs.info(SUBSUBDIR).properties().get(PROP_PERMISSION)); } @@ -988,7 +988,7 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest { assertEquals(props, igfsSecondary.info(SUBSUBDIR).properties()); - // We check only permission because GGFS client adds username and group name explicitly. + // We check only permission because IGFS client adds username and group name explicitly. assertEquals(props.get(PROP_PERMISSION), igfs.info(SUBSUBDIR).properties().get(PROP_PERMISSION)); } @@ -1426,7 +1426,7 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest { else { assert res2.get(); // Rename failed because delete succeeded. - checkExist(igfs, DIR); // DIR_NEW should not be synchronized with he primary GGFS. + checkExist(igfs, DIR); // DIR_NEW should not be synchronized with he primary IGFS. checkExist(igfsSecondary, DIR, DIR_NEW); checkNotExist(igfs, igfsSecondary, SUBDIR, SUBDIR_NEW); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsGroupDataBlockKeyMapperHashSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsGroupDataBlockKeyMapperHashSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsGroupDataBlockKeyMapperHashSelfTest.java index 35e99b2..adea707 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsGroupDataBlockKeyMapperHashSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsGroupDataBlockKeyMapperHashSelfTest.java @@ -48,8 +48,8 @@ public class IgfsGroupDataBlockKeyMapperHashSelfTest extends IgfsCommonAbstractT } /** - * @param mapper GGFS blocks mapper. - * @param fileId GGFS file ID. + * @param mapper IGFS blocks mapper. + * @param fileId IGFS file ID. * @param blockId File block ID. * @param partCnt Total partitions count. * @return Partition index. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsSelfTest.java index a99fbbc..56f6874 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsSelfTest.java @@ -34,13 +34,13 @@ import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.igfs.IgfsMode.*; /** - * Test for GGFS metrics. + * Test for IGFS metrics. */ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest { - /** Primary GGFS name. */ + /** Primary IGFS name. */ private static final String IGFS_PRIMARY = "igfs-primary"; - /** Primary GGFS name. */ + /** Primary IGFS name. */ private static final String IGFS_SECONDARY = "igfs-secondary"; /** Secondary file system REST endpoint configuration map. */ @@ -55,10 +55,10 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest { /** IP finder for the grid with the primary file system. */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); - /** Primary GGFS instances. */ + /** Primary IGFS instances. */ private static IgniteFs[] ggfsPrimary; - /** Secondary GGFS instance. */ + /** Secondary IGFS instance. */ private static IgniteFs ggfsSecondary; /** Primary file system block size. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsModesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsModesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsModesSelfTest.java index 13a5bf7..0ed202c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsModesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsModesSelfTest.java @@ -35,19 +35,19 @@ import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.igfs.IgfsMode.*; /** - * GGFS modes self test. + * IGFS modes self test. */ public class IgfsModesSelfTest extends IgfsCommonAbstractTest { - /** Grid instance hosting primary GGFS. */ + /** Grid instance hosting primary IGFS. */ private IgniteEx grid; - /** Primary GGFS. */ + /** Primary IGFS. */ private IgfsImpl ggfs; - /** Secondary GGFS. */ + /** Secondary IGFS. */ private IgfsImpl ggfsSecondary; - /** Default GGFS mode. */ + /** Default IGFS mode. */ private IgfsMode mode; /** Modes map. */ @@ -194,7 +194,7 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest { } /** - * Set GGFS modes for particular paths. + * Set IGFS modes for particular paths. * * @param modes Modes. */ @@ -448,7 +448,7 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest { } /** - * Ensure that data is not propagated to the secondary GGFS in PRIMARY mode. + * Ensure that data is not propagated to the secondary IGFS in PRIMARY mode. * * @throws Exception If failed. */ @@ -459,7 +459,7 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest { } /** - * Ensure that data is propagated to the secondary GGFS in DUAL_SYNC mode. + * Ensure that data is propagated to the secondary IGFS in DUAL_SYNC mode. * * @throws Exception If failed. */ @@ -470,7 +470,7 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest { } /** - * Ensure that data is propagated to the secondary GGFS in DUAL_SYNC mode. + * Ensure that data is propagated to the secondary IGFS in DUAL_SYNC mode. * * @throws Exception If failed. */ @@ -481,7 +481,7 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest { } /** - * Resolve GGFS mode for the given path and compare it with expected one. + * Resolve IGFS mode for the given path and compare it with expected one. * * @param pathStr Path ot resolve. * @param expMode Expected mode. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java index ac25d61..02eef2c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java @@ -596,7 +596,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest { /** * @param path Path. - * @return GGFS path. + * @return IGFS path. */ private IgfsPath path(String path) { assert path != null; @@ -606,7 +606,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest { /** * @param i Path index. - * @return GGFS path. + * @return IGFS path. */ private IgfsPath path(long i) { //return path(String.format("/%d", i));
