From 17fd2aa78d688bf4be11506dcca64ac49e47882e Mon Sep 17 00:00:00 2001 From: Adrian Damian Date: Wed, 8 Nov 2023 11:46:07 -0800 Subject: [PATCH 1/4] Support for recursive props --- vault/build.gradle | 2 +- .../vault/RecursiveNodeDeleteTest.java | 104 ++++++++++++++++ .../vault/RecursiveNodePropsTest.java | 104 ++++++++++++++++ .../opencadc/vault/VosiCapabilitiesTest.java | 4 +- .../vault/RecursiveNodePropsJobManager.java | 113 ++++++++++++++++++ vault/src/main/webapp/WEB-INF/web.xml | 42 ++++++- vault/src/main/webapp/capabilities.xml | 12 +- 7 files changed, 372 insertions(+), 9 deletions(-) create mode 100644 vault/src/intTest/java/org/opencadc/vault/RecursiveNodeDeleteTest.java create mode 100644 vault/src/intTest/java/org/opencadc/vault/RecursiveNodePropsTest.java create mode 100644 vault/src/main/java/org/opencadc/vault/RecursiveNodePropsJobManager.java diff --git a/vault/build.gradle b/vault/build.gradle index 7fd069259..2952fd263 100644 --- a/vault/build.gradle +++ b/vault/build.gradle @@ -35,7 +35,7 @@ dependencies { compile 'org.opencadc:cadc-gms:[1.0.5,)' compile 'org.opencadc:cadc-rest:[1.3.16,)' compile 'org.opencadc:cadc-vos:[2.0,)' - compile 'org.opencadc:cadc-vos-server-alt:[2.0,)' + compile 'org.opencadc:cadc-vos-server:[2.0.1,)' compile 'org.opencadc:cadc-vosi:[1.3.2,)' compile 'org.opencadc:cadc-uws:[1.0,)' compile 'org.opencadc:cadc-uws-server:[1.2.19,)' diff --git a/vault/src/intTest/java/org/opencadc/vault/RecursiveNodeDeleteTest.java b/vault/src/intTest/java/org/opencadc/vault/RecursiveNodeDeleteTest.java new file mode 100644 index 000000000..e66d0ed0a --- /dev/null +++ b/vault/src/intTest/java/org/opencadc/vault/RecursiveNodeDeleteTest.java @@ -0,0 +1,104 @@ +/* +************************************************************************ +******************* CANADIAN ASTRONOMY DATA CENTRE ******************* +************** CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES ************** +* +* (c) 2023. (c) 2023. +* Government of Canada Gouvernement du Canada +* National Research Council Conseil national de recherches +* Ottawa, Canada, K1A 0R6 Ottawa, Canada, K1A 0R6 +* All rights reserved Tous droits réservés +* +* NRC disclaims any warranties, Le CNRC dénie toute garantie +* expressed, implied, or énoncée, implicite ou légale, +* statutory, of any kind with de quelque nature que ce +* respect to the software, soit, concernant le logiciel, +* including without limitation y compris sans restriction +* any warranty of merchantability toute garantie de valeur +* or fitness for a particular marchande ou de pertinence +* purpose. NRC shall not be pour un usage particulier. +* liable in any event for any Le CNRC ne pourra en aucun cas +* damages, whether direct or être tenu responsable de tout +* indirect, special or general, dommage, direct ou indirect, +* consequential or incidental, particulier ou général, +* arising from the use of the accessoire ou fortuit, résultant +* software. Neither the name de l'utilisation du logiciel. Ni +* of the National Research le nom du Conseil National de +* Council of Canada nor the Recherches du Canada ni les noms +* names of its contributors may de ses participants ne peuvent +* be used to endorse or promote être utilisés pour approuver ou +* products derived from this promouvoir les produits dérivés +* software without specific prior de ce logiciel sans autorisation +* written permission. préalable et particulière +* par écrit. +* +* This file is part of the Ce fichier fait partie du projet +* OpenCADC project. OpenCADC. +* +* OpenCADC is free software: OpenCADC est un logiciel libre ; +* you can redistribute it and/or vous pouvez le redistribuer ou le +* modify it under the terms of modifier suivant les termes de +* the GNU Affero General Public la “GNU Affero General Public +* License as published by the License” telle que publiée +* Free Software Foundation, par la Free Software Foundation +* either version 3 of the : soit la version 3 de cette +* License, or (at your option) licence, soit (à votre gré) +* any later version. toute version ultérieure. +* +* OpenCADC is distributed in the OpenCADC est distribué +* hope that it will be useful, dans l’espoir qu’il vous +* but WITHOUT ANY WARRANTY; sera utile, mais SANS AUCUNE +* without even the implied GARANTIE : sans même la garantie +* warranty of MERCHANTABILITY implicite de COMMERCIALISABILITÉ +* or FITNESS FOR A PARTICULAR ni d’ADÉQUATION À UN OBJECTIF +* PURPOSE. See the GNU Affero PARTICULIER. Consultez la Licence +* General Public License for Générale Publique GNU Affero +* more details. pour plus de détails. +* +* You should have received Vous devriez avoir reçu une +* a copy of the GNU Affero copie de la Licence Générale +* General Public License along Publique GNU Affero avec +* with OpenCADC. If not, see OpenCADC ; si ce n’est +* . pas le cas, consultez : +* . +* +************************************************************************ +*/ + +package org.opencadc.vault; + +import ca.nrc.cadc.util.FileUtil; +import ca.nrc.cadc.util.Log4jInit; +import java.io.File; +import java.net.URI; +import org.apache.log4j.Level; +import org.apache.log4j.Logger; +import org.opencadc.gms.GroupURI; + +/** + * Test the async endpoint. + * + * @author pdowler + */ +public class RecursiveNodeDeleteTest extends org.opencadc.conformance.vos.RecursiveNodeDeleteTest { + private static final Logger log = Logger.getLogger(RecursiveNodeDeleteTest.class); + + static { + Log4jInit.setLevel("org.opencadc.conformance.vos", Level.DEBUG); + Log4jInit.setLevel("org.opencadc.vospace", Level.INFO); + //Log4jInit.setLevel("ca.nrc.cadc.auth", Level.DEBUG); + } + + private static File ADMIN_CERT = FileUtil.getFileFromResource("vault-test.pem", RecursiveNodeDeleteTest.class); + + public RecursiveNodeDeleteTest() { + super(URI.create("ivo://opencadc.org/vault"), ADMIN_CERT); + + File altCert = FileUtil.getFileFromResource("vault-auth-test.pem", RecursiveNodeDeleteTest.class); + enablePermissionTests(new GroupURI(URI.create("ivo://cadc.nrc.ca/gms?opencadc-vospace-test")), altCert); + + // vault does not check the actual groups in the permission props tests, hence they can be made up. + enablePermissionPropsTest(new GroupURI(URI.create("ivo://myauth/gms?gr1")), new GroupURI(URI.create("ivo://myauth/gms?gr2"))); + } + +} diff --git a/vault/src/intTest/java/org/opencadc/vault/RecursiveNodePropsTest.java b/vault/src/intTest/java/org/opencadc/vault/RecursiveNodePropsTest.java new file mode 100644 index 000000000..67e62e801 --- /dev/null +++ b/vault/src/intTest/java/org/opencadc/vault/RecursiveNodePropsTest.java @@ -0,0 +1,104 @@ +/* +************************************************************************ +******************* CANADIAN ASTRONOMY DATA CENTRE ******************* +************** CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES ************** +* +* (c) 2023. (c) 2023. +* Government of Canada Gouvernement du Canada +* National Research Council Conseil national de recherches +* Ottawa, Canada, K1A 0R6 Ottawa, Canada, K1A 0R6 +* All rights reserved Tous droits réservés +* +* NRC disclaims any warranties, Le CNRC dénie toute garantie +* expressed, implied, or énoncée, implicite ou légale, +* statutory, of any kind with de quelque nature que ce +* respect to the software, soit, concernant le logiciel, +* including without limitation y compris sans restriction +* any warranty of merchantability toute garantie de valeur +* or fitness for a particular marchande ou de pertinence +* purpose. NRC shall not be pour un usage particulier. +* liable in any event for any Le CNRC ne pourra en aucun cas +* damages, whether direct or être tenu responsable de tout +* indirect, special or general, dommage, direct ou indirect, +* consequential or incidental, particulier ou général, +* arising from the use of the accessoire ou fortuit, résultant +* software. Neither the name de l'utilisation du logiciel. Ni +* of the National Research le nom du Conseil National de +* Council of Canada nor the Recherches du Canada ni les noms +* names of its contributors may de ses participants ne peuvent +* be used to endorse or promote être utilisés pour approuver ou +* products derived from this promouvoir les produits dérivés +* software without specific prior de ce logiciel sans autorisation +* written permission. préalable et particulière +* par écrit. +* +* This file is part of the Ce fichier fait partie du projet +* OpenCADC project. OpenCADC. +* +* OpenCADC is free software: OpenCADC est un logiciel libre ; +* you can redistribute it and/or vous pouvez le redistribuer ou le +* modify it under the terms of modifier suivant les termes de +* the GNU Affero General Public la “GNU Affero General Public +* License as published by the License” telle que publiée +* Free Software Foundation, par la Free Software Foundation +* either version 3 of the : soit la version 3 de cette +* License, or (at your option) licence, soit (à votre gré) +* any later version. toute version ultérieure. +* +* OpenCADC is distributed in the OpenCADC est distribué +* hope that it will be useful, dans l’espoir qu’il vous +* but WITHOUT ANY WARRANTY; sera utile, mais SANS AUCUNE +* without even the implied GARANTIE : sans même la garantie +* warranty of MERCHANTABILITY implicite de COMMERCIALISABILITÉ +* or FITNESS FOR A PARTICULAR ni d’ADÉQUATION À UN OBJECTIF +* PURPOSE. See the GNU Affero PARTICULIER. Consultez la Licence +* General Public License for Générale Publique GNU Affero +* more details. pour plus de détails. +* +* You should have received Vous devriez avoir reçu une +* a copy of the GNU Affero copie de la Licence Générale +* General Public License along Publique GNU Affero avec +* with OpenCADC. If not, see OpenCADC ; si ce n’est +* . pas le cas, consultez : +* . +* +************************************************************************ +*/ + +package org.opencadc.vault; + +import ca.nrc.cadc.util.FileUtil; +import ca.nrc.cadc.util.Log4jInit; +import java.io.File; +import java.net.URI; +import org.apache.log4j.Level; +import org.apache.log4j.Logger; +import org.opencadc.gms.GroupURI; + +/** + * Test the async endpoint. + * + * @author pdowler + */ +public class RecursiveNodePropsTest extends org.opencadc.conformance.vos.RecursiveNodePropsTest { + private static final Logger log = Logger.getLogger(RecursiveNodePropsTest.class); + + static { + Log4jInit.setLevel("org.opencadc.conformance.vos", Level.DEBUG); + Log4jInit.setLevel("org.opencadc.vospace", Level.INFO); + //Log4jInit.setLevel("ca.nrc.cadc.auth", Level.DEBUG); + } + + private static File ADMIN_CERT = FileUtil.getFileFromResource("vault-test.pem", RecursiveNodePropsTest.class); + + public RecursiveNodePropsTest() { + super(URI.create("ivo://opencadc.org/vault"), ADMIN_CERT); + + File altCert = FileUtil.getFileFromResource("vault-auth-test.pem", RecursiveNodePropsTest.class); + enablePermissionTests(new GroupURI(URI.create("ivo://cadc.nrc.ca/gms?opencadc-vospace-test")), altCert); + + // vault does not check the actual groups in the permission props tests, hence they can be made up. + enablePermissionPropsTest(new GroupURI(URI.create("ivo://myauth/gms?gr1")), new GroupURI(URI.create("ivo://myauth/gms?gr2"))); + } + +} diff --git a/vault/src/intTest/java/org/opencadc/vault/VosiCapabilitiesTest.java b/vault/src/intTest/java/org/opencadc/vault/VosiCapabilitiesTest.java index af49d8548..fb88ef76e 100644 --- a/vault/src/intTest/java/org/opencadc/vault/VosiCapabilitiesTest.java +++ b/vault/src/intTest/java/org/opencadc/vault/VosiCapabilitiesTest.java @@ -85,8 +85,8 @@ public class VosiCapabilitiesTest extends CapabilitiesTest { private static final Logger log = Logger.getLogger(VosiCapabilitiesTest.class); static { - Log4jInit.setLevel("ca.nrc.cadc.vosi", Level.INFO); - Log4jInit.setLevel("org.opencadc.vault", Level.INFO); + Log4jInit.setLevel("ca.nrc.cadc.vosi", Level.DEBUG); + Log4jInit.setLevel("org.opencadc.vault", Level.DEBUG); } public static final URI VAULT_SERVICE_ID = URI.create("ivo://opencadc.org/vault"); diff --git a/vault/src/main/java/org/opencadc/vault/RecursiveNodePropsJobManager.java b/vault/src/main/java/org/opencadc/vault/RecursiveNodePropsJobManager.java new file mode 100644 index 000000000..1964d0bef --- /dev/null +++ b/vault/src/main/java/org/opencadc/vault/RecursiveNodePropsJobManager.java @@ -0,0 +1,113 @@ +/* +************************************************************************ +******************* CANADIAN ASTRONOMY DATA CENTRE ******************* +************** CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES ************** +* +* (c) 2023. (c) 2023. +* Government of Canada Gouvernement du Canada +* National Research Council Conseil national de recherches +* Ottawa, Canada, K1A 0R6 Ottawa, Canada, K1A 0R6 +* All rights reserved Tous droits réservés +* +* NRC disclaims any warranties, Le CNRC dénie toute garantie +* expressed, implied, or énoncée, implicite ou légale, +* statutory, of any kind with de quelque nature que ce +* respect to the software, soit, concernant le logiciel, +* including without limitation y compris sans restriction +* any warranty of merchantability toute garantie de valeur +* or fitness for a particular marchande ou de pertinence +* purpose. NRC shall not be pour un usage particulier. +* liable in any event for any Le CNRC ne pourra en aucun cas +* damages, whether direct or être tenu responsable de tout +* indirect, special or general, dommage, direct ou indirect, +* consequential or incidental, particulier ou général, +* arising from the use of the accessoire ou fortuit, résultant +* software. Neither the name de l'utilisation du logiciel. Ni +* of the National Research le nom du Conseil National de +* Council of Canada nor the Recherches du Canada ni les noms +* names of its contributors may de ses participants ne peuvent +* be used to endorse or promote être utilisés pour approuver ou +* products derived from this promouvoir les produits dérivés +* software without specific prior de ce logiciel sans autorisation +* written permission. préalable et particulière +* par écrit. +* +* This file is part of the Ce fichier fait partie du projet +* OpenCADC project. OpenCADC. +* +* OpenCADC is free software: OpenCADC est un logiciel libre ; +* you can redistribute it and/or vous pouvez le redistribuer ou le +* modify it under the terms of modifier suivant les termes de +* the GNU Affero General Public la “GNU Affero General Public +* License as published by the License” telle que publiée +* Free Software Foundation, par la Free Software Foundation +* either version 3 of the : soit la version 3 de cette +* License, or (at your option) licence, soit (à votre gré) +* any later version. toute version ultérieure. +* +* OpenCADC is distributed in the OpenCADC est distribué +* hope that it will be useful, dans l’espoir qu’il vous +* but WITHOUT ANY WARRANTY; sera utile, mais SANS AUCUNE +* without even the implied GARANTIE : sans même la garantie +* warranty of MERCHANTABILITY implicite de COMMERCIALISABILITÉ +* or FITNESS FOR A PARTICULAR ni d’ADÉQUATION À UN OBJECTIF +* PURPOSE. See the GNU Affero PARTICULIER. Consultez la Licence +* General Public License for Générale Publique GNU Affero +* more details. pour plus de détails. +* +* You should have received Vous devriez avoir reçu une +* a copy of the GNU Affero copie de la Licence Générale +* General Public License along Publique GNU Affero avec +* with OpenCADC. If not, see OpenCADC ; si ce n’est +* . pas le cas, consultez : +* . +* +* $Revision: 4 $ +* +************************************************************************ +*/ + +package org.opencadc.vault; + +import ca.nrc.cadc.auth.AuthenticationUtil; +import ca.nrc.cadc.uws.server.JobExecutor; +import ca.nrc.cadc.uws.server.JobPersistence; +import ca.nrc.cadc.uws.server.JobUpdater; +import ca.nrc.cadc.uws.server.SimpleJobManager; +import ca.nrc.cadc.uws.server.ThreadPoolExecutor; +import ca.nrc.cadc.uws.server.impl.PostgresJobPersistence; +import org.apache.log4j.Logger; +import org.opencadc.vospace.server.async.RecursiveNodePropsRunner; + +/** + * + * @author pdowler, majorb, yeunga, adriand + */ +public class RecursiveNodePropsJobManager extends SimpleJobManager { + private static final Logger log = Logger.getLogger(RecursiveNodePropsJobManager.class); + + private static final Long MAX_EXEC_DURATION = Long.valueOf(12 * 7200L); // 24 hours? + private static final Long MAX_DESTRUCTION = Long.valueOf(7 * 24 * 3600L); // 1 week + private static final Long MAX_QUOTE = Long.valueOf(12 * 7200L); // same as exec + + protected static JobPersistence jp; + + static { + log.info("Creating shared (postgres) job manager"); + jp = new PostgresJobPersistence(AuthenticationUtil.getIdentityManager()); + } + + public RecursiveNodePropsJobManager() { + super(); + // jp is instantiated in parent org.opencadc.cavern.JobManager + JobUpdater ju = jp; + super.setJobPersistence(jp); + + JobExecutor jobExec = new ThreadPoolExecutor(ju, RecursiveNodePropsRunner.class, 3); + super.setJobExecutor(jobExec); + + super.setMaxExecDuration(MAX_EXEC_DURATION); + super.setMaxDestruction(MAX_DESTRUCTION); + super.setMaxQuote(MAX_QUOTE); + } +} diff --git a/vault/src/main/webapp/WEB-INF/web.xml b/vault/src/main/webapp/WEB-INF/web.xml index 90476792e..8dc696d97 100644 --- a/vault/src/main/webapp/WEB-INF/web.xml +++ b/vault/src/main/webapp/WEB-INF/web.xml @@ -18,12 +18,12 @@ logLevelPackages org.opencadc.vault - ca.nrc.cadc.db + org.opencadc.vospace - ca.nrc.cadc.rest + @@ -63,7 +63,7 @@ 2 - + RecursiveDeleteNodeServlet ca.nrc.cadc.uws.server.JobServlet @@ -86,6 +86,33 @@ 3 + + + RecursiveNodePropsServlet + ca.nrc.cadc.uws.server.JobServlet + + get + ca.nrc.cadc.uws.web.GetAction + + + post + ca.nrc.cadc.uws.web.PostAction + + + delete + ca.nrc.cadc.uws.web.DeleteAction + + + ca.nrc.cadc.uws.server.JobManager + org.opencadc.vault.RecursiveNodePropsJobManager + + + ca.nrc.cadc.rest.InlineContentHandler + org.opencadc.vospace.server.async.InlineNodeJobHandler + + 3 + + @@ -134,7 +161,12 @@ RecursiveDeleteNodeServlet - /recursiveDelete/* + /async-delete/* + + + + RecursiveNodePropsServlet + /async-setprops/* diff --git a/vault/src/main/webapp/capabilities.xml b/vault/src/main/webapp/capabilities.xml index d24f1a220..28cfb09bc 100644 --- a/vault/src/main/webapp/capabilities.xml +++ b/vault/src/main/webapp/capabilities.xml @@ -43,7 +43,17 @@ - https://replace.me.com/vault/recursiveDelete + https://replace.me.com/vault/async-delete + + + + + + + + + + https://replace.me.com/vault/async-setprops From f1d4a635c9e6d836d28ed2e0f329269a8c3210cb Mon Sep 17 00:00:00 2001 From: Adrian Damian Date: Mon, 11 Dec 2023 06:38:12 -0800 Subject: [PATCH 2/4] Small updates --- .../java/org/opencadc/vault/VosiCapabilitiesTest.java | 4 ++-- vault/src/main/webapp/WEB-INF/web.xml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/vault/src/intTest/java/org/opencadc/vault/VosiCapabilitiesTest.java b/vault/src/intTest/java/org/opencadc/vault/VosiCapabilitiesTest.java index fb88ef76e..af49d8548 100644 --- a/vault/src/intTest/java/org/opencadc/vault/VosiCapabilitiesTest.java +++ b/vault/src/intTest/java/org/opencadc/vault/VosiCapabilitiesTest.java @@ -85,8 +85,8 @@ public class VosiCapabilitiesTest extends CapabilitiesTest { private static final Logger log = Logger.getLogger(VosiCapabilitiesTest.class); static { - Log4jInit.setLevel("ca.nrc.cadc.vosi", Level.DEBUG); - Log4jInit.setLevel("org.opencadc.vault", Level.DEBUG); + Log4jInit.setLevel("ca.nrc.cadc.vosi", Level.INFO); + Log4jInit.setLevel("org.opencadc.vault", Level.INFO); } public static final URI VAULT_SERVICE_ID = URI.create("ivo://opencadc.org/vault"); diff --git a/vault/src/main/webapp/WEB-INF/web.xml b/vault/src/main/webapp/WEB-INF/web.xml index 8dc696d97..c034a2f70 100644 --- a/vault/src/main/webapp/WEB-INF/web.xml +++ b/vault/src/main/webapp/WEB-INF/web.xml @@ -18,12 +18,12 @@ logLevelPackages org.opencadc.vault - + ca.nrc.cadc.db org.opencadc.vospace - + ca.nrc.cadc.uws From 0debf14be629547dfa4e86e8bc3b63f11c388679 Mon Sep 17 00:00:00 2001 From: Adrian Damian Date: Mon, 11 Dec 2023 06:47:24 -0800 Subject: [PATCH 3/4] Updated dependencies --- vault/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vault/build.gradle b/vault/build.gradle index 2952fd263..6a637f96c 100644 --- a/vault/build.gradle +++ b/vault/build.gradle @@ -35,7 +35,7 @@ dependencies { compile 'org.opencadc:cadc-gms:[1.0.5,)' compile 'org.opencadc:cadc-rest:[1.3.16,)' compile 'org.opencadc:cadc-vos:[2.0,)' - compile 'org.opencadc:cadc-vos-server:[2.0.1,)' + compile 'org.opencadc:cadc-vos-server:[2.0.3,)' compile 'org.opencadc:cadc-vosi:[1.3.2,)' compile 'org.opencadc:cadc-uws:[1.0,)' compile 'org.opencadc:cadc-uws-server:[1.2.19,)' @@ -51,7 +51,7 @@ dependencies { runtime 'org.opencadc:cadc-gms:[1.0.5,)' intTestCompile 'org.opencadc:cadc-test-vosi:[1.0.11,)' - intTestCompile 'org.opencadc:cadc-test-vos:[2.0,3.0)' + intTestCompile 'org.opencadc:cadc-test-vos:[2.1,)' } configurations { From f858acad0a4559c64e13a7dfe8a2e6e417f78c3b Mon Sep 17 00:00:00 2001 From: Adrian Damian Date: Mon, 11 Dec 2023 10:08:00 -0800 Subject: [PATCH 4/4] Rework after code review --- .../vault/RecursiveDeleteNodeJobManager.java | 16 +-- .../vault/RecursiveNodePropsJobManager.java | 16 +-- .../org/opencadc/vault/VaultJobManager.java | 97 +++++++++++++++++++ 3 files changed, 103 insertions(+), 26 deletions(-) create mode 100644 vault/src/main/java/org/opencadc/vault/VaultJobManager.java diff --git a/vault/src/main/java/org/opencadc/vault/RecursiveDeleteNodeJobManager.java b/vault/src/main/java/org/opencadc/vault/RecursiveDeleteNodeJobManager.java index b438dbeaa..87619dd2a 100644 --- a/vault/src/main/java/org/opencadc/vault/RecursiveDeleteNodeJobManager.java +++ b/vault/src/main/java/org/opencadc/vault/RecursiveDeleteNodeJobManager.java @@ -69,13 +69,10 @@ package org.opencadc.vault; -import ca.nrc.cadc.auth.AuthenticationUtil; import ca.nrc.cadc.uws.server.JobExecutor; import ca.nrc.cadc.uws.server.JobPersistence; import ca.nrc.cadc.uws.server.JobUpdater; -import ca.nrc.cadc.uws.server.SimpleJobManager; import ca.nrc.cadc.uws.server.ThreadPoolExecutor; -import ca.nrc.cadc.uws.server.impl.PostgresJobPersistence; import org.apache.log4j.Logger; import org.opencadc.vospace.server.async.RecursiveDeleteNodeRunner; @@ -83,24 +80,17 @@ * * @author pdowler, majorb, yeunga, adriand */ -public class RecursiveDeleteNodeJobManager extends SimpleJobManager { +public class RecursiveDeleteNodeJobManager extends VaultJobManager { private static final Logger log = Logger.getLogger(RecursiveDeleteNodeJobManager.class); private static final Long MAX_EXEC_DURATION = Long.valueOf(12 * 7200L); // 24 hours? private static final Long MAX_DESTRUCTION = Long.valueOf(7 * 24 * 3600L); // 1 week private static final Long MAX_QUOTE = Long.valueOf(12 * 7200L); // same as exec - protected static JobPersistence jp; - - static { - log.info("Creating shared (postgres) job manager"); - jp = new PostgresJobPersistence(AuthenticationUtil.getIdentityManager()); - } - public RecursiveDeleteNodeJobManager() { super(); - // jp is instantiated in parent org.opencadc.cavern.JobManager - JobUpdater ju = jp; + JobPersistence jp = createJobPersistence(); + JobUpdater ju = (JobUpdater) jp; super.setJobPersistence(jp); JobExecutor jobExec = new ThreadPoolExecutor(ju, RecursiveDeleteNodeRunner.class, 3); diff --git a/vault/src/main/java/org/opencadc/vault/RecursiveNodePropsJobManager.java b/vault/src/main/java/org/opencadc/vault/RecursiveNodePropsJobManager.java index 1964d0bef..6117aa67c 100644 --- a/vault/src/main/java/org/opencadc/vault/RecursiveNodePropsJobManager.java +++ b/vault/src/main/java/org/opencadc/vault/RecursiveNodePropsJobManager.java @@ -69,13 +69,10 @@ package org.opencadc.vault; -import ca.nrc.cadc.auth.AuthenticationUtil; import ca.nrc.cadc.uws.server.JobExecutor; import ca.nrc.cadc.uws.server.JobPersistence; import ca.nrc.cadc.uws.server.JobUpdater; -import ca.nrc.cadc.uws.server.SimpleJobManager; import ca.nrc.cadc.uws.server.ThreadPoolExecutor; -import ca.nrc.cadc.uws.server.impl.PostgresJobPersistence; import org.apache.log4j.Logger; import org.opencadc.vospace.server.async.RecursiveNodePropsRunner; @@ -83,24 +80,17 @@ * * @author pdowler, majorb, yeunga, adriand */ -public class RecursiveNodePropsJobManager extends SimpleJobManager { +public class RecursiveNodePropsJobManager extends VaultJobManager { private static final Logger log = Logger.getLogger(RecursiveNodePropsJobManager.class); private static final Long MAX_EXEC_DURATION = Long.valueOf(12 * 7200L); // 24 hours? private static final Long MAX_DESTRUCTION = Long.valueOf(7 * 24 * 3600L); // 1 week private static final Long MAX_QUOTE = Long.valueOf(12 * 7200L); // same as exec - protected static JobPersistence jp; - - static { - log.info("Creating shared (postgres) job manager"); - jp = new PostgresJobPersistence(AuthenticationUtil.getIdentityManager()); - } - public RecursiveNodePropsJobManager() { super(); - // jp is instantiated in parent org.opencadc.cavern.JobManager - JobUpdater ju = jp; + JobPersistence jp = createJobPersistence(); + JobUpdater ju = (JobUpdater) jp; super.setJobPersistence(jp); JobExecutor jobExec = new ThreadPoolExecutor(ju, RecursiveNodePropsRunner.class, 3); diff --git a/vault/src/main/java/org/opencadc/vault/VaultJobManager.java b/vault/src/main/java/org/opencadc/vault/VaultJobManager.java new file mode 100644 index 000000000..7968e7f52 --- /dev/null +++ b/vault/src/main/java/org/opencadc/vault/VaultJobManager.java @@ -0,0 +1,97 @@ +/* +************************************************************************ +******************* CANADIAN ASTRONOMY DATA CENTRE ******************* +************** CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES ************** +* +* (c) 2023. (c) 2023. +* Government of Canada Gouvernement du Canada +* National Research Council Conseil national de recherches +* Ottawa, Canada, K1A 0R6 Ottawa, Canada, K1A 0R6 +* All rights reserved Tous droits réservés +* +* NRC disclaims any warranties, Le CNRC dénie toute garantie +* expressed, implied, or énoncée, implicite ou légale, +* statutory, of any kind with de quelque nature que ce +* respect to the software, soit, concernant le logiciel, +* including without limitation y compris sans restriction +* any warranty of merchantability toute garantie de valeur +* or fitness for a particular marchande ou de pertinence +* purpose. NRC shall not be pour un usage particulier. +* liable in any event for any Le CNRC ne pourra en aucun cas +* damages, whether direct or être tenu responsable de tout +* indirect, special or general, dommage, direct ou indirect, +* consequential or incidental, particulier ou général, +* arising from the use of the accessoire ou fortuit, résultant +* software. Neither the name de l'utilisation du logiciel. Ni +* of the National Research le nom du Conseil National de +* Council of Canada nor the Recherches du Canada ni les noms +* names of its contributors may de ses participants ne peuvent +* be used to endorse or promote être utilisés pour approuver ou +* products derived from this promouvoir les produits dérivés +* software without specific prior de ce logiciel sans autorisation +* written permission. préalable et particulière +* par écrit. +* +* This file is part of the Ce fichier fait partie du projet +* OpenCADC project. OpenCADC. +* +* OpenCADC is free software: OpenCADC est un logiciel libre ; +* you can redistribute it and/or vous pouvez le redistribuer ou le +* modify it under the terms of modifier suivant les termes de +* the GNU Affero General Public la “GNU Affero General Public +* License as published by the License” telle que publiée +* Free Software Foundation, par la Free Software Foundation +* either version 3 of the : soit la version 3 de cette +* License, or (at your option) licence, soit (à votre gré) +* any later version. toute version ultérieure. +* +* OpenCADC is distributed in the OpenCADC est distribué +* hope that it will be useful, dans l’espoir qu’il vous +* but WITHOUT ANY WARRANTY; sera utile, mais SANS AUCUNE +* without even the implied GARANTIE : sans même la garantie +* warranty of MERCHANTABILITY implicite de COMMERCIALISABILITÉ +* or FITNESS FOR A PARTICULAR ni d’ADÉQUATION À UN OBJECTIF +* PURPOSE. See the GNU Affero PARTICULIER. Consultez la Licence +* General Public License for Générale Publique GNU Affero +* more details. pour plus de détails. +* +* You should have received Vous devriez avoir reçu une +* a copy of the GNU Affero copie de la Licence Générale +* General Public License along Publique GNU Affero avec +* with OpenCADC. If not, see OpenCADC ; si ce n’est +* . pas le cas, consultez : +* . +* +* $Revision: 4 $ +* +************************************************************************ +*/ + +package org.opencadc.vault; + +import ca.nrc.cadc.auth.AuthenticationUtil; +import ca.nrc.cadc.uws.server.JobPersistence; +import ca.nrc.cadc.uws.server.SimpleJobManager; +import ca.nrc.cadc.uws.server.impl.PostgresJobPersistence; +import org.apache.log4j.Logger; + +/** + * + * @author adriand + */ +public class VaultJobManager extends SimpleJobManager { + private static final Logger log = Logger.getLogger(VaultJobManager.class); + + protected VaultJobManager() { + super(); + } + + protected final JobPersistence createJobPersistence() { + return new PostgresJobPersistence(AuthenticationUtil.getIdentityManager()); + } + + @Override + public void terminate() throws InterruptedException { + super.terminate(); + } +}