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 BF88417540 for ; Sat, 11 Apr 2015 04:39:58 +0000 (UTC) Received: (qmail 3867 invoked by uid 500); 11 Apr 2015 04:39:58 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 3788 invoked by uid 500); 11 Apr 2015 04:39:58 -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 3370 invoked by uid 99); 11 Apr 2015 04:39:57 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 11 Apr 2015 04:39:57 +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; Sat, 11 Apr 2015 04:39:56 +0000 Received: (qmail 2920 invoked by uid 99); 11 Apr 2015 04:39:34 -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; Sat, 11 Apr 2015 04:39:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 968DFE04D9; Sat, 11 Apr 2015 04:39:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agoncharuk@apache.org To: commits@ignite.incubator.apache.org Date: Sat, 11 Apr 2015 04:40:09 -0000 Message-Id: In-Reply-To: <3cdfda7cdb1d4efdb8936e9d413132c4@git.apache.org> References: <3cdfda7cdb1d4efdb8936e9d413132c4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [36/50] incubator-ignite git commit: # Last-minute fix to IGFS: we were throwing IOError in some pretty valid cases what led to missed future completion and eventual hang. X-Virus-Checked: Checked by ClamAV on apache.org # Last-minute fix to IGFS: we were throwing IOError in some pretty valid cases what led to missed future completion and eventual hang. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c3210d80 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c3210d80 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c3210d80 Branch: refs/heads/ignite-80 Commit: c3210d8035bca7dccae2b1accacd7e641c4e8cc6 Parents: 26fa0bf Author: thatcoach Authored: Fri Apr 10 20:57:51 2015 +0300 Committer: thatcoach Committed: Fri Apr 10 20:57:51 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/igfs/IgfsInputStreamImpl.java | 2 +- .../ignite/internal/processors/igfs/IgfsOutputStreamImpl.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c3210d80/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamImpl.java index 30d2cf3..6c35032 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamImpl.java @@ -312,7 +312,7 @@ public class IgfsInputStreamImpl extends IgfsInputStreamAdapter { } } catch (IgniteCheckedException e) { - throw new IOError(e); // Something unrecoverable. + throw new IOException("File to close the file: " + fileInfo.path(), e); } finally { closed = true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c3210d80/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java index c5b3e20..298733a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java @@ -262,7 +262,7 @@ class IgfsOutputStreamImpl extends IgfsOutputStreamAdapter { exists = meta.exists(fileInfo.id()); } catch (IgniteCheckedException e) { - throw new IOError(e); // Something unrecoverable. + throw new IOException("File to read file metadata: " + fileInfo.path(), e); } if (!exists) { @@ -330,7 +330,7 @@ class IgfsOutputStreamImpl extends IgfsOutputStreamAdapter { exists = !deleted && meta.exists(fileInfo.id()); } catch (IgniteCheckedException e) { - throw new IOError(e); // Something unrecoverable. + throw new IOException("File to read file metadata: " + fileInfo.path(), e); } if (exists) { @@ -370,7 +370,7 @@ class IgfsOutputStreamImpl extends IgfsOutputStreamAdapter { throw new IOException("File was concurrently deleted: " + path); } catch (IgniteCheckedException e) { - throw new IOError(e); // Something unrecoverable. + throw new IOException("File to read file metadata: " + fileInfo.path(), e); } meta.updateParentListingAsync(parentId, fileInfo.id(), fileName, bytes, modificationTime);