cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sw...@apache.org
Subject [39/39] git commit: updated refs/heads/master to 3c800b4
Date Thu, 26 May 2016 03:06:18 GMT
Merge pull request #1518 from nvazquez/testnfs

CLOUDSTACK-9368: Fix for Support configurable NFS version for Secondary Storage mounts## Description
JIRA TICKET: https://issues.apache.org/jira/browse/CLOUDSTACK-9368
This pull request address a problem introduced in #1361 in which NFS version couldn't be changed
after hosts resources were configured on startup (for hosts using `VmwareResource`), and as
host parameters didn't include `nfs.version` key, it was set `null`.

## Proposed solution
In this proposed solution `nfsVersion` would be passed in `NfsTO` through `CopyCommand` to
`VmwareResource`, who will check if NFS version is still configured or not. If not, it will
use the one sent in the command and will set it to its storage processor and storage handler.
After those setups, it will proceed executing command.

* pr/1518:
  CLOUDSTACK-9368: Fix for Support configurable NFS version for Secondary Storage mounts

Signed-off-by: Will Stevens <williamstevens@gmail.com>


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

Branch: refs/heads/master
Commit: 3c800b4bfe1a8dd074b50516f32607e9f4dc4d3c
Parents: 978184b 2d28199
Author: Will Stevens <williamstevens@gmail.com>
Authored: Wed May 25 23:05:06 2016 -0400
Committer: Will Stevens <williamstevens@gmail.com>
Committed: Wed May 25 23:05:07 2016 -0400

----------------------------------------------------------------------
 api/src/com/cloud/agent/api/to/NfsTO.java       |  9 ++
 .../cloud/agent/api/BackupSnapshotCommand.java  |  8 --
 ...reatePrivateTemplateFromSnapshotCommand.java |  8 --
 .../CreatePrivateTemplateFromVolumeCommand.java |  8 --
 .../api/CreateVolumeFromSnapshotCommand.java    |  9 --
 .../cloud/agent/api/GetStorageStatsCommand.java | 16 +---
 .../cloud/agent/api/SecStorageSetupCommand.java | 11 +--
 .../com/cloud/agent/api/SnapshotCommand.java    |  3 +-
 .../agent/api/storage/CopyVolumeCommand.java    | 11 +--
 .../agent/api/storage/ListTemplateCommand.java  | 16 +---
 .../storage/PrimaryStorageDownloadCommand.java  |  8 --
 .../com/cloud/agent/api/storage/SsCommand.java  |  4 +-
 .../cloud/agent/api/storage/StorageCommand.java |  8 +-
 .../api/storage/StorageNfsVersionCommand.java   | 44 +++++++++
 .../TemplateOrVolumePostUploadCommand.java      |  6 +-
 .../storage/image/TemplateServiceImpl.java      |  3 +-
 .../MockLocalNfsSecondaryStorageResource.java   |  2 +-
 .../storage/image/BaseImageStoreDriverImpl.java |  1 +
 .../storage/image/NfsImageStoreDriverImpl.java  | 48 ++++++++++
 .../cloud/resource/AgentStorageResource.java    |  2 +-
 .../driver/SimulatorImageStoreDriverImpl.java   |  5 +-
 .../vmware/manager/VmwareManagerImpl.java       |  7 +-
 .../manager/VmwareStorageManagerImpl.java       | 24 ++---
 .../vmware/manager/VmwareStorageMount.java      |  2 +-
 .../vmware/resource/VmwareResource.java         | 68 +++++++++++++-
 .../PremiumSecondaryStorageResource.java        |  3 +-
 .../VmwareSecondaryStorageResourceHandler.java  |  4 +-
 .../resource/VmwareStorageProcessor.java        | 25 +++---
 .../VmwareStorageSubsystemCommandHandler.java   | 21 ++++-
 .../vmware/resource/VmwareResourceTest.java     | 95 +++++++++++++++++++-
 .../driver/CloudStackImageStoreDriverImpl.java  |  5 +-
 server/src/com/cloud/server/StatsCollector.java |  3 +-
 .../cloud/storage/ImageStoreDetailsUtil.java    |  6 +-
 .../storage/ImageStoreDetailsUtilTest.java      | 14 +--
 .../SecondaryStorageManagerImpl.java            |  5 +-
 .../LocalNfsSecondaryStorageResource.java       |  4 +-
 .../resource/LocalSecondaryStorageResource.java |  2 +-
 .../resource/NfsSecondaryStorageResource.java   | 37 ++++++--
 .../resource/SecondaryStorageResource.java      |  2 +-
 .../storage/template/DownloadManagerImpl.java   |  5 +-
 40 files changed, 398 insertions(+), 164 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3c800b4b/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
----------------------------------------------------------------------


Mime
View raw message