You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by hu...@apache.org on 2014/07/04 16:49:10 UTC
[1/3] git commit: updated refs/heads/master to fc23c70
Repository: cloudstack
Updated Branches:
refs/heads/master 539db0895 -> fc23c70a1
Fix CID 1164032 Dodgy code
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/362b4811
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/362b4811
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/362b4811
Branch: refs/heads/master
Commit: 362b4811765ed47c94e9c84e2dec03a311600fd6
Parents: 539db08
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Fri Jul 4 15:50:23 2014 +0200
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Fri Jul 4 16:48:27 2014 +0200
----------------------------------------------------------------------
.../cloudstack/storage/datastore/util/NexentaNmsClient.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/362b4811/plugins/storage/volume/nexenta/src/org/apache/cloudstack/storage/datastore/util/NexentaNmsClient.java
----------------------------------------------------------------------
diff --git a/plugins/storage/volume/nexenta/src/org/apache/cloudstack/storage/datastore/util/NexentaNmsClient.java b/plugins/storage/volume/nexenta/src/org/apache/cloudstack/storage/datastore/util/NexentaNmsClient.java
index 70565fc..ed1a780 100644
--- a/plugins/storage/volume/nexenta/src/org/apache/cloudstack/storage/datastore/util/NexentaNmsClient.java
+++ b/plugins/storage/volume/nexenta/src/org/apache/cloudstack/storage/datastore/util/NexentaNmsClient.java
@@ -45,10 +45,11 @@ import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.impl.conn.BasicClientConnectionManager;
import org.apache.log4j.Logger;
-import com.cloud.utils.exception.CloudRuntimeException;
import com.google.gson.Gson;
import com.google.gson.annotations.SerializedName;
+import com.cloud.utils.exception.CloudRuntimeException;
+
public class NexentaNmsClient {
private static final Logger logger = Logger.getLogger(NexentaNmsClient.class);
@@ -123,7 +124,7 @@ public class NexentaNmsClient {
private Object[] params;
NmsRequest(String object, String method) {
- this(method, object, null);
+ this(object, method, (Object[])null);
}
NmsRequest(String object, String method, Object... params) {
@@ -132,6 +133,7 @@ public class NexentaNmsClient {
this.params = params;
}
+ @Override
public String toString() {
StringBuffer b = new StringBuffer();
b.append("Request to ").append(object).append(" method ").append(method);
[2/3] git commit: updated refs/heads/master to fc23c70
Posted by hu...@apache.org.
Fix CID 1116267 Don't modify the set while the iterator is still in use.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b9145bea
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b9145bea
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b9145bea
Branch: refs/heads/master
Commit: b9145beab6672e7c8cae96e227ffab00d433350e
Parents: 362b481
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Fri Jul 4 16:32:53 2014 +0200
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Fri Jul 4 16:48:28 2014 +0200
----------------------------------------------------------------------
.../hypervisor/kvm/resource/KVMHAMonitor.java | 25 +++++++++++++-------
1 file changed, 17 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b9145bea/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAMonitor.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAMonitor.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAMonitor.java
index 4628fae..8695045 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAMonitor.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAMonitor.java
@@ -17,8 +17,10 @@
package com.cloud.hypervisor.kvm.resource;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.log4j.Logger;
@@ -39,24 +41,24 @@ public class KVMHAMonitor extends KVMHABase implements Runnable {
public KVMHAMonitor(NfsStoragePool pool, String host, String scriptPath) {
if (pool != null) {
- this._storagePool.put(pool._poolUUID, pool);
+ _storagePool.put(pool._poolUUID, pool);
}
- this._hostIP = host;
+ _hostIP = host;
KVMHABase.s_heartBeatPath = scriptPath;
}
public void addStoragePool(NfsStoragePool pool) {
synchronized (_storagePool) {
- this._storagePool.put(pool._poolUUID, pool);
+ _storagePool.put(pool._poolUUID, pool);
}
}
public void removeStoragePool(String uuid) {
synchronized (_storagePool) {
- NfsStoragePool pool = this._storagePool.get(uuid);
+ NfsStoragePool pool = _storagePool.get(uuid);
if (pool != null) {
Script.runSimpleBashScript("umount " + pool._mountDestPath);
- this._storagePool.remove(uuid);
+ _storagePool.remove(uuid);
}
}
}
@@ -72,6 +74,7 @@ public class KVMHAMonitor extends KVMHABase implements Runnable {
@Override
protected void runInContext() {
synchronized (_storagePool) {
+ Set<String> removedPools = new HashSet<String>();
for (String uuid : _storagePool.keySet()) {
NfsStoragePool primaryStoragePool = _storagePool.get(uuid);
@@ -84,13 +87,13 @@ public class KVMHAMonitor extends KVMHABase implements Runnable {
storage = conn.storagePoolLookupByUUIDString(uuid);
if (storage == null) {
s_logger.debug("Libvirt storage pool " + uuid + " not found, removing from HA list");
- removeStoragePool(uuid);
+ removedPools.add(uuid);
continue;
} else if (storage.getInfo().state != StoragePoolState.VIR_STORAGE_POOL_RUNNING) {
s_logger.debug("Libvirt storage pool " + uuid + " found, but not running, removing from HA list");
- removeStoragePool(uuid);
+ removedPools.add(uuid);
continue;
}
s_logger.debug("Found NFS storage pool " + uuid + " in libvirt, continuing");
@@ -102,7 +105,7 @@ public class KVMHAMonitor extends KVMHABase implements Runnable {
// connection fails
if (e.toString().contains("pool not found")) {
s_logger.debug("removing pool from HA monitor since it was deleted");
- removeStoragePool(uuid);
+ removedPools.add(uuid);
continue;
}
}
@@ -132,6 +135,12 @@ public class KVMHAMonitor extends KVMHABase implements Runnable {
result = cmd.execute();
}
}
+
+ if (!removedPools.isEmpty()) {
+ for (String uuid : removedPools) {
+ removeStoragePool(uuid);
+ }
+ }
}
}
[3/3] git commit: updated refs/heads/master to fc23c70
Posted by hu...@apache.org.
Fix CID 1116481 Widening should happen before calculation
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fc23c70a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fc23c70a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fc23c70a
Branch: refs/heads/master
Commit: fc23c70a1f349ff4c54fca18c17437cacf6c26dc
Parents: b9145be
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Fri Jul 4 16:47:11 2014 +0200
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Fri Jul 4 16:48:30 2014 +0200
----------------------------------------------------------------------
.../apache/cloudstack/storage/template/DownloadManagerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fc23c70a/services/secondary-storage/server/src/org/apache/cloudstack/storage/template/DownloadManagerImpl.java
----------------------------------------------------------------------
diff --git a/services/secondary-storage/server/src/org/apache/cloudstack/storage/template/DownloadManagerImpl.java b/services/secondary-storage/server/src/org/apache/cloudstack/storage/template/DownloadManagerImpl.java
index d45a6bb..ec5b569 100755
--- a/services/secondary-storage/server/src/org/apache/cloudstack/storage/template/DownloadManagerImpl.java
+++ b/services/secondary-storage/server/src/org/apache/cloudstack/storage/template/DownloadManagerImpl.java
@@ -357,7 +357,7 @@ public class DownloadManagerImpl extends ManagerBase implements DownloadManager
int imgSizeGigs = (int)Math.ceil(_storage.getSize(td.getDownloadLocalPath()) * 1.0d / (1024 * 1024 * 1024));
imgSizeGigs++; // add one just in case
- long timeout = imgSizeGigs * installTimeoutPerGig;
+ long timeout = (long)imgSizeGigs * installTimeoutPerGig;
Script scr = null;
String script = resourceType == ResourceType.TEMPLATE ? createTmpltScr : createVolScr;
scr = new Script(script, timeout, s_logger);