Skip to content

Async jobs add endtime #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ernjvr wants to merge 14 commits into from
Closed

Async jobs add endtime #16

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f3f2adb
initial commit: api, service, db access
ernjvr Jun 20, 2018
c81989d
add AsyncJobJoinDaoTest
ernjvr Jun 20, 2018
8514602
added licence to AsyncJobJoinDaoTest
ernjvr Jun 21, 2018
74b30a8
refactor AsyncJobJoinDaoTest
ernjvr Jun 22, 2018
9c6ff0d
add marvin test
ernjvr Jun 25, 2018
98ddc26
include removed in findById search
ernjvr Jul 3, 2018
f685024
Override findById to exclude 'removed IS NULL' sql clause. Rename API…
ernjvr Jul 3, 2018
58044ee
revert to findById
ernjvr Jul 4, 2018
a12b5ff
revert findById override; fix nullPointer during cleanupLeftOverJobs;…
ernjvr Jul 4, 2018
5de2bc6
add sql update for 41110to41200 upgrade
ernjvr Jul 5, 2018
d8fca2d
refactored test case to compare api field value against db column value
ernjvr Jul 9, 2018
3020cf3
job status check added
ernjvr Jul 9, 2018
6a36f78
formatting and wording changes
ernjvr Jul 11, 2018
4ac5796
pylint changes
ernjvr Jul 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add sql update for 41110to41200 upgrade
  • Loading branch information
@ernjvr
ernjvr committed Jul 5, 2018
commit 5de2bc60b5db6c5806a5673a59882dca32ad3465
4 changes: 3 additions & 1 deletion engine/schema/src/main/resources/META-INF/db/schema-41110to41200.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,6 @@ ALTER TABLE `vlan` CHANGE `description` `ip4_range` varchar(255);
-- We are only adding the permission to the default rules. Any custom rule must be configured by the root admin.
INSERT INTO `cloud`.`role_permissions` (`uuid`, `role_id`, `rule`, `permission`, `sort_order`) values (UUID(), 2, 'moveNetworkAclItem', 'ALLOW', 100) ON DUPLICATE KEY UPDATE rule=rule;
INSERT INTO `cloud`.`role_permissions` (`uuid`, `role_id`, `rule`, `permission`, `sort_order`) values (UUID(), 3, 'moveNetworkAclItem', 'ALLOW', 302) ON DUPLICATE KEY UPDATE rule=rule;
INSERT INTO `cloud`.`role_permissions` (`uuid`, `role_id`, `rule`, `permission`, `sort_order`) values (UUID(), 4, 'moveNetworkAclItem', 'ALLOW', 260) ON DUPLICATE KEY UPDATE rule=rule;
INSERT INTO `cloud`.`role_permissions` (`uuid`, `role_id`, `rule`, `permission`, `sort_order`) values (UUID(), 4, 'moveNetworkAclItem', 'ALLOW', 260) ON DUPLICATE KEY UPDATE rule=rule;

UPDATE `cloud`.`async_job` SET `removed` = now() WHERE `removed` IS NULL;
1 change: 0 additions & 1 deletion framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/dao/AsyncJobDaoImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
import com.cloud.utils.db.SearchCriteria.Op;
import com.cloud.utils.db.TransactionLegacy;


public class AsyncJobDaoImpl extends GenericDaoBase<AsyncJobVO, Long> implements AsyncJobDao {
private static final Logger s_logger = Logger.getLogger(AsyncJobDaoImpl.class.getName());

Expand Down