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

Merge remote-tracking branch 'apache/4.16' into 4.17

This commit is contained in:
Abhishek Kumar 2022-09-13 14:15:38 +05:30
parent e8b249f11d 77df050160
commit fa34d68766
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
framework/db/src/main/java/com/cloud/utils/db/ConnectionConcierge.java
View File

@ -174,7 +174,7 @@ public class ConnectionConcierge {
Connection conn = TransactionLegacy.getStandaloneConnection();
if (conn == null) {
return "Unable to get anotehr db connection";
return "Unable to get another db connection";
}
concierge.reset(conn);
@ -198,9 +198,13 @@ public class ConnectionConcierge {
protected void runInContext() {
s_logger.trace("connection concierge keep alive task");
for (Map.Entry<String, ConnectionConcierge> entry : _conns.entrySet()) {
String name = entry.getKey();
ConnectionConcierge concierge = entry.getValue();
if (concierge.keepAlive()) {
testValidity(entry.getKey(), entry.getValue().conn());
if (testValidity(name, concierge.conn()) != null) {
s_logger.info("Resetting DB connection " + name);
resetConnection(name);
}
}
}
}