# IGNITE-226: WIP.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7848855a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7848855a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7848855a Branch: refs/heads/ignite-226 Commit: 7848855acbd8c888c942a6b3a26d605f84a30bd4 Parents: 1428b79 Author: vozerov-gridgain <[email protected]> Authored: Fri Feb 13 14:31:15 2015 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Fri Feb 13 14:31:15 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/fs/IgfsDataManager.java | 76 ++++++++++---------- .../processors/fs/IgfsFragmentizerManager.java | 66 ++++++++--------- .../internal/processors/fs/IgfsManager.java | 4 +- .../internal/processors/fs/IgfsMetaManager.java | 26 +++---- .../processors/fs/IgfsServerManager.java | 8 +-- .../processors/fs/IgfsMetaManagerSelfTest.java | 2 +- 6 files changed, 91 insertions(+), 91 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7848855a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsDataManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsDataManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsDataManager.java index da49cd4..156d5eb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsDataManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsDataManager.java @@ -149,35 +149,35 @@ public class IgfsDataManager extends IgfsManager { /** {@inheritDoc} */ @Override protected void start0() throws IgniteCheckedException { - ggfs = ggfsCtx.ggfs(); + ggfs = igfsCtx.ggfs(); - dataCachePrj = ggfsCtx.kernalContext().cache().internalCache(ggfsCtx.configuration().getDataCacheName()); - dataCache = ggfsCtx.kernalContext().cache().internalCache(ggfsCtx.configuration().getDataCacheName()); + dataCachePrj = igfsCtx.kernalContext().cache().internalCache(igfsCtx.configuration().getDataCacheName()); + dataCache = igfsCtx.kernalContext().cache().internalCache(igfsCtx.configuration().getDataCacheName()); - dataCacheStartFut = ggfsCtx.kernalContext().cache().internalCache(ggfsCtx.configuration().getDataCacheName()) + dataCacheStartFut = igfsCtx.kernalContext().cache().internalCache(igfsCtx.configuration().getDataCacheName()) .preloader().startFuture(); if (dataCache.configuration().getAtomicityMode() != TRANSACTIONAL) throw new IgniteCheckedException("Data cache should be transactional: " + - ggfsCtx.configuration().getDataCacheName()); + igfsCtx.configuration().getDataCacheName()); - metrics = ggfsCtx.ggfs().localMetrics(); + metrics = igfsCtx.ggfs().localMetrics(); assert dataCachePrj != null; - CacheAffinityKeyMapper mapper = ggfsCtx.kernalContext().cache() - .internalCache(ggfsCtx.configuration().getDataCacheName()).configuration().getAffinityMapper(); + CacheAffinityKeyMapper mapper = igfsCtx.kernalContext().cache() + .internalCache(igfsCtx.configuration().getDataCacheName()).configuration().getAffinityMapper(); grpSize = mapper instanceof IgfsGroupDataBlocksKeyMapper ? ((IgfsGroupDataBlocksKeyMapper)mapper).groupSize() : 1; - grpBlockSize = ggfsCtx.configuration().getBlockSize() * grpSize; + grpBlockSize = igfsCtx.configuration().getBlockSize() * grpSize; - String ggfsName = ggfsCtx.configuration().getName(); + String ggfsName = igfsCtx.configuration().getName(); topic = F.isEmpty(ggfsName) ? TOPIC_GGFS : TOPIC_GGFS.topic(ggfsName); - ggfsCtx.kernalContext().io().addMessageListener(topic, new GridMessageListener() { + igfsCtx.kernalContext().io().addMessageListener(topic, new GridMessageListener() { @Override public void onMessage(UUID nodeId, Object msg) { if (msg instanceof IgfsBlocksMessage) processBlocksMessage(nodeId, (IgfsBlocksMessage)msg); @@ -186,13 +186,13 @@ public class IgfsDataManager extends IgfsManager { } }); - ggfsCtx.kernalContext().event().addLocalEventListener(new GridLocalEventListener() { + igfsCtx.kernalContext().event().addLocalEventListener(new GridLocalEventListener() { @Override public void onEvent(Event evt) { assert evt.type() == EVT_NODE_FAILED || evt.type() == EVT_NODE_LEFT; DiscoveryEvent discoEvt = (DiscoveryEvent)evt; - if (ggfsCtx.ggfsNode(discoEvt.eventNode())) { + if (igfsCtx.ggfsNode(discoEvt.eventNode())) { for (WriteCompletionFuture future : pendingWrites.values()) { future.onError(discoEvt.eventNode().id(), new ClusterTopologyCheckedException("Node left grid before write completed: " + evt.node().id())); @@ -201,14 +201,14 @@ public class IgfsDataManager extends IgfsManager { } }, EVT_NODE_LEFT, EVT_NODE_FAILED); - ggfsSvc = ggfsCtx.kernalContext().getGgfsExecutorService(); + ggfsSvc = igfsCtx.kernalContext().getGgfsExecutorService(); - trashPurgeTimeout = ggfsCtx.configuration().getTrashPurgeTimeout(); + trashPurgeTimeout = igfsCtx.configuration().getTrashPurgeTimeout(); - putExecSvc = ggfsCtx.configuration().getDualModePutExecutorService(); + putExecSvc = igfsCtx.configuration().getDualModePutExecutorService(); if (putExecSvc != null) - putExecSvcShutdown = ggfsCtx.configuration().getDualModePutExecutorServiceShutdown(); + putExecSvcShutdown = igfsCtx.configuration().getDualModePutExecutorServiceShutdown(); else { int coresCnt = Runtime.getRuntime().availableProcessors(); @@ -218,9 +218,9 @@ public class IgfsDataManager extends IgfsManager { putExecSvcShutdown = true; } - maxPendingPuts = ggfsCtx.configuration().getDualModeMaxPendingPutsSize(); + maxPendingPuts = igfsCtx.configuration().getDualModeMaxPendingPutsSize(); - delWorker = new AsyncDeleteWorker(ggfsCtx.kernalContext().gridName(), + delWorker = new AsyncDeleteWorker(igfsCtx.kernalContext().gridName(), "ggfs-" + ggfsName + "-delete-worker", log); } @@ -274,7 +274,7 @@ public class IgfsDataManager extends IgfsManager { if (!isAffinityNode(dataCache.configuration())) return null; - UUID nodeId = ggfsCtx.kernalContext().localNodeId(); + UUID nodeId = igfsCtx.kernalContext().localNodeId(); if (prevAffKey != null && dataCache.affinity().mapKeyToNode(prevAffKey).isLocal()) return prevAffKey; @@ -304,9 +304,9 @@ public class IgfsDataManager extends IgfsManager { */ private IgniteDataLoader<IgfsBlockKey, byte[]> dataLoader() { IgniteDataLoader<IgfsBlockKey, byte[]> ldr = - ggfsCtx.kernalContext().<IgfsBlockKey, byte[]>dataLoad().dataLoader(dataCachePrj.name()); + igfsCtx.kernalContext().<IgfsBlockKey, byte[]>dataLoad().dataLoader(dataCachePrj.name()); - IgfsConfiguration cfg = ggfsCtx.configuration(); + IgfsConfiguration cfg = igfsCtx.configuration(); if (cfg.getPerNodeBatchSize() > 0) ldr.perNodeBufferSize(cfg.getPerNodeBatchSize()); @@ -356,7 +356,7 @@ public class IgfsDataManager extends IgfsManager { ClusterNode primaryNode = affNodes.iterator().next(); - if (primaryNode.id().equals(ggfsCtx.kernalContext().localNodeId())) { + if (primaryNode.id().equals(igfsCtx.kernalContext().localNodeId())) { res.add(i); prevPrimaryFlag = true; @@ -393,7 +393,7 @@ public class IgfsDataManager extends IgfsManager { final IgfsBlockKey key = blockKey(blockIdx, fileInfo); if (log.isDebugEnabled() && - dataCache.affinity().isPrimaryOrBackup(ggfsCtx.kernalContext().discovery().localNode(), key)) { + dataCache.affinity().isPrimaryOrBackup(igfsCtx.kernalContext().discovery().localNode(), key)) { log.debug("Reading non-local data block [path=" + path + ", fileInfo=" + fileInfo + ", blockIdx=" + blockIdx + ']'); } @@ -406,7 +406,7 @@ public class IgfsDataManager extends IgfsManager { byte[] res = fut.get(); if (res == null) { - GridFutureAdapter<byte[]> rmtReadFut = new GridFutureAdapter<>(ggfsCtx.kernalContext()); + GridFutureAdapter<byte[]> rmtReadFut = new GridFutureAdapter<>(igfsCtx.kernalContext()); IgniteInternalFuture<byte[]> oldRmtReadFut = rmtReadFuts.putIfAbsent(key, rmtReadFut); @@ -490,7 +490,7 @@ public class IgfsDataManager extends IgfsManager { * @return Future that will be completed when all ack messages are received or when write failed. */ public IgniteInternalFuture<Boolean> writeStart(IgfsFileInfo fileInfo) { - WriteCompletionFuture fut = new WriteCompletionFuture(ggfsCtx.kernalContext(), fileInfo.id()); + WriteCompletionFuture fut = new WriteCompletionFuture(igfsCtx.kernalContext(), fileInfo.id()); WriteCompletionFuture oldFut = pendingWrites.putIfAbsent(fileInfo.id(), fut); @@ -599,7 +599,7 @@ public class IgfsDataManager extends IgfsManager { if (log.isDebugEnabled()) log.debug("Cannot delete content of not-data file: " + fileInfo); - return new GridFinishedFuture<>(ggfsCtx.kernalContext()); + return new GridFinishedFuture<>(igfsCtx.kernalContext()); } else return delWorker.deleteAsync(fileInfo); @@ -707,12 +707,12 @@ public class IgfsDataManager extends IgfsManager { bytesProcessed += block.length; - if (bytesProcessed >= ggfsCtx.configuration().getFragmentizerThrottlingBlockLength()) { + if (bytesProcessed >= igfsCtx.configuration().getFragmentizerThrottlingBlockLength()) { ldr.flush(); bytesProcessed = 0; - U.sleep(ggfsCtx.configuration().getFragmentizerThrottlingDelay()); + U.sleep(igfsCtx.configuration().getFragmentizerThrottlingDelay()); } } else if (log.isDebugEnabled()) @@ -1033,7 +1033,7 @@ public class IgfsDataManager extends IgfsManager { callGgfsLocalSafe(new GridPlainCallable<Object>() { @Override @Nullable public Object call() throws Exception { try { - ggfsCtx.send(nodeId, topic, msg, SYSTEM_POOL); + igfsCtx.send(nodeId, topic, msg, SYSTEM_POOL); } catch (IgniteCheckedException e) { completionFut.onError(nodeId, e); @@ -1102,7 +1102,7 @@ public class IgfsDataManager extends IgfsManager { ", allowed=" + dataCachePrj.ggfsDataSpaceMax() + ']'); completionFut.onDone(new IgniteCheckedException("Failed to write data (not enough space on node): " + - ggfsCtx.kernalContext().localNodeId(), e)); + igfsCtx.kernalContext().localNodeId(), e)); return; } @@ -1257,14 +1257,14 @@ public class IgfsDataManager extends IgfsManager { // Additional size check. if (dataCachePrj.ggfsDataSpaceUsed() >= dataCachePrj.ggfsDataSpaceMax()) - return new GridFinishedFuture<Object>(ggfsCtx.kernalContext(), + return new GridFinishedFuture<Object>(igfsCtx.kernalContext(), new IgfsOutOfSpaceException("Failed to write data block (GGFS maximum data size " + "exceeded) [used=" + dataCachePrj.ggfsDataSpaceUsed() + ", allowed=" + dataCachePrj.ggfsDataSpaceMax() + ']')); } catch (IgniteCheckedException e) { - return new GridFinishedFuture<>(ggfsCtx.kernalContext(), new IgniteCheckedException("Failed to store data " + + return new GridFinishedFuture<>(igfsCtx.kernalContext(), new IgniteCheckedException("Failed to store data " + "block due to unexpected exception.", e)); } } @@ -1290,7 +1290,7 @@ public class IgfsDataManager extends IgfsManager { try { // Send reply back to node. - ggfsCtx.send(nodeId, topic, new IgfsAckMessage(blocksMsg.fileId(), blocksMsg.id(), err), + igfsCtx.send(nodeId, topic, new IgfsAckMessage(blocksMsg.fileId(), blocksMsg.id(), err), SYSTEM_POOL); } catch (IgniteCheckedException e) { @@ -1307,7 +1307,7 @@ public class IgfsDataManager extends IgfsManager { */ private void processAckMessage(UUID nodeId, IgfsAckMessage ackMsg) { try { - ackMsg.finishUnmarshal(ggfsCtx.kernalContext().config().getMarshaller(), null); + ackMsg.finishUnmarshal(igfsCtx.kernalContext().config().getMarshaller(), null); } catch (IgniteCheckedException e) { U.error(log, "Failed to unmarshal message (will ignore): " + ackMsg, e); @@ -1364,7 +1364,7 @@ public class IgfsDataManager extends IgfsManager { // Check if we have enough free space to do colocated writes. if (dataCachePrj.ggfsDataSpaceUsed() > dataCachePrj.ggfsDataSpaceMax() * - ggfsCtx.configuration().getFragmentizerLocalWritesRatio()) { + igfsCtx.configuration().getFragmentizerLocalWritesRatio()) { // Forbid further co-location. locRange.markDone(); @@ -1675,7 +1675,7 @@ public class IgfsDataManager extends IgfsManager { * Gracefully stops worker by adding STOP_INFO to queue. */ private void stop() { - delReqs.offer(F.t(new GridFutureAdapter<>(ggfsCtx.kernalContext()), stopInfo)); + delReqs.offer(F.t(new GridFutureAdapter<>(igfsCtx.kernalContext()), stopInfo)); } /** @@ -1683,7 +1683,7 @@ public class IgfsDataManager extends IgfsManager { * @return Future which completes when entry is actually removed. */ private IgniteInternalFuture<Object> deleteAsync(IgfsFileInfo info) { - GridFutureAdapter<Object> fut = new GridFutureAdapter<>(ggfsCtx.kernalContext()); + GridFutureAdapter<Object> fut = new GridFutureAdapter<>(igfsCtx.kernalContext()); delReqs.offer(F.t(fut, info)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7848855a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsFragmentizerManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsFragmentizerManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsFragmentizerManager.java index cad0df1..03aa397 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsFragmentizerManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsFragmentizerManager.java @@ -79,11 +79,11 @@ public class IgfsFragmentizerManager extends IgfsManager { /** {@inheritDoc} */ @Override protected void start0() throws IgniteCheckedException { - if (!ggfsCtx.configuration().isFragmentizerEnabled()) + if (!igfsCtx.configuration().isFragmentizerEnabled()) return; // We care only about node leave and fail events. - ggfsCtx.kernalContext().event().addLocalEventListener(new GridLocalEventListener() { + igfsCtx.kernalContext().event().addLocalEventListener(new GridLocalEventListener() { @Override public void onEvent(Event evt) { assert evt.type() == EVT_NODE_LEFT || evt.type() == EVT_NODE_FAILED; @@ -95,20 +95,20 @@ public class IgfsFragmentizerManager extends IgfsManager { fragmentizerWorker = new FragmentizerWorker(); - String ggfsName = ggfsCtx.configuration().getName(); + String ggfsName = igfsCtx.configuration().getName(); topic = F.isEmpty(ggfsName) ? TOPIC_GGFS : TOPIC_GGFS.topic(ggfsName); - ggfsCtx.kernalContext().io().addMessageListener(topic, fragmentizerWorker); + igfsCtx.kernalContext().io().addMessageListener(topic, fragmentizerWorker); new IgniteThread(fragmentizerWorker).start(); } /** {@inheritDoc} */ @Override protected void onKernalStart0() throws IgniteCheckedException { - if (ggfsCtx.configuration().isFragmentizerEnabled()) { + if (igfsCtx.configuration().isFragmentizerEnabled()) { // Check at startup if this node is a fragmentizer coordinator. - DiscoveryEvent locJoinEvt = ggfsCtx.kernalContext().discovery().localJoinEvent(); + DiscoveryEvent locJoinEvt = igfsCtx.kernalContext().discovery().localJoinEvent(); checkLaunchCoordinator(locJoinEvt); } @@ -164,12 +164,12 @@ public class IgfsFragmentizerManager extends IgfsManager { private void sendWithRetries(UUID nodeId, IgfsCommunicationMessage msg) throws IgniteCheckedException { for (int i = 0; i < MESSAGE_SEND_RETRY_COUNT; i++) { try { - ggfsCtx.send(nodeId, topic, msg, SYSTEM_POOL); + igfsCtx.send(nodeId, topic, msg, SYSTEM_POOL); return; } catch (IgniteCheckedException e) { - if (!ggfsCtx.kernalContext().discovery().alive(nodeId)) + if (!igfsCtx.kernalContext().discovery().alive(nodeId)) throw new ClusterTopologyCheckedException("Failed to send message (node left the grid) " + "[nodeId=" + nodeId + ", msg=" + msg + ']'); @@ -200,11 +200,11 @@ public class IgfsFragmentizerManager extends IgfsManager { Collection<ClusterNode> nodes = discoEvt.topologyNodes(); for (ClusterNode node : nodes) { - if (node.order() < minNodeOrder && ggfsCtx.ggfsNode(node)) + if (node.order() < minNodeOrder && igfsCtx.ggfsNode(node)) minNodeOrder = node.order(); } - ClusterNode locNode = ggfsCtx.kernalContext().grid().localNode(); + ClusterNode locNode = igfsCtx.kernalContext().grid().localNode(); if (locNode.order() == minNodeOrder) { if (log.isDebugEnabled()) @@ -241,12 +241,12 @@ public class IgfsFragmentizerManager extends IgfsManager { */ @SuppressWarnings("fallthrough") private void processFragmentizerRequest(IgfsFragmentizerRequest req) throws IgniteCheckedException { - req.finishUnmarshal(ggfsCtx.kernalContext().config().getMarshaller(), null); + req.finishUnmarshal(igfsCtx.kernalContext().config().getMarshaller(), null); Collection<IgfsFileAffinityRange> ranges = req.fragmentRanges(); IgniteUuid fileId = req.fileId(); - IgfsFileInfo fileInfo = ggfsCtx.meta().info(fileId); + IgfsFileInfo fileInfo = igfsCtx.meta().info(fileId); if (fileInfo == null) { if (log.isDebugEnabled()) @@ -265,10 +265,10 @@ public class IgfsFragmentizerManager extends IgfsManager { switch (range.status()) { case RANGE_STATUS_INITIAL: { // Mark range as moving. - updated = ggfsCtx.meta().updateInfo(fileId, updateRange(range, RANGE_STATUS_MOVING)); + updated = igfsCtx.meta().updateInfo(fileId, updateRange(range, RANGE_STATUS_MOVING)); if (updated == null) { - ggfsCtx.data().cleanBlocks(fileInfo, range, true); + igfsCtx.data().cleanBlocks(fileInfo, range, true); continue; } @@ -278,13 +278,13 @@ public class IgfsFragmentizerManager extends IgfsManager { case RANGE_STATUS_MOVING: { // Move colocated blocks. - ggfsCtx.data().spreadBlocks(fileInfo, range); + igfsCtx.data().spreadBlocks(fileInfo, range); // Mark range as moved. - updated = ggfsCtx.meta().updateInfo(fileId, updateRange(range, RANGE_STATUS_MOVED)); + updated = igfsCtx.meta().updateInfo(fileId, updateRange(range, RANGE_STATUS_MOVED)); if (updated == null) { - ggfsCtx.data().cleanBlocks(fileInfo, range, true); + igfsCtx.data().cleanBlocks(fileInfo, range, true); continue; } @@ -294,13 +294,13 @@ public class IgfsFragmentizerManager extends IgfsManager { case RANGE_STATUS_MOVED: { // Remove old blocks. - ggfsCtx.data().cleanBlocks(fileInfo, range, false); + igfsCtx.data().cleanBlocks(fileInfo, range, false); // Remove range from map. - updated = ggfsCtx.meta().updateInfo(fileId, deleteRange(range)); + updated = igfsCtx.meta().updateInfo(fileId, deleteRange(range)); if (updated == null) - ggfsCtx.data().cleanBlocks(fileInfo, range, true); + igfsCtx.data().cleanBlocks(fileInfo, range, true); } } } @@ -386,10 +386,10 @@ public class IgfsFragmentizerManager extends IgfsManager { * Constructor. */ protected FragmentizerCoordinator() { - super(ggfsCtx.kernalContext().gridName(), "fragmentizer-coordinator", ggfsCtx.kernalContext().log()); + super(igfsCtx.kernalContext().gridName(), "fragmentizer-coordinator", igfsCtx.kernalContext().log()); - ggfsCtx.kernalContext().event().addLocalEventListener(this, EVT_NODE_LEFT, EVT_NODE_FAILED); - ggfsCtx.kernalContext().io().addMessageListener(topic, this); + igfsCtx.kernalContext().event().addLocalEventListener(this, EVT_NODE_LEFT, EVT_NODE_FAILED); + igfsCtx.kernalContext().io().addMessageListener(topic, this); } /** {@inheritDoc} */ @@ -400,7 +400,7 @@ public class IgfsFragmentizerManager extends IgfsManager { while (!isCancelled()) { // If we have room for files, add them to fragmentizer. try { - while (fragmentingFiles.size() < ggfsCtx.configuration().getFragmentizerConcurrentFiles()) { + while (fragmentingFiles.size() < igfsCtx.configuration().getFragmentizerConcurrentFiles()) { IgfsFileInfo fileInfo = fileForFragmentizer(fragmentingFiles.keySet()); // If no colocated files found, exit loop. @@ -510,7 +510,7 @@ public class IgfsFragmentizerManager extends IgfsManager { else if (msg instanceof IgfsSyncMessage) { IgfsSyncMessage sync = (IgfsSyncMessage)msg; - if (sync.response() && sync.order() == ggfsCtx.kernalContext().grid().localNode().order()) { + if (sync.response() && sync.order() == igfsCtx.kernalContext().grid().localNode().order()) { if (log.isDebugEnabled()) log.debug("Received fragmentizer sync response from remote node: " + nodeId); @@ -552,15 +552,15 @@ public class IgfsFragmentizerManager extends IgfsManager { private void syncStart() throws InterruptedException { Collection<UUID> startSync0 = startSync = new GridConcurrentHashSet<>( F.viewReadOnly( - ggfsCtx.kernalContext().discovery().allNodes(), + igfsCtx.kernalContext().discovery().allNodes(), F.node2id(), new P1<ClusterNode>() { @Override public boolean apply(ClusterNode n) { - return ggfsCtx.ggfsNode(n); + return igfsCtx.ggfsNode(n); } })); - ClusterNode locNode = ggfsCtx.kernalContext().grid().localNode(); + ClusterNode locNode = igfsCtx.kernalContext().grid().localNode(); while (!startSync0.isEmpty()) { for (UUID nodeId : startSync0) { @@ -574,7 +574,7 @@ public class IgfsFragmentizerManager extends IgfsManager { sendWithRetries(nodeId, syncReq); // Close window between message sending and discovery event. - if (!ggfsCtx.kernalContext().discovery().alive(nodeId)) + if (!igfsCtx.kernalContext().discovery().alive(nodeId)) startSync0.remove(nodeId); } catch (IgniteCheckedException e) { @@ -617,7 +617,7 @@ public class IgfsFragmentizerManager extends IgfsManager { Map<UUID, Collection<IgfsFileAffinityRange>> grpMap = U.newHashMap(map.ranges().size()); for (IgfsFileAffinityRange range : map.ranges()) { - UUID nodeId = ggfsCtx.data().affinityNode(range.affinityKey()).id(); + UUID nodeId = igfsCtx.data().affinityNode(range.affinityKey()).id(); Collection<IgfsFileAffinityRange> nodeRanges = grpMap.get(nodeId); @@ -627,7 +627,7 @@ public class IgfsFragmentizerManager extends IgfsManager { grpMap.put(nodeId, nodeRanges); } - nodeRanges.addAll(range.split(ggfsCtx.data().groupBlockSize())); + nodeRanges.addAll(range.split(igfsCtx.data().groupBlockSize())); } Collection<UUID> nodeIds = new IdentityHashSet(grpMap.keySet()); @@ -684,7 +684,7 @@ public class IgfsFragmentizerManager extends IgfsManager { * @throws IgniteCheckedException In case of error. */ @Nullable private IgfsFileInfo fileForFragmentizer(Collection<IgniteUuid> exclude) throws IgniteCheckedException { - return fragmentizerEnabled ? ggfsCtx.meta().fileForFragmentizer(exclude) : null; + return fragmentizerEnabled ? igfsCtx.meta().fileForFragmentizer(exclude) : null; } /** @@ -698,7 +698,7 @@ public class IgfsFragmentizerManager extends IgfsManager { * Constructor. */ protected FragmentizerWorker() { - super(ggfsCtx.kernalContext().gridName(), "fragmentizer-worker", ggfsCtx.kernalContext().log()); + super(igfsCtx.kernalContext().gridName(), "fragmentizer-worker", igfsCtx.kernalContext().log()); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7848855a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsManager.java index 21ec0cc..8848b38 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsManager.java @@ -26,7 +26,7 @@ import java.util.concurrent.atomic.*; */ public abstract class IgfsManager { /** GGFS context. */ - protected IgfsContext ggfsCtx; + protected IgfsContext igfsCtx; /** Logger. */ protected IgniteLogger log; @@ -45,7 +45,7 @@ public abstract class IgfsManager { assert ggfsCtx != null; - this.ggfsCtx = ggfsCtx; + this.igfsCtx = ggfsCtx; log = ggfsCtx.kernalContext().log(getClass()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7848855a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsMetaManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsMetaManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsMetaManager.java index 48a8ed7..eca83d2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsMetaManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsMetaManager.java @@ -96,17 +96,17 @@ public class IgfsMetaManager extends IgfsManager { /** {@inheritDoc} */ @Override protected void start0() throws IgniteCheckedException { - cfg = ggfsCtx.configuration(); + cfg = igfsCtx.configuration(); - metaCache = ggfsCtx.kernalContext().cache().cache(cfg.getMetaCacheName()); + metaCache = igfsCtx.kernalContext().cache().cache(cfg.getMetaCacheName()); - metaCacheStartFut = ggfsCtx.kernalContext().cache().internalCache(cfg.getMetaCacheName()).preloader() + metaCacheStartFut = igfsCtx.kernalContext().cache().internalCache(cfg.getMetaCacheName()).preloader() .startFuture(); if (metaCache.configuration().getAtomicityMode() != TRANSACTIONAL) throw new IgniteCheckedException("Meta cache should be transactional: " + cfg.getMetaCacheName()); - evts = ggfsCtx.kernalContext().event(); + evts = igfsCtx.kernalContext().event(); sampling = new IgfsSamplingKey(cfg.getName()); @@ -114,15 +114,15 @@ public class IgfsMetaManager extends IgfsManager { id2InfoPrj = (GridCacheProjectionEx<IgniteUuid, IgfsFileInfo>)metaCache.<IgniteUuid, IgfsFileInfo>cache(); - log = ggfsCtx.kernalContext().log(IgfsMetaManager.class); + log = igfsCtx.kernalContext().log(IgfsMetaManager.class); } /** {@inheritDoc} */ @Override protected void onKernalStart0() throws IgniteCheckedException { - locNode = ggfsCtx.kernalContext().discovery().localNode(); + locNode = igfsCtx.kernalContext().discovery().localNode(); // Start background delete worker. - delWorker = new IgfsDeleteWorker(ggfsCtx); + delWorker = new IgfsDeleteWorker(igfsCtx); delWorker.start(); } @@ -154,7 +154,7 @@ public class IgfsMetaManager extends IgfsManager { Collection<ClusterNode> metaCacheNodes() { if (busyLock.enterBusy()) { try { - return ggfsCtx.kernalContext().discovery().cacheNodes(metaCache.name(), -1); + return igfsCtx.kernalContext().discovery().cacheNodes(metaCache.name(), -1); } finally { busyLock.leaveBusy(); @@ -1665,7 +1665,7 @@ public class IgfsMetaManager extends IgfsManager { "the secondary file system because the path points to a directory: " + path); IgfsFileInfo newInfo = new IgfsFileInfo(status.blockSize(), status.length(), affKey, - IgniteUuid.randomUuid(), ggfsCtx.ggfs().evictExclude(path, false), status.properties()); + IgniteUuid.randomUuid(), igfsCtx.ggfs().evictExclude(path, false), status.properties()); // Add new file info to the listing optionally removing the previous one. IgniteUuid oldId = putIfAbsentNonTx(parentInfo.id(), path.name(), newInfo); @@ -1681,7 +1681,7 @@ public class IgfsMetaManager extends IgfsManager { id2InfoPrj.invoke(parentInfo.id(), new UpdateListing(path.name(), new IgfsListingEntry(newInfo), false)); - IgniteInternalFuture<?> delFut = ggfsCtx.data().delete(oldInfo); + IgniteInternalFuture<?> delFut = igfsCtx.data().delete(oldInfo); // Record PURGE event if needed. if (evts.isRecordable(EVT_GGFS_FILE_PURGED)) { @@ -1786,7 +1786,7 @@ public class IgfsMetaManager extends IgfsManager { IgfsReader reader = fs.open(path, bufSize); try { - ggfsCtx.data().dataBlock(info, path, blockIdx, reader).get(); + igfsCtx.data().dataBlock(info, path, blockIdx, reader).get(); } finally { reader.close(); @@ -2298,8 +2298,8 @@ public class IgfsMetaManager extends IgfsManager { // Recreate the path locally. IgfsFileInfo curInfo = status.isDirectory() ? new IgfsFileInfo(true, status.properties()) : - new IgfsFileInfo(ggfsCtx.configuration().getBlockSize(), status.length(), - ggfsCtx.ggfs().evictExclude(curPath, false), status.properties()); + new IgfsFileInfo(igfsCtx.configuration().getBlockSize(), status.length(), + igfsCtx.ggfs().evictExclude(curPath, false), status.properties()); IgniteUuid oldId = putIfAbsentNonTx(parentInfo.id(), components.get(i), curInfo); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7848855a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsServerManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsServerManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsServerManager.java index 7b51e37..07322e8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsServerManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsServerManager.java @@ -49,7 +49,7 @@ public class IgfsServerManager extends IgfsManager { /** {@inheritDoc} */ @Override protected void start0() throws IgniteCheckedException { - IgfsConfiguration ggfsCfg = ggfsCtx.configuration(); + IgfsConfiguration ggfsCfg = igfsCtx.configuration(); Map<String,String> cfg = ggfsCfg.getIpcEndpointConfiguration(); if (F.isEmpty(cfg)) { @@ -88,7 +88,7 @@ public class IgfsServerManager extends IgfsManager { if (srvrs == null) srvrs = new ConcurrentLinkedQueue<>(); - IgfsServer ipcSrv = new IgfsServer(ggfsCtx, endpointCfg, mgmt); + IgfsServer ipcSrv = new IgfsServer(igfsCtx, endpointCfg, mgmt); try { ipcSrv.start(); @@ -161,7 +161,7 @@ public class IgfsServerManager extends IgfsManager { * Constructor. */ private BindWorker() { - super(ggfsCtx.kernalContext().gridName(), "bind-worker", ggfsCtx.kernalContext().log()); + super(igfsCtx.kernalContext().gridName(), "bind-worker", igfsCtx.kernalContext().log()); } /** @@ -186,7 +186,7 @@ public class IgfsServerManager extends IgfsManager { while (it.hasNext()) { IgniteBiTuple<Map<String, String>, Boolean> cfg = it.next(); - IgfsServer ipcSrv = new IgfsServer(ggfsCtx, cfg.get1(), cfg.get2()); + IgfsServer ipcSrv = new IgfsServer(igfsCtx, cfg.get1(), cfg.get2()); try { ipcSrv.start(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7848855a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsMetaManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsMetaManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsMetaManagerSelfTest.java index 386e8a2..818b263 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsMetaManagerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsMetaManagerSelfTest.java @@ -111,7 +111,7 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest { /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { - mgr.ggfsCtx.ggfs().format(); + mgr.igfsCtx.ggfs().format(); } /** {@inheritDoc} */
