This is an automated email from the ASF dual-hosted git repository.
rajani pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit c4c692afa52ccb6f6551fad0b49eb1604667018c
Merge: 7b1b31d 7ea41a5
Author: Rajani Karuturi <karut...@users.noreply.github.com>
AuthorDate: Tue Jun 6 15:57:18 2017 +0530
Merge pull request #1862 from sateesh-chodapuneedi/pr-cloudstack-9704
CLOUDSTACK-9704 Remove dependency on VmwareContext object to fetch systemVM
keyfile
.../hypervisor/vmware/resource/VmwareResource.java | 57 ++++++++++++++++++----
1 file changed, 47 insertions(+), 10 deletions(-)
diff --cc
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index 848cd7f,268984c..fd608ad
---
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@@ -882,11 -844,10 +887,11 @@@ public class VmwareResource implements
// when we dynamically plug in a new NIC into virtual router, it may
take time to show up in guest OS
// we use a waiting loop here as a workaround to synchronize
activities in systems
long startTick = System.currentTimeMillis();
- while (System.currentTimeMillis() - startTick < 15000) {
+ long waitTimeoutMillis =
VmwareManager.s_vmwareNicHotplugWaitTimeout.value();
+ while (System.currentTimeMillis() - startTick < waitTimeoutMillis) {
// TODO : this is a temporary very inefficient solution, will
refactor it later
- Pair<Boolean, String> result = SshHelper.sshExecute(routerIp,
DefaultDomRSshPort, "root", mgr.getSystemVMKeyFile(), null, "ls
/proc/sys/net/ipv4/conf");
+ Pair<Boolean, String> result = SshHelper.sshExecute(routerIp,
DefaultDomRSshPort, "root", keyFile, null, "ls /proc/sys/net/ipv4/conf");
if (result.first()) {
String[] tokens = result.second().split("\\s+");
for (String token : tokens) {
--
To stop receiving notification emails like this one, please contact
"commits@cloudstack.apache.org" <commits@cloudstack.apache.org>.
