Skip to content

Commit 11d4565

Browse files
jbamptonjbampton
authored
misc: fix spelling (apache#7206)
This PR fixes spellings
1 parent 1bd47d3 commit 11d4565

51 files changed

Lines changed: 92 additions & 92 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmGroupCmd.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ public void execute() {
232232
responseObject.setResponseName(getCommandName());
233233
}
234234
} catch (Exception ex) {
235-
// TODO what will happen if Resource Layer fails in a step inbetween
235+
// TODO what will happen if Resource Layer fails in a step in between
236236
s_logger.warn("Failed to create autoscale vm group", ex);
237237
} finally {
238238
if (!success || vmGroup == null) {

‎engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -949,7 +949,7 @@ public int compare(Pair<Network, NicProfile> pair1, Pair<Network, NicProfile> pa
949949

950950
/**
951951
* private transaction method to run over the objects and determine nic requirements
952-
* @return the total numer of nics required
952+
* @return the total number of nics required
953953
*/
954954
private int determineNumberOfNicsRequired() {
955955
int size = 0;
@@ -1183,7 +1183,7 @@ protected void acquireLockAndCheckIfIpv4IsFree(Network network, String requested
11831183
}
11841184

11851185
/**
1186-
* Validates the locked IP, throwing an exeption if the locked IP is null or the locked IP is not in 'Free' state.
1186+
* Validates the locked IP, throwing an exception if the locked IP is null or the locked IP is not in 'Free' state.
11871187
*/
11881188
protected void validateLockedRequestedIp(IPAddressVO ipVO, IPAddressVO lockedIpVO) {
11891189
if (lockedIpVO == null) {
@@ -1605,7 +1605,7 @@ private void implementNetworkElements(final DeployDestination dest, final Reserv
16051605
}
16061606

16071607
if (s_logger.isDebugEnabled()) {
1608-
s_logger.debug("Asking " + element.getName() + " to implemenet " + network);
1608+
s_logger.debug("Asking " + element.getName() + " to implement " + network);
16091609
}
16101610

16111611
if (!element.implement(network, offering, dest, context)) {
@@ -2498,7 +2498,7 @@ && isDhcpAccrossMultipleSubnetsSupported(dhcpServiceProvider)) {
24982498

24992499
//remove the secondary ip addresses corresponding to to this nic
25002500
if (!removeVmSecondaryIpsOfNic(nic.getId())) {
2501-
s_logger.debug("Removing nic " + nic.getId() + " secondary ip addreses failed");
2501+
s_logger.debug("Removing nic " + nic.getId() + " secondary ip addresses failed");
25022502
}
25032503
}
25042504

‎engine/schema/src/main/java/com/cloud/network/dao/ExternalFirewallDeviceDao.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ public interface ExternalFirewallDeviceDao extends GenericDao<ExternalFirewallDe
3434
/**
3535
* list the firewall devices added in to this physical network of certain provider type?
3636
* @param physicalNetworkId physical Network Id
37-
* @param providerName netwrok service provider name
37+
* @param providerName network service provider name
3838
*/
3939
List<ExternalFirewallDeviceVO> listByPhysicalNetworkAndProvider(long physicalNetworkId, String providerName);
4040

4141
/**
4242
* list the firewall devices added in to this physical network by their allocation state
4343
* @param physicalNetworkId physical Network Id
44-
* @param providerName netwrok service provider name
44+
* @param providerName network service provider name
4545
* @param allocationState firewall device allocation state
4646
* @return list of ExternalFirewallDeviceVO for the devices in the physical network with a device allocation state
4747
*/
@@ -50,7 +50,7 @@ public interface ExternalFirewallDeviceDao extends GenericDao<ExternalFirewallDe
5050
/**
5151
* list the load balancer devices added in to this physical network by the device status (enabled/disabled)
5252
* @param physicalNetworkId physical Network Id
53-
* @param providerName netwrok service provider name
53+
* @param providerName network service provider name
5454
* @param state firewall device status
5555
* @return list of ExternalFirewallDeviceVO for the devices in the physical network with a device state
5656
*/

‎engine/schema/src/main/java/com/cloud/network/dao/ExternalLoadBalancerDeviceDao.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ public interface ExternalLoadBalancerDeviceDao extends GenericDao<ExternalLoadBa
3434
/**
3535
* list the load balancer devices added in to this physical network of certain provider type?
3636
* @param physicalNetworkId physical Network Id
37-
* @param providerName netwrok service provider name
37+
* @param providerName network service provider name
3838
*/
3939
List<ExternalLoadBalancerDeviceVO> listByPhysicalNetworkAndProvider(long physicalNetworkId, String providerName);
4040

4141
/**
4242
* list the load balancer devices added in to this physical network by their allocation state
4343
* @param physicalNetworkId physical Network Id
44-
* @param providerName netwrok service provider name
44+
* @param providerName network service provider name
4545
* @param allocationState load balancer device allocation state
4646
* @return list of ExternalLoadBalancerDeviceVO for the devices in the physical network with a device allocation state
4747
*/
@@ -50,7 +50,7 @@ public interface ExternalLoadBalancerDeviceDao extends GenericDao<ExternalLoadBa
5050
/**
5151
* list the load balancer devices added in to this physical network by the device status (enabled/disabled)
5252
* @param physicalNetworkId physical Network Id
53-
* @param providerName netwrok service provider name
53+
* @param providerName network service provider name
5454
* @param state load balancer device status
5555
* @return list of ExternalLoadBalancerDeviceVO for the devices in the physical network with a device state
5656
*/
@@ -59,7 +59,7 @@ public interface ExternalLoadBalancerDeviceDao extends GenericDao<ExternalLoadBa
5959
/**
6060
* list the load balancer devices added in to this physical network by the managed type (external/cloudstack managed)
6161
* @param physicalNetworkId physical Network Id
62-
* @param providerName netwrok service provider name
62+
* @param providerName network service provider name
6363
* @param managed managed type
6464
* @return list of ExternalLoadBalancerDeviceVO for the devices in to this physical network of a managed type
6565
*/

‎engine/schema/src/main/java/com/cloud/network/dao/IPAddressDao.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public interface IPAddressDao extends GenericDao<IPAddressVO, Long> {
5858
IPAddressVO findByAssociatedVmId(long vmId);
5959

6060
// for vm secondary ips case mapping is IP1--> vmIp1, IP2-->vmIp2, etc
61-
// This method is used when one vm is mapped to muliple to public ips
61+
// This method is used when one vm is mapped to multiple to public ips
6262
List<IPAddressVO> findAllByAssociatedVmId(long vmId);
6363

6464
IPAddressVO findByIpAndSourceNetworkId(long networkId, String ipAddress);

‎engine/schema/src/main/java/com/cloud/network/dao/IPAddressDaoImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ public IPAddressVO findByAssociatedVmId(long vmId) {
304304

305305

306306
// for vm secondary ips case mapping is IP1--> vmIp1, IP2-->vmIp2, etc
307-
// Used when vm is mapped to muliple to public ips
307+
// Used when vm is mapped to multiple to public ips
308308
@Override
309309
public List<IPAddressVO> findAllByAssociatedVmId(long vmId) {
310310
SearchCriteria<IPAddressVO> sc = AllFieldsSearch.create();

‎engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade410to420.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1884,7 +1884,7 @@ private void migrateSnapshotStoreRef(Connection conn) {
18841884
//Update all snapshots except KVM snapshots
18851885
int rowCount = snapshotStoreInsert.executeUpdate();
18861886
s_logger.debug("Inserted " + rowCount + " snapshots into snapshot_store_ref");
1887-
//backsnap_id for KVM snapshots is complate path. CONCAT is not required
1887+
//backsnap_id for KVM snapshots is complete path. CONCAT is not required
18881888
try(PreparedStatement snapshotStoreInsert_2 =
18891889
conn.prepareStatement("INSERT INTO `cloud`.`snapshot_store_ref` (store_id, snapshot_id, created, size, parent_snapshot_id, install_path, volume_id, update_count, ref_cnt, store_role, state) select sechost_id, id, created, size, prev_snap_id, backup_snap_id, volume_id, 0, 0, 'Image', 'Ready' from `cloud`.`snapshots` where status = 'BackedUp' and hypervisor_type = 'KVM' and sechost_id is not null and removed is null");) {
18901890
rowCount = snapshotStoreInsert_2.executeUpdate();

‎engine/schema/src/main/java/com/cloud/vm/dao/ConsoleProxyDaoImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public class ConsoleProxyDaoImpl extends GenericDaoBase<ConsoleProxyVO, Long> im
4343
private static final Logger s_logger = Logger.getLogger(ConsoleProxyDaoImpl.class);
4444

4545
//
46-
// query SQL for returnning console proxy assignment info as following
46+
// query SQL for returning console proxy assignment info as following
4747
// proxy vm id, count of assignment
4848
//
4949
private static final String PROXY_ASSIGNMENT_MATRIX = "SELECT c.id, count(runningVm.id) AS count "
@@ -63,7 +63,7 @@ public class ConsoleProxyDaoImpl extends GenericDaoBase<ConsoleProxyVO, Long> im
6363
+ " WHERE v.type='ConsoleProxy' AND (v.state='Creating' OR v.state='Starting' OR v.state='Running' OR v.state='Migrating')" + " GROUP BY d.id, d.name";
6464

6565
//
66-
// query SQL for returnning running console proxy count at data center basis
66+
// query SQL for returning running console proxy count at data center basis
6767
//
6868
private static final String DATACENTER_PROXY_MATRIX =
6969
"SELECT d.id, d.name, count(dcid) as count"

‎engine/schema/src/main/resources/META-INF/db/schema-442to450.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ CREATE VIEW `cloud`.`template_view` AS
448448

449449
UPDATE configuration SET value='KVM,XenServer,VMware,BareMetal,Ovm,LXC,Hyperv' WHERE name='hypervisor.list';
450450
UPDATE `cloud`.`configuration` SET description="If set to true, will set guest VM's name as it appears on the hypervisor, to its hostname. The flag is supported for VMware hypervisor only" WHERE name='vm.instancename.flag';
451-
INSERT IGNORE INTO `cloud`.`configuration`(category, instance, component, name, value, description, default_value) VALUES ('Advanced', 'DEFAULT', 'management-server', 'implicit.host.tags', 'GPU', 'Tag hosts at the time of host disovery based on the host properties/capabilities ', 'GPU');
451+
INSERT IGNORE INTO `cloud`.`configuration`(category, instance, component, name, value, description, default_value) VALUES ('Advanced', 'DEFAULT', 'management-server', 'implicit.host.tags', 'GPU', 'Tag hosts at the time of host discovery based on the host properties/capabilities ', 'GPU');
452452

453453
DROP VIEW IF EXISTS `cloud`.`domain_router_view`;
454454
CREATE VIEW `cloud`.`domain_router_view` AS

‎engine/storage/cache/src/main/java/org/apache/cloudstack/storage/cache/manager/StorageCacheManagerImpl.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -253,11 +253,11 @@ public DataObject createCacheObject(DataObject data, DataStore store) {
253253
if (obj != null) {
254254
State st = obj.getState();
255255

256-
long miliSeconds = 10000;
256+
long milliSeconds = 10000;
257257
long timeoutSeconds = 3600;
258-
long timeoutMiliSeconds = timeoutSeconds * 1000;
258+
long timeoutMilliSeconds = timeoutSeconds * 1000;
259259
Date now = new Date();
260-
long expiredEpoch = now.getTime() + timeoutMiliSeconds;
260+
long expiredEpoch = now.getTime() + timeoutMilliSeconds;
261261
Date expiredDate = new Date(expiredEpoch);
262262

263263
/*
@@ -273,7 +273,7 @@ public DataObject createCacheObject(DataObject data, DataStore store) {
273273
*/
274274
s_logger.debug("waiting cache copy completion type: " + typeName + ", id: " + obj.getObjectId() + ", lock: " + lock.hashCode());
275275
try {
276-
lock.wait(miliSeconds);
276+
lock.wait(milliSeconds);
277277
} catch (InterruptedException e) {
278278
s_logger.debug("[ignored] interrupted while waiting for cache copy completion.");
279279
}

0 commit comments

Comments
 (0)