Return-Path: 
 <commits-return-49711-apmail-cloudstack-commits-archive=cloudstack.apache.org@cloudstack.apache.org>
X-Original-To: apmail-cloudstack-commits-archive@www.apache.org
Delivered-To: apmail-cloudstack-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 1D34017816
	for <apmail-cloudstack-commits-archive@www.apache.org>;
 Wed, 29 Apr 2015 10:21:20 +0000 (UTC)
Received: (qmail 46304 invoked by uid 500); 29 Apr 2015 10:00:00 -0000
Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org
Received: (qmail 10749 invoked by uid 500); 29 Apr 2015 09:59:01 -0000
Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cloudstack.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cloudstack.apache.org>
List-Post: <mailto:commits@cloudstack.apache.org>
List-Id: <commits.cloudstack.apache.org>
Reply-To: dev@cloudstack.apache.org
Delivered-To: mailing list commits@cloudstack.apache.org
Received: (qmail 86050 invoked by uid 99); 29 Apr 2015 05:43:45 -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, 29 Apr 2015 05:43:45 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id BE303E0986; Wed, 29 Apr 2015 05:43:45 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: rajani@apache.org
To: commits@cloudstack.apache.org
Date: Wed, 29 Apr 2015 05:44:02 -0000
Message-Id: <9bf258d9444841b1b9faa7084dfc86d4@git.apache.org>
In-Reply-To: <45d63cde7a8140048c7ab36aae2c9a92@git.apache.org>
References: <45d63cde7a8140048c7ab36aae2c9a92@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [18/50] git commit: updated refs/heads/master to 0b83559

handling tcp close event in netty server

while the file is in uploading state and connection is reset by peer,
volume upload request posted again shows the upload is IN_Progress
state. marking them as errored


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6b8b4b92
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6b8b4b92
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6b8b4b92

Branch: refs/heads/master
Commit: 6b8b4b92e6d5ec36d4b976e81083f72ae17245a3
Parents: 7d1ca8a
Author: Rajani Karuturi <rajanikaruturi@gmail.com>
Authored: Tue Mar 17 15:17:33 2015 +0530
Committer: Rajani Karuturi <rajanikaruturi@gmail.com>
Committed: Tue Mar 17 15:21:25 2015 +0530

----------------------------------------------------------------------
 .../cloudstack/storage/resource/HttpUploadServerHandler.java  | 7 +++++++
 .../storage/resource/NfsSecondaryStorageResource.java         | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6b8b4b92/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/HttpUploadServerHandler.java
----------------------------------------------------------------------
diff --git a/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/HttpUploadServerHandler.java b/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/HttpUploadServerHandler.java
index 7a17ef1..0caee32 100644
--- a/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/HttpUploadServerHandler.java
+++ b/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/HttpUploadServerHandler.java
@@ -95,6 +95,13 @@ public class HttpUploadServerHandler extends SimpleChannelInboundHandler<HttpObj
     }
 
     @Override
+    public void channelInactive(ChannelHandlerContext ctx) throws Exception {
+        String message = "file receive failed or connection closed prematurely.";
+        logger.error(message);
+        storageResource.updateStateMapWithError(uuid, message);
+    }
+
+    @Override
     public void channelRead0(ChannelHandlerContext ctx, HttpObject msg) throws Exception {
         if (msg instanceof HttpRequest) {
             HttpRequest request = this.request = (HttpRequest) msg;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6b8b4b92/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
----------------------------------------------------------------------
diff --git a/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java b/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
index d10242c..1bce4a0 100755
--- a/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
+++ b/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
@@ -2774,7 +2774,7 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
         return _ssvmPSK;
     }
 
-    private void updateStateMapWithError(String uuid,String errorMessage) {
+    public void updateStateMapWithError(String uuid,String errorMessage) {
         UploadEntity uploadEntity=null;
         if (uploadEntityStateMap.get(uuid)!=null) {
             uploadEntity=uploadEntityStateMap.get(uuid);