From 8e7c1f7bd7b0b0f44acd8eadd4334def67531dc5 Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhishek.mrt22@gmail.com>
Date: Wed, 26 Apr 2023 22:05:21 +0530
Subject: [PATCH] schema: acquired for console_session turned into datetime
 (#7414)

* schema: acquire for console_session turned into datetime

Fixes #7159

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

* fix

* Update schema-41810to41900.sql

* Update schema-41810to41900.sql

* fix

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

---------

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
---
 .../src/main/java/com/cloud/vm/ConsoleSessionVO.java   |  9 +++++----
 .../java/com/cloud/vm/dao/ConsoleSessionDaoImpl.java   | 10 +++++-----
 .../main/resources/META-INF/db/schema-41810to41900.sql |  4 ++++
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/engine/schema/src/main/java/com/cloud/vm/ConsoleSessionVO.java b/engine/schema/src/main/java/com/cloud/vm/ConsoleSessionVO.java
index 4b476af463c..53e98226db8 100644
--- a/engine/schema/src/main/java/com/cloud/vm/ConsoleSessionVO.java
+++ b/engine/schema/src/main/java/com/cloud/vm/ConsoleSessionVO.java
@@ -19,13 +19,14 @@
 
 package com.cloud.vm;
 
+import java.util.Date;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Table;
-import java.util.Date;
 
 @Entity
 @Table(name = "console_session")
@@ -55,7 +56,7 @@ public class ConsoleSessionVO {
     private long hostId;
 
     @Column(name = "acquired")
-    private boolean acquired;
+    private Date acquired;
 
     @Column(name = "removed")
     private Date removed;
@@ -124,11 +125,11 @@ public class ConsoleSessionVO {
         this.removed = removed;
     }
 
-    public boolean isAcquired() {
+    public Date getAcquired() {
         return acquired;
     }
 
-    public void setAcquired(boolean acquired) {
+    public void setAcquired(Date acquired) {
         this.acquired = acquired;
     }
 }
diff --git a/engine/schema/src/main/java/com/cloud/vm/dao/ConsoleSessionDaoImpl.java b/engine/schema/src/main/java/com/cloud/vm/dao/ConsoleSessionDaoImpl.java
index f2f4703a2a2..8e7e229622e 100644
--- a/engine/schema/src/main/java/com/cloud/vm/dao/ConsoleSessionDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/vm/dao/ConsoleSessionDaoImpl.java
@@ -19,12 +19,12 @@
 
 package com.cloud.vm.dao;
 
+import java.util.Date;
+
+import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
 import com.cloud.vm.ConsoleSessionVO;
-import com.cloud.utils.db.GenericDaoBase;
-
-import java.util.Date;
 
 public class ConsoleSessionDaoImpl extends GenericDaoBase<ConsoleSessionVO, Long> implements ConsoleSessionDao {
 
@@ -48,7 +48,7 @@ public class ConsoleSessionDaoImpl extends GenericDaoBase<ConsoleSessionVO, Long
         if (consoleSessionVO == null) {
             return false;
         }
-        return !consoleSessionVO.isAcquired();
+        return consoleSessionVO.getAcquired() == null;
     }
 
     @Override
@@ -61,7 +61,7 @@ public class ConsoleSessionDaoImpl extends GenericDaoBase<ConsoleSessionVO, Long
     @Override
     public void acquireSession(String sessionUuid) {
         ConsoleSessionVO consoleSessionVO = findByUuid(sessionUuid);
-        consoleSessionVO.setAcquired(true);
+        consoleSessionVO.setAcquired(new Date());
         update(consoleSessionVO.getId(), consoleSessionVO);
     }
 
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41810to41900.sql b/engine/schema/src/main/resources/META-INF/db/schema-41810to41900.sql
index 541d3dbacac..23d607768ac 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-41810to41900.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-41810to41900.sql
@@ -131,3 +131,7 @@ CREATE VIEW `cloud`.`async_job_view` AS
             left join
         `cloud`.`autoscale_vmgroups` ON async_job.instance_id = autoscale_vmgroups.id;
 
+-- Invalidate existing console_session records
+UPDATE `cloud`.`console_session` SET removed=now();
+-- Modify acquired column in console_session to datetime type
+ALTER TABLE `cloud`.`console_session` DROP `acquired`, ADD `acquired` datetime COMMENT 'When the session was acquired' AFTER `host_id`;