You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by wi...@apache.org on 2015/07/27 10:43:32 UTC
[44/50] [abbrv] git commit: updated refs/heads/reporter to 3e1816d
CLOUDSTACK-8648: Pass the proper storage layer when configuring
Signed-off-by: Pierre-Luc Dion <pd...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9dbc99c6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9dbc99c6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9dbc99c6
Branch: refs/heads/reporter
Commit: 9dbc99c6083ac833045713403f794bf3506065b1
Parents: 554f5f9
Author: Wido den Hollander <wi...@widodh.nl>
Authored: Thu Jul 23 23:39:02 2015 +0200
Committer: Pierre-Luc Dion <pd...@apache.org>
Committed: Sun Jul 26 10:25:06 2015 -0400
----------------------------------------------------------------------
.../cloudstack/storage/resource/NfsSecondaryStorageResource.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9dbc99c6/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 5c361ed..be59691 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,6 +860,9 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
return file.length();
}
+ Map<String, Object> params = new HashMap<String, Object>();
+ params.put(StorageLayer.InstanceConfigKey, _storage);
+ processor.configure("template processor", params);
return processor.getVirtualSize(file);
} catch (Exception e) {
s_logger.warn("Failed to get virtual size of file " + file.getPath() + ", returning file size instead: ", e);