etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix compile issues in mysql-ha plugin

This commit is contained in:
Hugo Trippaers 2014-03-12 09:03:58 +01:00
parent ec4db7bbff
commit f3668453f0
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/database/mysql-ha/pom.xml
View File

@ -15,8 +15,8 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
<version>4.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
<version>4.3.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
<dependency>

21
plugins/database/mysql-ha/src/com/cloud/utils/db/StaticStrategy.java
View File

@ -34,14 +34,17 @@ public class StaticStrategy implements BalanceStrategy {
public StaticStrategy() {
}
@Override
public void destroy() {
// we don't have anything to clean up
}
@Override
public void init(Connection conn, Properties props) throws SQLException {
// we don't have anything to initialize
}
@Override
public ConnectionImpl pickConnection(LoadBalancingConnectionProxy proxy,
List<String> configuredHosts, Map<String, ConnectionImpl> liveConnections, long[] responseTimes,
int numRetries) throws SQLException {
@ -51,13 +54,13 @@ public class StaticStrategy implements BalanceStrategy {
List<String> whiteList = new ArrayList<String>(numHosts);
whiteList.addAll(configuredHosts);
Map<String, Long> blackList = proxy.getGlobalBlacklist();
whiteList.removeAll(blackList.keySet());
Map<String, Integer> whiteListMap = this.getArrayIndexMap(whiteList);
Map<String, Integer> whiteListMap = getArrayIndexMap(whiteList);
for (int attempts = 0; attempts < numRetries;) {
if(whiteList.size() == 0){
@ -81,7 +84,7 @@ public class StaticStrategy implements BalanceStrategy {
// exclude this host from being picked again
if (whiteListIndex != null) {
whiteList.remove(whiteListIndex.intValue());
whiteListMap = this.getArrayIndexMap(whiteList);
whiteListMap = getArrayIndexMap(whiteList);
}
proxy.addToGlobalBlacklist( hostPortSpec );
@ -98,7 +101,7 @@ public class StaticStrategy implements BalanceStrategy {
blackList = proxy.getGlobalBlacklist();
whiteList.removeAll(blackList.keySet());
whiteListMap = this.getArrayIndexMap(whiteList);
whiteListMap = getArrayIndexMap(whiteList);
}
continue;
@ -107,7 +110,7 @@ public class StaticStrategy implements BalanceStrategy {
throw sqlEx;
}
}
return conn;
}
@ -117,14 +120,14 @@ public class StaticStrategy implements BalanceStrategy {
return null; // we won't get here, compiler can't tell
}
private Map<String, Integer> getArrayIndexMap(List<String> l) {
Map<String, Integer> m = new HashMap<String, Integer>(l.size());
for (int i = 0; i < l.size(); i++) {
m.put(l.get(i), Integer.valueOf(i));
}
return m;
}
}