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

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>
This commit is contained in:
Abhishek Kumar 2023-04-26 22:05:21 +05:30 committed by GitHub
parent 575ffc6acc
commit 8e7c1f7bd7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
engine/schema/src/main/java/com/cloud/vm/ConsoleSessionVO.java
View File

@ -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;
}
}

10
engine/schema/src/main/java/com/cloud/vm/dao/ConsoleSessionDaoImpl.java
View File

@ -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);
}

4
engine/schema/src/main/resources/META-INF/db/schema-41810to41900.sql
View File

@ -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`;