GeorgeJahad commented on a change in pull request #2703:
URL: https://github.com/apache/ozone/pull/2703#discussion_r720868956
##########
File path:
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmMetrics.java
##########
@@ -111,63 +123,54 @@ public void testVolumeOps() throws Exception {
ozoneManager, "volumeManager");
VolumeManager mockVm = Mockito.spy(volumeManager);
- Mockito.doNothing().when(mockVm).createVolume(null);
- Mockito.doNothing().when(mockVm).deleteVolume(null);
- Mockito.doReturn(null).when(mockVm).getVolumeInfo(null);
- Mockito.doReturn(true).when(mockVm).checkVolumeAccess(null, null);
- Mockito.doNothing().when(mockVm).setOwner(null, null);
- Mockito.doReturn(null).when(mockVm).listVolumes(null, null, null, 0);
-
- HddsWhiteboxTestUtils.setInternalState(
- ozoneManager, "volumeManager", mockVm);
- doVolumeOps();
-
+ OmVolumeArgs volumeArgs = createVolumeArgs();
+ doVolumeOps(volumeArgs);
MetricsRecordBuilder omMetrics = getMetrics("OMMetrics");
- assertCounter("NumVolumeOps", 6L, omMetrics);
+ assertCounter("NumVolumeOps", 5L, omMetrics);
assertCounter("NumVolumeCreates", 1L, omMetrics);
Review comment:
decreased by 1 because of removal of checkVolumeAccess() op
##########
File path:
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmMetrics.java
##########
@@ -111,63 +123,54 @@ public void testVolumeOps() throws Exception {
ozoneManager, "volumeManager");
VolumeManager mockVm = Mockito.spy(volumeManager);
- Mockito.doNothing().when(mockVm).createVolume(null);
- Mockito.doNothing().when(mockVm).deleteVolume(null);
- Mockito.doReturn(null).when(mockVm).getVolumeInfo(null);
- Mockito.doReturn(true).when(mockVm).checkVolumeAccess(null, null);
- Mockito.doNothing().when(mockVm).setOwner(null, null);
- Mockito.doReturn(null).when(mockVm).listVolumes(null, null, null, 0);
-
- HddsWhiteboxTestUtils.setInternalState(
- ozoneManager, "volumeManager", mockVm);
- doVolumeOps();
-
+ OmVolumeArgs volumeArgs = createVolumeArgs();
+ doVolumeOps(volumeArgs);
MetricsRecordBuilder omMetrics = getMetrics("OMMetrics");
- assertCounter("NumVolumeOps", 6L, omMetrics);
+ assertCounter("NumVolumeOps", 5L, omMetrics);
assertCounter("NumVolumeCreates", 1L, omMetrics);
assertCounter("NumVolumeUpdates", 1L, omMetrics);
assertCounter("NumVolumeInfos", 1L, omMetrics);
- assertCounter("NumVolumeCheckAccesses", 1L, omMetrics);
assertCounter("NumVolumeDeletes", 1L, omMetrics);
assertCounter("NumVolumeLists", 1L, omMetrics);
assertCounter("NumVolumes", 1L, omMetrics);
- ozoneManager.createVolume(null);
- ozoneManager.createVolume(null);
- ozoneManager.createVolume(null);
- ozoneManager.deleteVolume(null);
+ volumeArgs = createVolumeArgs();
+ writeClient.createVolume(volumeArgs);
+ volumeArgs = createVolumeArgs();
+ writeClient.createVolume(volumeArgs);
+ volumeArgs = createVolumeArgs();
+ writeClient.createVolume(volumeArgs);
+ writeClient.deleteVolume(volumeArgs.getVolume());
omMetrics = getMetrics("OMMetrics");
// Accounting 's3v' volume which is created by default.
assertCounter("NumVolumes", 3L, omMetrics);
- // inject exception to test for Failure Metrics
- Mockito.doThrow(exception).when(mockVm).createVolume(null);
- Mockito.doThrow(exception).when(mockVm).deleteVolume(null);
- Mockito.doThrow(exception).when(mockVm).getVolumeInfo(null);
- Mockito.doThrow(exception).when(mockVm).checkVolumeAccess(null, null);
- Mockito.doThrow(exception).when(mockVm).setOwner(null, null);
- Mockito.doThrow(exception).when(mockVm).listVolumes(null, null, null, 0);
+ // inject exception to test for Failure Metrics on the read path
+ Mockito.doThrow(exception).when(mockVm).getVolumeInfo(any());
+ Mockito.doThrow(exception).when(mockVm).listVolumes(any(), any(),
+ any(), anyInt());
HddsWhiteboxTestUtils.setInternalState(ozoneManager,
"volumeManager", mockVm);
- doVolumeOps();
+ // inject exception to test for Failure Metrics on the write path
+ mockWritePathExceptions(OmVolumeArgs.class);
+ volumeArgs = createVolumeArgs();
+ doVolumeOps(volumeArgs);
omMetrics = getMetrics("OMMetrics");
- assertCounter("NumVolumeOps", 16L, omMetrics);
+ assertCounter("NumVolumeOps", 14L, omMetrics);
Review comment:
decreased by 1 because of removal of checkVolumeAccess() op
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
