[CLOUDSTACK-5051] Revert "CLOUDSTACK-3715. Socket timeout error is observed in VMware setup if a VMware task (RelocateVM_Task, CloneVM_Task etc.) takes more than 10 minutes. Making this value configurable to allow admins to modify the timeout if required. It defaults to the current value i.e. 10 minutes."

Likitha Shetty · Likitha Shetty · commit f03dcdab19af · 2013-11-06T19:07:33.000+05:30
This reverts commit 3a91500. Conflicts: plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareSecondaryStorageContextFactory.java
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManager.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManager.java
@@ -69,7 +69,5 @@ List<ManagedObjectReference> addHostToPodCluster(VmwareContext serviceContext, l
     
     public String getRootDiskController();
 
-    public int getVcenterSessionTimeout();
-
     boolean isLegacyZone(long dcId);
 }
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
@@ -177,7 +177,6 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw
     int _additionalPortRangeStart;
     int _additionalPortRangeSize;
     int _routerExtraPublicNics = 2;
-    int _vCenterSessionTimeout = 600000; // Timeout in milliseconds
 
     String _reserveCpu = "false";
 
@@ -280,9 +279,6 @@ public boolean configure(String name, Map<String, Object> params) throws Configu
 
         _routerExtraPublicNics = NumbersUtil.parseInt(_configDao.getValue(Config.RouterExtraPublicNics.key()), 2);
 
-        _vCenterSessionTimeout = NumbersUtil.parseInt(_configDao.getValue(Config.VmwareVcenterSessionTimeout.key()), 600) * 1000;
-        s_logger.info("VmwareManagerImpl config - vmware.vcenter.session.timeout: " + _vCenterSessionTimeout);
-
         _reserveCpu = _configDao.getValue(Config.VmwareReserveCpu.key());
         if(_reserveCpu == null || _reserveCpu.isEmpty()) {
             _reserveCpu = "false";
@@ -989,11 +985,6 @@ public String getRootDiskController() {
         return _rootDiskController;
     }
 
-    @Override
-    public int getVcenterSessionTimeout() {
-        return _vCenterSessionTimeout;
-    }
-
     @Override
     public List<Class<?>> getCommands() {
         List<Class<?>> cmdList = new ArrayList<Class<?>>();
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareContextFactory.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareContextFactory.java
@@ -63,7 +63,6 @@ public static VmwareContext create(String vCenterAddress, String vCenterUserName
 			s_logger.debug("initialize VmwareContext. url: " + serviceUrl + ", username: " + vCenterUserName + ", password: " + StringUtils.getMaskedPasswordForDisplay(vCenterPassword));
 
 		VmwareClient vimClient = new VmwareClient(vCenterAddress + "-" + s_seq++);
-		vimClient.setVcenterSessionTimeout(s_vmwareMgr.getVcenterSessionTimeout());
 		vimClient.connect(serviceUrl, vCenterUserName, vCenterPassword);
 
 		VmwareContext context = new VmwareContext(vimClient, vCenterAddress);
diff --git a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareSecondaryStorageContextFactory.java b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareSecondaryStorageContextFactory.java
@@ -16,49 +16,34 @@
 // under the License.
 package com.cloud.storage.resource;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
 import org.apache.log4j.Logger;
 
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
 
-import com.cloud.configuration.Config;
 import com.cloud.hypervisor.vmware.util.VmwareClient;
 import com.cloud.hypervisor.vmware.util.VmwareContext;
 import com.cloud.hypervisor.vmware.util.VmwareContextPool;
-import com.cloud.utils.NumbersUtil;
 
 public class VmwareSecondaryStorageContextFactory {
     private static final Logger s_logger = Logger.getLogger(VmwareSecondaryStorageContextFactory.class);
     
 	private static volatile int s_seq = 1;
 
 	private static VmwareContextPool s_pool;
-    private static ConfigurationDao s_configDao;
-
-    @Inject ConfigurationDao _configDao;
 
 	public static void initFactoryEnvironment() {
 		System.setProperty("axis.socketSecureFactory", "org.apache.axis.components.net.SunFakeTrustSocketFactory");
 		s_pool = new VmwareContextPool();
 	}
 
-    @PostConstruct
-        void init() {
-            s_configDao = _configDao;
-    }
-
 	public static VmwareContext create(String vCenterAddress, String vCenterUserName, String vCenterPassword) throws Exception {
 		assert(vCenterAddress != null);
 		assert(vCenterUserName != null);
 		assert(vCenterPassword != null);
 
 		String serviceUrl = "https://" + vCenterAddress + "/sdk/vimService";
-        int vCenterSessionTimeout = NumbersUtil.parseInt(s_configDao.getValue(Config.VmwareVcenterSessionTimeout.key()), 600) * 1000;
 		VmwareClient vimClient = new VmwareClient(vCenterAddress + "-" + s_seq++);
-        vimClient.setVcenterSessionTimeout(vCenterSessionTimeout);
-        vimClient.connect(serviceUrl, vCenterUserName, vCenterPassword);
+		vimClient.connect(serviceUrl, vCenterUserName, vCenterPassword);
 		VmwareContext context = new VmwareContext(vimClient, vCenterAddress);
 		assert(context != null);
 		
diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/com/cloud/configuration/Config.java
@@ -265,7 +265,6 @@ public enum Config {
     VmwareRecycleHungWorker("Advanced", ManagementServer.class, Boolean.class, "vmware.recycle.hung.wokervm", "false", "Specify whether or not to recycle hung worker VMs", null),
     VmwareHungWorkerTimeout("Advanced", ManagementServer.class, Long.class, "vmware.hung.wokervm.timeout", "7200", "Worker VM timeout in seconds", null),
     VmwareEnableNestedVirtualization("Advanced", ManagementServer.class, Boolean.class, "vmware.nested.virtualization", "false", "When set to true this will enable nested virtualization when this is supported by the hypervisor", null),
-    VmwareVcenterSessionTimeout("Advanced", ManagementServer.class, Long.class, "vmware.vcenter.session.timeout", "600", "VMware client timeout in seconds", null),
 
     // Midonet
     MidoNetAPIServerAddress("Network", ManagementServer.class, String.class, "midonet.apiserver.address", "http://localhost:8081", "Specify the address at which the Midonet API server can be contacted (if using Midonet)", null),
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareClient.java b/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareClient.java
@@ -109,7 +109,6 @@ private static void trustAllHttpsCertificates() throws Exception {
     private VimPortType vimPort;
     private String serviceCookie;
     private final String SVC_INST_NAME = "ServiceInstance";
-    private int vCenterSessionTimeout = 600000; // Timeout in milliseconds
 
     private boolean isConnected = false;
 
@@ -133,8 +132,8 @@ public void connect(String url, String userName, String password) throws Excepti
         ctxt.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, url);
         ctxt.put(BindingProvider.SESSION_MAINTAIN_PROPERTY, true);
 
-        ctxt.put("com.sun.xml.internal.ws.request.timeout", vCenterSessionTimeout);
-        ctxt.put("com.sun.xml.internal.ws.connect.timeout", vCenterSessionTimeout);
+        ctxt.put("com.sun.xml.internal.ws.request.timeout", 600000);
+        ctxt.put("com.sun.xml.internal.ws.connect.timeout", 600000);
 
         ServiceContent serviceContent = vimPort.retrieveServiceContent(SVC_INST_REF);
 
@@ -617,9 +616,4 @@ public ManagedObjectReference getMoRefProp(ManagedObjectReference objMor, String
        }
        return propmor;
     }
-
-    public void setVcenterSessionTimeout(int vCenterSessionTimeout) {
-        this.vCenterSessionTimeout = vCenterSessionTimeout;
-    }
-
 }
diff --git a/vmware-base/test/com/cloud/hypervisor/vmware/mo/TestVmwareContextFactory.java b/vmware-base/test/com/cloud/hypervisor/vmware/mo/TestVmwareContextFactory.java
@@ -48,7 +48,6 @@ public static VmwareContext create(String vCenterAddress, String vCenterUserName
 			s_logger.debug("initialize VmwareContext. url: " + serviceUrl + ", username: " + vCenterUserName + ", password: " + StringUtils.getMaskedPasswordForDisplay(vCenterPassword));
 
 		VmwareClient vimClient = new VmwareClient(vCenterAddress + "-" + s_seq++);
-        vimClient.setVcenterSessionTimeout(600000); // Timeout in milliseconds
 		vimClient.connect(serviceUrl, vCenterUserName, vCenterPassword);
 
 		VmwareContext context = new VmwareContext(vimClient, vCenterAddress);

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,5 @@ List<ManagedObjectReference> addHostToPodCluster(VmwareContext serviceContext, l`
`69`	`69`
`70`	`70`	`public String getRootDiskController();`
`71`	`71`
`72`		`- public int getVcenterSessionTimeout();`
`73`		`-`
`74`	`72`	`boolean isLegacyZone(long dcId);`
`75`	`73`	`}`