You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by we...@apache.org on 2013/06/12 11:12:47 UTC
[1/8] git commit: updated refs/heads/disk_io_throttling to 9b88582
Updated Branches:
refs/heads/disk_io_throttling 02e5cb3e9 -> 9b88582b2
Code cleanup
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f15a7c3f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f15a7c3f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f15a7c3f
Branch: refs/heads/disk_io_throttling
Commit: f15a7c3f8ef557aff6b98dcdf60cf046cb0844b0
Parents: 3f3c6aa
Author: Brian Federle <br...@citrix.com>
Authored: Mon Jun 10 10:43:31 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Mon Jun 10 10:43:31 2013 -0700
----------------------------------------------------------------------
ui/scripts/ui-custom/projectSelect.js | 4 ++--
ui/scripts/ui/utils.js | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f15a7c3f/ui/scripts/ui-custom/projectSelect.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/projectSelect.js b/ui/scripts/ui-custom/projectSelect.js
index 82d02c1..aef49ed 100644
--- a/ui/scripts/ui-custom/projectSelect.js
+++ b/ui/scripts/ui-custom/projectSelect.js
@@ -32,9 +32,9 @@
var projects = args.data;
$(projects).map(function(index, project) {
- var $option = $('<option>').val(project.id);
+ var $option = $('<option>').val(_s(project.id));
- $option.html(project.displaytext ? project.displaytext : project.name);
+ $option.html(_s(project.displaytext ? project.displaytext : project.name));
$option.appendTo($projectSelect);
});
},
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f15a7c3f/ui/scripts/ui/utils.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/utils.js b/ui/scripts/ui/utils.js
index 7a6fb2f..39ef3e3 100644
--- a/ui/scripts/ui/utils.js
+++ b/ui/scripts/ui/utils.js
@@ -23,7 +23,7 @@
$($form.serializeArray()).each(function() {
var dataItem = data[this.name];
- var value = this.value.toString();
+ var value = _s(this.value.toString());
if (options.escapeSlashes) {
value = value.replace(/\//g, '__forwardSlash__');
[6/8] git commit: updated refs/heads/disk_io_throttling to 9b88582
Posted by we...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack into disk_io_throttling
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8da34d29
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8da34d29
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8da34d29
Branch: refs/heads/disk_io_throttling
Commit: 8da34d296493e9d6be346f9521f392cb09bf9146
Parents: 02e5cb3 ecbce6a
Author: Wei Zhou <w....@leaseweb.com>
Authored: Mon Jun 10 23:12:45 2013 +0200
Committer: Wei Zhou <w....@leaseweb.com>
Committed: Mon Jun 10 23:12:45 2013 +0200
----------------------------------------------------------------------
engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java | 1 +
.../hypervisor/kvm/resource/LibvirtStorageVolumeDef.java | 2 +-
ui/scripts/network.js | 7 +++----
ui/scripts/ui-custom/projectSelect.js | 4 ++--
ui/scripts/ui-custom/projects.js | 4 ++--
ui/scripts/ui/utils.js | 2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
[4/8] git commit: updated refs/heads/disk_io_throttling to 9b88582
Posted by we...@apache.org.
CLOUDSTACK UI - network menu - create guest network dialog - change label.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a59067e9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a59067e9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a59067e9
Branch: refs/heads/disk_io_throttling
Commit: a59067e94f7095a2448d342d5eed0ffee5f066c0
Parents: 40982cc
Author: Jessica Wang <je...@apache.org>
Authored: Mon Jun 10 13:43:07 2013 -0700
Committer: Jessica Wang <je...@apache.org>
Committed: Mon Jun 10 13:43:07 2013 -0700
----------------------------------------------------------------------
ui/scripts/network.js | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a59067e9/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 9e60cbc..61468fc 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -320,8 +320,8 @@
title: 'label.guest.networks',
listView: {
actions: {
- add: { //add Isolated guest network (can't add Shared guest network here)
- label: 'Add Isolated Guest Network',
+ add: {
+ label: 'Add Isolated Guest Network with SourceNat',
preFilter: function(args) { //Isolated networks is only supported in Advanced (SG-disabled) zone
if(args.context.zoneType != 'Basic')
@@ -331,8 +331,7 @@
},
createForm: {
- title: 'Add Isolated Guest Network',
- desc: 'Add Isolated Guest Network with SourceNat',
+ title: 'Add Isolated Guest Network with SourceNat',
fields: {
name: { label: 'label.name', validation: { required: true }, docID: 'helpGuestNetworkName' },
displayText: { label: 'label.display.text', validation: { required: true }, docID: 'helpGuestNetworkDisplayText'},
[5/8] git commit: updated refs/heads/disk_io_throttling to 9b88582
Posted by we...@apache.org.
fix disk IO requests display error
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ecbce6a6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ecbce6a6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ecbce6a6
Branch: refs/heads/disk_io_throttling
Commit: ecbce6a67f675a0869a62462defed8ee316f139c
Parents: a59067e
Author: Wei Zhou <w....@leaseweb.com>
Authored: Mon Jun 10 23:11:48 2013 +0200
Committer: Wei Zhou <w....@leaseweb.com>
Committed: Mon Jun 10 23:11:48 2013 +0200
----------------------------------------------------------------------
.../cloud/hypervisor/kvm/resource/LibvirtStorageVolumeDef.java | 2 +-
ui/scripts/instances.js | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ecbce6a6/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtStorageVolumeDef.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtStorageVolumeDef.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtStorageVolumeDef.java
index 7f9ceeb..92f6e39 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtStorageVolumeDef.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtStorageVolumeDef.java
@@ -73,7 +73,7 @@ public class LibvirtStorageVolumeDef {
storageVolBuilder.append("<name>" + _volName + "</name>\n");
if (_volSize != null) {
storageVolBuilder
- .append("<capacity >" + _volSize + "</capacity>\n");
+ .append("<capacity>" + _volSize + "</capacity>\n");
}
storageVolBuilder.append("<target>\n");
storageVolBuilder.append("<format type='" + _volFormat + "'/>\n");
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ecbce6a6/ui/scripts/instances.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 7149815..33a5767 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -1670,8 +1670,8 @@
networkkbswrite: (jsonObj.networkkbswrite == null)? "N/A": cloudStack.converters.convertBytes(jsonObj.networkkbswrite * 1024),
diskkbsread: (jsonObj.diskkbsread == null)? "N/A": cloudStack.converters.convertBytes(jsonObj.diskkbsread * 1024),
diskkbswrite: (jsonObj.diskkbswrite == null)? "N/A": cloudStack.converters.convertBytes(jsonObj.diskkbswrite * 1024),
- diskioread: (jsonObj.diskioread == null)? "N/A": cloudStack.converters.convertBytes(jsonObj.diskioread * 1024),
- diskiowrite: (jsonObj.diskiowrite == null)? "N/A": cloudStack.converters.convertBytes(jsonObj.diskiowrite * 1024)
+ diskioread: (jsonObj.diskioread == null)? "N/A": jsonObj.diskioread,
+ diskiowrite: (jsonObj.diskiowrite == null)? "N/A": jsonObj.diskiowrite
}
});
}
[7/8] git commit: updated refs/heads/disk_io_throttling to 9b88582
Posted by we...@apache.org.
replace tab with space, remove debugging messages
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0f2c59ad
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0f2c59ad
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0f2c59ad
Branch: refs/heads/disk_io_throttling
Commit: 0f2c59ad0ae49dd6262e4f92ac2c1bf8b9c85ad4
Parents: 8da34d2
Author: Wei Zhou <w....@leaseweb.com>
Authored: Wed Jun 12 09:19:29 2013 +0200
Committer: Wei Zhou <w....@leaseweb.com>
Committed: Wed Jun 12 09:19:29 2013 +0200
----------------------------------------------------------------------
api/src/com/cloud/agent/api/to/VolumeTO.java | 2 +-
api/src/com/cloud/offering/DiskOffering.java | 2 +-
.../admin/offering/CreateDiskOfferingCmd.java | 9 ++++----
.../api/response/DiskOfferingResponse.java | 4 ++--
.../api/response/ServiceOfferingResponse.java | 4 ++--
.../cloud/agent/api/AttachVolumeCommand.java | 2 +-
.../src/com/cloud/storage/DiskOfferingVO.java | 2 +-
.../kvm/resource/LibvirtComputingResource.java | 2 +-
.../kvm/resource/LibvirtDomainXMLParser.java | 2 +-
.../hypervisor/kvm/resource/LibvirtVMDef.java | 6 ++---
.../configuration/ConfigurationManagerImpl.java | 2 --
.../com/cloud/storage/VolumeManagerImpl.java | 2 +-
ui/scripts/configuration.js | 24 ++++++++++----------
13 files changed, 30 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0f2c59ad/api/src/com/cloud/agent/api/to/VolumeTO.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/to/VolumeTO.java b/api/src/com/cloud/agent/api/to/VolumeTO.java
index b95aa1d..0f1f9af 100644
--- a/api/src/com/cloud/agent/api/to/VolumeTO.java
+++ b/api/src/com/cloud/agent/api/to/VolumeTO.java
@@ -137,7 +137,7 @@ public class VolumeTO implements InternalIdentity {
public String toString() {
return new StringBuilder("Vol[").append(id).append("|").append(type).append("|").append(path).append("|").append(size).append("]").toString();
}
-
+
public void setBytesReadRate(long bytesReadRate) {
this.bytesReadRate = bytesReadRate;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0f2c59ad/api/src/com/cloud/offering/DiskOffering.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/offering/DiskOffering.java b/api/src/com/cloud/offering/DiskOffering.java
index 0c119fc..4f87dc5 100644
--- a/api/src/com/cloud/offering/DiskOffering.java
+++ b/api/src/com/cloud/offering/DiskOffering.java
@@ -52,7 +52,7 @@ public interface DiskOffering extends InfrastructureEntity, Identity, InternalId
boolean isCustomized();
void setDiskSize(long diskSize);
-
+
void setBytesReadRate(long bytesReadRate);
long getBytesReadRate();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0f2c59ad/api/src/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java
index 47ec365..8ffc4a7 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java
@@ -61,7 +61,7 @@ public class CreateDiskOfferingCmd extends BaseCmd {
@Parameter(name=ApiConstants.STORAGE_TYPE, type=CommandType.STRING, description="the storage type of the disk offering. Values are local and shared.")
private String storageType = ServiceOffering.StorageType.shared.toString();
-
+
@Parameter(name=ApiConstants.BYTES_READ_RATE, type=CommandType.LONG, required=false, description="bytes read rate of the disk offering")
private Long bytesReadRate;
@@ -104,10 +104,9 @@ public class CreateDiskOfferingCmd extends BaseCmd {
public Long getDomainId(){
return domainId;
}
-
+
public long getBytesReadRate() {
- return bytesReadRate;
- //return (bytesReadRate == null) || (bytesReadRate < 0) ? 0 : bytesReadRate;
+ return (bytesReadRate == null) || (bytesReadRate < 0) ? 0 : bytesReadRate;
}
public long getBytesWriteRate() {
@@ -143,7 +142,7 @@ public class CreateDiskOfferingCmd extends BaseCmd {
public long getEntityOwnerId() {
return Account.ACCOUNT_ID_SYSTEM;
}
-
+
@Override
public void execute(){
DiskOffering offering = _configService.createDiskOffering(this);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0f2c59ad/api/src/org/apache/cloudstack/api/response/DiskOfferingResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/DiskOfferingResponse.java b/api/src/org/apache/cloudstack/api/response/DiskOfferingResponse.java
index 9cd2918..fd00f4e 100644
--- a/api/src/org/apache/cloudstack/api/response/DiskOfferingResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/DiskOfferingResponse.java
@@ -57,7 +57,7 @@ public class DiskOfferingResponse extends BaseResponse {
@SerializedName("storagetype") @Param(description="the storage type for this disk offering")
private String storageType;
-
+
@SerializedName("diskBytesReadRate") @Param(description="bytes read rate of the disk offering")
private Long bytesReadRate;
@@ -176,5 +176,5 @@ public class DiskOfferingResponse extends BaseResponse {
public void setIopsWriteRate(long iopsWriteRate) {
this.iopsWriteRate = iopsWriteRate;
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0f2c59ad/api/src/org/apache/cloudstack/api/response/ServiceOfferingResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/ServiceOfferingResponse.java b/api/src/org/apache/cloudstack/api/response/ServiceOfferingResponse.java
index a56e91a..f12f35a 100644
--- a/api/src/org/apache/cloudstack/api/response/ServiceOfferingResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/ServiceOfferingResponse.java
@@ -86,7 +86,7 @@ public class ServiceOfferingResponse extends BaseResponse {
@SerializedName(ApiConstants.NETWORKRATE) @Param(description="data transfer rate in megabits per second allowed.")
private Integer networkRate;
-
+
@SerializedName("diskBytesReadRate") @Param(description="bytes read rate of the service offering")
private Long bytesReadRate;
@@ -260,7 +260,7 @@ public class ServiceOfferingResponse extends BaseResponse {
public void setVolatileVm(boolean isVolatile) {
this.isVolatile = isVolatile;
}
-
+
public void setBytesReadRate(long bytesReadRate) {
this.bytesReadRate = bytesReadRate;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0f2c59ad/core/src/com/cloud/agent/api/AttachVolumeCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/AttachVolumeCommand.java b/core/src/com/cloud/agent/api/AttachVolumeCommand.java
index 74480cc..987bb21 100644
--- a/core/src/com/cloud/agent/api/AttachVolumeCommand.java
+++ b/core/src/com/cloud/agent/api/AttachVolumeCommand.java
@@ -100,7 +100,7 @@ public class AttachVolumeCommand extends Command {
public String getChainInfo() {
return chainInfo;
}
-
+
public void setBytesReadRate(long bytesReadRate) {
this.bytesReadRate = bytesReadRate;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0f2c59ad/engine/schema/src/com/cloud/storage/DiskOfferingVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/storage/DiskOfferingVO.java b/engine/schema/src/com/cloud/storage/DiskOfferingVO.java
index 16e11af..1554f18 100755
--- a/engine/schema/src/com/cloud/storage/DiskOfferingVO.java
+++ b/engine/schema/src/com/cloud/storage/DiskOfferingVO.java
@@ -99,7 +99,7 @@ public class DiskOfferingVO implements DiskOffering {
@Column(name="sort_key")
int sortKey;
-
+
@Column(name="bytes_read_rate")
long bytesReadRate;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0f2c59ad/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index 690c15f..02e0a88 100755
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -3498,7 +3498,7 @@ ServerResource {
}
}
-
+
if (volume.getBytesReadRate() > 0)
disk.setBytesReadRate(volume.getBytesReadRate());
if (volume.getBytesWriteRate() > 0)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0f2c59ad/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtDomainXMLParser.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtDomainXMLParser.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtDomainXMLParser.java
index c364cd4..8514a5b 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtDomainXMLParser.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtDomainXMLParser.java
@@ -105,7 +105,7 @@ public class LibvirtDomainXMLParser {
DiskDef.diskBus.valueOf(bus.toUpperCase()));
}
}
-
+
NodeList iotune = disk.getElementsByTagName("iotune");
if ((iotune != null) && (iotune.getLength() !=0)) {
String bytesReadRateStr = getTagValue("read_bytes_sec", (Element)iotune.item(0));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0f2c59ad/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
index a347fee..aee1409 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
@@ -589,7 +589,7 @@ public class LibvirtVMDef {
char suffix = this._diskLabel.charAt(this._diskLabel.length() - 1);
return suffix - 'a';
}
-
+
public void setBytesReadRate(long bytesReadRate) {
_bytesReadRate = bytesReadRate;
}
@@ -649,7 +649,7 @@ public class LibvirtVMDef {
diskBuilder.append(" bus='" + _bus + "'");
}
diskBuilder.append("/>\n");
-
+
String libvirtVersion = Script.runSimpleBashScript("virsh version |grep API | awk '{print $4}'");
String qemuVersion = Script.runSimpleBashScript("virsh version |grep hypervisor | awk '{print $4}'");
if ((_deviceType != deviceType.CDROM) && (libvirtVersion != null) && (qemuVersion != null)
@@ -675,7 +675,7 @@ public class LibvirtVMDef {
diskBuilder.append("</iotune>\n");
}
}
-
+
diskBuilder.append("</disk>\n");
return diskBuilder.toString();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0f2c59ad/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index e5dbf3a..170625f 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -2169,8 +2169,6 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
newDiskOffering.setIopsReadRate(iopsReadRate);
if (iopsWriteRate != null && (iopsWriteRate > 0))
newDiskOffering.setIopsWriteRate(iopsWriteRate);
- s_logger.warn("bytesReadRate =" + bytesReadRate);
- s_logger.warn("newDiskOffering.getBytesReadRate" + newDiskOffering.getBytesReadRate());
UserContext.current().setEventDetails("Disk offering id=" + newDiskOffering.getId());
DiskOfferingVO offering = _diskOfferingDao.persist(newDiskOffering);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0f2c59ad/server/src/com/cloud/storage/VolumeManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/VolumeManagerImpl.java b/server/src/com/cloud/storage/VolumeManagerImpl.java
index f3c94ab..2fc8b1e 100644
--- a/server/src/com/cloud/storage/VolumeManagerImpl.java
+++ b/server/src/com/cloud/storage/VolumeManagerImpl.java
@@ -678,7 +678,7 @@ public class VolumeManagerImpl extends ManagerBase implements VolumeManager {
}
dskCh.setHyperType(hyperType);
-
+
final HashSet<StoragePool> avoidPools = new HashSet<StoragePool>(
avoids);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0f2c59ad/ui/scripts/configuration.js
----------------------------------------------------------------------
diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js
index 6a9765e..e813c66 100644
--- a/ui/scripts/configuration.js
+++ b/ui/scripts/configuration.js
@@ -110,28 +110,28 @@
}
},
diskBytesReadRate: {
- label: 'label.disk.bytes.read.rate',
+ label: 'label.disk.bytes.read.rate',
validation: {
required: false, //optional
number: true
}
},
diskBytesWriteRate: {
- label: 'label.disk.bytes.write.rate',
+ label: 'label.disk.bytes.write.rate',
validation: {
required: false, //optional
number: true
}
},
diskIopsReadRate: {
- label: 'label.disk.iops.read.rate',
+ label: 'label.disk.iops.read.rate',
validation: {
required: false, //optional
number: true
}
},
diskIopsWriteRate: {
- label: 'label.disk.iops.write.rate',
+ label: 'label.disk.iops.write.rate',
validation: {
required: false, //optional
number: true
@@ -586,28 +586,28 @@
}
},
diskBytesReadRate: {
- label: 'label.disk.bytes.read.rate',
+ label: 'label.disk.bytes.read.rate',
validation: {
required: false, //optional
number: true
}
},
diskBytesWriteRate: {
- label: 'label.disk.bytes.write.rate',
+ label: 'label.disk.bytes.write.rate',
validation: {
required: false, //optional
number: true
}
},
diskIopsReadRate: {
- label: 'label.disk.iops.read.rate',
+ label: 'label.disk.iops.read.rate',
validation: {
required: false, //optional
number: true
}
},
diskIopsWriteRate: {
- label: 'label.disk.iops.write.rate',
+ label: 'label.disk.iops.write.rate',
validation: {
required: false, //optional
number: true
@@ -1043,28 +1043,28 @@
validation: { required: true, number: true }
},
diskBytesReadRate: {
- label: 'label.disk.bytes.read.rate',
+ label: 'label.disk.bytes.read.rate',
validation: {
required: false, //optional
number: true
}
},
diskBytesWriteRate: {
- label: 'label.disk.bytes.write.rate',
+ label: 'label.disk.bytes.write.rate',
validation: {
required: false, //optional
number: true
}
},
diskIopsReadRate: {
- label: 'label.disk.iops.read.rate',
+ label: 'label.disk.iops.read.rate',
validation: {
required: false, //optional
number: true
}
},
diskIopsWriteRate: {
- label: 'label.disk.iops.write.rate',
+ label: 'label.disk.iops.write.rate',
validation: {
required: false, //optional
number: true
[2/8] git commit: updated refs/heads/disk_io_throttling to 9b88582
Posted by we...@apache.org.
Update projects UI validation
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1eab817a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1eab817a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1eab817a
Branch: refs/heads/disk_io_throttling
Commit: 1eab817a964f7cd5adcb748b4a05af096748693f
Parents: f15a7c3
Author: Brian Federle <br...@citrix.com>
Authored: Mon Jun 10 11:02:08 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Mon Jun 10 11:02:08 2013 -0700
----------------------------------------------------------------------
ui/scripts/ui-custom/projects.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1eab817a/ui/scripts/ui-custom/projects.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/projects.js b/ui/scripts/ui-custom/projects.js
index 7824b3d..f1f9eba 100644
--- a/ui/scripts/ui-custom/projects.js
+++ b/ui/scripts/ui-custom/projects.js
@@ -304,14 +304,14 @@
var $formDesc = $('<div>').addClass('form-desc');
var $projectName = $('<div>').addClass('field name')
.append($('<label>').attr('for', 'project-name').html(_l('label.project.name')))
- .append($('<input>').addClass('required').attr({
+ .append($('<input>').addClass('required disallowSpecialCharacters').attr({
type: 'text',
name: 'project-name',
id: 'project-name'
}));
var $projectDesc = $('<div>').addClass('field desc')
.append($('<label>').attr('for', 'project-desc').html(_l('label.display.text')))
- .append($('<input>').attr({
+ .append($('<input>').addClass('disallowSpecialCharacters').attr({
type: 'text',
name: 'project-display-text',
id: 'project-desc'
[3/8] git commit: updated refs/heads/disk_io_throttling to 9b88582
Posted by we...@apache.org.
drop all alert indice on column last_sent created up to 4.1 version
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/40982cce
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/40982cce
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/40982cce
Branch: refs/heads/disk_io_throttling
Commit: 40982ccef22e2a6f61ae571017d711f60358ede8
Parents: 1eab817
Author: Min Chen <mi...@citrix.com>
Authored: Mon Jun 10 11:03:45 2013 -0700
Committer: Min Chen <mi...@citrix.com>
Committed: Mon Jun 10 11:04:50 2013 -0700
----------------------------------------------------------------------
engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/40982cce/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
index d8f90ad..8378eec 100644
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
@@ -90,6 +90,7 @@ public class Upgrade410to420 implements DbUpgrade {
//First drop if it exists. (Due to patches shipped to customers some will have the index and some wont.)
List<String> indexList = new ArrayList<String>();
s_logger.debug("Dropping index i_alert__last_sent if it exists");
+ indexList.add("last_sent"); // in 4.1, we created this index that is not in convention.
indexList.add("i_alert__last_sent");
DbUpgradeUtils.dropKeysIfExist(conn, "alert", indexList, false);
[8/8] git commit: updated refs/heads/disk_io_throttling to 9b88582
Posted by we...@apache.org.
replace 'virsh version' command with conn.getVersion/getLibvirVersion
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9b88582b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9b88582b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9b88582b
Branch: refs/heads/disk_io_throttling
Commit: 9b88582b29688bd6fe79e45f7915d5ced5e1f8d1
Parents: 0f2c59a
Author: Wei Zhou <w....@leaseweb.com>
Authored: Wed Jun 12 11:12:24 2013 +0200
Committer: Wei Zhou <w....@leaseweb.com>
Committed: Wed Jun 12 11:12:24 2013 +0200
----------------------------------------------------------------------
api/src/com/cloud/offering/DiskOffering.java | 2 +-
api/src/com/cloud/vm/DiskProfile.java | 2 +-
.../kvm/resource/LibvirtComputingResource.java | 6 +++
.../hypervisor/kvm/resource/LibvirtVMDef.java | 43 ++++++++++----------
4 files changed, 29 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9b88582b/api/src/com/cloud/offering/DiskOffering.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/offering/DiskOffering.java b/api/src/com/cloud/offering/DiskOffering.java
index 4f87dc5..f4cd7b7 100644
--- a/api/src/com/cloud/offering/DiskOffering.java
+++ b/api/src/com/cloud/offering/DiskOffering.java
@@ -52,7 +52,7 @@ public interface DiskOffering extends InfrastructureEntity, Identity, InternalId
boolean isCustomized();
void setDiskSize(long diskSize);
-
+
void setBytesReadRate(long bytesReadRate);
long getBytesReadRate();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9b88582b/api/src/com/cloud/vm/DiskProfile.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/vm/DiskProfile.java b/api/src/com/cloud/vm/DiskProfile.java
index 90fb71e..4e3de7b 100644
--- a/api/src/com/cloud/vm/DiskProfile.java
+++ b/api/src/com/cloud/vm/DiskProfile.java
@@ -158,7 +158,7 @@ public class DiskProfile {
public void setSize(long size) {
this.size = size;
}
-
+
public void setBytesReadRate(long bytesReadRate) {
this.bytesReadRate = bytesReadRate;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9b88582b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index 02e0a88..6a0032f 100755
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -336,6 +336,8 @@ ServerResource {
protected HypervisorType _hypervisorType;
protected String _hypervisorURI;
+ protected long _hypervisorLibvirtVersion;
+ protected long _hypervisorQemuVersion;
protected String _hypervisorPath;
protected String _networkDirectSourceMode;
protected String _networkDirectDevice;
@@ -735,6 +737,8 @@ ServerResource {
try {
_hvVersion = conn.getVersion();
_hvVersion = (_hvVersion % 1000000) / 1000;
+ _hypervisorLibvirtVersion = conn.getLibVirVersion();
+ _hypervisorQemuVersion = conn.getVersion();
} catch (LibvirtException e) {
s_logger.trace("Ignoring libvirt error.", e);
}
@@ -3228,6 +3232,8 @@ ServerResource {
} else {
guest.setGuestType(GuestDef.guestType.KVM);
vm.setHvsType(HypervisorType.KVM.toString().toLowerCase());
+ vm.setLibvirtVersion(_hypervisorLibvirtVersion);
+ vm.setQemuVersion(_hypervisorQemuVersion);
}
guest.setGuestArch(vmTO.getArch());
guest.setMachineType("pc");
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9b88582b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
index aee1409..afa183f 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
@@ -26,6 +26,8 @@ import com.cloud.utils.script.Script;
public class LibvirtVMDef {
private String _hvsType;
+ private static long _libvirtVersion;
+ private static long _qemuVersion;
private String _domName;
private String _domUUID;
private String _desc;
@@ -650,30 +652,19 @@ public class LibvirtVMDef {
}
diskBuilder.append("/>\n");
- String libvirtVersion = Script.runSimpleBashScript("virsh version |grep API | awk '{print $4}'");
- String qemuVersion = Script.runSimpleBashScript("virsh version |grep hypervisor | awk '{print $4}'");
- if ((_deviceType != deviceType.CDROM) && (libvirtVersion != null) && (qemuVersion != null)
+ if ((_deviceType != deviceType.CDROM) && (_libvirtVersion >= 9008) && (_qemuVersion >= 1001000)
&& (((_bytesReadRate != null) && (_bytesReadRate > 0)) || ((_bytesWriteRate != null) && (_bytesWriteRate > 0))
|| ((_iopsReadRate != null) && (_iopsReadRate > 0)) || ((_iopsWriteRate != null) && (_iopsWriteRate > 0)) )) { // not CDROM, from libvirt 0.9.8 and QEMU 1.1.0
- String[] libvirtVersions = libvirtVersion.split("\\.");
- String[] qemuVersions = qemuVersion.split("\\.");
- if (((libvirtVersions != null) && (libvirtVersions.length == 3) && ((Integer.valueOf(libvirtVersions[0]) > 0)
- || ((Integer.valueOf(libvirtVersions[0]) == 0) && (Integer.valueOf(libvirtVersions[1]) > 9))
- || ((Integer.valueOf(libvirtVersions[0]) == 0) && (Integer.valueOf(libvirtVersions[1]) == 9) && (Integer.valueOf(libvirtVersions[1]) >= 8))))
- && ((qemuVersions != null) && (qemuVersions.length == 3) && ((Integer.valueOf(qemuVersions[0]) > 1)
- || ((Integer.valueOf(qemuVersions[0]) == 1) && (Integer.valueOf(qemuVersions[1]) > 1))
- || ((Integer.valueOf(qemuVersions[0]) == 1) && (Integer.valueOf(qemuVersions[1]) == 1) && (Integer.valueOf(qemuVersions[1]) >= 0))))) {
- diskBuilder.append("<iotune>\n");
- if ((_bytesReadRate != null) && (_bytesReadRate > 0))
- diskBuilder.append("<read_bytes_sec>" + _bytesReadRate + "</read_bytes_sec>\n");
- if ((_bytesWriteRate != null) && (_bytesWriteRate > 0))
- diskBuilder.append("<write_bytes_sec>" + _bytesWriteRate + "</write_bytes_sec>\n");
- if ((_iopsReadRate != null) && (_iopsReadRate > 0))
- diskBuilder.append("<read_iops_sec>" + _iopsReadRate + "</read_iops_sec>\n");
- if ((_iopsWriteRate != null) && (_iopsWriteRate > 0))
- diskBuilder.append("<write_iops_sec>" + _iopsWriteRate + "</write_iops_sec>\n");
- diskBuilder.append("</iotune>\n");
- }
+ diskBuilder.append("<iotune>\n");
+ if ((_bytesReadRate != null) && (_bytesReadRate > 0))
+ diskBuilder.append("<read_bytes_sec>" + _bytesReadRate + "</read_bytes_sec>\n");
+ if ((_bytesWriteRate != null) && (_bytesWriteRate > 0))
+ diskBuilder.append("<write_bytes_sec>" + _bytesWriteRate + "</write_bytes_sec>\n");
+ if ((_iopsReadRate != null) && (_iopsReadRate > 0))
+ diskBuilder.append("<read_iops_sec>" + _iopsReadRate + "</read_iops_sec>\n");
+ if ((_iopsWriteRate != null) && (_iopsWriteRate > 0))
+ diskBuilder.append("<write_iops_sec>" + _iopsWriteRate + "</write_iops_sec>\n");
+ diskBuilder.append("</iotune>\n");
}
diskBuilder.append("</disk>\n");
@@ -1061,6 +1052,14 @@ public class LibvirtVMDef {
return _hvsType;
}
+ public void setLibvirtVersion(long libvirtVersion) {
+ _libvirtVersion = libvirtVersion;
+ }
+
+ public void setQemuVersion(long qemuVersion) {
+ _qemuVersion = qemuVersion;
+ }
+
public void setDomainName(String domainName) {
_domName = domainName;
}