-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #543 from andamian/CADC-12562
Recursive properties (CADC-12562)
- Loading branch information
Showing
8 changed files
with
458 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
104 changes: 104 additions & 0 deletions
104
vault/src/intTest/java/org/opencadc/vault/RecursiveNodeDeleteTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 | ||
| * <http://www.gnu.org/licenses/>. pas le cas, consultez : | ||
| * <http://www.gnu.org/licenses/>. | ||
| * | ||
| ************************************************************************ | ||
| */ | ||
|
|
||
| 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"))); | ||
| } | ||
|
|
||
| } |
104 changes: 104 additions & 0 deletions
104
vault/src/intTest/java/org/opencadc/vault/RecursiveNodePropsTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 | ||
| * <http://www.gnu.org/licenses/>. pas le cas, consultez : | ||
| * <http://www.gnu.org/licenses/>. | ||
| * | ||
| ************************************************************************ | ||
| */ | ||
|
|
||
| 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"))); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
103 changes: 103 additions & 0 deletions
103
vault/src/main/java/org/opencadc/vault/RecursiveNodePropsJobManager.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| /* | ||
| ************************************************************************ | ||
| ******************* 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 | ||
| * <http://www.gnu.org/licenses/>. pas le cas, consultez : | ||
| * <http://www.gnu.org/licenses/>. | ||
| * | ||
| * $Revision: 4 $ | ||
| * | ||
| ************************************************************************ | ||
| */ | ||
|
|
||
| package org.opencadc.vault; | ||
|
|
||
| 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.ThreadPoolExecutor; | ||
| import org.apache.log4j.Logger; | ||
| import org.opencadc.vospace.server.async.RecursiveNodePropsRunner; | ||
|
|
||
| /** | ||
| * | ||
| * @author pdowler, majorb, yeunga, adriand | ||
| */ | ||
| 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 | ||
|
|
||
| public RecursiveNodePropsJobManager() { | ||
| super(); | ||
| JobPersistence jp = createJobPersistence(); | ||
| JobUpdater ju = (JobUpdater) 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); | ||
| } | ||
| } |
Oops, something went wrong.