Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ public class OMMetrics {
private @Metric MutableCounterLong numVolumeInfos;
private @Metric MutableCounterLong numVolumeCheckAccesses;
private @Metric MutableCounterLong numBucketCreates;
private @Metric MutableCounterLong numFSOBucketCreates;
private @Metric MutableCounterLong numVolumeDeletes;
private @Metric MutableCounterLong numBucketInfos;
private @Metric MutableCounterLong numBucketUpdates;
Expand Down Expand Up @@ -306,6 +307,10 @@ public void incNumBucketCreates() {
numBucketCreates.incr();
}

public void incNumFSOBucketCreates() {
numFSOBucketCreates.incr();
}

public void incNumBucketInfos() {
numBucketOps.incr();
numBucketInfos.incr();
Expand Down Expand Up @@ -629,6 +634,11 @@ public long getNumBucketCreates() {
return numBucketCreates.value();
}

@VisibleForTesting
public long getNumFSOBucketCreates() {
return numFSOBucketCreates.value();
}

@VisibleForTesting
public long getNumBucketInfos() {
return numBucketInfos.value();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,9 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
} else {
omBucketInfo = OmBucketInfo.getFromProtobuf(bucketInfo);
}

if (omBucketInfo.getBucketLayout().isFileSystemOptimized()) {
omMetrics.incNumFSOBucketCreates();
}
AuditLogger auditLogger = ozoneManager.getAuditLogger();
OzoneManagerProtocolProtos.UserInfo userInfo = getOmRequest().getUserInfo();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,15 @@ public void testValidateAndUpdateCacheWithFSO() throws Exception {
String volumeName = UUID.randomUUID().toString();
String bucketName = UUID.randomUUID().toString();

Assert.assertEquals(0, omMetrics.getNumFSOBucketCreates());

OMBucketCreateRequest omBucketCreateRequest = doPreExecute(volumeName,
bucketName);

doValidateAndUpdateCache(volumeName, bucketName,
omBucketCreateRequest.getOmRequest());

Assert.assertEquals(1, omMetrics.getNumFSOBucketCreates());
}

private OMBucketCreateRequest doPreExecute(String volumeName,
Expand Down