Skip to content

Commit 1b44c0c

Browse files
author
kishan
committed
bug 11199: Added indexes to tables in cloud_usage DB in create-schema-premium.sql
status 11199: resolved fixed
1 parent d461cfb commit 1b44c0c

2 files changed

Lines changed: 42 additions & 1 deletion

File tree

‎setup/db/create-schema-premium.sql‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@ CREATE TABLE `cloud_usage`.`cloud_usage` (
4949
PRIMARY KEY (`id`)
5050
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
5151

52+
ALTER TABLE `cloud_usage`.`cloud_usage` ADD INDEX `i_cloud_usage__account_id`(`account_id`);
53+
ALTER TABLE `cloud_usage`.`cloud_usage` ADD INDEX `i_cloud_usage__domain_id`(`domain_id`);
54+
ALTER TABLE `cloud_usage`.`cloud_usage` ADD INDEX `i_cloud_usage__start_date`(`start_date`);
55+
ALTER TABLE `cloud_usage`.`cloud_usage` ADD INDEX `i_cloud_usage__end_date`(`end_date`);
56+
5257
CREATE TABLE `cloud_usage`.`usage_vm_instance` (
5358
`usage_type` int(1) unsigned,
5459
`zone_id` bigint unsigned NOT NULL,
@@ -62,6 +67,10 @@ CREATE TABLE `cloud_usage`.`usage_vm_instance` (
6267
`end_date` DATETIME NULL
6368
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
6469

70+
ALTER TABLE `cloud_usage`.`usage_vm_instance` ADD INDEX `i_usage_vm_instance__account_id`(`account_id`);
71+
ALTER TABLE `cloud_usage`.`usage_vm_instance` ADD INDEX `i_usage_vm_instance__start_date`(`start_date`);
72+
ALTER TABLE `cloud_usage`.`usage_vm_instance` ADD INDEX `i_usage_vm_instance__end_date`(`end_date`);
73+
6574
CREATE TABLE `cloud_usage`.`usage_network` (
6675
`account_id` bigint unsigned NOT NULL,
6776
`zone_id` bigint unsigned NOT NULL,
@@ -89,6 +98,10 @@ CREATE TABLE `cloud_usage`.`usage_ip_address` (
8998
`released` DATETIME NULL
9099
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
91100

101+
ALTER TABLE `cloud_usage`.`usage_ip_address` ADD INDEX `i_usage_ip_address__account_id`(`account_id`);
102+
ALTER TABLE `cloud_usage`.`usage_ip_address` ADD INDEX `i_usage_ip_address__assigned`(`assigned`);
103+
ALTER TABLE `cloud_usage`.`usage_ip_address` ADD INDEX `i_usage_ip_address__released`(`released`);
104+
92105
CREATE TABLE `cloud_usage`.`usage_job` (
93106
`id` bigint unsigned NOT NULL auto_increment,
94107
`host` varchar(255),
@@ -105,6 +118,8 @@ CREATE TABLE `cloud_usage`.`usage_job` (
105118
PRIMARY KEY (`id`)
106119
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
107120

121+
ALTER TABLE `cloud_usage`.`usage_job` ADD INDEX `i_usage_job__end_millis`(`end_millis`);
122+
108123
CREATE TABLE `cloud_usage`.`account` (
109124
`id` bigint unsigned NOT NULL,
110125
`account_name` varchar(100) COMMENT 'an account name set by the creator of the account, defaults to username for single accounts',
@@ -117,6 +132,8 @@ CREATE TABLE `cloud_usage`.`account` (
117132
PRIMARY KEY (`id`)
118133
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
119134

135+
ALTER TABLE `cloud_usage`.`account` ADD INDEX `i_account__removed`(`removed`);
136+
120137
CREATE TABLE `cloud_usage`.`user_statistics` (
121138
`id` bigint unsigned UNIQUE NOT NULL,
122139
`data_center_id` bigint unsigned NOT NULL,
@@ -145,6 +162,10 @@ CREATE TABLE `cloud_usage`.`usage_volume` (
145162
`deleted` DATETIME NULL
146163
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
147164

165+
ALTER TABLE `cloud_usage`.`usage_volume` ADD INDEX `i_usage_volume__account_id`(`account_id`);
166+
ALTER TABLE `cloud_usage`.`usage_volume` ADD INDEX `i_usage_volume__created`(`created`);
167+
ALTER TABLE `cloud_usage`.`usage_volume` ADD INDEX `i_usage_volume__deleted`(`deleted`);
168+
148169
CREATE TABLE `cloud_usage`.`usage_storage` (
149170
`id` bigint unsigned NOT NULL,
150171
`zone_id` bigint unsigned NOT NULL,
@@ -157,6 +178,10 @@ CREATE TABLE `cloud_usage`.`usage_storage` (
157178
`deleted` DATETIME NULL
158179
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
159180

181+
ALTER TABLE `cloud_usage`.`usage_storage` ADD INDEX `i_usage_storage__account_id`(`account_id`);
182+
ALTER TABLE `cloud_usage`.`usage_storage` ADD INDEX `i_usage_storage__created`(`created`);
183+
ALTER TABLE `cloud_usage`.`usage_storage` ADD INDEX `i_usage_storage__deleted`(`deleted`);
184+
160185
CREATE TABLE `cloud_usage`.`usage_security_group` (
161186
`id` bigint unsigned NOT NULL,
162187
`zone_id` bigint unsigned NOT NULL,
@@ -177,6 +202,10 @@ CREATE TABLE `cloud_usage`.`usage_load_balancer_policy` (
177202
`deleted` DATETIME NULL
178203
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
179204

205+
ALTER TABLE `cloud_usage`.`usage_load_balancer_policy` ADD INDEX `i_usage_load_balancer_policy__account_id`(`account_id`);
206+
ALTER TABLE `cloud_usage`.`usage_load_balancer_policy` ADD INDEX `i_usage_load_balancer_policy__created`(`created`);
207+
ALTER TABLE `cloud_usage`.`usage_load_balancer_policy` ADD INDEX `i_usage_load_balancer_policy__deleted`(`deleted`);
208+
180209
CREATE TABLE `cloud_usage`.`usage_event` (
181210
`id` bigint unsigned NOT NULL auto_increment,
182211
`type` varchar(32) NOT NULL,
@@ -193,6 +222,8 @@ CREATE TABLE `cloud_usage`.`usage_event` (
193222
PRIMARY KEY (`id`)
194223
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
195224

225+
ALTER TABLE `cloud_usage`.`usage_event` ADD INDEX `i_usage_event__created`(`created`);
226+
196227
CREATE TABLE `cloud_usage`.`usage_port_forwarding` (
197228
`id` bigint unsigned NOT NULL,
198229
`zone_id` bigint unsigned NOT NULL,
@@ -202,6 +233,10 @@ CREATE TABLE `cloud_usage`.`usage_port_forwarding` (
202233
`deleted` DATETIME NULL
203234
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
204235

236+
ALTER TABLE `cloud_usage`.`usage_port_forwarding` ADD INDEX `i_usage_port_forwarding__account_id`(`account_id`);
237+
ALTER TABLE `cloud_usage`.`usage_port_forwarding` ADD INDEX `i_usage_port_forwarding__created`(`created`);
238+
ALTER TABLE `cloud_usage`.`usage_port_forwarding` ADD INDEX `i_usage_port_forwarding__deleted`(`deleted`);
239+
205240
CREATE TABLE `cloud_usage`.`usage_network_offering` (
206241
`zone_id` bigint unsigned NOT NULL,
207242
`account_id` bigint unsigned NOT NULL,
@@ -213,6 +248,10 @@ CREATE TABLE `cloud_usage`.`usage_network_offering` (
213248
`deleted` DATETIME NULL
214249
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
215250

251+
ALTER TABLE `cloud_usage`.`usage_network_offering` ADD INDEX `i_usage_network_offering__account_id`(`account_id`);
252+
ALTER TABLE `cloud_usage`.`usage_network_offering` ADD INDEX `i_usage_network_offering__created`(`created`);
253+
ALTER TABLE `cloud_usage`.`usage_network_offering` ADD INDEX `i_usage_network_offering__deleted`(`deleted`);
254+
216255
CREATE TABLE `cloud`.`netapp_volume` (
217256
`id` bigint unsigned NOT NULL UNIQUE AUTO_INCREMENT COMMENT 'id',
218257
`ip_address` varchar(255) NOT NULL COMMENT 'ip address/fqdn of the volume',

‎usage/src/com/cloud/usage/UsageManagerImpl.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,9 @@ public boolean start() {
266266
public boolean stop() {
267267
m_heartbeat.cancel(true);
268268
m_scheduledFuture.cancel(true);
269-
m_sanity.cancel(true);
269+
if(m_sanityCheckInterval > 0){
270+
m_sanity.cancel(true);
271+
}
270272
return true;
271273
}
272274

0 commit comments

Comments
 (0)