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.z...@leaseweb.com> Authored: Wed Jun 12 09:19:29 2013 +0200 Committer: Wei Zhou <w.z...@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
