Merge pull request #1331 from syed/swift-restart-fix Fix Sync of template.properties in SwiftWhen using Swift as a secondary storage, we create a template.properties file which stores the metadata about the template. Currently the data which is present in the file is incorrect which leads to templates becoming unavailable after they are downloaded. This fix makes sure that the template.properties has the correct "path" set so that templates are available.
I've also done a bit of cleanup and made the code bit more clean. * pr/1331: Fix Sync of template.properties in Swift Signed-off-by: Will Stevens <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/06e52e4f Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/06e52e4f Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/06e52e4f Branch: refs/heads/4.8 Commit: 06e52e4f3474fea5ef2b3738853bc19f533ce32d Parents: ebc70a5 f5ac8dd Author: Will Stevens <[email protected]> Authored: Wed May 18 15:53:32 2016 -0400 Committer: Will Stevens <[email protected]> Committed: Wed May 18 15:53:33 2016 -0400 ---------------------------------------------------------------------- .../datastore/ObjectInDataStoreManagerImpl.java | 1 + server/src/com/cloud/test/TestAppender.java | 178 +++++++++ services/secondary-storage/server/pom.xml | 3 - .../resource/NfsSecondaryStorageResource.java | 373 ++++++++++++------- .../LocalNfsSecondaryStorageResourceTest.java | 44 ++- .../NfsSecondaryStorageResourceTest.java | 118 +++--- 6 files changed, 481 insertions(+), 236 deletions(-) ----------------------------------------------------------------------
