Skip to content

Commit 5faf462

Browse files
committed
Add indexes for vm_stats
1 parent a7ec873 commit 5faf462

File tree

4 files changed

+133
-0
lines changed

4 files changed

+133
-0
lines changed

engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333

3434
import javax.inject.Inject;
3535

36+
import com.cloud.upgrade.dao.Upgrade41900to41910;
3637
import com.cloud.utils.FileUtil;
3738
import org.apache.cloudstack.utils.CloudStackVersion;
3839
import org.apache.commons.lang3.StringUtils;
@@ -224,6 +225,7 @@ public DatabaseUpgradeChecker() {
224225
.next("4.17.2.0", new Upgrade41720to41800())
225226
.next("4.18.0.0", new Upgrade41800to41810())
226227
.next("4.18.1.0", new Upgrade41810to41900())
228+
.next("4.19.0.0", new Upgrade41900to41910())
227229
.build();
228230
}
229231

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
// Licensed to the Apache Software Foundation (ASF) under one
2+
// or more contributor license agreements. See the NOTICE file
3+
// distributed with this work for additional information
4+
// regarding copyright ownership. The ASF licenses this file
5+
// to you under the Apache License, Version 2.0 (the
6+
// "License"); you may not use this file except in compliance
7+
// with the License. You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing,
12+
// software distributed under the License is distributed on an
13+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
// KIND, either express or implied. See the License for the
15+
// specific language governing permissions and limitations
16+
// under the License.
17+
package com.cloud.upgrade.dao;
18+
19+
import com.cloud.upgrade.SystemVmTemplateRegistration;
20+
import com.cloud.utils.exception.CloudRuntimeException;
21+
import org.apache.log4j.Logger;
22+
23+
import java.io.InputStream;
24+
import java.sql.Connection;
25+
26+
public class Upgrade41900to41910 implements DbUpgrade, DbUpgradeSystemVmTemplate {
27+
final static Logger LOG = Logger.getLogger(Upgrade41900to41910.class);
28+
private SystemVmTemplateRegistration systemVmTemplateRegistration;
29+
30+
@Override
31+
public String[] getUpgradableVersionRange() {
32+
return new String[] {"4.19.0.0", "4.19.1.0"};
33+
}
34+
35+
@Override
36+
public String getUpgradedVersion() {
37+
return "4.19.1.0";
38+
}
39+
40+
@Override
41+
public boolean supportsRollingUpgrade() {
42+
return false;
43+
}
44+
45+
@Override
46+
public InputStream[] getPrepareScripts() {
47+
final String scriptFile = "META-INF/db/schema-41900to41910.sql";
48+
final InputStream script = Thread.currentThread().getContextClassLoader().getResourceAsStream(scriptFile);
49+
if (script == null) {
50+
throw new CloudRuntimeException("Unable to find " + scriptFile);
51+
}
52+
53+
return new InputStream[] {script};
54+
}
55+
56+
@Override
57+
public void performDataMigration(Connection conn) {
58+
addIndexes(conn);
59+
}
60+
61+
@Override
62+
public InputStream[] getCleanupScripts() {
63+
final String scriptFile = "META-INF/db/schema-41900to41910-cleanup.sql";
64+
final InputStream script = Thread.currentThread().getContextClassLoader().getResourceAsStream(scriptFile);
65+
if (script == null) {
66+
throw new CloudRuntimeException("Unable to find " + scriptFile);
67+
}
68+
69+
return new InputStream[] {script};
70+
}
71+
72+
private void initSystemVmTemplateRegistration() {
73+
systemVmTemplateRegistration = new SystemVmTemplateRegistration("");
74+
}
75+
76+
@Override
77+
public void updateSystemVmTemplates(Connection conn) {
78+
LOG.debug("Updating System Vm template IDs");
79+
initSystemVmTemplateRegistration();
80+
try {
81+
systemVmTemplateRegistration.updateSystemVmTemplates(conn);
82+
} catch (Exception e) {
83+
throw new CloudRuntimeException("Failed to find / register SystemVM template(s)");
84+
}
85+
}
86+
87+
private void addIndexes(Connection conn) {
88+
DbUpgradeUtils.addIndexIfNeeded(conn, "vm_stats", "vm_id", "timestamp");
89+
DbUpgradeUtils.addIndexIfNeeded(conn, "vm_stats", "timestamp");
90+
}
91+
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
-- Licensed to the Apache Software Foundation (ASF) under one
2+
-- or more contributor license agreements. See the NOTICE file
3+
-- distributed with this work for additional information
4+
-- regarding copyright ownership. The ASF licenses this file
5+
-- to you under the Apache License, Version 2.0 (the
6+
-- "License"); you may not use this file except in compliance
7+
-- with the License. You may obtain a copy of the License at
8+
--
9+
-- http://www.apache.org/licenses/LICENSE-2.0
10+
--
11+
-- Unless required by applicable law or agreed to in writing,
12+
-- software distributed under the License is distributed on an
13+
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
-- KIND, either express or implied. See the License for the
15+
-- specific language governing permissions and limitations
16+
-- under the License.
17+
18+
--;
19+
-- Schema upgrade cleanup from 4.19.0.0 to 4.19.1.0
20+
--;
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
-- Licensed to the Apache Software Foundation (ASF) under one
2+
-- or more contributor license agreements. See the NOTICE file
3+
-- distributed with this work for additional information
4+
-- regarding copyright ownership. The ASF licenses this file
5+
-- to you under the Apache License, Version 2.0 (the
6+
-- "License"); you may not use this file except in compliance
7+
-- with the License. You may obtain a copy of the License at
8+
--
9+
-- http://www.apache.org/licenses/LICENSE-2.0
10+
--
11+
-- Unless required by applicable law or agreed to in writing,
12+
-- software distributed under the License is distributed on an
13+
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
-- KIND, either express or implied. See the License for the
15+
-- specific language governing permissions and limitations
16+
-- under the License.
17+
18+
--;
19+
-- Schema upgrade from 4.19.0.0 to 4.19.1.0
20+
--;

0 commit comments

Comments
 (0)