cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pdion...@apache.org
Subject [1/6] git commit: updated refs/heads/master to 31b486d
Date Sun, 26 Jul 2015 14:41:19 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master ac9c2a224 -> 31b486d38


CLOUDSTACK-8648: Do not configure the ImageFormat Processor when fetching filesize

It will throw an exception and that's needed.

Also, make the log show about which file we are talking about

Signed-off-by: Wido den Hollander <wido@widodh.nl>
Signed-off-by: Pierre-Luc Dion <pdion891@apache.org>


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

Branch: refs/heads/master
Commit: 554f5f9fbbedaeb8c14519d423c042375002d976
Parents: ac9c2a2
Author: Wido den Hollander <wido@widodh.nl>
Authored: Fri Jul 17 15:16:35 2015 +0200
Committer: Pierre-Luc Dion <pdion891@apache.org>
Committed: Sun Jul 26 10:25:05 2015 -0400

----------------------------------------------------------------------
 .../cloudstack/storage/resource/NfsSecondaryStorageResource.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/554f5f9f/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 a529b87..5c361ed 100644
--- 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
@@ -860,10 +860,9 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements
S
                 return file.length();
             }
 
-            processor.configure("template processor", new HashMap<String, Object>());
             return processor.getVirtualSize(file);
         } catch (Exception e) {
-            s_logger.warn("Failed to get virtual size, returning file size instead:", e);
+            s_logger.warn("Failed to get virtual size of file " + file.getPath() + ", returning
file size instead: ", e);
             return file.length();
         }
 


Mime
View raw message