Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 256241795A for ; Wed, 1 Apr 2015 12:55:44 +0000 (UTC) Received: (qmail 12812 invoked by uid 500); 1 Apr 2015 12:55:28 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 12779 invoked by uid 500); 1 Apr 2015 12:55:28 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 12731 invoked by uid 99); 1 Apr 2015 12:55:28 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Apr 2015 12:55:28 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 01 Apr 2015 12:55:26 +0000 Received: (qmail 10846 invoked by uid 99); 1 Apr 2015 12:55:04 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Apr 2015 12:55:04 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 04CD3E2F27; Wed, 1 Apr 2015 12:55:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Wed, 01 Apr 2015 12:55:26 -0000 Message-Id: <4f7488b7e04e44b1b0d82665586aa6b4@git.apache.org> In-Reply-To: <01ec5f625791434f807e29d5a9fca527@git.apache.org> References: <01ec5f625791434f807e29d5a9fca527@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [24/25] incubator-ignite git commit: # IGNITE-498: Applied patch from Ivan V.. X-Virus-Checked: Checked by ClamAV on apache.org # IGNITE-498: Applied patch from Ivan V.. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dc628223 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dc628223 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dc628223 Branch: refs/heads/ignite-662 Commit: dc628223a3000dcd19cab144f755449787d8a373 Parents: f097a5b Author: vozerov-gridgain Authored: Wed Apr 1 15:42:30 2015 +0300 Committer: vozerov-gridgain Committed: Wed Apr 1 15:42:30 2015 +0300 ---------------------------------------------------------------------- .../configuration/FileSystemConfiguration.java | 6 +++++ .../processors/igfs/IgfsDataManager.java | 11 +--------- .../processors/igfs/IgfsFileAffinityRange.java | 23 ++++---------------- 3 files changed, 11 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc628223/modules/core/src/main/java/org/apache/ignite/configuration/FileSystemConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/FileSystemConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/FileSystemConfiguration.java index 5793df1..d589cf7 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/FileSystemConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/FileSystemConfiguration.java @@ -609,7 +609,10 @@ public class FileSystemConfiguration { * Default value is {@link #DFLT_FRAGMENTIZER_LOCAL_WRITES_RATIO}. * * @return Ratio for local writes space. + * + * @deprecated Parameter is no longer used. */ + @Deprecated public float getFragmentizerLocalWritesRatio() { return fragmentizerLocWritesRatio; } @@ -619,7 +622,10 @@ public class FileSystemConfiguration { * * @param fragmentizerLocWritesRatio Ratio for local file writes. * @see #getFragmentizerLocalWritesRatio() + * + * @deprecated Parameter is no longer used. */ + @Deprecated public void setFragmentizerLocalWritesRatio(float fragmentizerLocWritesRatio) { this.fragmentizerLocWritesRatio = fragmentizerLocWritesRatio; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc628223/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java index 27a69f1..4b09375 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java @@ -1350,7 +1350,7 @@ public class IgfsDataManager extends IgfsManager { return new IgfsBlockKey(fileInfo.id(), fileInfo.affinityKey(), fileInfo.evictExclude(), block); // If range is done, no colocated writes are attempted. - if (locRange == null || locRange.done()) + if (locRange == null) return new IgfsBlockKey(fileInfo.id(), null, fileInfo.evictExclude(), block); long blockStart = block * fileInfo.blockSize(); @@ -1362,15 +1362,6 @@ public class IgfsDataManager extends IgfsManager { return new IgfsBlockKey(fileInfo.id(), affKey, fileInfo.evictExclude(), block); } - // Check if we have enough free space to do colocated writes. - if (dataCachePrj.igfsDataSpaceUsed() > dataCachePrj.igfsDataSpaceMax() * - igfsCtx.configuration().getFragmentizerLocalWritesRatio()) { - // Forbid further co-location. - locRange.markDone(); - - return new IgfsBlockKey(fileInfo.id(), null, fileInfo.evictExclude(), block); - } - if (!locRange.belongs(blockStart)) locRange.expand(blockStart, fileInfo.blockSize()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc628223/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileAffinityRange.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileAffinityRange.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileAffinityRange.java index 439f647..9736f10 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileAffinityRange.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileAffinityRange.java @@ -56,9 +56,6 @@ public class IgfsFileAffinityRange implements Message, Externalizable { /** Range end offset (endOff + 1 divisible by block size). */ private long endOff; - /** Transient flag indicating no further writes should be made to this range. */ - private boolean done; - /** * Empty constructor required by {@link Externalizable}. */ @@ -219,20 +216,6 @@ public class IgfsFileAffinityRange implements Message, Externalizable { } /** - * Marks this range as done. - */ - public void markDone() { - done = true; - } - - /** - * @return Done flag. - */ - public boolean done() { - return done; - } - - /** * Checks if range regions are equal. * * @param other Other range to check against. @@ -281,7 +264,8 @@ public class IgfsFileAffinityRange implements Message, Externalizable { writer.incrementState(); case 1: - if (!writer.writeBoolean("done", done)) + // The field 'done' was removed, but its writing preserved for compatibility reasons. + if (!writer.writeBoolean("done", false)) return false; writer.incrementState(); @@ -326,7 +310,8 @@ public class IgfsFileAffinityRange implements Message, Externalizable { reader.incrementState(); case 1: - done = reader.readBoolean("done"); + // field 'done' was removed, but reading preserved for compatibility reasons. + reader.readBoolean("done"); if (!reader.isLastRead()) return false;