Skip to content

Commit c265df9

Browse files
jbamptonyadvrSadiJr
authored
Fix spelling (#6185)
* Fix spelling * Update services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java Co-authored-by: SadiJr <sadijacinto@gmail.com> Co-authored-by: Rohit Yadav <rohityadav89@gmail.com> Co-authored-by: SadiJr <sadijacinto@gmail.com>
1 parent 3ac91aa commit c265df9

File tree

41 files changed

+68
-68
lines changed

Some content is hidden

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

41 files changed

+68
-68
lines changed

‎engine/orchestration/src/main/java/com/cloud/agent/manager/ClusteredAgentManagerImpl.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1014,13 +1014,13 @@ protected void runInContext() {
10141014
}
10151015

10161016
} else {
1017-
s_logger.debug("Agent " + hostId + " can't be transfered yet as its request queue size is " + attache.getQueueSize() + " and listener queue size is "
1017+
s_logger.debug("Agent " + hostId + " can't be transferred yet as its request queue size is " + attache.getQueueSize() + " and listener queue size is "
10181018
+ attache.getNonRecurringListenersSize());
10191019
}
10201020
}
10211021
} else {
10221022
if (s_logger.isTraceEnabled()) {
1023-
s_logger.trace("Found no agents to be transfered by the management server " + _nodeId);
1023+
s_logger.trace("Found no agents to be transferred by the management server " + _nodeId);
10241024
}
10251025
}
10261026
}
@@ -1060,7 +1060,7 @@ protected boolean rebalanceHost(final long hostId, final long currentOwnerId, fi
10601060
}
10611061

10621062
if (result) {
1063-
s_logger.debug("Successfully transfered host id=" + hostId + " to management server " + futureOwnerId);
1063+
s_logger.debug("Successfully transferred host id=" + hostId + " to management server " + futureOwnerId);
10641064
finishRebalance(hostId, futureOwnerId, Event.RebalanceCompleted);
10651065
} else {
10661066
s_logger.warn("Failed to transfer host id=" + hostId + " to management server " + futureOwnerId);

‎engine/schema/src/main/resources/META-INF/db/schema-2214to30.sql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ CREATE TABLE `cloud`.`external_load_balancer_devices` (
446446
`is_dedicated` int(1) unsigned NOT NULL DEFAULT 0 COMMENT '1 if device/appliance is provisioned for dedicated use only',
447447
`is_inline` int(1) unsigned NOT NULL DEFAULT 0 COMMENT '1 if load balancer will be used in in-line configuration with firewall',
448448
`is_managed` int(1) unsigned NOT NULL DEFAULT 0 COMMENT '1 if load balancer appliance is provisioned and its life cycle is managed by by cloudstack',
449-
`host_id` bigint unsigned NOT NULL COMMENT 'host id coresponding to the external load balancer device',
449+
`host_id` bigint unsigned NOT NULL COMMENT 'host id corresponding to the external load balancer device',
450450
`parent_host_id` bigint unsigned COMMENT 'if the load balancer appliance is cloudstack managed, then host id on which this appliance is provisioned',
451451
PRIMARY KEY (`id`),
452452
CONSTRAINT `fk_external_lb_devices_host_id` FOREIGN KEY (`host_id`) REFERENCES `host`(`id`) ON DELETE CASCADE,
@@ -463,7 +463,7 @@ CREATE TABLE `cloud`.`external_firewall_devices` (
463463
`device_state` varchar(32) NOT NULL DEFAULT 'Disabled' COMMENT 'state (enabled/disabled/shutdown) of the device',
464464
`is_dedicated` int(1) unsigned NOT NULL DEFAULT 0 COMMENT '1 if device/appliance meant for dedicated use only',
465465
`allocation_state` varchar(32) NOT NULL DEFAULT 'Free' COMMENT 'Allocation state (Free/Allocated) of the device',
466-
`host_id` bigint unsigned NOT NULL COMMENT 'host id coresponding to the external firewall device',
466+
`host_id` bigint unsigned NOT NULL COMMENT 'host id corresponding to the external firewall device',
467467
`capacity` bigint unsigned NOT NULL DEFAULT 0 COMMENT 'Capacity of the external firewall device',
468468
PRIMARY KEY (`id`),
469469
CONSTRAINT `fk_external_firewall_devices__host_id` FOREIGN KEY (`host_id`) REFERENCES `host`(`id`) ON DELETE CASCADE,

‎engine/schema/src/main/resources/META-INF/db/schema-227to228.sql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ ALTER TABLE `cloud`.`network_offerings` ADD COLUMN `shared_source_nat_service` i
107107

108108
CREATE TABLE IF NOT EXISTS `cloud`.`op_host_transfer` (
109109
`id` bigint unsigned UNIQUE NOT NULL COMMENT 'Id of the host',
110-
`initial_mgmt_server_id` bigint unsigned COMMENT 'management server the host is transfered from',
111-
`future_mgmt_server_id` bigint unsigned COMMENT 'management server the host is transfered to',
110+
`initial_mgmt_server_id` bigint unsigned COMMENT 'management server the host is transferred from',
111+
`future_mgmt_server_id` bigint unsigned COMMENT 'management server the host is transferred to',
112112
`state` varchar(32) NOT NULL COMMENT 'the transfer state of the host',
113113
`created` datetime NOT NULL COMMENT 'date created',
114114
PRIMARY KEY (`id`),

‎engine/schema/src/main/resources/META-INF/db/schema-302to40.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ CREATE TABLE `cloud`.`external_nicira_nvp_devices` (
211211
`physical_network_id` bigint unsigned NOT NULL COMMENT 'id of the physical network in to which nicira nvp device is added',
212212
`provider_name` varchar(255) NOT NULL COMMENT 'Service Provider name corresponding to this nicira nvp device',
213213
`device_name` varchar(255) NOT NULL COMMENT 'name of the nicira nvp device',
214-
`host_id` bigint unsigned NOT NULL COMMENT 'host id coresponding to the external nicira nvp device',
214+
`host_id` bigint unsigned NOT NULL COMMENT 'host id corresponding to the external nicira nvp device',
215215
PRIMARY KEY (`id`),
216216
CONSTRAINT `fk_external_nicira_nvp_devices__host_id` FOREIGN KEY (`host_id`) REFERENCES `host`(`id`) ON DELETE CASCADE,
217217
CONSTRAINT `fk_external_nicira_nvp_devices__physical_network_id` FOREIGN KEY (`physical_network_id`) REFERENCES `physical_network`(`id`) ON DELETE CASCADE

‎engine/schema/src/main/resources/META-INF/db/schema-307to410.sql‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ CREATE TABLE `cloud`.`external_nicira_nvp_devices` (
2929
`physical_network_id` bigint unsigned NOT NULL COMMENT 'id of the physical network in to which nicira nvp device is added',
3030
`provider_name` varchar(255) NOT NULL COMMENT 'Service Provider name corresponding to this nicira nvp device',
3131
`device_name` varchar(255) NOT NULL COMMENT 'name of the nicira nvp device',
32-
`host_id` bigint unsigned NOT NULL COMMENT 'host id coresponding to the external nicira nvp device',
32+
`host_id` bigint unsigned NOT NULL COMMENT 'host id corresponding to the external nicira nvp device',
3333
PRIMARY KEY (`id`),
3434
CONSTRAINT `fk_external_nicira_nvp_devices__host_id` FOREIGN KEY (`host_id`) REFERENCES `host`(`id`) ON DELETE CASCADE,
3535
CONSTRAINT `fk_external_nicira_nvp_devices__physical_network_id` FOREIGN KEY (`physical_network_id`) REFERENCES `physical_network`(`id`) ON DELETE CASCADE
@@ -165,7 +165,7 @@ CREATE TABLE `cloud`.`s3` (
165165
`https` tinyint unsigned DEFAULT NULL COMMENT ' Flag indicating whether or not to connect over HTTPS',
166166
`connection_timeout` integer COMMENT ' The amount of time to wait (in milliseconds) when initially establishing a connection before giving up and timing out.',
167167
`max_error_retry` integer COMMENT ' The maximum number of retry attempts for failed retryable requests (ex: 5xx error responses from services).',
168-
`socket_timeout` integer COMMENT ' The amount of time to wait (in milliseconds) for data to be transfered over an established, open connection before the connection times out and is closed.',
168+
`socket_timeout` integer COMMENT ' The amount of time to wait (in milliseconds) for data to be transferred over an established, open connection before the connection times out and is closed.',
169169
`created` datetime COMMENT 'date the s3 first signed on',
170170
PRIMARY KEY (`id`),
171171
CONSTRAINT `uc_s3__uuid` UNIQUE (`uuid`)
@@ -304,7 +304,7 @@ CREATE TABLE `cloud`.`external_bigswitch_vns_devices` (
304304
`physical_network_id` bigint unsigned NOT NULL COMMENT 'id of the physical network in to which bigswitch vns device is added',
305305
`provider_name` varchar(255) NOT NULL COMMENT 'Service Provider name corresponding to this bigswitch vns device',
306306
`device_name` varchar(255) NOT NULL COMMENT 'name of the bigswitch vns device',
307-
`host_id` bigint unsigned NOT NULL COMMENT 'host id coresponding to the external bigswitch vns device',
307+
`host_id` bigint unsigned NOT NULL COMMENT 'host id corresponding to the external bigswitch vns device',
308308
PRIMARY KEY (`id`),
309309
CONSTRAINT `fk_external_bigswitch_vns_devices__host_id` FOREIGN KEY (`host_id`) REFERENCES `host`(`id`) ON DELETE CASCADE,
310310
CONSTRAINT `fk_external_bigswitch_vns_devices__physical_network_id` FOREIGN KEY (`physical_network_id`) REFERENCES `physical_network`(`id`) ON DELETE CASCADE
@@ -1536,15 +1536,15 @@ CREATE TABLE IF NOT EXISTS `cloud`.`baremetal_dhcp_devices`(
15361536
`pod_id` bigint unsigned DEFAULT NULL COMMENT 'Pod id where this dhcp server in',
15371537
`device_type` varchar(255) DEFAULT NULL COMMENT 'type of the external device',
15381538
`physical_network_id` bigint unsigned DEFAULT NULL COMMENT 'id of the physical network in to which external dhcp device is added',
1539-
`host_id` bigint unsigned DEFAULT NULL COMMENT 'host id coresponding to the external dhcp device',
1539+
`host_id` bigint unsigned DEFAULT NULL COMMENT 'host id corresponding to the external dhcp device',
15401540
PRIMARY KEY (`id`)
15411541
)ENGINE=InnoDB DEFAULT CHARSET=utf8;
15421542

15431543
ALTER TABLE `cloud`.`baremetal_dhcp_devices` CHANGE COLUMN `nsp_id` `nsp_id` bigint unsigned DEFAULT NULL COMMENT 'Network Service Provider ID';
15441544
ALTER TABLE `cloud`.`baremetal_dhcp_devices` CHANGE COLUMN `pod_id` `pod_id` bigint unsigned DEFAULT NULL COMMENT 'Pod id where this dhcp server in';
15451545
ALTER TABLE `cloud`.`baremetal_dhcp_devices` CHANGE COLUMN `device_type` `device_type` varchar(255) DEFAULT NULL COMMENT 'type of the external device';
15461546
ALTER TABLE `cloud`.`baremetal_dhcp_devices` CHANGE COLUMN `physical_network_id` `physical_network_id` bigint unsigned DEFAULT NULL COMMENT 'id of the physical network in to which external dhcp device is added';
1547-
ALTER TABLE `cloud`.`baremetal_dhcp_devices` CHANGE COLUMN `host_id` `host_id` bigint unsigned DEFAULT NULL COMMENT 'host id coresponding to the external dhcp device';
1547+
ALTER TABLE `cloud`.`baremetal_dhcp_devices` CHANGE COLUMN `host_id` `host_id` bigint unsigned DEFAULT NULL COMMENT 'host id corresponding to the external dhcp device';
15481548

15491549
CREATE TABLE IF NOT EXISTS `cloud`.`baremetal_pxe_devices` (
15501550
`id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',
@@ -1553,15 +1553,15 @@ CREATE TABLE IF NOT EXISTS `cloud`.`baremetal_pxe_devices` (
15531553
`pod_id` bigint unsigned DEFAULT NULL COMMENT 'Pod id where this pxe server in, for pxe per zone this field is null',
15541554
`device_type` varchar(255) DEFAULT NULL COMMENT 'type of the pxe device',
15551555
`physical_network_id` bigint unsigned DEFAULT NULL COMMENT 'id of the physical network in to which external pxe device is added',
1556-
`host_id` bigint unsigned DEFAULT NULL COMMENT 'host id coresponding to the external pxe device',
1556+
`host_id` bigint unsigned DEFAULT NULL COMMENT 'host id corresponding to the external pxe device',
15571557
PRIMARY KEY (`id`)
15581558
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
15591559

15601560
ALTER TABLE `cloud`.`baremetal_pxe_devices` CHANGE COLUMN `nsp_id` `nsp_id` bigint unsigned DEFAULT NULL COMMENT 'Network Service Provider ID';
15611561
ALTER TABLE `cloud`.`baremetal_pxe_devices` CHANGE COLUMN `pod_id` `pod_id` bigint unsigned DEFAULT NULL COMMENT 'Pod id where this pxe server in, for pxe per zone this field is null';
15621562
ALTER TABLE `cloud`.`baremetal_pxe_devices` CHANGE COLUMN `device_type` `device_type` varchar(255) DEFAULT NULL COMMENT 'type of the pxe device';
15631563
ALTER TABLE `cloud`.`baremetal_pxe_devices` CHANGE COLUMN `physical_network_id` `physical_network_id` bigint unsigned DEFAULT NULL COMMENT 'id of the physical network in to which external pxe device is added';
1564-
ALTER TABLE `cloud`.`baremetal_pxe_devices` CHANGE COLUMN `host_id` `host_id` bigint unsigned DEFAULT NULL COMMENT 'host id coresponding to the external pxe device';
1564+
ALTER TABLE `cloud`.`baremetal_pxe_devices` CHANGE COLUMN `host_id` `host_id` bigint unsigned DEFAULT NULL COMMENT 'host id corresponding to the external pxe device';
15651565

15661566
#drop tables as the feature is not a part of 4.2
15671567
DROP TABLE IF EXISTS `cloud`.`host_updates`;

‎engine/schema/src/main/resources/META-INF/db/schema-40to410.sql‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ CREATE TABLE `cloud`.`s3` (
116116
`https` tinyint unsigned DEFAULT NULL COMMENT ' Flag indicating whether or not to connect over HTTPS',
117117
`connection_timeout` integer COMMENT ' The amount of time to wait (in milliseconds) when initially establishing a connection before giving up and timing out.',
118118
`max_error_retry` integer COMMENT ' The maximum number of retry attempts for failed retryable requests (ex: 5xx error responses from services).',
119-
`socket_timeout` integer COMMENT ' The amount of time to wait (in milliseconds) for data to be transfered over an established, open connection before the connection times out and is closed.',
119+
`socket_timeout` integer COMMENT ' The amount of time to wait (in milliseconds) for data to be transferred over an established, open connection before the connection times out and is closed.',
120120
`created` datetime COMMENT 'date the s3 first signed on',
121121
PRIMARY KEY (`id`),
122122
CONSTRAINT `uc_s3__uuid` UNIQUE (`uuid`)
@@ -278,7 +278,7 @@ CREATE TABLE `cloud`.`external_bigswitch_vns_devices` (
278278
`physical_network_id` bigint unsigned NOT NULL COMMENT 'id of the physical network in to which bigswitch vns device is added',
279279
`provider_name` varchar(255) NOT NULL COMMENT 'Service Provider name corresponding to this bigswitch vns device',
280280
`device_name` varchar(255) NOT NULL COMMENT 'name of the bigswitch vns device',
281-
`host_id` bigint unsigned NOT NULL COMMENT 'host id coresponding to the external bigswitch vns device',
281+
`host_id` bigint unsigned NOT NULL COMMENT 'host id corresponding to the external bigswitch vns device',
282282
PRIMARY KEY (`id`),
283283
CONSTRAINT `fk_external_bigswitch_vns_devices__host_id` FOREIGN KEY (`host_id`) REFERENCES `host`(`id`) ON DELETE CASCADE,
284284
CONSTRAINT `fk_external_bigswitch_vns_devices__physical_network_id` FOREIGN KEY (`physical_network_id`) REFERENCES `physical_network`(`id`) ON DELETE CASCADE
@@ -1603,7 +1603,7 @@ CREATE TABLE `cloud`.`baremetal_dhcp_devices` (
16031603
`pod_id` bigint unsigned DEFAULT NULL COMMENT 'Pod id where this dhcp server in',
16041604
`device_type` varchar(255) DEFAULT NULL COMMENT 'type of the external device',
16051605
`physical_network_id` bigint unsigned DEFAULT NULL COMMENT 'id of the physical network in to which external dhcp device is added',
1606-
`host_id` bigint unsigned DEFAULT NULL COMMENT 'host id coresponding to the external dhcp device',
1606+
`host_id` bigint unsigned DEFAULT NULL COMMENT 'host id corresponding to the external dhcp device',
16071607
PRIMARY KEY (`id`)
16081608
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
16091609

@@ -1614,7 +1614,7 @@ CREATE TABLE `cloud`.`baremetal_pxe_devices` (
16141614
`pod_id` bigint unsigned DEFAULT NULL COMMENT 'Pod id where this pxe server in, for pxe per zone this field is null',
16151615
`device_type` varchar(255) DEFAULT NULL COMMENT 'type of the pxe device',
16161616
`physical_network_id` bigint unsigned DEFAULT NULL COMMENT 'id of the physical network in to which external pxe device is added',
1617-
`host_id` bigint unsigned DEFAULT NULL COMMENT 'host id coresponding to the external pxe device',
1617+
`host_id` bigint unsigned DEFAULT NULL COMMENT 'host id corresponding to the external pxe device',
16181618
PRIMARY KEY (`id`)
16191619
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
16201620

‎engine/schema/src/main/resources/META-INF/db/schema-410to420.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1164,7 +1164,7 @@ CREATE TABLE `cloud`.`external_cisco_vnmc_devices` (
11641164
`physical_network_id` bigint unsigned NOT NULL COMMENT 'id of the physical network in to which cisco vnmc device is added',
11651165
`provider_name` varchar(255) NOT NULL COMMENT 'Service Provider name corresponding to this cisco vnmc device',
11661166
`device_name` varchar(255) NOT NULL COMMENT 'name of the cisco vnmc device',
1167-
`host_id` bigint unsigned NOT NULL COMMENT 'host id coresponding to the external cisco vnmc device',
1167+
`host_id` bigint unsigned NOT NULL COMMENT 'host id corresponding to the external cisco vnmc device',
11681168
PRIMARY KEY (`id`),
11691169
CONSTRAINT `fk_external_cisco_vnmc_devices__host_id` FOREIGN KEY (`host_id`) REFERENCES `host`(`id`) ON DELETE CASCADE,
11701170
CONSTRAINT `fk_external_cisco_vnmc_devices__physical_network_id` FOREIGN KEY (`physical_network_id`) REFERENCES `physical_network`(`id`) ON DELETE CASCADE

‎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
@@ -272,7 +272,7 @@ CREATE TABLE `cloud`.`external_brocade_vcs_devices` (
272272
`physical_network_id` bigint unsigned NOT NULL COMMENT 'id of the physical network in to which brocade vcs switch is added',
273273
`provider_name` varchar(255) NOT NULL COMMENT 'Service Provider name corresponding to this brocade vcs switch',
274274
`device_name` varchar(255) NOT NULL COMMENT 'name of the brocade vcs switch',
275-
`host_id` bigint unsigned NOT NULL COMMENT 'host id coresponding to the external brocade vcs switch',
275+
`host_id` bigint unsigned NOT NULL COMMENT 'host id corresponding to the external brocade vcs switch',
276276
PRIMARY KEY (`id`),
277277
CONSTRAINT `fk_external_brocade_vcs_devices__host_id` FOREIGN KEY (`host_id`) REFERENCES `host`(`id`) ON DELETE CASCADE,
278278
CONSTRAINT `fk_external_brocade_vcs_devices__physical_network_id` FOREIGN KEY (`physical_network_id`) REFERENCES `physical_network`(`id`) ON DELETE CASCADE

‎engine/schema/src/main/resources/META-INF/db/schema-452to460.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ CREATE TABLE IF NOT EXISTS `cloud`.`external_bigswitch_bcf_devices` (
391391
`physical_network_id` bigint unsigned NOT NULL COMMENT 'id of the physical network in to which bigswitch bcf device is added',
392392
`provider_name` varchar(255) NOT NULL COMMENT 'Service Provider name corresponding to this bigswitch bcf device',
393393
`device_name` varchar(255) NOT NULL COMMENT 'name of the bigswitch bcf device',
394-
`host_id` bigint unsigned NOT NULL COMMENT 'host id coresponding to the external bigswitch bcf device',
394+
`host_id` bigint unsigned NOT NULL COMMENT 'host id corresponding to the external bigswitch bcf device',
395395
`hostname` varchar(255) NOT NULL COMMENT 'host name or IP address for the bigswitch bcf device',
396396
`username` varchar(255) NOT NULL COMMENT 'username for the bigswitch bcf device',
397397
`password` varchar(255) NOT NULL COMMENT 'password for the bigswitch bcf device',

‎plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,7 @@ public boolean needRecycle(String workerTag) {
687687

688688
// this time-out check was disabled
689689
// "until we have found out a VMware API that can check if there are pending tasks on the subject VM"
690-
// but as we expire jobs and those stale worker VMs stay around untill an MS reboot we opt in to have them removed anyway
690+
// but as we expire jobs and those stale worker VMs stay around until an MS reboot we opt in to have them removed anyway
691691
Instant start = Instant.ofEpochMilli(startTick);
692692
Instant end = start.plusSeconds(2 * (AsyncJobManagerImpl.JobExpireMinutes.value() + AsyncJobManagerImpl.JobCancelThresholdMinutes.value()) * SECONDS_PER_MINUTE);
693693
Instant now = Instant.now();

0 commit comments

Comments
 (0)