Github user pdube commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/1331#discussion_r50066929
--- Diff:
services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
---
@@ -942,6 +931,83 @@ protected Answer copyFromNfsToS3(CopyCommand cmd) {
}
}
+ protected boolean swiftUploadMetadataFile(SwiftTO swift, File srcFile,
String containerName) throws IOException {
+
+
+ //create a template.properties for Swift with its correct unique
name
+ File uniqDir = _storage.createUniqDir();
+ String metaFileName = uniqDir.getAbsolutePath() + File.separator +
"template.properties";
+ _storage.create(uniqDir.getAbsolutePath(), "template.properties");
+
+ String uniqueName = FilenameUtils.getBaseName(srcFile.getName());
+ File metaFile = new File(metaFileName);
+ FileWriter writer = new FileWriter(metaFile);
+ BufferedWriter bufferWriter = new BufferedWriter(writer);
+ bufferWriter.write("uniquename=" + uniqueName);
+ bufferWriter.write("\n");
+ bufferWriter.write("filename=" + srcFile.getName());
+ bufferWriter.write("\n");
+ bufferWriter.write("size=" + srcFile.length());
+ bufferWriter.write("\n");
+ bufferWriter.write("virtualsize=" + getVirtualSize(srcFile,
getTemplateFormat(srcFile.getName())));
+ bufferWriter.close();
+ writer.close();
+
+ SwiftUtil.putObject(swift, metaFile, containerName, _tmpltpp);
+ metaFile.delete();
+ uniqDir.delete();
+
+ return true;
+ }
+
+
+ protected Answer copyFromNfsToSwift(CopyCommand cmd) {
+
+ final DataTO srcData = cmd.getSrcTO();
+ final DataTO destData = cmd.getDestTO();
+
+ DataStoreTO srcDataStore = srcData.getDataStore();
+ NfsTO srcStore = (NfsTO)srcDataStore;
+ DataStoreTO destDataStore = destData.getDataStore();
+ File srcFile = getFile(srcData.getPath(), srcStore.getUrl());
+
+ SwiftTO swift = (SwiftTO)destDataStore;
+
+ try {
+
+ String containerName =
SwiftUtil.getContainerName(destData.getObjectType().toString(),
destData.getId());
+ String swiftPath = SwiftUtil.putObject(swift, srcFile,
containerName, srcFile.getName());
+
+
+ DataTO retObj = null;
+ if (destData.getObjectType() == DataObjectType.TEMPLATE) {
+ swiftUploadMetadataFile(swift, srcFile, containerName);
+ TemplateObjectTO newTemplate = new TemplateObjectTO();
+ newTemplate.setPath(swiftPath);
+ newTemplate.setSize(getVirtualSize(srcFile,
getTemplateFormat(srcFile.getName())));
+ newTemplate.setPhysicalSize(srcFile.length());
+
newTemplate.setFormat(getTemplateFormat(srcFile.getName()));
+ retObj = newTemplate;
+ } else if (destData.getObjectType() == DataObjectType.VOLUME) {
+ VolumeObjectTO newVol = new VolumeObjectTO();
+ newVol.setPath(containerName);
+ newVol.setSize(srcFile.length());
--- End diff --
Not 100% related to this PR, but are the sizes on volumes and snapshots
correct?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
