GutoVeronezi commented on code in PR #7132:
URL: https://github.com/apache/cloudstack/pull/7132#discussion_r1090861795
##########
server/src/main/java/org/apache/cloudstack/consoleproxy/ConsoleAccessManagerImpl.java:
##########
@@ -100,9 +110,63 @@ public class ConsoleAccessManagerImpl extends ManagerBase
implements ConsoleAcce
@Override
public boolean configure(String name, Map<String, Object> params) throws
ConfigurationException {
ConsoleAccessManagerImpl.secretKeysManager = keysManager;
+ executorService = Executors.newScheduledThreadPool(1, new
NamedThreadFactory("ConsoleSession-Scavenger"));
return super.configure(name, params);
}
+ @Override
+ public boolean start() {
+ int consoleCleanupInterval =
ConsoleAccessManager.ConsoleSessionCleanupInterval.value();
+ if (consoleCleanupInterval > 0) {
+ s_logger.info(String.format("The ConsoleSessionCleanupTask will
run every %s hours", consoleCleanupInterval));
+ executorService.scheduleWithFixedDelay(new
ConsoleSessionCleanupTask(), consoleCleanupInterval, consoleCleanupInterval,
TimeUnit.HOURS);
+ }
+ return true;
+ }
+
+ @Override
+ public String getConfigComponentName() {
+ return ConsoleAccessManager.class.getName();
+ }
+
+ @Override
+ public ConfigKey<?>[] getConfigKeys() {
+ return new ConfigKey[] {
+ ConsoleAccessManager.ConsoleSessionCleanupInterval,
+ ConsoleAccessManager.ConsoleSessionCleanupRetentionHours
+ };
+ }
+
+ public class ConsoleSessionCleanupTask extends ManagedContextRunnable {
+ @Override
+ protected void runInContext() {
+ final GlobalLock gcLock =
GlobalLock.getInternLock("ConsoleSession.Cleanup.Lock");
+ try {
+ if (gcLock.lock(3)) {
+ try {
+ reallyRun();
+ } finally {
+ gcLock.unlock();
+ }
+ }
+ } finally {
+ gcLock.releaseRef();
+ }
+ }
+
+ private void reallyRun() {
+ if (s_logger.isDebugEnabled()) {
+ s_logger.debug("Starting ConsoleSessionCleanupTask...");
+ }
+ Integer retentionHours =
ConsoleAccessManager.ConsoleSessionCleanupRetentionHours.value();
+ Date dateBefore =
DateTime.now().minusHours(retentionHours).toDate();
+ int sessionsExpunged =
consoleSessionDao.expungeSessionsOlderThanDate(dateBefore);
+ if (sessionsExpunged > 0 && s_logger.isDebugEnabled()) {
+ s_logger.info(String.format("Expunged %s removed console
session records", sessionsExpunged));
Review Comment:
It is validating if debug is enabled (`s_logger.isDebugEnabled()`); however,
the log is in info.
##########
server/src/main/java/org/apache/cloudstack/consoleproxy/ConsoleAccessManagerImpl.java:
##########
@@ -100,9 +110,63 @@ public class ConsoleAccessManagerImpl extends ManagerBase
implements ConsoleAcce
@Override
public boolean configure(String name, Map<String, Object> params) throws
ConfigurationException {
ConsoleAccessManagerImpl.secretKeysManager = keysManager;
+ executorService = Executors.newScheduledThreadPool(1, new
NamedThreadFactory("ConsoleSession-Scavenger"));
return super.configure(name, params);
}
+ @Override
+ public boolean start() {
+ int consoleCleanupInterval =
ConsoleAccessManager.ConsoleSessionCleanupInterval.value();
+ if (consoleCleanupInterval > 0) {
+ s_logger.info(String.format("The ConsoleSessionCleanupTask will
run every %s hours", consoleCleanupInterval));
+ executorService.scheduleWithFixedDelay(new
ConsoleSessionCleanupTask(), consoleCleanupInterval, consoleCleanupInterval,
TimeUnit.HOURS);
+ }
+ return true;
+ }
+
+ @Override
+ public String getConfigComponentName() {
+ return ConsoleAccessManager.class.getName();
+ }
+
+ @Override
+ public ConfigKey<?>[] getConfigKeys() {
+ return new ConfigKey[] {
+ ConsoleAccessManager.ConsoleSessionCleanupInterval,
+ ConsoleAccessManager.ConsoleSessionCleanupRetentionHours
+ };
+ }
+
+ public class ConsoleSessionCleanupTask extends ManagedContextRunnable {
+ @Override
+ protected void runInContext() {
+ final GlobalLock gcLock =
GlobalLock.getInternLock("ConsoleSession.Cleanup.Lock");
+ try {
+ if (gcLock.lock(3)) {
+ try {
+ reallyRun();
+ } finally {
+ gcLock.unlock();
+ }
+ }
+ } finally {
+ gcLock.releaseRef();
+ }
+ }
+
+ private void reallyRun() {
+ if (s_logger.isDebugEnabled()) {
+ s_logger.debug("Starting ConsoleSessionCleanupTask...");
+ }
+ Integer retentionHours =
ConsoleAccessManager.ConsoleSessionCleanupRetentionHours.value();
+ Date dateBefore =
DateTime.now().minusHours(retentionHours).toDate();
+ int sessionsExpunged =
consoleSessionDao.expungeSessionsOlderThanDate(dateBefore);
+ if (sessionsExpunged > 0 && s_logger.isDebugEnabled()) {
+ s_logger.info(String.format("Expunged %s removed console
session records", sessionsExpunged));
Review Comment:
We could also add a log when there is no console sessions to expunge.
##########
server/src/main/java/org/apache/cloudstack/consoleproxy/ConsoleAccessManagerImpl.java:
##########
@@ -100,9 +110,63 @@ public class ConsoleAccessManagerImpl extends ManagerBase
implements ConsoleAcce
@Override
public boolean configure(String name, Map<String, Object> params) throws
ConfigurationException {
ConsoleAccessManagerImpl.secretKeysManager = keysManager;
+ executorService = Executors.newScheduledThreadPool(1, new
NamedThreadFactory("ConsoleSession-Scavenger"));
return super.configure(name, params);
}
+ @Override
+ public boolean start() {
+ int consoleCleanupInterval =
ConsoleAccessManager.ConsoleSessionCleanupInterval.value();
+ if (consoleCleanupInterval > 0) {
+ s_logger.info(String.format("The ConsoleSessionCleanupTask will
run every %s hours", consoleCleanupInterval));
+ executorService.scheduleWithFixedDelay(new
ConsoleSessionCleanupTask(), consoleCleanupInterval, consoleCleanupInterval,
TimeUnit.HOURS);
+ }
+ return true;
+ }
+
+ @Override
+ public String getConfigComponentName() {
+ return ConsoleAccessManager.class.getName();
+ }
+
+ @Override
+ public ConfigKey<?>[] getConfigKeys() {
+ return new ConfigKey[] {
+ ConsoleAccessManager.ConsoleSessionCleanupInterval,
+ ConsoleAccessManager.ConsoleSessionCleanupRetentionHours
+ };
+ }
+
+ public class ConsoleSessionCleanupTask extends ManagedContextRunnable {
+ @Override
+ protected void runInContext() {
+ final GlobalLock gcLock =
GlobalLock.getInternLock("ConsoleSession.Cleanup.Lock");
+ try {
+ if (gcLock.lock(3)) {
+ try {
+ reallyRun();
+ } finally {
+ gcLock.unlock();
+ }
+ }
+ } finally {
+ gcLock.releaseRef();
+ }
+ }
+
+ private void reallyRun() {
+ if (s_logger.isDebugEnabled()) {
+ s_logger.debug("Starting ConsoleSessionCleanupTask...");
+ }
+ Integer retentionHours =
ConsoleAccessManager.ConsoleSessionCleanupRetentionHours.value();
+ Date dateBefore =
DateTime.now().minusHours(retentionHours).toDate();
Review Comment:
We could add a log in debug informing the retention and the date limit.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
