Skip to content

Commit f714d26

Browse files
ustcweizhouustcweizhou
committed
Revert "CLOUDSTACK-1301: Add VM Disk I/O Throttling"
This reverts commit 6dad8ad.
1 parent b4969c4 commit f714d26

33 files changed

Lines changed: 17 additions & 481 deletions

‎api/src/com/cloud/agent/api/to/VolumeTO.java‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ protected VolumeTO() {
3737
private long deviceId;
3838
private String chainInfo;
3939
private String guestOsType;
40-
private long bytesRate;
41-
private long iopsRate;
4240

4341
public VolumeTO(long id, Volume.Type type, StoragePoolType poolType, String poolUuid, String name, String mountPoint, String path, long size, String chainInfo) {
4442
this.id = id;
@@ -135,20 +133,4 @@ public void setPath(String path){
135133
public String toString() {
136134
return new StringBuilder("Vol[").append(id).append("|").append(type).append("|").append(path).append("|").append(size).append("]").toString();
137135
}
138-
139-
public void setBytesRate(long bytesRate) {
140-
this.bytesRate = bytesRate;
141-
}
142-
143-
public long getBytesRate() {
144-
return bytesRate;
145-
}
146-
147-
public void setIopsRate(long iopsRate) {
148-
this.iopsRate = iopsRate;
149-
}
150-
151-
public long getIopsRate() {
152-
return iopsRate;
153-
}
154136
}

‎api/src/com/cloud/offering/DiskOffering.java‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,4 @@ public interface DiskOffering extends InfrastructureEntity, Identity, InternalId
5252
boolean isCustomized();
5353

5454
void setDiskSize(long diskSize);
55-
56-
void setBytesRate(long bytesRate);
57-
58-
long getBytesRate();
59-
60-
void setIopsRate(long iopsRate);
61-
62-
long getIopsRate();
6355
}

‎api/src/com/cloud/vm/DiskProfile.java‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ public class DiskProfile {
3535
private Long templateId;
3636
private long volumeId;
3737
private String path;
38-
private long bytesRate;
39-
private long iopsRate;
4038

4139
private HypervisorType hyperType;
4240

@@ -156,20 +154,4 @@ public String getPath() {
156154
public void setSize(long size) {
157155
this.size = size;
158156
}
159-
160-
public void setBytesRate(long bytesRate) {
161-
this.bytesRate = bytesRate;
162-
}
163-
164-
public long getBytesRate() {
165-
return bytesRate;
166-
}
167-
168-
public void setIopsRate(long iopsRate) {
169-
this.iopsRate = iopsRate;
170-
}
171-
172-
public long getIopsRate() {
173-
return iopsRate;
174-
}
175157
}

‎api/src/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,6 @@ public class CreateDiskOfferingCmd extends BaseCmd {
6161

6262
@Parameter(name=ApiConstants.STORAGE_TYPE, type=CommandType.STRING, description="the storage type of the disk offering. Values are local and shared.")
6363
private String storageType = ServiceOffering.StorageType.shared.toString();
64-
65-
@Parameter(name="bytesRate", type=CommandType.LONG, required=false, description="bytes rate of the disk offering")
66-
private Long bytesRate;
67-
68-
@Parameter(name="iopsRate", type=CommandType.LONG, required=false, description="io requests rate of the disk offering")
69-
private Long iopsRate;
7064

7165
@Parameter(name=ApiConstants.DISPLAY_OFFERING, type=CommandType.BOOLEAN, description="an optional field, whether to display the offering to the end user or not.")
7266
private Boolean displayOffering;
@@ -98,14 +92,6 @@ public Boolean isCustomized(){
9892
public Long getDomainId(){
9993
return domainId;
10094
}
101-
102-
public Long getBytesRate() {
103-
return bytesRate;
104-
}
105-
106-
public Long getIopsRate() {
107-
return iopsRate;
108-
}
10995

11096
public String getStorageType() {
11197
return storageType;
@@ -128,7 +114,7 @@ public String getCommandName() {
128114
public long getEntityOwnerId() {
129115
return Account.ACCOUNT_ID_SYSTEM;
130116
}
131-
117+
132118
@Override
133119
public void execute(){
134120
DiskOffering offering = _configService.createDiskOffering(this);

‎api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,6 @@ public class CreateServiceOfferingCmd extends BaseCmd {
9393
@Parameter(name = ApiConstants.SERVICE_OFFERING_DETAILS, type = CommandType.MAP, description = "details for planner, used to store specific parameters")
9494
private Map<String, String> details;
9595

96-
@Parameter(name="bytesRate", type=CommandType.LONG, required=false, description="bytes rate of the disk offering")
97-
private Long bytesRate;
98-
99-
@Parameter(name="iopsRate", type=CommandType.LONG, required=false, description="io requests rate of the disk offering")
100-
private Long iopsRate;
101-
10296
/////////////////////////////////////////////////////
10397
/////////////////// Accessors ///////////////////////
10498
/////////////////////////////////////////////////////
@@ -177,14 +171,6 @@ public Map<String, String> getDetails() {
177171
return params;
178172
}
179173

180-
public long getBytesRate() {
181-
return bytesRate;
182-
}
183-
184-
public long getIopsRate() {
185-
return iopsRate;
186-
}
187-
188174
/////////////////////////////////////////////////////
189175
/////////////// API Implementation///////////////////
190176
/////////////////////////////////////////////////////

‎api/src/org/apache/cloudstack/api/response/DiskOfferingResponse.java‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,6 @@ public class DiskOfferingResponse extends BaseResponse {
5757

5858
@SerializedName("storagetype") @Param(description="the storage type for this disk offering")
5959
private String storageType;
60-
61-
@SerializedName("diskBytesRate") @Param(description="bytes rate of the disk offering")
62-
private Long bytesRate;
63-
64-
@SerializedName("diskIORate") @Param(description="io requests rate of the disk offering")
65-
private Long iopsRate;
6660

6761
@SerializedName("displayoffering") @Param(description="whether to display the offering to the end user or not.")
6862
private Boolean displayOffering;
@@ -155,12 +149,4 @@ public String getStorageType() {
155149
public void setStorageType(String storageType) {
156150
this.storageType = storageType;
157151
}
158-
159-
public void setBytesRate(long bytesRate) {
160-
this.bytesRate = bytesRate;
161-
}
162-
163-
public void setIopsRate(long iopsRate) {
164-
this.iopsRate = iopsRate;
165-
}
166152
}

‎api/src/org/apache/cloudstack/api/response/ServiceOfferingResponse.java‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,6 @@ public class ServiceOfferingResponse extends BaseResponse {
8686

8787
@SerializedName(ApiConstants.NETWORKRATE) @Param(description="data transfer rate in megabits per second allowed.")
8888
private Integer networkRate;
89-
90-
@SerializedName("diskBytesRate") @Param(description="bytes rate of the service offering")
91-
private Long bytesRate;
92-
93-
@SerializedName("diskIORate") @Param(description="io requests rate of the service offering")
94-
private Long iopsRate;
9589

9690
@SerializedName(ApiConstants.DEPLOYMENT_PLANNER) @Param(description="deployment strategy used to deploy VM.")
9791
private String deploymentPlanner;
@@ -254,12 +248,4 @@ public boolean getVolatileVm() {
254248
public void setVolatileVm(boolean isVolatile) {
255249
this.isVolatile = isVolatile;
256250
}
257-
258-
public void setBytesRate(long bytesRate) {
259-
this.bytesRate = bytesRate;
260-
}
261-
262-
public void setIopsRate(long iopsRate) {
263-
this.iopsRate = iopsRate;
264-
}
265251
}

‎api/src/org/apache/cloudstack/api/response/VolumeResponse.java‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -110,12 +110,6 @@ public class VolumeResponse extends BaseResponse implements ControlledViewEntity
110110
@Param(description = "shared or local storage")
111111
private String storageType;
112112

113-
@SerializedName("diskBytesRate") @Param(description="bytes rate of the disk offering")
114-
private Long bytesRate;
115-
116-
@SerializedName("diskIORate") @Param(description="io requests rate of the disk offering")
117-
private Long iopsRate;
118-
119113
@SerializedName(ApiConstants.HYPERVISOR)
120114
@Param(description = "Hypervisor the volume belongs to")
121115
private String hypervisor;
@@ -264,14 +258,6 @@ public void setStorageType(String storageType) {
264258
this.storageType = storageType;
265259
}
266260

267-
public void setBytesRate(long bytesRate) {
268-
this.bytesRate = bytesRate;
269-
}
270-
271-
public void setIopsRate(long iopsRate) {
272-
this.iopsRate = iopsRate;
273-
}
274-
275261
public void setHypervisor(String hypervisor) {
276262
this.hypervisor = hypervisor;
277263
}

‎client/WEB-INF/classes/resources/messages.properties‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -463,8 +463,6 @@ label.disable.vpn=Disable VPN
463463
label.disabled=Disabled
464464
label.disabling.vpn.access=Disabling VPN Access
465465
label.disk.allocated=Disk Allocated
466-
label.disk.bytes.rate=Disk Rate (BPS)
467-
label.disk.iops.rate=Disk Rate (IOPS)
468466
label.disk.offering=Disk Offering
469467
label.disk.read.bytes=Disk Read (Bytes)
470468
label.disk.read.io=Disk Read (IO)

‎core/src/com/cloud/agent/api/AttachVolumeCommand.java‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ public class AttachVolumeCommand extends Command {
2929
String volumeName;
3030
Long deviceId;
3131
String chainInfo;
32-
long bytesRate;
33-
long iopsRate;
3432

3533
protected AttachVolumeCommand() {
3634
}
@@ -98,20 +96,4 @@ public void setPoolUuid(String poolUuid) {
9896
public String getChainInfo() {
9997
return chainInfo;
10098
}
101-
102-
public void setBytesRate(long bytesRate) {
103-
this.bytesRate = bytesRate;
104-
}
105-
106-
public long getBytesRate() {
107-
return bytesRate;
108-
}
109-
110-
public void setIopsRate(long iopsRate) {
111-
this.iopsRate = iopsRate;
112-
}
113-
114-
public long getIopsRate() {
115-
return iopsRate;
116-
}
11799
}

0 commit comments

Comments
 (0)