From e4d92162220a6128c2a545f280606d42bafa1b4f Mon Sep 17 00:00:00 2001 From: Edison Su Date: Wed, 26 Jan 2011 04:07:36 -0500 Subject: [PATCH] Revert "fix for the Bug 7836 - Add secondary storage- MS fails to check invalid path specified" This reverts commit 53b2ba278d597cd653774e0f89273ddfc9cfdedb. --- .../storage/secondary/SecondaryStorageDiscoverer.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageDiscoverer.java b/server/src/com/cloud/storage/secondary/SecondaryStorageDiscoverer.java index 36ad1612ab0..30b0555c28c 100644 --- a/server/src/com/cloud/storage/secondary/SecondaryStorageDiscoverer.java +++ b/server/src/com/cloud/storage/secondary/SecondaryStorageDiscoverer.java @@ -104,6 +104,9 @@ public class SecondaryStorageDiscoverer extends DiscovererBase implements Discov protected Map> createNfsSecondaryStorageResource(long dcId, Long podId, URI uri) { + if (_useServiceVM) { + return createDummySecondaryStorageResource(dcId, podId, uri); + } String mountStr = NfsUtils.uri2Mount(uri); Script script = new Script(true, "mount", _timeout, s_logger); @@ -132,10 +135,6 @@ public class SecondaryStorageDiscoverer extends DiscovererBase implements Discov script.execute(); file.delete(); - - if (_useServiceVM) { - return createDummySecondaryStorageResource(dcId, podId, uri); - } Map> srs = new HashMap>();