Skip to content

Commit bc8f0ae

Browse files
jbamptondhslove
authored andcommitted
java: fix one typo in many files (apache#11284)
1 parent 8f03edf commit bc8f0ae

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

engine/storage/src/main/java/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ protected boolean filter(ExcludeList avoid, StoragePool pool, DiskProfile dskCh,
378378
return false;
379379
}
380380
} catch (StorageUnavailableException e) {
381-
logger.warn(String.format("Could not verify storage policy complaince against storage pool %s due to exception %s", pool.getUuid(), e.getMessage()));
381+
logger.warn(String.format("Could not verify storage policy compliance against storage pool %s due to exception %s", pool.getUuid(), e.getMessage()));
382382
return false;
383383
}
384384
}

plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3793,14 +3793,14 @@ public Answer checkDataStoreStoragePolicyCompliance(CheckDataStoreStoragePolicyC
37933793
DatastoreMO primaryDsMo = new DatastoreMO(hyperHost.getContext(), morPrimaryDs);
37943794
boolean isDatastoreStoragePolicyComplaint = primaryDsMo.isDatastoreStoragePolicyComplaint(storagePolicyId);
37953795

3796-
String failedMessage = String.format("DataStore %s is not complaince with storage policy id %s", primaryStorageNameLabel, storagePolicyId);
3796+
String failedMessage = String.format("DataStore %s is not compliance with storage policy id %s", primaryStorageNameLabel, storagePolicyId);
37973797
if (!isDatastoreStoragePolicyComplaint)
37983798
return new Answer(cmd, isDatastoreStoragePolicyComplaint, failedMessage);
37993799
else
38003800
return new Answer(cmd, isDatastoreStoragePolicyComplaint, null);
38013801
} catch (Throwable e) {
38023802
hostService.createLogMessageException(e, cmd);
3803-
String details = String.format("Exception while checking if datastore [%s] is storage policy [%s] complaince due to: [%s]", primaryStorageNameLabel, storagePolicyId, VmwareHelper.getExceptionMessage(e));
3803+
String details = String.format("Exception while checking if datastore [%s] is storage policy [%s] compliance due to: [%s]", primaryStorageNameLabel, storagePolicyId, VmwareHelper.getExceptionMessage(e));
38043804
return new Answer(cmd, false, details);
38053805
}
38063806
}

server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1538,12 +1538,12 @@ public int compare(Volume v1, Volume v2) {
15381538
hostCanAccessPool = true;
15391539
if (potentialHost.getHypervisorType() == HypervisorType.VMware) {
15401540
try {
1541-
boolean isStoragePoolStoragepolicyComplaince = _storageMgr.isStoragePoolCompliantWithStoragePolicy(volumeDiskProfilePair, storagePool);
1542-
if (!isStoragePoolStoragepolicyComplaince) {
1541+
boolean isStoragePoolStoragepolicyCompliance = _storageMgr.isStoragePoolCompliantWithStoragePolicy(volumeDiskProfilePair, storagePool);
1542+
if (!isStoragePoolStoragepolicyCompliance) {
15431543
continue;
15441544
}
15451545
} catch (StorageUnavailableException e) {
1546-
logger.warn("Could not verify storage policy complaince against storage pool {} due to exception {}", storagePool, e.getMessage());
1546+
logger.warn("Could not verify storage policy compliance against storage pool {} due to exception {}", storagePool, e.getMessage());
15471547
continue;
15481548
}
15491549
haveEnoughSpace = true;
@@ -1577,12 +1577,12 @@ public int compare(Volume v1, Volume v2) {
15771577
List<Pair<Volume, DiskProfile>> volumeDiskProfilePair = getVolumeDiskProfilePairs(requestVolumes);
15781578
if (potentialHost.getHypervisorType() == HypervisorType.VMware) {
15791579
try {
1580-
boolean isStoragePoolStoragepolicyComplaince = _storageMgr.isStoragePoolCompliantWithStoragePolicy(volumeDiskProfilePair, potentialSPool);
1581-
if (!isStoragePoolStoragepolicyComplaince) {
1580+
boolean isStoragePoolStoragepolicyCompliance = _storageMgr.isStoragePoolCompliantWithStoragePolicy(volumeDiskProfilePair, potentialSPool);
1581+
if (!isStoragePoolStoragepolicyCompliance) {
15821582
continue;
15831583
}
15841584
} catch (StorageUnavailableException e) {
1585-
logger.warn("Could not verify storage policy complaince against storage pool {} due to exception {}", potentialSPool, e.getMessage());
1585+
logger.warn("Could not verify storage policy compliance against storage pool {} due to exception {}", potentialSPool, e.getMessage());
15861586
continue;
15871587
}
15881588
}

server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3662,8 +3662,8 @@ public Volume migrateVolume(MigrateVolumeCmd cmd) {
36623662

36633663
if (hypervisorType.equals(HypervisorType.VMware)) {
36643664
try {
3665-
boolean isStoragePoolStoragepolicyComplaince = storageMgr.isStoragePoolCompliantWithStoragePolicy(Arrays.asList(volumeDiskProfilePair), destPool);
3666-
if (!isStoragePoolStoragepolicyComplaince) {
3665+
boolean isStoragePoolStoragepolicyCompliance = storageMgr.isStoragePoolCompliantWithStoragePolicy(Arrays.asList(volumeDiskProfilePair), destPool);
3666+
if (!isStoragePoolStoragepolicyCompliance) {
36673667
throw new CloudRuntimeException(String.format("Storage pool %s is not storage policy compliance with the volume %s", poolUuid, vol.getUuid()));
36683668
}
36693669
} catch (StorageUnavailableException e) {

0 commit comments

Comments
 (0)