Skip to content

server: report distinct read/write volume throttle rates #14048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nagaboinaramgopal wants to merge 1 commit into
base: 4.20
Choose a base branch
from
+27 −4
Open

server: report distinct read/write volume throttle rates #14048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions server/src/main/java/com/cloud/api/query/dao/VolumeJoinDaoImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,13 @@ protected VolumeJoinDaoImpl() {
_count = "select count(distinct id) from volume_view WHERE ";
}

protected void setThrottleRates(VolumeResponse volResponse, VolumeJoinVO volume) {
volResponse.setBytesReadRate(volume.getBytesReadRate());
volResponse.setBytesWriteRate(volume.getBytesWriteRate());
volResponse.setIopsReadRate(volume.getIopsReadRate());
volResponse.setIopsWriteRate(volume.getIopsWriteRate());
}

@Override
public VolumeResponse newVolumeResponse(ResponseView view, VolumeJoinVO volume) {
VolumeResponse volResponse = new VolumeResponse();
Expand Down Expand Up @@ -206,10 +213,7 @@ public VolumeResponse newVolumeResponse(ResponseView view, VolumeJoinVO volume)
if (view == ResponseView.Full) {
volResponse.setStorageType(volume.isUseLocalStorage() ? ServiceOffering.StorageType.local.toString() : ServiceOffering.StorageType.shared.toString());
}
volResponse.setBytesReadRate(volume.getBytesReadRate());
volResponse.setBytesWriteRate(volume.getBytesReadRate());
volResponse.setIopsReadRate(volume.getIopsWriteRate());
volResponse.setIopsWriteRate(volume.getIopsWriteRate());
setThrottleRates(volResponse, volume);

}

Expand Down
19 changes: 19 additions & 0 deletions server/src/test/java/com/cloud/api/query/dao/VolumeJoinDaoImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,12 @@

import com.cloud.api.query.vo.VolumeJoinVO;
import org.apache.cloudstack.api.response.VolumeResponse;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;

@RunWith(MockitoJUnitRunner.class)
Expand All @@ -43,4 +45,21 @@ public void testUpdateVolumeTagInfo(){
testUpdateTagInformation(_volumeJoinDaoImpl, volume, volumeResponse);
}

@Test
public void testSetThrottleRatesMapsReadAndWriteDistinctly() {
VolumeJoinVO vol = Mockito.mock(VolumeJoinVO.class);
Mockito.when(vol.getBytesReadRate()).thenReturn(100L);
Mockito.when(vol.getBytesWriteRate()).thenReturn(200L);
Mockito.when(vol.getIopsReadRate()).thenReturn(300L);
Mockito.when(vol.getIopsWriteRate()).thenReturn(400L);

VolumeResponse response = new VolumeResponse();
_volumeJoinDaoImpl.setThrottleRates(response, vol);

Assert.assertEquals(Long.valueOf(100L), response.getBytesReadRate());
Assert.assertEquals(Long.valueOf(200L), response.getBytesWriteRate());
Assert.assertEquals(Long.valueOf(300L), response.getIopsReadRate());
Assert.assertEquals(Long.valueOf(400L), response.getIopsWriteRate());
}

}
Loading