rafaelweingartner closed pull request #1499: Remove unused "umount" method in
NfsSecondaryStorageResource
URL: https://github.com/apache/cloudstack/pull/1499
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
index 93d8c271df3..64081d56759 100644
---
a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
+++
b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
@@ -3041,29 +3041,6 @@ protected String mountUri(URI uri, Integer nfsVersion)
throws UnknownHostExcepti
return dir;
}
- protected void umount(String localRootPath, URI uri) {
- ensureLocalRootPathExists(localRootPath, uri);
-
- if (!mountExists(localRootPath, uri)) {
- return;
- }
-
- Script command = new Script(!_inSystemVM, "mount", _timeout, s_logger);
- command.add(localRootPath);
- String result = command.execute();
- if (result != null) {
- // Fedora Core 12 errors out with any -o option executed from java
- String errMsg = "Unable to umount " + localRootPath + " due to " +
result;
- s_logger.error(errMsg);
- File file = new File(localRootPath);
- if (file.exists()) {
- file.delete();
- }
- throw new CloudRuntimeException(errMsg);
- }
- s_logger.debug("Successfully umounted " + localRootPath);
- }
-
protected void mount(String localRootPath, String remoteDevice, URI uri,
Integer nfsVersion) {
s_logger.debug("mount " + uri.toString() + " on " + localRootPath +
((nfsVersion != null) ? " nfsVersion=" + nfsVersion : ""));
ensureLocalRootPathExists(localRootPath, uri);
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
