diff --git a/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java b/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java index 3e9232760a4..cbdfaa7ea0d 100755 --- a/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java +++ b/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java @@ -23,7 +23,6 @@ import java.io.IOException; import java.io.InputStream; import java.math.BigInteger; import java.net.InetAddress; -import java.net.UnknownHostException; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.net.URI; @@ -108,7 +107,7 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S private String _localgw; private String _eth1mask; private String _eth1ip; - final private String _parent = "/mnt/SecStorage/"; + final private String _parent = "/mnt/SecStorage"; @Override public void disconnected() { } @@ -640,7 +639,7 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S protected String mount(String root, String nfsPath) { File file = new File(root); if (!file.exists()) { - if (!_storage.mkdir(root)) { + if (_storage.mkdir(root)) { s_logger.debug("create mount point: " + root); } else { s_logger.debug("Unable to create mount point: " + root); diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java index c9de93b1b22..6cbf696efc2 100644 --- a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java +++ b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java @@ -238,10 +238,7 @@ public class SecondaryStorageManagerImpl implements SecondaryStorageVmManager, V s_logger.warn("secondary storage VM " + cssHost.getName() + " doesn't exist"); return false; } - if (secStorageVm.getState() != State.Running) { - s_logger.warn("secondary storage VM " + cssHost.getName() + " is not running"); - return false; - } + List ssHosts = _hostDao.listSecondaryStorageHosts(zoneId); for( HostVO ssHost : ssHosts ) { String secUrl = ssHost.getStorageUrl(); @@ -292,11 +289,7 @@ public class SecondaryStorageManagerImpl implements SecondaryStorageVmManager, V s_logger.warn("secondary storage VM " + ssAHost.getName() + " doesn't exist"); return false; } - if (secStorageVm.getState() != State.Running) { - s_logger.warn("secondary storage VM " + ssAHost.getName() + " is not running"); - return false; - } - + SecStorageVMSetupCommand setupCmd = new SecStorageVMSetupCommand(); if (_allowedInternalSites != null) { List allowedCidrs = new ArrayList(); @@ -351,10 +344,6 @@ public class SecondaryStorageManagerImpl implements SecondaryStorageVmManager, V s_logger.warn("secondary storage VM " + ssAHost.getName() + " doesn't exist"); return false; } - if (thisSecStorageVm.getState() != State.Running) { - s_logger.warn("secondary storage VM " + ssAHost.getName() + " is not running"); - return false; - } List alreadyRunning = _secStorageVmDao.getSecStorageVmListInStates(SecondaryStorageVm.Role.templateProcessor, State.Running, State.Migrating, State.Starting);